diff --git a/src/binder/CMakeLists.txt b/src/binder/CMakeLists.txt
index 719e45f701..73a345ec71 100644
--- a/src/binder/CMakeLists.txt
+++ b/src/binder/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(kuzu_binder
         bound_statement_result.cpp
         bound_statement_visitor.cpp
         expression_binder.cpp
+        expression_visitor.cpp
         query_normalizer.cpp)
 
 set(ALL_OBJECT_FILES
diff --git a/src/binder/bind/bind_create_macro.cpp b/src/binder/bind/bind_create_macro.cpp
index 0d8c10023b..2db040ba12 100644
--- a/src/binder/bind/bind_create_macro.cpp
+++ b/src/binder/bind/bind_create_macro.cpp
@@ -1,5 +1,5 @@
 #include "binder/binder.h"
-#include "binder/macro/bound_create_macro.h"
+#include "binder/bound_create_macro.h"
 #include "common/string_utils.h"
 #include "parser/create_macro.h"
 
diff --git a/src/binder/bind/bind_projection_clause.cpp b/src/binder/bind/bind_projection_clause.cpp
index 23aa07f1d4..3efbaf1ce1 100644
--- a/src/binder/bind/bind_projection_clause.cpp
+++ b/src/binder/bind/bind_projection_clause.cpp
@@ -1,6 +1,6 @@
 #include "binder/binder.h"
-#include "binder/expression/expression_visitor.h"
 #include "binder/expression/literal_expression.h"
+#include "binder/expression_visitor.h"
 #include "parser/expression/parsed_property_expression.h"
 
 using namespace kuzu::common;
diff --git a/src/binder/bind/bind_reading_clause.cpp b/src/binder/bind/bind_reading_clause.cpp
index 00caec2ef9..29bdf7b05e 100644
--- a/src/binder/bind/bind_reading_clause.cpp
+++ b/src/binder/bind/bind_reading_clause.cpp
@@ -1,6 +1,6 @@
 #include "binder/binder.h"
-#include "binder/call/bound_in_query_call.h"
 #include "binder/expression/literal_expression.h"
+#include "binder/query/reading_clause/bound_in_query_call.h"
 #include "binder/query/reading_clause/bound_unwind_clause.h"
 #include "parser/query/reading_clause/in_query_call_clause.h"
 #include "parser/query/reading_clause/unwind_clause.h"
diff --git a/src/binder/bind/bind_standalone_call.cpp b/src/binder/bind/bind_standalone_call.cpp
index 67b1070f9a..f1e0a4ed20 100644
--- a/src/binder/bind/bind_standalone_call.cpp
+++ b/src/binder/bind/bind_standalone_call.cpp
@@ -1,5 +1,5 @@
 #include "binder/binder.h"
-#include "binder/call/bound_standalone_call.h"
+#include "binder/bound_standalone_call.h"
 #include "parser/standalone_call.h"
 
 namespace kuzu {
diff --git a/src/binder/expression/CMakeLists.txt b/src/binder/expression/CMakeLists.txt
index e134ec5642..5c0e6e8aec 100644
--- a/src/binder/expression/CMakeLists.txt
+++ b/src/binder/expression/CMakeLists.txt
@@ -3,7 +3,6 @@ add_library(
         OBJECT
         case_expression.cpp
         expression.cpp
-        expression_visitor.cpp
         function_expression.cpp)
 
 set(ALL_OBJECT_FILES
diff --git a/src/binder/expression_binder.cpp b/src/binder/expression_binder.cpp
index ab8f36092d..dd70b416fe 100644
--- a/src/binder/expression_binder.cpp
+++ b/src/binder/expression_binder.cpp
@@ -1,10 +1,10 @@
 #include "binder/expression_binder.h"
 
 #include "binder/binder.h"
-#include "binder/expression/expression_visitor.h"
 #include "binder/expression/function_expression.h"
 #include "binder/expression/literal_expression.h"
 #include "binder/expression/parameter_expression.h"
+#include "binder/expression_visitor.h"
 #include "function/cast/vector_cast_functions.h"
 
 using namespace kuzu::common;
diff --git a/src/binder/expression/expression_visitor.cpp b/src/binder/expression_visitor.cpp
similarity index 98%
rename from src/binder/expression/expression_visitor.cpp
rename to src/binder/expression_visitor.cpp
index f50360af9e..e49b7400bd 100644
--- a/src/binder/expression/expression_visitor.cpp
+++ b/src/binder/expression_visitor.cpp
@@ -1,4 +1,4 @@
-#include "binder/expression/expression_visitor.h"
+#include "binder/expression_visitor.h"
 
 #include "binder/expression/case_expression.h"
 #include "binder/expression/existential_subquery_expression.h"
diff --git a/src/binder/expression_visitor/CMakeLists.txt b/src/binder/expression_visitor/CMakeLists.txt
deleted file mode 100644
index 6e624e681b..0000000000
--- a/src/binder/expression_visitor/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-add_library(
-        kuzu_binder_expression_visitor
-        OBJECT
-        ../expression/expression_visitor.cpp)
-
-set(ALL_OBJECT_FILES
-        ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:kuzu_binder_expression_visitor>
-        PARENT_SCOPE)
diff --git a/src/binder/query/query_graph.cpp b/src/binder/query/query_graph.cpp
index 4b02721653..0b98a2b96f 100644
--- a/src/binder/query/query_graph.cpp
+++ b/src/binder/query/query_graph.cpp
@@ -1,6 +1,6 @@
-#include "binder/query/reading_clause/query_graph.h"
+#include "binder/query/query_graph.h"
 
-#include "binder/expression/expression_visitor.h"
+#include "binder/expression_visitor.h"
 
 namespace kuzu {
 namespace binder {
diff --git a/src/binder/visitor/property_collector.cpp b/src/binder/visitor/property_collector.cpp
index 3400d3ad65..e965f03314 100644
--- a/src/binder/visitor/property_collector.cpp
+++ b/src/binder/visitor/property_collector.cpp
@@ -1,6 +1,6 @@
 #include "binder/visitor/property_collector.h"
 
-#include "binder/expression/expression_visitor.h"
+#include "binder/expression_visitor.h"
 #include "binder/query/reading_clause/bound_match_clause.h"
 #include "binder/query/reading_clause/bound_unwind_clause.h"
 #include "binder/query/updating_clause/bound_create_clause.h"
diff --git a/src/include/binder/macro/bound_create_macro.h b/src/include/binder/bound_create_macro.h
similarity index 100%
rename from src/include/binder/macro/bound_create_macro.h
rename to src/include/binder/bound_create_macro.h
diff --git a/src/include/binder/call/bound_standalone_call.h b/src/include/binder/bound_standalone_call.h
similarity index 100%
rename from src/include/binder/call/bound_standalone_call.h
rename to src/include/binder/bound_standalone_call.h
diff --git a/src/include/binder/expression/expression_visitor.h b/src/include/binder/expression_visitor.h
similarity index 100%
rename from src/include/binder/expression/expression_visitor.h
rename to src/include/binder/expression_visitor.h
diff --git a/src/include/binder/query/normalized_query_part.h b/src/include/binder/query/normalized_query_part.h
index 3eb2f07e8d..a589493d78 100644
--- a/src/include/binder/query/normalized_query_part.h
+++ b/src/include/binder/query/normalized_query_part.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "binder/query/reading_clause/bound_unwind_clause.h"
-#include "binder/query/reading_clause/query_graph.h"
 #include "binder/query/return_with_clause/bound_projection_body.h"
 #include "binder/query/updating_clause/bound_updating_clause.h"
+#include "query_graph.h"
 
 namespace kuzu {
 namespace binder {
diff --git a/src/include/binder/query/reading_clause/query_graph.h b/src/include/binder/query/query_graph.h
similarity index 100%
rename from src/include/binder/query/reading_clause/query_graph.h
rename to src/include/binder/query/query_graph.h
diff --git a/src/include/binder/call/bound_in_query_call.h b/src/include/binder/query/reading_clause/bound_in_query_call.h
similarity index 100%
rename from src/include/binder/call/bound_in_query_call.h
rename to src/include/binder/query/reading_clause/bound_in_query_call.h
diff --git a/src/include/binder/query/reading_clause/bound_match_clause.h b/src/include/binder/query/reading_clause/bound_match_clause.h
index 711b77543a..7fa673e884 100644
--- a/src/include/binder/query/reading_clause/bound_match_clause.h
+++ b/src/include/binder/query/reading_clause/bound_match_clause.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "binder/expression/expression.h"
+#include "binder/query/query_graph.h"
 #include "bound_reading_clause.h"
-#include "query_graph.h"
 
 namespace kuzu {
 namespace binder {
diff --git a/src/include/binder/query/updating_clause/bound_merge_clause.h b/src/include/binder/query/updating_clause/bound_merge_clause.h
index 2bbcd56434..608d3c6942 100644
--- a/src/include/binder/query/updating_clause/bound_merge_clause.h
+++ b/src/include/binder/query/updating_clause/bound_merge_clause.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "binder/query/reading_clause/query_graph.h"
+#include "binder/query/query_graph.h"
 #include "bound_create_info.h"
 #include "bound_set_info.h"
 #include "bound_updating_clause.h"
diff --git a/src/include/planner/join_order/cardinality_estimator.h b/src/include/planner/join_order/cardinality_estimator.h
index e01fe4438f..05153f6abc 100644
--- a/src/include/planner/join_order/cardinality_estimator.h
+++ b/src/include/planner/join_order/cardinality_estimator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "binder/query/reading_clause/query_graph.h"
+#include "binder/query/query_graph.h"
 #include "planner/logical_plan/logical_plan.h"
 #include "storage/store/nodes_statistics_and_deleted_ids.h"
 #include "storage/store/rels_statistics.h"
diff --git a/src/include/planner/query_planner.h b/src/include/planner/query_planner.h
index 8b40bce58b..856c071208 100644
--- a/src/include/planner/query_planner.h
+++ b/src/include/planner/query_planner.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "binder/bound_statement.h"
-#include "binder/call/bound_in_query_call.h"
 #include "binder/expression/existential_subquery_expression.h"
+#include "binder/query/reading_clause/bound_in_query_call.h"
 #include "join_order_enumerator.h"
 #include "planner/join_order/cardinality_estimator.h"
 #include "projection_planner.h"
diff --git a/src/include/planner/subplans_table.h b/src/include/planner/subplans_table.h
index b25fd420e1..35b0a7f1d1 100644
--- a/src/include/planner/subplans_table.h
+++ b/src/include/planner/subplans_table.h
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "binder/query/reading_clause/query_graph.h"
+#include "binder/query/query_graph.h"
 #include "planner/logical_plan/logical_plan.h"
 
 using namespace kuzu::binder;
diff --git a/src/optimizer/filter_push_down_optimizer.cpp b/src/optimizer/filter_push_down_optimizer.cpp
index 21d5b6bf33..ae82971c71 100644
--- a/src/optimizer/filter_push_down_optimizer.cpp
+++ b/src/optimizer/filter_push_down_optimizer.cpp
@@ -1,8 +1,8 @@
 #include "optimizer/filter_push_down_optimizer.h"
 
-#include "binder/expression/expression_visitor.h"
 #include "binder/expression/literal_expression.h"
 #include "binder/expression/property_expression.h"
+#include "binder/expression_visitor.h"
 #include "planner/logical_plan/logical_operator/logical_dummy_scan.h"
 #include "planner/logical_plan/logical_operator/logical_filter.h"
 #include "planner/logical_plan/logical_operator/logical_scan_node.h"
diff --git a/src/optimizer/projection_push_down_optimizer.cpp b/src/optimizer/projection_push_down_optimizer.cpp
index 9941470a0e..441ff863ef 100644
--- a/src/optimizer/projection_push_down_optimizer.cpp
+++ b/src/optimizer/projection_push_down_optimizer.cpp
@@ -1,6 +1,6 @@
 #include "optimizer/projection_push_down_optimizer.h"
 
-#include "binder/expression/expression_visitor.h"
+#include "binder/expression_visitor.h"
 #include "planner/logical_plan/logical_operator/logical_accumulate.h"
 #include "planner/logical_plan/logical_operator/logical_create.h"
 #include "planner/logical_plan/logical_operator/logical_delete.h"
diff --git a/src/planner/join_order/append_extend.cpp b/src/planner/join_order/append_extend.cpp
index 9b640331d1..0cb84db063 100644
--- a/src/planner/join_order/append_extend.cpp
+++ b/src/planner/join_order/append_extend.cpp
@@ -1,4 +1,4 @@
-#include "binder/expression/expression_visitor.h"
+#include "binder/expression_visitor.h"
 #include "planner/join_order/cost_model.h"
 #include "planner/join_order_enumerator.h"
 #include "planner/logical_plan/logical_operator/logical_extend.h"
diff --git a/src/planner/join_order_enumerator.cpp b/src/planner/join_order_enumerator.cpp
index 8c061a232f..25a7e07137 100644
--- a/src/planner/join_order_enumerator.cpp
+++ b/src/planner/join_order_enumerator.cpp
@@ -1,6 +1,6 @@
 #include "planner/join_order_enumerator.h"
 
-#include "binder/expression/expression_visitor.h"
+#include "binder/expression_visitor.h"
 #include "planner/join_order/cost_model.h"
 #include "planner/logical_plan/logical_operator/logical_scan_node.h"
 #include "planner/query_planner.h"
diff --git a/src/planner/operator/schema.cpp b/src/planner/operator/schema.cpp
index 93aa307071..af5dd98aa0 100644
--- a/src/planner/operator/schema.cpp
+++ b/src/planner/operator/schema.cpp
@@ -1,6 +1,6 @@
 #include "planner/logical_plan/logical_operator/schema.h"
 
-#include "binder/expression/expression_visitor.h"
+#include "binder/expression_visitor.h"
 #include "common/exception.h"
 
 using namespace kuzu::binder;
diff --git a/src/planner/planner.cpp b/src/planner/planner.cpp
index 1cd1611510..5d6dfacb5f 100644
--- a/src/planner/planner.cpp
+++ b/src/planner/planner.cpp
@@ -1,7 +1,8 @@
 #include "planner/planner.h"
 
+#include "binder/bound_create_macro.h"
 #include "binder/bound_explain.h"
-#include "binder/call/bound_standalone_call.h"
+#include "binder/bound_standalone_call.h"
 #include "binder/copy/bound_copy_from.h"
 #include "binder/copy/bound_copy_to.h"
 #include "binder/ddl/bound_add_property.h"
@@ -12,7 +13,6 @@
 #include "binder/ddl/bound_rename_property.h"
 #include "binder/ddl/bound_rename_table.h"
 #include "binder/expression/variable_expression.h"
-#include "binder/macro/bound_create_macro.h"
 #include "planner/logical_plan/logical_operator/logical_add_property.h"
 #include "planner/logical_plan/logical_operator/logical_copy_from.h"
 #include "planner/logical_plan/logical_operator/logical_copy_to.h"
diff --git a/src/planner/projection_planner.cpp b/src/planner/projection_planner.cpp
index 59e6dc0a99..0a99f2c64c 100644
--- a/src/planner/projection_planner.cpp
+++ b/src/planner/projection_planner.cpp
@@ -1,7 +1,7 @@
 #include "planner/projection_planner.h"
 
-#include "binder/expression/expression_visitor.h"
 #include "binder/expression/function_expression.h"
+#include "binder/expression_visitor.h"
 #include "planner/logical_plan/logical_operator/flatten_resolver.h"
 #include "planner/logical_plan/logical_operator/logical_aggregate.h"
 #include "planner/logical_plan/logical_operator/logical_limit.h"
diff --git a/src/planner/query_planner.cpp b/src/planner/query_planner.cpp
index 973509ca9f..3bd9ba0fc4 100644
--- a/src/planner/query_planner.cpp
+++ b/src/planner/query_planner.cpp
@@ -1,7 +1,7 @@
 #include "planner/query_planner.h"
 
-#include "binder/expression/expression_visitor.h"
 #include "binder/expression/literal_expression.h"
+#include "binder/expression_visitor.h"
 #include "binder/query/bound_regular_query.h"
 #include "binder/visitor/property_collector.h"
 #include "common/join_type.h"