diff --git a/dbcon/rbo/CMakeLists.txt b/dbcon/rbo/CMakeLists.txt
index 3d7136538..96909c512 100644
--- a/dbcon/rbo/CMakeLists.txt
+++ b/dbcon/rbo/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(rbo_SRCS ../mysql/rulebased_optimizer.cpp ../mysql/rbo_apply_parallel_ces.cpp ../mysql/rbo_predicate_pushdown.cpp)
+set(rbo_SRCS rulebased_optimizer.cpp rbo_apply_parallel_ces.cpp rbo_predicate_pushdown.cpp)
 
 columnstore_library(rbo ${rbo_SRCS})
 
diff --git a/dbcon/mysql/rbo_apply_parallel_ces.cpp b/dbcon/rbo/rbo_apply_parallel_ces.cpp
similarity index 100%
rename from dbcon/mysql/rbo_apply_parallel_ces.cpp
rename to dbcon/rbo/rbo_apply_parallel_ces.cpp
diff --git a/dbcon/mysql/rbo_apply_parallel_ces.h b/dbcon/rbo/rbo_apply_parallel_ces.h
similarity index 98%
rename from dbcon/mysql/rbo_apply_parallel_ces.h
rename to dbcon/rbo/rbo_apply_parallel_ces.h
index b6f931430..dee6ea173 100644
--- a/dbcon/mysql/rbo_apply_parallel_ces.h
+++ b/dbcon/rbo/rbo_apply_parallel_ces.h
@@ -19,7 +19,7 @@
 
 #define PREFER_MY_CONFIG_H
 #include <my_config.h>
-#include "idb_mysql.h"
+#include <dbcon/mysql/idb_mysql.h>
 
 #include <optional>
 #include <vector>
diff --git a/dbcon/mysql/rbo_predicate_pushdown.cpp b/dbcon/rbo/rbo_predicate_pushdown.cpp
similarity index 100%
rename from dbcon/mysql/rbo_predicate_pushdown.cpp
rename to dbcon/rbo/rbo_predicate_pushdown.cpp
diff --git a/dbcon/mysql/rbo_predicate_pushdown.h b/dbcon/rbo/rbo_predicate_pushdown.h
similarity index 96%
rename from dbcon/mysql/rbo_predicate_pushdown.h
rename to dbcon/rbo/rbo_predicate_pushdown.h
index d05617208..de8b5fa57 100644
--- a/dbcon/mysql/rbo_predicate_pushdown.h
+++ b/dbcon/rbo/rbo_predicate_pushdown.h
@@ -19,7 +19,7 @@
 
 #define PREFER_MY_CONFIG_H
 #include <my_config.h>
-#include "idb_mysql.h"
+#include <dbcon/mysql/idb_mysql.h>
 
 #include "execplan/calpontselectexecutionplan.h"
 #include "rulebased_optimizer.h"
diff --git a/dbcon/mysql/rulebased_optimizer.cpp b/dbcon/rbo/rulebased_optimizer.cpp
similarity index 100%
rename from dbcon/mysql/rulebased_optimizer.cpp
rename to dbcon/rbo/rulebased_optimizer.cpp
diff --git a/dbcon/mysql/rulebased_optimizer.h b/dbcon/rbo/rulebased_optimizer.h
similarity index 98%
rename from dbcon/mysql/rulebased_optimizer.h
rename to dbcon/rbo/rulebased_optimizer.h
index 39dc47f6d..a181e911f 100644
--- a/dbcon/mysql/rulebased_optimizer.h
+++ b/dbcon/rbo/rulebased_optimizer.h
@@ -23,7 +23,7 @@
 #include <my_config.h>
 // #include "idb_mysql.h"
 
-#include "ha_mcs_impl_if.h"
+#include <dbcon/mysql/ha_mcs_impl_if.h>
 
 #include "execplan/calpontselectexecutionplan.h"
 
diff --git a/tests/rbo_hybrid.cpp b/tests/rbo_hybrid.cpp
index 7bc4a599a..39b83bf5d 100644
--- a/tests/rbo_hybrid.cpp
+++ b/tests/rbo_hybrid.cpp
@@ -9,11 +9,11 @@
 #include <vector>
 #include <string>
 
-#include "../dbcon/mysql/rbo_apply_parallel_ces.h"
+#include <dbcon/rbo/rbo_apply_parallel_ces.h>
 
-#include "../dbcon/execplan/calpontselectexecutionplan.h"
-#include "../dbcon/execplan/simplecolumn.h"
-#include "../dbcon/mysql/ha_mcs_impl_if.h"
+#include <dbcon/execplan/calpontselectexecutionplan.h>
+#include <dbcon/execplan/simplecolumn.h>
+#include <dbcon/mysql/ha_mcs_impl_if.h>
 
 class RBOHybridTest : public ::testing::Test
 {
diff --git a/tests/rewritetest.cpp b/tests/rewritetest.cpp
old mode 100755
new mode 100644