diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba8ce62fd3..f3bbbbc53e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,15 +308,7 @@ endif()
 
 # --- Core Project Structure and Module Setup ---
 
-include_directories(
-    "src/core"
-    "src/core/algorithms"
-    "src/core/model"
-    "src/core/model/types"
-    "src/core/parser"
-    "src/core/util"
-    "src/core/config"
-)
+include_directories("src")
 
 add_subdirectory("src/core")
 
diff --git a/src/core/algorithms/algebraic_constraints/ac_algorithm.cpp b/src/core/algorithms/algebraic_constraints/ac_algorithm.cpp
index 9d84db3f0d..1dda94b968 100644
--- a/src/core/algorithms/algebraic_constraints/ac_algorithm.cpp
+++ b/src/core/algorithms/algebraic_constraints/ac_algorithm.cpp
@@ -1,15 +1,15 @@
-#include "ac_algorithm.h"
+#include "core/algorithms/algebraic_constraints/ac_algorithm.h"
 
 #include <cmath>
 #include <functional>
 #include <iostream>
 #include <random>
 
-#include "config/exceptions.h"
-#include "config/names_and_descriptions.h"
-#include "config/tabular_data/input_table/option.h"
-#include "types/create_type.h"
-#include "util/logger.h"
+#include "core/config/exceptions.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/types/create_type.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algebraic_constraints/ac_algorithm.h b/src/core/algorithms/algebraic_constraints/ac_algorithm.h
index a76688c4bc..a76810ca5d 100644
--- a/src/core/algorithms/algebraic_constraints/ac_algorithm.h
+++ b/src/core/algorithms/algebraic_constraints/ac_algorithm.h
@@ -6,17 +6,17 @@
 
 #include <enum.h>
 
-#include "ac.h"
-#include "ac_exception.h"
-#include "ac_exception_finder.h"
-#include "ac_pairs_collection.h"
-#include "algorithms/algorithm.h"
-#include "bin_operation_enum.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "model/types/types.h"
-#include "ranges_collection.h"
-#include "typed_column_pair.h"
+#include "core/algorithms/algebraic_constraints/ac.h"
+#include "core/algorithms/algebraic_constraints/ac_exception.h"
+#include "core/algorithms/algebraic_constraints/ac_exception_finder.h"
+#include "core/algorithms/algebraic_constraints/ac_pairs_collection.h"
+#include "core/algorithms/algebraic_constraints/bin_operation_enum.h"
+#include "core/algorithms/algebraic_constraints/ranges_collection.h"
+#include "core/algorithms/algebraic_constraints/typed_column_pair.h"
+#include "core/algorithms/algorithm.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/model/types/types.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algebraic_constraints/ac_exception.h b/src/core/algorithms/algebraic_constraints/ac_exception.h
index 11b138a270..2fc6cbfbfc 100644
--- a/src/core/algorithms/algebraic_constraints/ac_exception.h
+++ b/src/core/algorithms/algebraic_constraints/ac_exception.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "typed_column_pair.h"
+#include "core/algorithms/algebraic_constraints/typed_column_pair.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algebraic_constraints/ac_exception_finder.cpp b/src/core/algorithms/algebraic_constraints/ac_exception_finder.cpp
index 248a5dcff2..1405b26fc1 100644
--- a/src/core/algorithms/algebraic_constraints/ac_exception_finder.cpp
+++ b/src/core/algorithms/algebraic_constraints/ac_exception_finder.cpp
@@ -1,7 +1,7 @@
-#include "ac_exception_finder.h"
+#include "core/algorithms/algebraic_constraints/ac_exception_finder.h"
 
-#include "ac_algorithm.h"
-#include "bin_operation_enum.h"
+#include "core/algorithms/algebraic_constraints/ac_algorithm.h"
+#include "core/algorithms/algebraic_constraints/bin_operation_enum.h"
 
 namespace algos::algebraic_constraints {
 
diff --git a/src/core/algorithms/algebraic_constraints/ac_exception_finder.h b/src/core/algorithms/algebraic_constraints/ac_exception_finder.h
index 99b45ff0d2..3546935f83 100644
--- a/src/core/algorithms/algebraic_constraints/ac_exception_finder.h
+++ b/src/core/algorithms/algebraic_constraints/ac_exception_finder.h
@@ -2,9 +2,9 @@
 
 #include <vector>
 
-#include "ac_exception.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "ranges_collection.h"
+#include "core/algorithms/algebraic_constraints/ac_exception.h"
+#include "core/algorithms/algebraic_constraints/ranges_collection.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos {
 class ACAlgorithm;
diff --git a/src/core/algorithms/algebraic_constraints/ac_pairs_collection.h b/src/core/algorithms/algebraic_constraints/ac_pairs_collection.h
index c72a7e5f03..48c82b6663 100644
--- a/src/core/algorithms/algebraic_constraints/ac_pairs_collection.h
+++ b/src/core/algorithms/algebraic_constraints/ac_pairs_collection.h
@@ -3,8 +3,8 @@
 #include <memory>
 #include <vector>
 
-#include "ac.h"
-#include "typed_column_pair.h"
+#include "core/algorithms/algebraic_constraints/ac.h"
+#include "core/algorithms/algebraic_constraints/typed_column_pair.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algebraic_constraints/mining_algorithms.h b/src/core/algorithms/algebraic_constraints/mining_algorithms.h
index 7cbb7ba941..bb27426239 100644
--- a/src/core/algorithms/algebraic_constraints/mining_algorithms.h
+++ b/src/core/algorithms/algebraic_constraints/mining_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/algebraic_constraints/ac_algorithm.h"
+#include "core/algorithms/algebraic_constraints/ac_algorithm.h"
diff --git a/src/core/algorithms/algebraic_constraints/ranges_collection.h b/src/core/algorithms/algebraic_constraints/ranges_collection.h
index 50f1a339e9..eeade74607 100644
--- a/src/core/algorithms/algebraic_constraints/ranges_collection.h
+++ b/src/core/algorithms/algebraic_constraints/ranges_collection.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include "numeric_type.h"
-#include "typed_column_pair.h"
+#include "core/algorithms/algebraic_constraints/typed_column_pair.h"
+#include "core/model/types/numeric_type.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algebraic_constraints/typed_column_pair.h b/src/core/algorithms/algebraic_constraints/typed_column_pair.h
index 87b13518f1..88eb5e2dff 100644
--- a/src/core/algorithms/algebraic_constraints/typed_column_pair.h
+++ b/src/core/algorithms/algebraic_constraints/typed_column_pair.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "numeric_type.h"
+#include "core/model/types/numeric_type.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algo_factory.cpp b/src/core/algorithms/algo_factory.cpp
index 37e5a19a49..5d21bbb2fd 100644
--- a/src/core/algorithms/algo_factory.cpp
+++ b/src/core/algorithms/algo_factory.cpp
@@ -1,14 +1,14 @@
-#include "algo_factory.h"
+#include "core/algorithms/algo_factory.h"
 
 #include <algorithm>
 #include <stdexcept>
 #include <type_traits>
 #include <vector>
 
-#include "algorithms/algorithms.h"
-#include "algorithms/create_algorithm.h"
-#include "config/names.h"
-#include "tabular_data/input_tables_type.h"
+#include "core/algorithms/algorithms.h"
+#include "core/algorithms/create_algorithm.h"
+#include "core/config/names.h"
+#include "core/config/tabular_data/input_tables_type.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algo_factory.h b/src/core/algorithms/algo_factory.h
index 1554f076fc..33b71e4193 100644
--- a/src/core/algorithms/algo_factory.h
+++ b/src/core/algorithms/algo_factory.h
@@ -7,8 +7,8 @@
 
 #include <boost/any.hpp>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/algorithm_types.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/algorithm_types.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algorithm.cpp b/src/core/algorithms/algorithm.cpp
index 4822b6e1eb..5e1a9ffd2d 100644
--- a/src/core/algorithms/algorithm.cpp
+++ b/src/core/algorithms/algorithm.cpp
@@ -1,9 +1,9 @@
-#include "algorithms/algorithm.h"
+#include "core/algorithms/algorithm.h"
 
 #include <algorithm>
 #include <cassert>
 
-#include "config/exceptions.h"
+#include "core/config/exceptions.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algorithm.h b/src/core/algorithms/algorithm.h
index 85f3c8b490..05409665dc 100644
--- a/src/core/algorithms/algorithm.h
+++ b/src/core/algorithms/algorithm.h
@@ -10,11 +10,11 @@
 
 #include <boost/any.hpp>
 
-#include "config/ioption.h"
-#include "config/option.h"
-#include "model/table/idataset_stream.h"
-#include "parser/csv_parser/csv_parser.h"
-#include "util/progress.h"
+#include "core/config/ioption.h"
+#include "core/config/option.h"
+#include "core/model/table/idataset_stream.h"
+#include "core/parser/csv_parser/csv_parser.h"
+#include "core/util/progress.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algorithm_types.h b/src/core/algorithms/algorithm_types.h
index 00fb9278d7..70cbbef635 100644
--- a/src/core/algorithms/algorithm_types.h
+++ b/src/core/algorithms/algorithm_types.h
@@ -2,7 +2,7 @@
 
 #include <enum.h>
 
-#include "algorithms/algorithms.h"
+#include "core/algorithms/algorithms.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/algorithms.h b/src/core/algorithms/algorithms.h
index c48c174d53..3984eab5bb 100644
--- a/src/core/algorithms/algorithms.h
+++ b/src/core/algorithms/algorithms.h
@@ -1,21 +1,21 @@
 #pragma once
 
-#include "algorithms/algebraic_constraints/mining_algorithms.h"
-#include "algorithms/association_rules/mining_algorithms.h"
-#include "algorithms/cfd/cfd_verifier/cfd_verifier.h"
-#include "algorithms/cfd/mining_algorithms.h"
-#include "algorithms/dd/mining_algorithms.h"
-#include "algorithms/fd/mining_algorithms.h"
-#include "algorithms/fd/sfd/cords.h"
-#include "algorithms/fd/verification_algorithms.h"
-#include "algorithms/gfd/gfd_validator/verification_algorithms.h"
-#include "algorithms/ind/ind_verifier/ind_verifier.h"
-#include "algorithms/ind/mining_algorithms.h"
-#include "algorithms/md/mining_algorithms.h"
-#include "algorithms/md/verification_algorithms.h"
-#include "algorithms/metric/verification_algorithms.h"
-#include "algorithms/nar/mining_algorithms.h"
-#include "algorithms/od/mining_algorithms.h"
-#include "algorithms/statistics/algorithms.h"
-#include "algorithms/ucc/mining_algorithms.h"
-#include "algorithms/ucc/verification_algorithms.h"
+#include "core/algorithms/algebraic_constraints/mining_algorithms.h"
+#include "core/algorithms/association_rules/mining_algorithms.h"
+#include "core/algorithms/cfd/cfd_verifier/cfd_verifier.h"
+#include "core/algorithms/cfd/mining_algorithms.h"
+#include "core/algorithms/dd/mining_algorithms.h"
+#include "core/algorithms/fd/mining_algorithms.h"
+#include "core/algorithms/fd/sfd/cords.h"
+#include "core/algorithms/fd/verification_algorithms.h"
+#include "core/algorithms/gfd/gfd_validator/verification_algorithms.h"
+#include "core/algorithms/ind/ind_verifier/ind_verifier.h"
+#include "core/algorithms/ind/mining_algorithms.h"
+#include "core/algorithms/md/mining_algorithms.h"
+#include "core/algorithms/md/verification_algorithms.h"
+#include "core/algorithms/metric/verification_algorithms.h"
+#include "core/algorithms/nar/mining_algorithms.h"
+#include "core/algorithms/od/mining_algorithms.h"
+#include "core/algorithms/statistics/algorithms.h"
+#include "core/algorithms/ucc/mining_algorithms.h"
+#include "core/algorithms/ucc/verification_algorithms.h"
diff --git a/src/core/algorithms/association_rules/apriori.cpp b/src/core/algorithms/association_rules/apriori.cpp
index 605f710c99..85c86c310c 100644
--- a/src/core/algorithms/association_rules/apriori.cpp
+++ b/src/core/algorithms/association_rules/apriori.cpp
@@ -1,9 +1,9 @@
-#include "algorithms/association_rules/apriori.h"
+#include "core/algorithms/association_rules/apriori.h"
 
 #include <algorithm>
 #include <cassert>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/association_rules/apriori.h b/src/core/algorithms/association_rules/apriori.h
index f88272fa5a..d866787ff5 100644
--- a/src/core/algorithms/association_rules/apriori.h
+++ b/src/core/algorithms/association_rules/apriori.h
@@ -5,10 +5,10 @@
 #include <stack>
 #include <vector>
 
-#include "algorithms/association_rules/candidate_hash_tree.h"
-#include "algorithms/association_rules/node.h"
-#include "ar_algorithm.h"
-#include "model/transaction/itemset.h"
+#include "core/algorithms/association_rules/ar_algorithm.h"
+#include "core/algorithms/association_rules/candidate_hash_tree.h"
+#include "core/algorithms/association_rules/node.h"
+#include "core/model/transaction/itemset.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/association_rules/ar.h b/src/core/algorithms/association_rules/ar.h
index 1f0cce2c70..4031494db3 100644
--- a/src/core/algorithms/association_rules/ar.h
+++ b/src/core/algorithms/association_rules/ar.h
@@ -2,8 +2,8 @@
 
 #include <list>
 
-#include "model/transaction/itemset.h"
-#include "model/transaction/transactional_data.h"
+#include "core/model/transaction/itemset.h"
+#include "core/model/transaction/transactional_data.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/association_rules/ar_algorithm.cpp b/src/core/algorithms/association_rules/ar_algorithm.cpp
index f7d3d13ee4..0da8de06fd 100644
--- a/src/core/algorithms/association_rules/ar_algorithm.cpp
+++ b/src/core/algorithms/association_rules/ar_algorithm.cpp
@@ -1,12 +1,12 @@
-#include "ar_algorithm.h"
+#include "core/algorithms/association_rules/ar_algorithm.h"
 
 #include <algorithm>
 #include <cassert>
 
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "util/logger.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/association_rules/ar_algorithm.h b/src/core/algorithms/association_rules/ar_algorithm.h
index 4e6e12e87c..b137be14c8 100644
--- a/src/core/algorithms/association_rules/ar_algorithm.h
+++ b/src/core/algorithms/association_rules/ar_algorithm.h
@@ -7,11 +7,11 @@
 
 #include <boost/any.hpp>
 
-#include "algorithms/algorithm.h"
-#include "ar.h"
-#include "ar_algorithm_enums.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/transaction/transactional_data.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/association_rules/ar.h"
+#include "core/algorithms/association_rules/ar_algorithm_enums.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/transaction/transactional_data.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/association_rules/candidate_hash_tree.cpp b/src/core/algorithms/association_rules/candidate_hash_tree.cpp
index 2d9829d7fc..4916295779 100644
--- a/src/core/algorithms/association_rules/candidate_hash_tree.cpp
+++ b/src/core/algorithms/association_rules/candidate_hash_tree.cpp
@@ -1,4 +1,4 @@
-#include "candidate_hash_tree.h"
+#include "core/algorithms/association_rules/candidate_hash_tree.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/core/algorithms/association_rules/candidate_hash_tree.h b/src/core/algorithms/association_rules/candidate_hash_tree.h
index 6419acb718..4f4ddd8b3d 100644
--- a/src/core/algorithms/association_rules/candidate_hash_tree.h
+++ b/src/core/algorithms/association_rules/candidate_hash_tree.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "model/transaction/transactional_data.h"
-#include "node.h"
+#include "core/algorithms/association_rules/node.h"
+#include "core/model/transaction/transactional_data.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/association_rules/mining_algorithms.h b/src/core/algorithms/association_rules/mining_algorithms.h
index 604c477439..69380a5271 100644
--- a/src/core/algorithms/association_rules/mining_algorithms.h
+++ b/src/core/algorithms/association_rules/mining_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/association_rules/apriori.h"
+#include "core/algorithms/association_rules/apriori.h"
diff --git a/src/core/algorithms/cfd/cfd_discovery.cpp b/src/core/algorithms/cfd/cfd_discovery.cpp
index 2965f306f3..4c453912a4 100644
--- a/src/core/algorithms/cfd/cfd_discovery.cpp
+++ b/src/core/algorithms/cfd/cfd_discovery.cpp
@@ -1,14 +1,14 @@
-#include "cfd_discovery.h"
+#include "core/algorithms/cfd/cfd_discovery.h"
 
 #include <iterator>
 #include <thread>
 
-#include "algorithms/cfd/util/cfd_output_util.h"
-#include "algorithms/cfd/util/set_util.h"
-#include "config/equal_nulls/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
+#include "core/algorithms/cfd/util/cfd_output_util.h"
+#include "core/algorithms/cfd/util/set_util.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/cfd_discovery.h b/src/core/algorithms/cfd/cfd_discovery.h
index 7c9373e733..18a56cbfae 100644
--- a/src/core/algorithms/cfd/cfd_discovery.h
+++ b/src/core/algorithms/cfd/cfd_discovery.h
@@ -8,10 +8,10 @@
 
 #include <boost/any.hpp>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/cfd/model/cfd_relation_data.h"
-#include "algorithms/cfd/model/cfd_types.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/cfd/model/cfd_relation_data.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.cpp b/src/core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.cpp
index c9872ff617..283c2e1f21 100644
--- a/src/core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.cpp
+++ b/src/core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.cpp
@@ -1,9 +1,9 @@
-#include "cfd_stats_calculator.h"
+#include "core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.h"
 
 #include <ranges>
 
-#include "cfd/model/cfd_types.h"
-#include "cfd/util/cfd_output_util.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
+#include "core/algorithms/cfd/util/cfd_output_util.h"
 
 namespace algos::cfd_verifier {
 void CFDStatsCalculator::CreateSupportMask() {
diff --git a/src/core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.h b/src/core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.h
index 0825748659..f43c4c786f 100644
--- a/src/core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.h
+++ b/src/core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.h
@@ -8,9 +8,9 @@
 
 #include <boost/functional/hash.hpp>
 
-#include "cfd/model/cfd_relation_data.h"
-#include "cfd/model/cfd_types.h"
-#include "highlight.h"
+#include "core/algorithms/cfd/cfd_verifier/highlight.h"
+#include "core/algorithms/cfd/model/cfd_relation_data.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
 
 namespace algos::cfd_verifier {
 class CFDStatsCalculator {
diff --git a/src/core/algorithms/cfd/cfd_verifier/cfd_verifier.cpp b/src/core/algorithms/cfd/cfd_verifier/cfd_verifier.cpp
index 60cf144cad..a280f02046 100644
--- a/src/core/algorithms/cfd/cfd_verifier/cfd_verifier.cpp
+++ b/src/core/algorithms/cfd/cfd_verifier/cfd_verifier.cpp
@@ -1,12 +1,12 @@
-#include "cfd_verifier.h"
-
-#include "cfd/model/cfd_relation_data.h"
-#include "cfd/util/cfd_output_util.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "util/logger.h"
-#include "util/timed_invoke.h"
+#include "core/algorithms/cfd/cfd_verifier/cfd_verifier.h"
+
+#include "core/algorithms/cfd/model/cfd_relation_data.h"
+#include "core/algorithms/cfd/util/cfd_output_util.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/util/logger.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos::cfd_verifier {
 
diff --git a/src/core/algorithms/cfd/cfd_verifier/cfd_verifier.h b/src/core/algorithms/cfd/cfd_verifier/cfd_verifier.h
index 8f57b074c5..e4fffa2696 100644
--- a/src/core/algorithms/cfd/cfd_verifier/cfd_verifier.h
+++ b/src/core/algorithms/cfd/cfd_verifier/cfd_verifier.h
@@ -5,9 +5,9 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "cfd_stats_calculator.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/cfd/cfd_verifier/cfd_stats_calculator.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace algos::cfd_verifier {
 
diff --git a/src/core/algorithms/cfd/cfd_verifier/highlight.h b/src/core/algorithms/cfd/cfd_verifier/highlight.h
index f18d5a1742..94caf67630 100644
--- a/src/core/algorithms/cfd/cfd_verifier/highlight.h
+++ b/src/core/algorithms/cfd/cfd_verifier/highlight.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "model/table/position_list_index.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos::cfd_verifier {
 
diff --git a/src/core/algorithms/cfd/fd_first_algorithm.cpp b/src/core/algorithms/cfd/fd_first_algorithm.cpp
index c8a2d15a7f..64a7b31095 100644
--- a/src/core/algorithms/cfd/fd_first_algorithm.cpp
+++ b/src/core/algorithms/cfd/fd_first_algorithm.cpp
@@ -1,18 +1,18 @@
-#include "fd_first_algorithm.h"
+#include "core/algorithms/cfd/fd_first_algorithm.h"
 
 #include <iterator>
 
 #include <boost/unordered_map.hpp>
 
-#include "algorithms/cfd/util/partition_tidlist_util.h"
-#include "algorithms/cfd/util/partition_util.h"
-#include "algorithms/cfd/util/set_util.h"
-#include "algorithms/cfd/util/tidlist_util.h"
-#include "config/equal_nulls/option.h"
-#include "config/exceptions.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "util/logger.h"
+#include "core/algorithms/cfd/util/partition_tidlist_util.h"
+#include "core/algorithms/cfd/util/partition_util.h"
+#include "core/algorithms/cfd/util/set_util.h"
+#include "core/algorithms/cfd/util/tidlist_util.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/exceptions.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/util/logger.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/fd_first_algorithm.h b/src/core/algorithms/cfd/fd_first_algorithm.h
index 20671384bc..5407d18a41 100644
--- a/src/core/algorithms/cfd/fd_first_algorithm.h
+++ b/src/core/algorithms/cfd/fd_first_algorithm.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "algorithms/cfd/model/partition_tidlist.h"
-#include "algorithms/cfd/util/prefix_tree.h"
-#include "cfd_discovery.h"
-#include "enums.h"
-#include "miner_node.h"
+#include "core/algorithms/cfd/cfd_discovery.h"
+#include "core/algorithms/cfd/enums.h"
+#include "core/algorithms/cfd/miner_node.h"
+#include "core/algorithms/cfd/model/partition_tidlist.h"
+#include "core/algorithms/cfd/util/prefix_tree.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/miner_node.h b/src/core/algorithms/cfd/miner_node.h
index 275d0946e8..0812a859a4 100644
--- a/src/core/algorithms/cfd/miner_node.h
+++ b/src/core/algorithms/cfd/miner_node.h
@@ -2,8 +2,8 @@
 
 #include <utility>
 
-#include "algorithms/cfd/model/cfd_types.h"
-#include "algorithms/cfd/util/tidlist_util.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
+#include "core/algorithms/cfd/util/tidlist_util.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/mining_algorithms.h b/src/core/algorithms/cfd/mining_algorithms.h
index 510b5619f0..fe3a39e826 100644
--- a/src/core/algorithms/cfd/mining_algorithms.h
+++ b/src/core/algorithms/cfd/mining_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/cfd/fd_first_algorithm.h"
+#include "core/algorithms/cfd/fd_first_algorithm.h"
diff --git a/src/core/algorithms/cfd/model/cfd_column_data.h b/src/core/algorithms/cfd/model/cfd_column_data.h
index ad4396a278..859147bb60 100644
--- a/src/core/algorithms/cfd/model/cfd_column_data.h
+++ b/src/core/algorithms/cfd/model/cfd_column_data.h
@@ -3,7 +3,7 @@
 #include <utility>
 #include <vector>
 
-#include "model/table/abstract_column_data.h"
+#include "core/model/table/abstract_column_data.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/model/cfd_relation_data.cpp b/src/core/algorithms/cfd/model/cfd_relation_data.cpp
index 2779329dc6..ce9a28900f 100644
--- a/src/core/algorithms/cfd/model/cfd_relation_data.cpp
+++ b/src/core/algorithms/cfd/model/cfd_relation_data.cpp
@@ -1,11 +1,11 @@
-#include "cfd_relation_data.h"
+#include "core/algorithms/cfd/model/cfd_relation_data.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <iostream>
 #include <random>
 
-#include "algorithms/cfd/util/set_util.h"
+#include "core/algorithms/cfd/util/set_util.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/model/cfd_relation_data.h b/src/core/algorithms/cfd/model/cfd_relation_data.h
index 67617406b3..63ae899c92 100644
--- a/src/core/algorithms/cfd/model/cfd_relation_data.h
+++ b/src/core/algorithms/cfd/model/cfd_relation_data.h
@@ -6,10 +6,10 @@
 #include <boost/functional/hash.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "cfd_column_data.h"
-#include "cfd_types.h"
-#include "model/table/idataset_stream.h"
-#include "model/table/relation_data.h"
+#include "core/algorithms/cfd/model/cfd_column_data.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
+#include "core/model/table/idataset_stream.h"
+#include "core/model/table/relation_data.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/model/cfd_types.h b/src/core/algorithms/cfd/model/cfd_types.h
index 2b034d7012..d1a0b03869 100644
--- a/src/core/algorithms/cfd/model/cfd_types.h
+++ b/src/core/algorithms/cfd/model/cfd_types.h
@@ -11,7 +11,7 @@
 #include <boost/functional/hash.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "raw_cfd.h"
+#include "core/algorithms/cfd/model/raw_cfd.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/model/partition_tidlist.cpp b/src/core/algorithms/cfd/model/partition_tidlist.cpp
index 3bbe433d92..fbf83aab9e 100644
--- a/src/core/algorithms/cfd/model/partition_tidlist.cpp
+++ b/src/core/algorithms/cfd/model/partition_tidlist.cpp
@@ -1,4 +1,4 @@
-#include "partition_tidlist.h"
+#include "core/algorithms/cfd/model/partition_tidlist.h"
 
 namespace algos::cfd {
 
diff --git a/src/core/algorithms/cfd/model/partition_tidlist.h b/src/core/algorithms/cfd/model/partition_tidlist.h
index aeb4590cb4..69b4053c4e 100644
--- a/src/core/algorithms/cfd/model/partition_tidlist.h
+++ b/src/core/algorithms/cfd/model/partition_tidlist.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cfd_types.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
 
 namespace algos::cfd {
 
diff --git a/src/core/algorithms/cfd/model/raw_cfd.cpp b/src/core/algorithms/cfd/model/raw_cfd.cpp
index 6e96e9b9fd..e1f81d4fb5 100644
--- a/src/core/algorithms/cfd/model/raw_cfd.cpp
+++ b/src/core/algorithms/cfd/model/raw_cfd.cpp
@@ -1,4 +1,4 @@
-#include "raw_cfd.h"
+#include "core/algorithms/cfd/model/raw_cfd.h"
 
 #include <sstream>
 
diff --git a/src/core/algorithms/cfd/util/cfd_output_util.cpp b/src/core/algorithms/cfd/util/cfd_output_util.cpp
index 85404c9609..a0ef429ef8 100644
--- a/src/core/algorithms/cfd/util/cfd_output_util.cpp
+++ b/src/core/algorithms/cfd/util/cfd_output_util.cpp
@@ -1,9 +1,9 @@
-#include "cfd_output_util.h"
+#include "core/algorithms/cfd/util/cfd_output_util.h"
 
 #include <boost/algorithm/string.hpp>
 
-#include "algorithms/cfd/model/cfd_relation_data.h"
-#include "algorithms/cfd/model/cfd_types.h"
+#include "core/algorithms/cfd/model/cfd_relation_data.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/util/cfd_output_util.h b/src/core/algorithms/cfd/util/cfd_output_util.h
index 67520ca777..6d483d15a7 100644
--- a/src/core/algorithms/cfd/util/cfd_output_util.h
+++ b/src/core/algorithms/cfd/util/cfd_output_util.h
@@ -4,8 +4,8 @@
 #include <optional>
 #include <string>
 
-#include "algorithms/cfd/model/cfd_relation_data.h"
-#include "algorithms/cfd/model/cfd_types.h"
+#include "core/algorithms/cfd/model/cfd_relation_data.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/util/partition_tidlist_util.cpp b/src/core/algorithms/cfd/util/partition_tidlist_util.cpp
index afedcd1a0b..2a3e5e8c79 100644
--- a/src/core/algorithms/cfd/util/partition_tidlist_util.cpp
+++ b/src/core/algorithms/cfd/util/partition_tidlist_util.cpp
@@ -1,6 +1,6 @@
-#include "partition_tidlist_util.h"
+#include "core/algorithms/cfd/util/partition_tidlist_util.h"
 
-#include "tidlist_util.h"
+#include "core/algorithms/cfd/util/tidlist_util.h"
 
 namespace algos::cfd {
 
diff --git a/src/core/algorithms/cfd/util/partition_tidlist_util.h b/src/core/algorithms/cfd/util/partition_tidlist_util.h
index 4cea8ad09d..d1cfc405be 100644
--- a/src/core/algorithms/cfd/util/partition_tidlist_util.h
+++ b/src/core/algorithms/cfd/util/partition_tidlist_util.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/cfd/model/partition_tidlist.h"
+#include "core/algorithms/cfd/model/partition_tidlist.h"
 
 namespace algos::cfd {
 
diff --git a/src/core/algorithms/cfd/util/partition_util.cpp b/src/core/algorithms/cfd/util/partition_util.cpp
index 9118a4b7dd..8675b75245 100644
--- a/src/core/algorithms/cfd/util/partition_util.cpp
+++ b/src/core/algorithms/cfd/util/partition_util.cpp
@@ -1,4 +1,4 @@
-#include "partition_util.h"
+#include "core/algorithms/cfd/util/partition_util.h"
 
 #include <numeric>
 
diff --git a/src/core/algorithms/cfd/util/partition_util.h b/src/core/algorithms/cfd/util/partition_util.h
index 0e46e6e792..99974391b7 100644
--- a/src/core/algorithms/cfd/util/partition_util.h
+++ b/src/core/algorithms/cfd/util/partition_util.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/cfd/model/cfd_types.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/util/set_util.cpp b/src/core/algorithms/cfd/util/set_util.cpp
index 066b7a3155..5dbf584e23 100644
--- a/src/core/algorithms/cfd/util/set_util.cpp
+++ b/src/core/algorithms/cfd/util/set_util.cpp
@@ -1,4 +1,4 @@
-#include "set_util.h"
+#include "core/algorithms/cfd/util/set_util.h"
 
 #include <algorithm>
 #include <numeric>
diff --git a/src/core/algorithms/cfd/util/tidlist_util.cpp b/src/core/algorithms/cfd/util/tidlist_util.cpp
index f90d40e60f..912eeabe83 100644
--- a/src/core/algorithms/cfd/util/tidlist_util.cpp
+++ b/src/core/algorithms/cfd/util/tidlist_util.cpp
@@ -1,4 +1,4 @@
-#include "tidlist_util.h"
+#include "core/algorithms/cfd/util/tidlist_util.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/cfd/util/tidlist_util.h b/src/core/algorithms/cfd/util/tidlist_util.h
index b89cea7149..ee3c91bfc8 100644
--- a/src/core/algorithms/cfd/util/tidlist_util.h
+++ b/src/core/algorithms/cfd/util/tidlist_util.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/cfd/model/cfd_types.h"
-#include "algorithms/cfd/model/partition_tidlist.h"
+#include "core/algorithms/cfd/model/cfd_types.h"
+#include "core/algorithms/cfd/model/partition_tidlist.h"
 
 // see algorithms/cfd/LICENSE
 
diff --git a/src/core/algorithms/create_algorithm.h b/src/core/algorithms/create_algorithm.h
index 590f034a6a..75208119f8 100644
--- a/src/core/algorithms/create_algorithm.h
+++ b/src/core/algorithms/create_algorithm.h
@@ -2,7 +2,7 @@
 
 #include <boost/mp11.hpp>
 
-#include "algorithms/algorithm_types.h"
+#include "core/algorithms/algorithm_types.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/dc/FastADC/fastadc.cpp b/src/core/algorithms/dc/FastADC/fastadc.cpp
index 230cb382fe..2f42f39b91 100644
--- a/src/core/algorithms/dc/FastADC/fastadc.cpp
+++ b/src/core/algorithms/dc/FastADC/fastadc.cpp
@@ -1,19 +1,19 @@
-#include "algorithms/dc/FastADC/fastadc.h"
+#include "core/algorithms/dc/FastADC/fastadc.h"
 
 #include <stdexcept>
 #include <vector>
 
-#include "config/names_and_descriptions.h"
-#include "config/option.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "dc/FastADC/model/pli_shard.h"
-#include "dc/FastADC/util/approximate_evidence_inverter.h"
-#include "dc/FastADC/util/evidence_aux_structures_builder.h"
-#include "dc/FastADC/util/evidence_set_builder.h"
-#include "dc/FastADC/util/predicate_builder.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/model/pli_shard.h"
+#include "core/algorithms/dc/FastADC/util/approximate_evidence_inverter.h"
+#include "core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h"
+#include "core/algorithms/dc/FastADC/util/evidence_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/predicate_builder.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/util/logger.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/FastADC/fastadc.h b/src/core/algorithms/dc/FastADC/fastadc.h
index 32583da00c..92c3719634 100644
--- a/src/core/algorithms/dc/FastADC/fastadc.h
+++ b/src/core/algorithms/dc/FastADC/fastadc.h
@@ -3,12 +3,12 @@
 #include <memory>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "dc/FastADC/providers/predicate_provider.h"
-#include "dc/FastADC/util/denial_constraint_set.h"
-#include "model/denial_constraint.h"
-#include "table/column_layout_typed_relation_data.h"
-#include "tabular_data/input_table_type.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/dc/FastADC/model/denial_constraint.h"
+#include "core/algorithms/dc/FastADC/providers/predicate_provider.h"
+#include "core/algorithms/dc/FastADC/util/denial_constraint_set.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/FastADC/misc/misc.h b/src/core/algorithms/dc/FastADC/misc/misc.h
index 452b2f5c12..e16055e154 100644
--- a/src/core/algorithms/dc/FastADC/misc/misc.h
+++ b/src/core/algorithms/dc/FastADC/misc/misc.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "model/table/typed_column_data.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.cpp b/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.cpp
index 24cc1ec340..667e295b51 100644
--- a/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.cpp
+++ b/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.cpp
@@ -1,4 +1,4 @@
-#include "dc/FastADC/misc/typed_column_data_value_differences.h"
+#include "core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h"
 
 #include <algorithm>
 #include <stddef.h>
@@ -6,12 +6,12 @@
 #include <string>
 #include <unordered_map>
 
-#include "dc/FastADC/misc/misc.h"
-#include "model/table/column.h"
-#include "model/table/typed_column_data.h"
-#include "model/types/builtin.h"
-#include "model/types/type.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/misc/misc.h"
+#include "core/model/table/column.h"
+#include "core/model/table/typed_column_data.h"
+#include "core/model/types/builtin.h"
+#include "core/model/types/type.h"
+#include "core/util/logger.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h b/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h
index 1abdcb8f19..e588c41c7d 100644
--- a/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h
+++ b/src/core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h
@@ -1,4 +1,4 @@
-#include "model/table/typed_column_data.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/column_operand.h b/src/core/algorithms/dc/FastADC/model/column_operand.h
index 67d36593ef..156366ae96 100644
--- a/src/core/algorithms/dc/FastADC/model/column_operand.h
+++ b/src/core/algorithms/dc/FastADC/model/column_operand.h
@@ -2,7 +2,7 @@
 
 #include <enum.h>
 
-#include "model/table/column.h"
+#include "core/model/table/column.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/denial_constraint.h b/src/core/algorithms/dc/FastADC/model/denial_constraint.h
index aa65e87f9f..6b4ea70b2d 100644
--- a/src/core/algorithms/dc/FastADC/model/denial_constraint.h
+++ b/src/core/algorithms/dc/FastADC/model/denial_constraint.h
@@ -6,8 +6,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "dc/FastADC/model/predicate.h"
-#include "dc/FastADC/model/predicate_set.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/model/predicate_set.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/evidence.h b/src/core/algorithms/dc/FastADC/model/evidence.h
index 0c9b3c93b0..1a272b96f8 100644
--- a/src/core/algorithms/dc/FastADC/model/evidence.h
+++ b/src/core/algorithms/dc/FastADC/model/evidence.h
@@ -1,5 +1,5 @@
-#include "dc/FastADC/model/predicate.h"
-#include "dc/FastADC/util/common_clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/util/common_clue_set_builder.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/evidence_set.h b/src/core/algorithms/dc/FastADC/model/evidence_set.h
index 2d02d6c71e..d8d0a88950 100644
--- a/src/core/algorithms/dc/FastADC/model/evidence_set.h
+++ b/src/core/algorithms/dc/FastADC/model/evidence_set.h
@@ -2,8 +2,8 @@
 
 #include <numeric>
 
-#include "dc/FastADC/model/evidence.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/model/evidence.h"
+#include "core/util/logger.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/operator.cpp b/src/core/algorithms/dc/FastADC/model/operator.cpp
index ff58c9a775..8e61191162 100644
--- a/src/core/algorithms/dc/FastADC/model/operator.cpp
+++ b/src/core/algorithms/dc/FastADC/model/operator.cpp
@@ -1,7 +1,7 @@
-#include "dc/FastADC/model/operator.h"
+#include "core/algorithms/dc/FastADC/model/operator.h"
 
-#include "model/types/builtin.h"
-#include "model/types/type.h"
+#include "core/model/types/builtin.h"
+#include "core/model/types/type.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/operator.h b/src/core/algorithms/dc/FastADC/model/operator.h
index adb1e9c86d..21a22a2c0a 100644
--- a/src/core/algorithms/dc/FastADC/model/operator.h
+++ b/src/core/algorithms/dc/FastADC/model/operator.h
@@ -4,9 +4,10 @@
 #include <cstddef>
 #include <string>
 
-#include "frozen/string.h"
-#include "frozen/unordered_map.h"
-#include "model/types/type.h"
+#include <frozen/string.h>
+#include <frozen/unordered_map.h>
+
+#include "core/model/types/type.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/pli_shard.cpp b/src/core/algorithms/dc/FastADC/model/pli_shard.cpp
index 805d4aed4b..efe0410ace 100644
--- a/src/core/algorithms/dc/FastADC/model/pli_shard.cpp
+++ b/src/core/algorithms/dc/FastADC/model/pli_shard.cpp
@@ -1,4 +1,4 @@
-#include "dc/FastADC/model/pli_shard.h"
+#include "core/algorithms/dc/FastADC/model/pli_shard.h"
 
 #include <algorithm>
 #include <functional>
@@ -7,10 +7,10 @@
 #include <stdexcept>
 #include <unordered_set>
 
-#include "dc/FastADC/providers/index_provider.h"
-#include "model/types/builtin.h"
-#include "model/types/type.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/providers/index_provider.h"
+#include "core/model/types/builtin.h"
+#include "core/model/types/type.h"
+#include "core/util/logger.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/pli_shard.h b/src/core/algorithms/dc/FastADC/model/pli_shard.h
index 9b9ffd6e96..dbd9477ea2 100644
--- a/src/core/algorithms/dc/FastADC/model/pli_shard.h
+++ b/src/core/algorithms/dc/FastADC/model/pli_shard.h
@@ -8,9 +8,9 @@
 #include <utility>
 #include <vector>
 
-#include "dc/FastADC/misc/misc.h"
-#include "dc/FastADC/providers/index_provider.h"
-#include "table/typed_column_data.h"
+#include "core/algorithms/dc/FastADC/misc/misc.h"
+#include "core/algorithms/dc/FastADC/providers/index_provider.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/predicate.cpp b/src/core/algorithms/dc/FastADC/model/predicate.cpp
index bae8475e0b..0148659ee2 100644
--- a/src/core/algorithms/dc/FastADC/model/predicate.cpp
+++ b/src/core/algorithms/dc/FastADC/model/predicate.cpp
@@ -1,12 +1,12 @@
-#include "dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
 
 #include <algorithm>
 
-#include "dc/FastADC/model/column_operand.h"
-#include "dc/FastADC/model/operator.h"
-#include "dc/FastADC/providers/predicate_provider.h"
-#include "model/table/column.h"
-#include "model/table/typed_column_data.h"
+#include "core/algorithms/dc/FastADC/model/column_operand.h"
+#include "core/algorithms/dc/FastADC/model/operator.h"
+#include "core/algorithms/dc/FastADC/providers/predicate_provider.h"
+#include "core/model/table/column.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/predicate.h b/src/core/algorithms/dc/FastADC/model/predicate.h
index 0be2b04f81..632248beee 100644
--- a/src/core/algorithms/dc/FastADC/model/predicate.h
+++ b/src/core/algorithms/dc/FastADC/model/predicate.h
@@ -8,10 +8,10 @@
 
 #include <boost/container_hash/hash.hpp>
 
-#include "dc/FastADC/model/column_operand.h"
-#include "dc/FastADC/model/operator.h"
-#include "model/types/bitset.h"
-#include "table/typed_column_data.h"
+#include "core/algorithms/dc/FastADC/model/column_operand.h"
+#include "core/algorithms/dc/FastADC/model/operator.h"
+#include "core/model/table/typed_column_data.h"
+#include "core/model/types/bitset.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/predicate_set.cpp b/src/core/algorithms/dc/FastADC/model/predicate_set.cpp
index f11eb29ae3..5eeb27be1b 100644
--- a/src/core/algorithms/dc/FastADC/model/predicate_set.cpp
+++ b/src/core/algorithms/dc/FastADC/model/predicate_set.cpp
@@ -1,8 +1,8 @@
-#include "dc/FastADC/model/predicate_set.h"
+#include "core/algorithms/dc/FastADC/model/predicate_set.h"
 
 #include <algorithm>
 
-#include "dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/model/predicate_set.h b/src/core/algorithms/dc/FastADC/model/predicate_set.h
index 6cdc6d8102..73b1b3810e 100644
--- a/src/core/algorithms/dc/FastADC/model/predicate_set.h
+++ b/src/core/algorithms/dc/FastADC/model/predicate_set.h
@@ -9,8 +9,8 @@
 #include <boost/dynamic_bitset/dynamic_bitset.hpp>
 #include <boost/move/utility_core.hpp>
 
-#include "dc/FastADC/model/predicate.h"
-#include "dc/FastADC/providers/index_provider.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/providers/index_provider.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/providers/index_provider.cpp b/src/core/algorithms/dc/FastADC/providers/index_provider.cpp
index 6e15682781..75c96cbf37 100644
--- a/src/core/algorithms/dc/FastADC/providers/index_provider.cpp
+++ b/src/core/algorithms/dc/FastADC/providers/index_provider.cpp
@@ -1,6 +1,6 @@
-#include "dc/FastADC/providers/index_provider.h"
+#include "core/algorithms/dc/FastADC/providers/index_provider.h"
 
-#include "dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/providers/index_provider.h b/src/core/algorithms/dc/FastADC/providers/index_provider.h
index 878e228e44..9401541848 100644
--- a/src/core/algorithms/dc/FastADC/providers/index_provider.h
+++ b/src/core/algorithms/dc/FastADC/providers/index_provider.h
@@ -8,7 +8,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/providers/predicate_provider.h b/src/core/algorithms/dc/FastADC/providers/predicate_provider.h
index 14986890e1..5e6c26d448 100644
--- a/src/core/algorithms/dc/FastADC/providers/predicate_provider.h
+++ b/src/core/algorithms/dc/FastADC/providers/predicate_provider.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/approximate_evidence_inverter.h b/src/core/algorithms/dc/FastADC/util/approximate_evidence_inverter.h
index 7c22c6c7d8..f245292a9b 100644
--- a/src/core/algorithms/dc/FastADC/util/approximate_evidence_inverter.h
+++ b/src/core/algorithms/dc/FastADC/util/approximate_evidence_inverter.h
@@ -8,12 +8,12 @@
 
 #include <boost/dynamic_bitset/dynamic_bitset.hpp>
 
-#include "dc/FastADC/model/evidence_set.h"
-#include "dc/FastADC/util/dc_candidate_trie.h"
-#include "dc/FastADC/util/denial_constraint_set.h"
-#include "dc/FastADC/util/predicate_builder.h"
-#include "dc/FastADC/util/predicate_organizer.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/model/evidence_set.h"
+#include "core/algorithms/dc/FastADC/util/dc_candidate_trie.h"
+#include "core/algorithms/dc/FastADC/util/denial_constraint_set.h"
+#include "core/algorithms/dc/FastADC/util/predicate_builder.h"
+#include "core/algorithms/dc/FastADC/util/predicate_organizer.h"
+#include "core/util/logger.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/closure.h b/src/core/algorithms/dc/FastADC/util/closure.h
index 58686a9ebe..e30e4cbfe9 100644
--- a/src/core/algorithms/dc/FastADC/util/closure.h
+++ b/src/core/algorithms/dc/FastADC/util/closure.h
@@ -4,8 +4,8 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "dc/FastADC/model/predicate_set.h"
-#include "dc/FastADC/providers/predicate_provider.h"
+#include "core/algorithms/dc/FastADC/model/predicate_set.h"
+#include "core/algorithms/dc/FastADC/providers/predicate_provider.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/clue_set_builder.cpp b/src/core/algorithms/dc/FastADC/util/clue_set_builder.cpp
index 117725eaab..ce5a82c66f 100644
--- a/src/core/algorithms/dc/FastADC/util/clue_set_builder.cpp
+++ b/src/core/algorithms/dc/FastADC/util/clue_set_builder.cpp
@@ -1,8 +1,8 @@
-#include "dc/FastADC/util/clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/clue_set_builder.h"
 
-#include "dc/FastADC/util/cross_clue_set_builder.h"
-#include "dc/FastADC/util/single_clue_set_builder.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/util/cross_clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/single_clue_set_builder.h"
+#include "core/util/logger.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/clue_set_builder.h b/src/core/algorithms/dc/FastADC/util/clue_set_builder.h
index 102f75f6d6..02d5a2977c 100644
--- a/src/core/algorithms/dc/FastADC/util/clue_set_builder.h
+++ b/src/core/algorithms/dc/FastADC/util/clue_set_builder.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "dc/FastADC/model/pli_shard.h"
-#include "dc/FastADC/util/common_clue_set_builder.h"
-#include "dc/FastADC/util/evidence_aux_structures_builder.h"
+#include "core/algorithms/dc/FastADC/model/pli_shard.h"
+#include "core/algorithms/dc/FastADC/util/common_clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/common_clue_set_builder.h b/src/core/algorithms/dc/FastADC/util/common_clue_set_builder.h
index 353a4d7f05..87660f4e27 100644
--- a/src/core/algorithms/dc/FastADC/util/common_clue_set_builder.h
+++ b/src/core/algorithms/dc/FastADC/util/common_clue_set_builder.h
@@ -4,8 +4,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "dc/FastADC/model/predicate.h"
-#include "model/types/bitset.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/model/types/bitset.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.cpp b/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.cpp
index d688c05ec8..81406e3d61 100644
--- a/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.cpp
+++ b/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.cpp
@@ -1,10 +1,10 @@
-#include "dc/FastADC/util/cross_clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/cross_clue_set_builder.h"
 
 #include <stdexcept>
 #include <stdint.h>
 
-#include "dc/FastADC/model/pli_shard.h"
-#include "dc/FastADC/util/evidence_aux_structures_builder.h"
+#include "core/algorithms/dc/FastADC/model/pli_shard.h"
+#include "core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.h b/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.h
index 1d1d5f4655..15418557f7 100644
--- a/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.h
+++ b/src/core/algorithms/dc/FastADC/util/cross_clue_set_builder.h
@@ -3,9 +3,9 @@
 #include <stddef.h>
 #include <vector>
 
-#include "dc/FastADC/model/pli_shard.h"
-#include "dc/FastADC/util/common_clue_set_builder.h"
-#include "dc/FastADC/util/evidence_aux_structures_builder.h"
+#include "core/algorithms/dc/FastADC/model/pli_shard.h"
+#include "core/algorithms/dc/FastADC/util/common_clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/dc_candidate.h b/src/core/algorithms/dc/FastADC/util/dc_candidate.h
index 4fa2b6f675..45a3f8a2f5 100644
--- a/src/core/algorithms/dc/FastADC/util/dc_candidate.h
+++ b/src/core/algorithms/dc/FastADC/util/dc_candidate.h
@@ -2,7 +2,7 @@
 
 #include <boost/dynamic_bitset/dynamic_bitset.hpp>
 
-#include "dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.cpp b/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.cpp
index a3a8410df3..b367d820ae 100644
--- a/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.cpp
+++ b/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.cpp
@@ -1,7 +1,7 @@
-#include "dc/FastADC/util/dc_candidate_trie.h"
+#include "core/algorithms/dc/FastADC/util/dc_candidate_trie.h"
 
-#include "dc/FastADC/model/predicate.h"
-#include "dc/FastADC/util/dc_candidate.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/util/dc_candidate.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.h b/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.h
index 0d42d5f452..777d80f77c 100644
--- a/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.h
+++ b/src/core/algorithms/dc/FastADC/util/dc_candidate_trie.h
@@ -7,8 +7,8 @@
 
 #include <boost/dynamic_bitset/dynamic_bitset.hpp>
 
-#include "dc/FastADC/model/predicate.h"
-#include "dc/FastADC/util/dc_candidate.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/util/dc_candidate.h"
 
 namespace algos::fastadc {
 class DCCandidateTrie {
diff --git a/src/core/algorithms/dc/FastADC/util/denial_constraint_set.h b/src/core/algorithms/dc/FastADC/util/denial_constraint_set.h
index 0c7f2bf4cc..8db925a754 100644
--- a/src/core/algorithms/dc/FastADC/util/denial_constraint_set.h
+++ b/src/core/algorithms/dc/FastADC/util/denial_constraint_set.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "dc/FastADC/model/denial_constraint.h"
-#include "dc/FastADC/util/closure.h"
-#include "dc/FastADC/util/ntree_search.h"
+#include "core/algorithms/dc/FastADC/model/denial_constraint.h"
+#include "core/algorithms/dc/FastADC/util/closure.h"
+#include "core/algorithms/dc/FastADC/util/ntree_search.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.cpp b/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.cpp
index 1d0454b7f0..a25279d24e 100644
--- a/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.cpp
+++ b/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.cpp
@@ -1,10 +1,10 @@
-#include "dc/FastADC/util/evidence_aux_structures_builder.h"
+#include "core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h"
 
 #include <assert.h>
 #include <stddef.h>
 
-#include "dc/FastADC/model/predicate.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/util/logger.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h b/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h
index ec2d4933ba..24eded4a21 100644
--- a/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h
+++ b/src/core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h
@@ -6,13 +6,13 @@
 #include <stdexcept>
 #include <vector>
 
-#include "dc/FastADC/model/column_operand.h"
-#include "dc/FastADC/model/operator.h"
-#include "dc/FastADC/model/predicate.h"
-#include "dc/FastADC/providers/index_provider.h"
-#include "dc/FastADC/util/common_clue_set_builder.h"
-#include "dc/FastADC/util/predicate_builder.h"
-#include "model/table/column.h"
+#include "core/algorithms/dc/FastADC/model/column_operand.h"
+#include "core/algorithms/dc/FastADC/model/operator.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/providers/index_provider.h"
+#include "core/algorithms/dc/FastADC/util/common_clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/predicate_builder.h"
+#include "core/model/table/column.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/evidence_set_builder.h b/src/core/algorithms/dc/FastADC/util/evidence_set_builder.h
index 210b09a1f8..385383b928 100644
--- a/src/core/algorithms/dc/FastADC/util/evidence_set_builder.h
+++ b/src/core/algorithms/dc/FastADC/util/evidence_set_builder.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "dc/FastADC/model/evidence_set.h"
-#include "dc/FastADC/util/clue_set_builder.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/model/evidence_set.h"
+#include "core/algorithms/dc/FastADC/util/clue_set_builder.h"
+#include "core/util/logger.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/predicate_builder.cpp b/src/core/algorithms/dc/FastADC/util/predicate_builder.cpp
index 5baeea83a5..c17b207ae6 100644
--- a/src/core/algorithms/dc/FastADC/util/predicate_builder.cpp
+++ b/src/core/algorithms/dc/FastADC/util/predicate_builder.cpp
@@ -1,18 +1,18 @@
-#include "dc/FastADC/util/predicate_builder.h"
+#include "core/algorithms/dc/FastADC/util/predicate_builder.h"
 
 #include <array>
 #include <assert.h>
 #include <bitset>
 
-#include "dc/FastADC/misc/typed_column_data_value_differences.h"
-#include "dc/FastADC/model/column_operand.h"
-#include "dc/FastADC/model/operator.h"
-#include "dc/FastADC/model/predicate.h"
-#include "dc/FastADC/providers/index_provider.h"
-#include "dc/FastADC/providers/predicate_provider.h"
-#include "model/types/builtin.h"
-#include "table/typed_column_data.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/FastADC/misc/typed_column_data_value_differences.h"
+#include "core/algorithms/dc/FastADC/model/column_operand.h"
+#include "core/algorithms/dc/FastADC/model/operator.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/providers/index_provider.h"
+#include "core/algorithms/dc/FastADC/providers/predicate_provider.h"
+#include "core/model/table/typed_column_data.h"
+#include "core/model/types/builtin.h"
+#include "core/util/logger.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/predicate_builder.h b/src/core/algorithms/dc/FastADC/util/predicate_builder.h
index 374b6fb22a..681b408895 100644
--- a/src/core/algorithms/dc/FastADC/util/predicate_builder.h
+++ b/src/core/algorithms/dc/FastADC/util/predicate_builder.h
@@ -5,8 +5,8 @@
 #include <utility>
 #include <vector>
 
-#include "dc/FastADC/model/predicate.h"
-#include "dc/FastADC/providers/index_provider.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/algorithms/dc/FastADC/providers/index_provider.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/predicate_organizer.h b/src/core/algorithms/dc/FastADC/util/predicate_organizer.h
index 2d4edbcd89..72ccd3040f 100644
--- a/src/core/algorithms/dc/FastADC/util/predicate_organizer.h
+++ b/src/core/algorithms/dc/FastADC/util/predicate_organizer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "dc/FastADC/model/evidence_set.h"
+#include "core/algorithms/dc/FastADC/model/evidence_set.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.cpp b/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.cpp
index fe33e7b94c..4f08dc90d8 100644
--- a/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.cpp
+++ b/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.cpp
@@ -1,9 +1,9 @@
-#include "dc/FastADC/util/single_clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/single_clue_set_builder.h"
 
 #include <stdint.h>
 
-#include "dc/FastADC/model/pli_shard.h"
-#include "dc/FastADC/util/evidence_aux_structures_builder.h"
+#include "core/algorithms/dc/FastADC/model/pli_shard.h"
+#include "core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.h b/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.h
index 1650d5b2e9..9d7d957054 100644
--- a/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.h
+++ b/src/core/algorithms/dc/FastADC/util/single_clue_set_builder.h
@@ -3,9 +3,9 @@
 #include <stddef.h>
 #include <vector>
 
-#include "dc/FastADC/model/pli_shard.h"
-#include "dc/FastADC/util/common_clue_set_builder.h"
-#include "dc/FastADC/util/evidence_aux_structures_builder.h"
+#include "core/algorithms/dc/FastADC/model/pli_shard.h"
+#include "core/algorithms/dc/FastADC/util/common_clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h"
 
 namespace algos::fastadc {
 
diff --git a/src/core/algorithms/dc/mining_alrorithms.h b/src/core/algorithms/dc/mining_alrorithms.h
index 5107af8416..f8dc305f9d 100644
--- a/src/core/algorithms/dc/mining_alrorithms.h
+++ b/src/core/algorithms/dc/mining_alrorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/dc/FastADC/fastadc.h"
+#include "core/algorithms/dc/FastADC/fastadc.h"
diff --git a/src/core/algorithms/dc/model/column_operand.h b/src/core/algorithms/dc/model/column_operand.h
index 1d0973cdd8..19d21dd452 100644
--- a/src/core/algorithms/dc/model/column_operand.h
+++ b/src/core/algorithms/dc/model/column_operand.h
@@ -7,11 +7,11 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/dc/model/tuple.h"
-#include "model/table/column.h"
-#include "model/table/relation_data.h"
-#include "model/types/type.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/model/tuple.h"
+#include "core/model/table/column.h"
+#include "core/model/table/relation_data.h"
+#include "core/model/types/type.h"
+#include "core/util/logger.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/model/component.cpp b/src/core/algorithms/dc/model/component.cpp
index 4a907fff84..6b9e9aa666 100644
--- a/src/core/algorithms/dc/model/component.cpp
+++ b/src/core/algorithms/dc/model/component.cpp
@@ -1,12 +1,12 @@
-#include "component.h"
+#include "core/algorithms/dc/model/component.h"
 
 #include <cstddef>
 #include <stdexcept>
 #include <string>
 
-#include "algorithms/dc/model/operator.h"
-#include "model/types/builtin.h"
-#include "model/types/types.h"
+#include "core/algorithms/dc/model/operator.h"
+#include "core/model/types/builtin.h"
+#include "core/model/types/types.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/model/component.h b/src/core/algorithms/dc/model/component.h
index 459765aaae..92680d6e17 100644
--- a/src/core/algorithms/dc/model/component.h
+++ b/src/core/algorithms/dc/model/component.h
@@ -3,9 +3,9 @@
 #include <cstddef>
 #include <string>
 
-#include "algorithms/dc/model/operator.h"
-#include "model/types/builtin.h"
-#include "model/types/types.h"
+#include "core/algorithms/dc/model/operator.h"
+#include "core/model/types/builtin.h"
+#include "core/model/types/types.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/model/dc.cpp b/src/core/algorithms/dc/model/dc.cpp
index a9dd40706d..471d6f6fa0 100644
--- a/src/core/algorithms/dc/model/dc.cpp
+++ b/src/core/algorithms/dc/model/dc.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/dc/model/dc.h"
+#include "core/algorithms/dc/model/dc.h"
 
 #include <algorithm>
 #include <ranges>
@@ -8,8 +8,8 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/dc/model/operator.h"
-#include "algorithms/dc/model/predicate.h"
+#include "core/algorithms/dc/model/operator.h"
+#include "core/algorithms/dc/model/predicate.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/model/dc.h b/src/core/algorithms/dc/model/dc.h
index b19676b5bd..209bcb1e9e 100644
--- a/src/core/algorithms/dc/model/dc.h
+++ b/src/core/algorithms/dc/model/dc.h
@@ -7,9 +7,9 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/dc/model/predicate.h"
-#include "model/table/column.h"
-#include "model/table/vertical.h"
+#include "core/algorithms/dc/model/predicate.h"
+#include "core/model/table/column.h"
+#include "core/model/table/vertical.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/model/point.h b/src/core/algorithms/dc/model/point.h
index 835674ec17..5cbe613fa9 100644
--- a/src/core/algorithms/dc/model/point.h
+++ b/src/core/algorithms/dc/model/point.h
@@ -8,7 +8,7 @@
 
 #include <boost/functional/hash/hash.hpp>
 
-#include "algorithms/dc/model/component.h"
+#include "core/algorithms/dc/model/component.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/model/predicate.h b/src/core/algorithms/dc/model/predicate.h
index 991f1d7dcd..5ebd80bac6 100644
--- a/src/core/algorithms/dc/model/predicate.h
+++ b/src/core/algorithms/dc/model/predicate.h
@@ -3,10 +3,10 @@
 #include <string>
 #include <variant>
 
-#include "algorithms/dc/model/column_operand.h"
-#include "algorithms/dc/model/operator.h"
-#include "algorithms/dc/model/tuple.h"
-#include "model/table/typed_column_data.h"
+#include "core/algorithms/dc/model/column_operand.h"
+#include "core/algorithms/dc/model/operator.h"
+#include "core/algorithms/dc/model/tuple.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/parser/dc_parser.cpp b/src/core/algorithms/dc/parser/dc_parser.cpp
index c85c10ad79..a65d45f76a 100644
--- a/src/core/algorithms/dc/parser/dc_parser.cpp
+++ b/src/core/algorithms/dc/parser/dc_parser.cpp
@@ -1,15 +1,15 @@
-#include "algorithms/dc/parser/dc_parser.h"
+#include "core/algorithms/dc/parser/dc_parser.h"
 
 #include <ranges>
 #include <stdexcept>
 
 #include <boost/algorithm/string.hpp>
 
-#include "algorithms/dc/model/dc.h"
-#include "algorithms/dc/model/operator.h"
-#include "algorithms/dc/model/predicate.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/typed_column_data.h"
+#include "core/algorithms/dc/model/dc.h"
+#include "core/algorithms/dc/model/operator.h"
+#include "core/algorithms/dc/model/predicate.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace mo = model;
 
diff --git a/src/core/algorithms/dc/parser/dc_parser.h b/src/core/algorithms/dc/parser/dc_parser.h
index 29aa15aa98..559353e843 100644
--- a/src/core/algorithms/dc/parser/dc_parser.h
+++ b/src/core/algorithms/dc/parser/dc_parser.h
@@ -2,11 +2,11 @@
 
 #include <stdexcept>
 
-#include "algorithms/dc/model/dc.h"
-#include "algorithms/dc/model/operator.h"
-#include "algorithms/dc/model/predicate.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/typed_column_data.h"
+#include "core/algorithms/dc/model/dc.h"
+#include "core/algorithms/dc/model/operator.h"
+#include "core/algorithms/dc/model/predicate.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::dc {
 
diff --git a/src/core/algorithms/dc/verifier/dc_verifier.cpp b/src/core/algorithms/dc/verifier/dc_verifier.cpp
index 402775fde3..d32c79e8e2 100644
--- a/src/core/algorithms/dc/verifier/dc_verifier.cpp
+++ b/src/core/algorithms/dc/verifier/dc_verifier.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/dc/verifier/dc_verifier.h"
+#include "core/algorithms/dc/verifier/dc_verifier.h"
 
 #include <algorithm>
 #include <chrono>
@@ -16,19 +16,19 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
 
-#include "algorithms/dc/model/component.h"
-#include "algorithms/dc/model/point.h"
-#include "algorithms/dc/model/predicate.h"
-#include "algorithms/dc/parser/dc_parser.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "model/table/column_index.h"
-#include "model/table/column_layout_relation_data.h"
-#include "table/typed_column_data.h"
-#include "util/get_preallocated_vector.h"
-#include "util/kdtree.h"
-#include "util/logger.h"
+#include "core/algorithms/dc/model/component.h"
+#include "core/algorithms/dc/model/point.h"
+#include "core/algorithms/dc/model/predicate.h"
+#include "core/algorithms/dc/parser/dc_parser.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/typed_column_data.h"
+#include "core/util/get_preallocated_vector.h"
+#include "core/util/kdtree.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/dc/verifier/dc_verifier.h b/src/core/algorithms/dc/verifier/dc_verifier.h
index 51d77eff35..dd70169f92 100644
--- a/src/core/algorithms/dc/verifier/dc_verifier.h
+++ b/src/core/algorithms/dc/verifier/dc_verifier.h
@@ -8,14 +8,14 @@
 
 #include <frozen/unordered_map.h>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/dc/model/dc.h"
-#include "algorithms/dc/model/point.h"
-#include "config/tabular_data/input_table/option.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_layout_relation_data.h"
-#include "table/typed_column_data.h"
-#include "util/kdtree.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/dc/model/dc.h"
+#include "core/algorithms/dc/model/point.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/typed_column_data.h"
+#include "core/util/kdtree.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/dd/dd.h b/src/core/algorithms/dd/dd.h
index f0f8f410ea..825789a9f0 100644
--- a/src/core/algorithms/dd/dd.h
+++ b/src/core/algorithms/dd/dd.h
@@ -10,8 +10,8 @@
 
 #include <boost/test/tools/floating_point_comparison.hpp>
 
-#include "model/types/builtin.h"
-#include "model/types/double_type.h"
+#include "core/model/types/builtin.h"
+#include "core/model/types/double_type.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/dd/dd_verifier/dd_verifier.cpp b/src/core/algorithms/dd/dd_verifier/dd_verifier.cpp
index 16ebd046f4..bc27e6df89 100644
--- a/src/core/algorithms/dd/dd_verifier/dd_verifier.cpp
+++ b/src/core/algorithms/dd/dd_verifier/dd_verifier.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/dd/dd_verifier/dd_verifier.h"
+#include "core/algorithms/dd/dd_verifier/dd_verifier.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -6,13 +6,13 @@
 #include <string>
 #include <vector>
 
-#include "config/descriptions.h"
-#include "config/names.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "model/table/vertical.h"
-#include "util/logger.h"
-#include "util/timed_invoke.h"
+#include "core/config/descriptions.h"
+#include "core/config/names.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/vertical.h"
+#include "core/util/logger.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos::dd {
 DDVerifier::DDVerifier() : Algorithm({}) {
diff --git a/src/core/algorithms/dd/dd_verifier/dd_verifier.h b/src/core/algorithms/dd/dd_verifier/dd_verifier.h
index b50e1deb38..adde81fa8e 100644
--- a/src/core/algorithms/dd/dd_verifier/dd_verifier.h
+++ b/src/core/algorithms/dd/dd_verifier/dd_verifier.h
@@ -4,11 +4,11 @@
 #include <memory>
 #include <vector>
 
-#include "algorithm.h"
-#include "algorithms/dd/dd.h"
-#include "algorithms/dd/dd_verifier/highlight.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_layout_typed_relation_data.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/dd/dd.h"
+#include "core/algorithms/dd/dd_verifier/highlight.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos::dd {
 using DFs = model::DFStringConstraint;
diff --git a/src/core/algorithms/dd/dd_verifier/highlight.h b/src/core/algorithms/dd/dd_verifier/highlight.h
index 4582b56bad..a517894918 100644
--- a/src/core/algorithms/dd/dd_verifier/highlight.h
+++ b/src/core/algorithms/dd/dd_verifier/highlight.h
@@ -2,7 +2,7 @@
 #include <cstddef>
 #include <utility>
 
-#include "model/table/column_index.h"
+#include "core/model/table/column_index.h"
 
 class Highlight {
 private:
diff --git a/src/core/algorithms/dd/mining_algorithms.h b/src/core/algorithms/dd/mining_algorithms.h
index a1f4bb2c61..4a5807704e 100644
--- a/src/core/algorithms/dd/mining_algorithms.h
+++ b/src/core/algorithms/dd/mining_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/dd/split/split.h"
+#include "core/algorithms/dd/split/split.h"
diff --git a/src/core/algorithms/dd/split/model/distance_position_list_index.cpp b/src/core/algorithms/dd/split/model/distance_position_list_index.cpp
index 9558e7df18..487f49a768 100644
--- a/src/core/algorithms/dd/split/model/distance_position_list_index.cpp
+++ b/src/core/algorithms/dd/split/model/distance_position_list_index.cpp
@@ -1,10 +1,10 @@
-#include "algorithms/dd/split/model/distance_position_list_index.h"
+#include "core/algorithms/dd/split/model/distance_position_list_index.h"
 
 #include <string>
 #include <utility>
 
-#include "model/table/tuple_index.h"
-#include "model/table/typed_column_data.h"
+#include "core/model/table/tuple_index.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::dd {
 template <typename T>
diff --git a/src/core/algorithms/dd/split/model/distance_position_list_index.h b/src/core/algorithms/dd/split/model/distance_position_list_index.h
index add3c9b541..5fcc42a6d1 100644
--- a/src/core/algorithms/dd/split/model/distance_position_list_index.h
+++ b/src/core/algorithms/dd/split/model/distance_position_list_index.h
@@ -5,8 +5,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "model/table/tuple_index.h"
-#include "model/table/typed_column_data.h"
+#include "core/model/table/tuple_index.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::dd {
 using ClusterIndex = std::size_t;
diff --git a/src/core/algorithms/dd/split/split.cpp b/src/core/algorithms/dd/split/split.cpp
index ad820a2057..eec91152ad 100644
--- a/src/core/algorithms/dd/split/split.cpp
+++ b/src/core/algorithms/dd/split/split.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/dd/split/split.h"
+#include "core/algorithms/dd/split/split.h"
 
 #include <algorithm>
 #include <cassert>
@@ -17,14 +17,14 @@
 #include <boost/dynamic_bitset.hpp>
 #include <boost/regex.hpp>
 
-#include "algorithms/dd/split/model/distance_position_list_index.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "model/table/column_index.h"
-#include "model/types/numeric_type.h"
-#include "util/levenshtein_distance.h"
-#include "util/logger.h"
+#include "core/algorithms/dd/split/model/distance_position_list_index.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/column_index.h"
+#include "core/model/types/numeric_type.h"
+#include "core/util/levenshtein_distance.h"
+#include "core/util/logger.h"
 
 namespace algos::dd {
 
diff --git a/src/core/algorithms/dd/split/split.h b/src/core/algorithms/dd/split/split.h
index 9a4852fd10..29401c5e20 100644
--- a/src/core/algorithms/dd/split/split.h
+++ b/src/core/algorithms/dd/split/split.h
@@ -7,15 +7,15 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/dd/dd.h"
-#include "algorithms/dd/split/model/distance_position_list_index.h"
-#include "config/tabular_data/input_table_type.h"
-#include "enums.h"
-#include "model/table/column_index.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "model/types/builtin.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/dd/dd.h"
+#include "core/algorithms/dd/split/enums.h"
+#include "core/algorithms/dd/split/model/distance_position_list_index.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/model/types/builtin.h"
 
 namespace algos::dd {
 
diff --git a/src/core/algorithms/fd/aidfd/aid.cpp b/src/core/algorithms/fd/aidfd/aid.cpp
index 88eece24d8..e7d86b604d 100644
--- a/src/core/algorithms/fd/aidfd/aid.cpp
+++ b/src/core/algorithms/fd/aidfd/aid.cpp
@@ -1,6 +1,6 @@
-#include "aid.h"
+#include "core/algorithms/fd/aidfd/aid.h"
 
-#include "config/tabular_data/input_table/option.h"
+#include "core/config/tabular_data/input_table/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/aidfd/aid.h b/src/core/algorithms/fd/aidfd/aid.h
index 6b76223f50..bc01075137 100644
--- a/src/core/algorithms/fd/aidfd/aid.h
+++ b/src/core/algorithms/fd/aidfd/aid.h
@@ -6,12 +6,12 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "config/tabular_data/input_table_type.h"
-#include "fd/fd_algorithm.h"
-#include "model/table/column.h"
-#include "model/table/relational_schema.h"
-#include "model/table/vertical.h"
-#include "search_tree.h"
+#include "core/algorithms/fd/aidfd/search_tree.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/vertical.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/aidfd/search_tree.cpp b/src/core/algorithms/fd/aidfd/search_tree.cpp
index 1f7721667b..c497bcc158 100644
--- a/src/core/algorithms/fd/aidfd/search_tree.cpp
+++ b/src/core/algorithms/fd/aidfd/search_tree.cpp
@@ -1,4 +1,4 @@
-#include "search_tree.h"
+#include "core/algorithms/fd/aidfd/search_tree.h"
 
 SearchTree::Node::Node(size_t bit, SearchTree::Bitset set, SearchTree::Bitset sets_union,
                        SearchTree::Bitset sets_inter, std::shared_ptr<Node> const& parent,
diff --git a/src/core/algorithms/fd/depminer/cmax_set.h b/src/core/algorithms/fd/depminer/cmax_set.h
index 0b31cc0d4e..4cac441060 100644
--- a/src/core/algorithms/fd/depminer/cmax_set.h
+++ b/src/core/algorithms/fd/depminer/cmax_set.h
@@ -2,8 +2,8 @@
 
 #include <unordered_set>
 
-#include "model/table/column_layout_relation_data.h"
-#include "util/custom_hashes.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/util/custom_hashes.h"
 
 class CMAXSet {
 private:
diff --git a/src/core/algorithms/fd/depminer/depminer.cpp b/src/core/algorithms/fd/depminer/depminer.cpp
index f9aad3a383..0e8037fb1e 100644
--- a/src/core/algorithms/fd/depminer/depminer.cpp
+++ b/src/core/algorithms/fd/depminer/depminer.cpp
@@ -1,12 +1,12 @@
-#include "algorithms/fd/depminer/depminer.h"
+#include "core/algorithms/fd/depminer/depminer.h"
 
 #include <chrono>
 #include <list>
 #include <memory>
 
-#include "model/table/agree_set_factory.h"
-#include "model/table/relational_schema.h"
-#include "util/logger.h"
+#include "core/model/table/agree_set_factory.h"
+#include "core/model/table/relational_schema.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/depminer/depminer.h b/src/core/algorithms/fd/depminer/depminer.h
index 92cfa2a440..764148da85 100644
--- a/src/core/algorithms/fd/depminer/depminer.h
+++ b/src/core/algorithms/fd/depminer/depminer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/fd/depminer/cmax_set.h"
-#include "algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/depminer/cmax_set.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/dfd/column_order/column_order.cpp b/src/core/algorithms/fd/dfd/column_order/column_order.cpp
index 2571092176..8cd761abd4 100644
--- a/src/core/algorithms/fd/dfd/column_order/column_order.cpp
+++ b/src/core/algorithms/fd/dfd/column_order/column_order.cpp
@@ -1,10 +1,10 @@
-#include "column_order.h"
+#include "core/algorithms/fd/dfd/column_order/column_order.h"
 
 #include <set>
 
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/relational_schema.h"
-#include "ordered_partition.h"
+#include "core/algorithms/fd/dfd/column_order/ordered_partition.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/relational_schema.h"
 
 ColumnOrder::ColumnOrder(ColumnLayoutRelationData const* const relation_data)
     : order_(relation_data->GetSchema()->GetNumColumns()) {
diff --git a/src/core/algorithms/fd/dfd/column_order/column_order.h b/src/core/algorithms/fd/dfd/column_order/column_order.h
index f6f2cd1955..1c8993e19b 100644
--- a/src/core/algorithms/fd/dfd/column_order/column_order.h
+++ b/src/core/algorithms/fd/dfd/column_order/column_order.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "model/table/column_data.h"
-#include "model/table/vertical.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/vertical.h"
 
 class ColumnOrder {
 private:
diff --git a/src/core/algorithms/fd/dfd/column_order/ordered_partition.cpp b/src/core/algorithms/fd/dfd/column_order/ordered_partition.cpp
index d09e060c73..fd1c2042c5 100644
--- a/src/core/algorithms/fd/dfd/column_order/ordered_partition.cpp
+++ b/src/core/algorithms/fd/dfd/column_order/ordered_partition.cpp
@@ -1,4 +1,4 @@
-#include "ordered_partition.h"
+#include "core/algorithms/fd/dfd/column_order/ordered_partition.h"
 
 OrderedPartition::OrderedPartition(model::PositionListIndex const* const partition,
                                    unsigned int number_of_rows, unsigned int column_index)
diff --git a/src/core/algorithms/fd/dfd/column_order/ordered_partition.h b/src/core/algorithms/fd/dfd/column_order/ordered_partition.h
index 6eea77fc38..4915b3fcb5 100644
--- a/src/core/algorithms/fd/dfd/column_order/ordered_partition.h
+++ b/src/core/algorithms/fd/dfd/column_order/ordered_partition.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "model/table/position_list_index.h"
+#include "core/model/table/position_list_index.h"
 
 class OrderedPartition {
 private:
diff --git a/src/core/algorithms/fd/dfd/dfd.cpp b/src/core/algorithms/fd/dfd/dfd.cpp
index 435a8bd625..1c031ae83e 100644
--- a/src/core/algorithms/fd/dfd/dfd.cpp
+++ b/src/core/algorithms/fd/dfd/dfd.cpp
@@ -1,14 +1,14 @@
-#include "dfd.h"
+#include "core/algorithms/fd/dfd/dfd.h"
 
 #include <boost/asio.hpp>
 
-#include "config/max_lhs/option.h"
-#include "config/thread_number/option.h"
-#include "lattice_traversal/lattice_traversal.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/position_list_index.h"
-#include "model/table/relational_schema.h"
-#include "util/logger.h"
+#include "core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h"
+#include "core/config/max_lhs/option.h"
+#include "core/config/thread_number/option.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/position_list_index.h"
+#include "core/model/table/relational_schema.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/dfd/dfd.h b/src/core/algorithms/fd/dfd/dfd.h
index b2ee5a304b..e94ca6b58e 100644
--- a/src/core/algorithms/fd/dfd/dfd.h
+++ b/src/core/algorithms/fd/dfd/dfd.h
@@ -3,10 +3,10 @@
 #include <random>
 #include <stack>
 
-#include "algorithms/fd/pli_based_fd_algorithm.h"
-#include "config/thread_number/type.h"
-#include "model/table/vertical.h"
-#include "partition_storage/partition_storage.h"
+#include "core/algorithms/fd/dfd/partition_storage/partition_storage.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/vertical.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.cpp b/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.cpp
index 11fee8346a..57022fa1fa 100644
--- a/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.cpp
+++ b/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.cpp
@@ -1,4 +1,4 @@
-#include "lattice_observations.h"
+#include "core/algorithms/fd/dfd/lattice_observations/lattice_observations.h"
 
 NodeCategory LatticeObservations::UpdateDependencyCategory(Vertical const& node) {
     NodeCategory new_category;
diff --git a/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.h b/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.h
index dc80757079..5e21424a08 100644
--- a/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.h
+++ b/src/core/algorithms/fd/dfd/lattice_observations/lattice_observations.h
@@ -2,10 +2,10 @@
 
 #include <unordered_map>
 
-#include "../column_order/column_order.h"
-#include "../node_category.h"
-#include "model/table/vertical.h"
-#include "util/custom_hashes.h"
+#include "core/algorithms/fd/dfd/column_order/column_order.h"
+#include "core/algorithms/fd/dfd/node_category.h"
+#include "core/model/table/vertical.h"
+#include "core/util/custom_hashes.h"
 
 class LatticeObservations : public std::unordered_map<Vertical, NodeCategory> {
 public:
diff --git a/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.cpp b/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.cpp
index 84fc072792..f75592949c 100644
--- a/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.cpp
+++ b/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.cpp
@@ -1,8 +1,8 @@
-#include "lattice_traversal.h"
+#include "core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h"
 
 #include <random>
 
-#include "model/table/position_list_index.h"
+#include "core/model/table/position_list_index.h"
 
 LatticeTraversal::LatticeTraversal(Column const* const rhs,
                                    ColumnLayoutRelationData const* const relation,
diff --git a/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h b/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h
index 6c5cff1a24..345bfef137 100644
--- a/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h
+++ b/src/core/algorithms/fd/dfd/lattice_traversal/lattice_traversal.h
@@ -3,12 +3,12 @@
 #include <random>
 #include <stack>
 
-#include "../column_order/column_order.h"
-#include "../lattice_observations/lattice_observations.h"
-#include "../partition_storage/partition_storage.h"
-#include "../pruning_maps/dependencies_map.h"
-#include "../pruning_maps/non_dependencies_map.h"
-#include "model/table/vertical.h"
+#include "core/algorithms/fd/dfd/column_order/column_order.h"
+#include "core/algorithms/fd/dfd/lattice_observations/lattice_observations.h"
+#include "core/algorithms/fd/dfd/partition_storage/partition_storage.h"
+#include "core/algorithms/fd/dfd/pruning_maps/dependencies_map.h"
+#include "core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h"
+#include "core/model/table/vertical.h"
 
 class LatticeTraversal {
 private:
diff --git a/src/core/algorithms/fd/dfd/partition_storage/partition_storage.cpp b/src/core/algorithms/fd/dfd/partition_storage/partition_storage.cpp
index 86343800e2..bfbc3ad3a8 100644
--- a/src/core/algorithms/fd/dfd/partition_storage/partition_storage.cpp
+++ b/src/core/algorithms/fd/dfd/partition_storage/partition_storage.cpp
@@ -1,10 +1,10 @@
-#include "partition_storage.h"
+#include "core/algorithms/fd/dfd/partition_storage/partition_storage.h"
 
 #include <boost/format.hpp>
 #include <boost/optional.hpp>
 
-#include "model/table/vertical_map.h"
-#include "util/logger.h"
+#include "core/model/table/vertical_map.h"
+#include "core/util/logger.h"
 
 model::PositionListIndex* PartitionStorage::Get(Vertical const& vertical) {
     return index_->Get(vertical).get();
diff --git a/src/core/algorithms/fd/dfd/partition_storage/partition_storage.h b/src/core/algorithms/fd/dfd/partition_storage/partition_storage.h
index 870a222b0a..c22c860c59 100644
--- a/src/core/algorithms/fd/dfd/partition_storage/partition_storage.h
+++ b/src/core/algorithms/fd/dfd/partition_storage/partition_storage.h
@@ -2,8 +2,8 @@
 
 #include <mutex>
 
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/vertical_map.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/vertical_map.h"
 
 class PartitionStorage {
 private:
diff --git a/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.cpp b/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.cpp
index 15b644bb37..505d8f0e15 100644
--- a/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.cpp
+++ b/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.cpp
@@ -1,4 +1,4 @@
-#include "dependencies_map.h"
+#include "core/algorithms/fd/dfd/pruning_maps/dependencies_map.h"
 
 DependenciesMap::DependenciesMap(RelationalSchema const* schema) : PruningMap(schema) {}
 
diff --git a/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.h b/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.h
index a2c1b4536a..9079522ecf 100644
--- a/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.h
+++ b/src/core/algorithms/fd/dfd/pruning_maps/dependencies_map.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "model/table/vertical.h"
-#include "pruning_map.h"
+#include "core/algorithms/fd/dfd/pruning_maps/pruning_map.h"
+#include "core/model/table/vertical.h"
 
 class DependenciesMap : public PruningMap {
 public:
diff --git a/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.cpp b/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.cpp
index 191a348ef7..21e2e9ec3a 100644
--- a/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.cpp
+++ b/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.cpp
@@ -1,4 +1,4 @@
-#include "non_dependencies_map.h"
+#include "core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h"
 
 NonDependenciesMap::NonDependenciesMap(RelationalSchema const* schema) : PruningMap(schema) {}
 
diff --git a/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h b/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h
index e362468237..ba6f1dd430 100644
--- a/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h
+++ b/src/core/algorithms/fd/dfd/pruning_maps/non_dependencies_map.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "model/table/vertical.h"
-#include "pruning_map.h"
+#include "core/algorithms/fd/dfd/pruning_maps/pruning_map.h"
+#include "core/model/table/vertical.h"
 
 class NonDependenciesMap : public PruningMap {
 public:
diff --git a/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.cpp b/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.cpp
index f3d76193d4..1ac0032ec4 100644
--- a/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.cpp
+++ b/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.cpp
@@ -1,4 +1,4 @@
-#include "pruning_map.h"
+#include "core/algorithms/fd/dfd/pruning_maps/pruning_map.h"
 
 PruningMap::PruningMap(RelationalSchema const* schema) {
     for (auto const& column : schema->GetColumns()) {
diff --git a/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.h b/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.h
index c4c2cab605..9001642a70 100644
--- a/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.h
+++ b/src/core/algorithms/fd/dfd/pruning_maps/pruning_map.h
@@ -3,8 +3,8 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "../lattice_observations/lattice_observations.h"
-#include "model/table/vertical.h"
+#include "core/algorithms/fd/dfd/lattice_observations/lattice_observations.h"
+#include "core/model/table/vertical.h"
 
 class PruningMap : public std::unordered_map<Vertical, std::unordered_set<Vertical>> {
 public:
diff --git a/src/core/algorithms/fd/eulerfd/cluster.cpp b/src/core/algorithms/fd/eulerfd/cluster.cpp
index 1b3791b51a..b0aea590d0 100644
--- a/src/core/algorithms/fd/eulerfd/cluster.cpp
+++ b/src/core/algorithms/fd/eulerfd/cluster.cpp
@@ -1,4 +1,4 @@
-#include "cluster.h"
+#include "core/algorithms/fd/eulerfd/cluster.h"
 
 #include <cstdint>
 
diff --git a/src/core/algorithms/fd/eulerfd/eulerfd.cpp b/src/core/algorithms/fd/eulerfd/eulerfd.cpp
index c99e4a0267..2067d64a71 100644
--- a/src/core/algorithms/fd/eulerfd/eulerfd.cpp
+++ b/src/core/algorithms/fd/eulerfd/eulerfd.cpp
@@ -1,4 +1,4 @@
-#include "eulerfd.h"
+#include "core/algorithms/fd/eulerfd/eulerfd.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/eulerfd/eulerfd.h b/src/core/algorithms/fd/eulerfd/eulerfd.h
index eb9b7f5f3e..38f4a82cc8 100644
--- a/src/core/algorithms/fd/eulerfd/eulerfd.h
+++ b/src/core/algorithms/fd/eulerfd/eulerfd.h
@@ -14,17 +14,17 @@
 #include <boost/dynamic_bitset/dynamic_bitset.hpp>
 #include <boost/unordered_set.hpp>
 
-#include "config/equal_nulls/option.h"
-#include "config/tabular_data/input_table/option.h"
-#include "custom_random_seed/option.h"
-#include "custom_random_seed/type.h"
-#include "fd/fd_algorithm.h"
-#include "mlfq.h"
-#include "model/table/column.h"
-#include "model/table/relational_schema.h"
-#include "model/table/vertical.h"
-#include "search_tree.h"
-#include "util/custom_random.h"
+#include "core/algorithms/fd/eulerfd/mlfq.h"
+#include "core/algorithms/fd/eulerfd/search_tree.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/config/custom_random_seed/option.h"
+#include "core/config/custom_random_seed/type.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/column.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/vertical.h"
+#include "core/util/custom_random.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/eulerfd/mlfq.cpp b/src/core/algorithms/fd/eulerfd/mlfq.cpp
index 5c40795551..eb9afbab03 100644
--- a/src/core/algorithms/fd/eulerfd/mlfq.cpp
+++ b/src/core/algorithms/fd/eulerfd/mlfq.cpp
@@ -1,4 +1,4 @@
-#include "mlfq.h"
+#include "core/algorithms/fd/eulerfd/mlfq.h"
 
 #include <cmath>
 
diff --git a/src/core/algorithms/fd/eulerfd/mlfq.h b/src/core/algorithms/fd/eulerfd/mlfq.h
index 3b3e86f3fa..18940819e7 100644
--- a/src/core/algorithms/fd/eulerfd/mlfq.h
+++ b/src/core/algorithms/fd/eulerfd/mlfq.h
@@ -5,7 +5,7 @@
 #include <queue>
 #include <vector>
 
-#include "cluster.h"
+#include "core/algorithms/fd/eulerfd/cluster.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/eulerfd/search_tree.cpp b/src/core/algorithms/fd/eulerfd/search_tree.cpp
index 4482d1b978..96eeb81782 100644
--- a/src/core/algorithms/fd/eulerfd/search_tree.cpp
+++ b/src/core/algorithms/fd/eulerfd/search_tree.cpp
@@ -1,4 +1,4 @@
-#include "search_tree.h"
+#include "core/algorithms/fd/eulerfd/search_tree.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/fastfds/fastfds.cpp b/src/core/algorithms/fd/fastfds/fastfds.cpp
index 75ae127645..52074e4911 100644
--- a/src/core/algorithms/fd/fastfds/fastfds.cpp
+++ b/src/core/algorithms/fd/fastfds/fastfds.cpp
@@ -1,4 +1,4 @@
-#include "fastfds.h"
+#include "core/algorithms/fd/fastfds/fastfds.h"
 
 #include <algorithm>
 #include <mutex>
@@ -9,11 +9,11 @@
 #include <boost/dynamic_bitset.hpp>
 #include <boost/thread.hpp>
 
-#include "config/max_lhs/option.h"
-#include "config/thread_number/option.h"
-#include "model/table/agree_set_factory.h"
-#include "util/logger.h"
-#include "util/parallel_for.h"
+#include "core/config/max_lhs/option.h"
+#include "core/config/thread_number/option.h"
+#include "core/model/table/agree_set_factory.h"
+#include "core/util/logger.h"
+#include "core/util/parallel_for.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/fastfds/fastfds.h b/src/core/algorithms/fd/fastfds/fastfds.h
index c470bc1127..f045f31f33 100644
--- a/src/core/algorithms/fd/fastfds/fastfds.h
+++ b/src/core/algorithms/fd/fastfds/fastfds.h
@@ -5,10 +5,10 @@
 
 #include <boost/thread/mutex.hpp>
 
-#include "algorithms/fd/pli_based_fd_algorithm.h"
-#include "config/thread_number/type.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/vertical.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/vertical.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/fd.cpp b/src/core/algorithms/fd/fd.cpp
index 11c1a8bfc6..414daaa4b2 100644
--- a/src/core/algorithms/fd/fd.cpp
+++ b/src/core/algorithms/fd/fd.cpp
@@ -1,6 +1,6 @@
-#include "algorithms/fd/fd.h"
+#include "core/algorithms/fd/fd.h"
 
-#include "util/bitset_utils.h"
+#include "core/util/bitset_utils.h"
 
 std::vector<model::ColumnIndex> FD::GetLhsIndices() const {
     return util::BitsetToIndices<model::ColumnIndex>(lhs_.GetColumnIndices());
diff --git a/src/core/algorithms/fd/fd.h b/src/core/algorithms/fd/fd.h
index 1a4688f7da..9bac2c3972 100644
--- a/src/core/algorithms/fd/fd.h
+++ b/src/core/algorithms/fd/fd.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include "model/table/column.h"
-#include "model/table/vertical.h"
-#include "raw_fd.h"
+#include "core/algorithms/fd/raw_fd.h"
+#include "core/model/table/column.h"
+#include "core/model/table/vertical.h"
 
 class FD {
 private:
diff --git a/src/core/algorithms/fd/fd_algorithm.cpp b/src/core/algorithms/fd/fd_algorithm.cpp
index 45a245964c..44b8d0098b 100644
--- a/src/core/algorithms/fd/fd_algorithm.cpp
+++ b/src/core/algorithms/fd/fd_algorithm.cpp
@@ -1,10 +1,10 @@
-#include "fd_algorithm.h"
+#include "core/algorithms/fd/fd_algorithm.h"
 
 #include <map>
 #include <thread>
 #include <vector>
 
-#include "config/max_lhs/option.h"
+#include "core/config/max_lhs/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/fd_algorithm.h b/src/core/algorithms/fd/fd_algorithm.h
index cc3e98938b..322b181243 100644
--- a/src/core/algorithms/fd/fd_algorithm.h
+++ b/src/core/algorithms/fd/fd_algorithm.h
@@ -6,10 +6,10 @@
 
 #include <boost/any.hpp>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/fd/fd.h"
-#include "config/max_lhs/type.h"
-#include "util/primitive_collection.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/fd/fd.h"
+#include "core/config/max_lhs/type.h"
+#include "core/util/primitive_collection.h"
 
 namespace model {
 class AgreeSetFactory;
diff --git a/src/core/algorithms/fd/fd_mine/fd_mine.cpp b/src/core/algorithms/fd/fd_mine/fd_mine.cpp
index 6f1a9d3001..2948cef3ee 100644
--- a/src/core/algorithms/fd/fd_mine/fd_mine.cpp
+++ b/src/core/algorithms/fd/fd_mine/fd_mine.cpp
@@ -1,11 +1,11 @@
-#include "fd_mine.h"
+#include "core/algorithms/fd/fd_mine/fd_mine.h"
 
 #include <queue>
 #include <vector>
 
 #include <boost/unordered_map.hpp>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/fd_mine/fd_mine.h b/src/core/algorithms/fd/fd_mine/fd_mine.h
index 398ef0d632..d7a587f500 100644
--- a/src/core/algorithms/fd/fd_mine/fd_mine.h
+++ b/src/core/algorithms/fd/fd_mine/fd_mine.h
@@ -6,10 +6,10 @@
 #include <boost/dynamic_bitset.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "algorithms/fd/pli_based_fd_algorithm.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/position_list_index.h"
-#include "model/table/vertical.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/position_list_index.h"
+#include "core/model/table/vertical.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.cpp b/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.cpp
index b789be5480..a55a4f64bc 100644
--- a/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.cpp
+++ b/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.cpp
@@ -1,16 +1,16 @@
-#include "algorithms/fd/fd_verifier/dynamic_fd_verifier.h"
+#include "core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h"
 
 #include <chrono>
 #include <memory>
 #include <stdexcept>
 
-#include "config/equal_nulls/option.h"
-#include "config/indices/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/crud_operations/operations.h"
-#include "config/tabular_data/input_table/option.h"
-#include "util/logger.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/indices/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/crud_operations/operations.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/util/logger.h"
 
 namespace algos::fd_verifier {
 
diff --git a/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h b/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h
index 27041796de..aa86a2729e 100644
--- a/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h
+++ b/src/core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h
@@ -5,12 +5,12 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/fd/fd_verifier/dynamic_stats_calculator.h"
-#include "config/equal_nulls/type.h"
-#include "config/indices/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/dynamic_table_data.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/dynamic_table_data.h"
 
 namespace algos::fd_verifier {
 
diff --git a/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.cpp b/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.cpp
index 287689c860..7bcfd29592 100644
--- a/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.cpp
+++ b/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/fd/fd_verifier/dynamic_stats_calculator.h"
+#include "core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h b/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h
index c9e7965e96..9e4d57c1bb 100644
--- a/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h
+++ b/src/core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h
@@ -5,10 +5,10 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/fd/fd_verifier/highlight.h"
-#include "config/indices/type.h"
-#include "model/table/dynamic_position_list_index.h"
-#include "model/table/dynamic_table_data.h"
+#include "core/algorithms/fd/fd_verifier/highlight.h"
+#include "core/config/indices/type.h"
+#include "core/model/table/dynamic_position_list_index.h"
+#include "core/model/table/dynamic_table_data.h"
 
 namespace algos::fd_verifier {
 
diff --git a/src/core/algorithms/fd/fd_verifier/fd_verifier.cpp b/src/core/algorithms/fd/fd_verifier/fd_verifier.cpp
index 193195d9d2..f96994d431 100644
--- a/src/core/algorithms/fd/fd_verifier/fd_verifier.cpp
+++ b/src/core/algorithms/fd/fd_verifier/fd_verifier.cpp
@@ -1,14 +1,14 @@
-#include "algorithms/fd/fd_verifier/fd_verifier.h"
+#include "core/algorithms/fd/fd_verifier/fd_verifier.h"
 
 #include <chrono>
 #include <memory>
 #include <stdexcept>
 
-#include "config/equal_nulls/option.h"
-#include "config/indices/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/indices/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
 
 namespace algos::fd_verifier {
 
diff --git a/src/core/algorithms/fd/fd_verifier/fd_verifier.h b/src/core/algorithms/fd/fd_verifier/fd_verifier.h
index 2e57c4aa64..73b911b913 100644
--- a/src/core/algorithms/fd/fd_verifier/fd_verifier.h
+++ b/src/core/algorithms/fd/fd_verifier/fd_verifier.h
@@ -5,11 +5,11 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/fd/fd_verifier/stats_calculator.h"
-#include "config/equal_nulls/type.h"
-#include "config/indices/type.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/fd/fd_verifier/stats_calculator.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace algos::fd_verifier {
 
diff --git a/src/core/algorithms/fd/fd_verifier/highlight.h b/src/core/algorithms/fd/fd_verifier/highlight.h
index c3d18ea926..8b9543dd3f 100644
--- a/src/core/algorithms/fd/fd_verifier/highlight.h
+++ b/src/core/algorithms/fd/fd_verifier/highlight.h
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "model/table/position_list_index.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos::fd_verifier {
 
diff --git a/src/core/algorithms/fd/fd_verifier/stats_calculator.cpp b/src/core/algorithms/fd/fd_verifier/stats_calculator.cpp
index 35ffbe582e..54d4dc823e 100644
--- a/src/core/algorithms/fd/fd_verifier/stats_calculator.cpp
+++ b/src/core/algorithms/fd/fd_verifier/stats_calculator.cpp
@@ -1,11 +1,11 @@
-#include "algorithms/fd/fd_verifier/stats_calculator.h"
+#include "core/algorithms/fd/fd_verifier/stats_calculator.h"
 
 #include <algorithm>
 #include <cassert>
 #include <numeric>
 #include <unordered_map>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace {
 
diff --git a/src/core/algorithms/fd/fd_verifier/stats_calculator.h b/src/core/algorithms/fd/fd_verifier/stats_calculator.h
index e1d0ad5354..a722815edc 100644
--- a/src/core/algorithms/fd/fd_verifier/stats_calculator.h
+++ b/src/core/algorithms/fd/fd_verifier/stats_calculator.h
@@ -5,10 +5,10 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/fd/fd_verifier/highlight.h"
-#include "config/indices/type.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/column_layout_typed_relation_data.h"
+#include "core/algorithms/fd/fd_verifier/highlight.h"
+#include "core/config/indices/type.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos::fd_verifier {
 
diff --git a/src/core/algorithms/fd/fdep/fd_tree_element.cpp b/src/core/algorithms/fd/fdep/fd_tree_element.cpp
index 9d2f49c342..8375fbd0ed 100644
--- a/src/core/algorithms/fd/fdep/fd_tree_element.cpp
+++ b/src/core/algorithms/fd/fdep/fd_tree_element.cpp
@@ -1,6 +1,6 @@
-#include "fd_tree_element.h"
+#include "core/algorithms/fd/fdep/fd_tree_element.h"
 
-#include "model/types/bitset.h"
+#include "core/model/types/bitset.h"
 
 FDTreeElement::FDTreeElement(size_t max_attribute_number)
     : max_attribute_number_(max_attribute_number) {
diff --git a/src/core/algorithms/fd/fdep/fd_tree_element.h b/src/core/algorithms/fd/fdep/fd_tree_element.h
index 4d28dbf289..f31f2e7db0 100644
--- a/src/core/algorithms/fd/fdep/fd_tree_element.h
+++ b/src/core/algorithms/fd/fdep/fd_tree_element.h
@@ -8,9 +8,9 @@
 #include <fstream>
 #include <string>
 
-#include "algorithms/fd/fd.h"
-#include "model/table/relational_schema.h"
-#include "model/types/bitset.h"
+#include "core/algorithms/fd/fd.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/types/bitset.h"
 
 class FDTreeElement {
 public:
diff --git a/src/core/algorithms/fd/fdep/fdep.cpp b/src/core/algorithms/fd/fdep/fdep.cpp
index 0d6895b296..55bb9a4b98 100644
--- a/src/core/algorithms/fd/fdep/fdep.cpp
+++ b/src/core/algorithms/fd/fdep/fdep.cpp
@@ -1,11 +1,11 @@
-#include "algorithms/fd/fdep/fdep.h"
+#include "core/algorithms/fd/fdep/fdep.h"
 
 #include <chrono>
 
-#include "config/equal_nulls/option.h"
-#include "config/tabular_data/input_table/option.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/types/bitset.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/types/bitset.h"
 
 // #ifndef PRINT_FDS
 // #define PRINT_FDS
diff --git a/src/core/algorithms/fd/fdep/fdep.h b/src/core/algorithms/fd/fdep/fdep.h
index 01b05c6ba0..4ba9278bd5 100644
--- a/src/core/algorithms/fd/fdep/fdep.h
+++ b/src/core/algorithms/fd/fdep/fdep.h
@@ -3,13 +3,13 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/fd/fd_algorithm.h"
-#include "algorithms/fd/fdep/fd_tree_element.h"
-#include "config/equal_nulls/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/relation_data.h"
-#include "model/table/relational_schema.h"
-#include "model/types/bitset.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/algorithms/fd/fdep/fd_tree_element.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/relation_data.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/types/bitset.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/fun/fun.cpp b/src/core/algorithms/fd/fun/fun.cpp
index 946538a870..b8bac3daba 100644
--- a/src/core/algorithms/fd/fun/fun.cpp
+++ b/src/core/algorithms/fd/fun/fun.cpp
@@ -1,6 +1,6 @@
-#include "fun.h"
+#include "core/algorithms/fd/fun/fun.h"
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/fun/fun.h b/src/core/algorithms/fd/fun/fun.h
index 104fb64512..8fe70ad253 100644
--- a/src/core/algorithms/fd/fun/fun.h
+++ b/src/core/algorithms/fd/fun/fun.h
@@ -2,8 +2,8 @@
 
 #include <set>
 
-#include "algorithms/fd/pli_based_fd_algorithm.h"
-#include "util/custom_hashes.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/util/custom_hashes.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/hycommon/all_column_combinations.cpp b/src/core/algorithms/fd/hycommon/all_column_combinations.cpp
index b79fc77bef..7eb8c6923d 100644
--- a/src/core/algorithms/fd/hycommon/all_column_combinations.cpp
+++ b/src/core/algorithms/fd/hycommon/all_column_combinations.cpp
@@ -1,4 +1,4 @@
-#include "all_column_combinations.h"
+#include "core/algorithms/fd/hycommon/all_column_combinations.h"
 
 #include <utility>
 
diff --git a/src/core/algorithms/fd/hycommon/all_column_combinations.h b/src/core/algorithms/fd/hycommon/all_column_combinations.h
index 3068ee75df..5795dcb50d 100644
--- a/src/core/algorithms/fd/hycommon/all_column_combinations.h
+++ b/src/core/algorithms/fd/hycommon/all_column_combinations.h
@@ -5,7 +5,7 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "column_combination_list.h"
+#include "core/algorithms/fd/hycommon/column_combination_list.h"
 
 namespace algos::hy {
 
diff --git a/src/core/algorithms/fd/hycommon/efficiency.h b/src/core/algorithms/fd/hycommon/efficiency.h
index dca2d909fe..9b8e98d156 100644
--- a/src/core/algorithms/fd/hycommon/efficiency.h
+++ b/src/core/algorithms/fd/hycommon/efficiency.h
@@ -1,6 +1,6 @@
 #include <cstddef>
 
-#include "sampler.h"
+#include "core/algorithms/fd/hycommon/sampler.h"
 
 namespace algos::hy {
 
diff --git a/src/core/algorithms/fd/hycommon/preprocessor.cpp b/src/core/algorithms/fd/hycommon/preprocessor.cpp
index 0f0da1ff18..f897f44777 100644
--- a/src/core/algorithms/fd/hycommon/preprocessor.cpp
+++ b/src/core/algorithms/fd/hycommon/preprocessor.cpp
@@ -1,9 +1,9 @@
-#include "preprocessor.h"
+#include "core/algorithms/fd/hycommon/preprocessor.h"
 
 #include <algorithm>
 #include <vector>
 
-#include "algorithms/fd/hycommon/util/pli_util.h"
+#include "core/algorithms/fd/hycommon/util/pli_util.h"
 
 namespace algos::hy::util {
 
diff --git a/src/core/algorithms/fd/hycommon/preprocessor.h b/src/core/algorithms/fd/hycommon/preprocessor.h
index 84e5d28cb9..6288221c5f 100644
--- a/src/core/algorithms/fd/hycommon/preprocessor.h
+++ b/src/core/algorithms/fd/hycommon/preprocessor.h
@@ -4,8 +4,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "model/table/column_layout_relation_data.h"
-#include "types.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/model/table/column_layout_relation_data.h"
 
 namespace algos::hy::util {
 
diff --git a/src/core/algorithms/fd/hycommon/primitive_validations.h b/src/core/algorithms/fd/hycommon/primitive_validations.h
index 6aa424b7d7..1bb8ee7e95 100644
--- a/src/core/algorithms/fd/hycommon/primitive_validations.h
+++ b/src/core/algorithms/fd/hycommon/primitive_validations.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <vector>
 
-#include "types.h"
+#include "core/algorithms/fd/hycommon/types.h"
 
 namespace algos::hy {
 
diff --git a/src/core/algorithms/fd/hycommon/sampler.cpp b/src/core/algorithms/fd/hycommon/sampler.cpp
index 5f45de7327..a9a3709507 100644
--- a/src/core/algorithms/fd/hycommon/sampler.cpp
+++ b/src/core/algorithms/fd/hycommon/sampler.cpp
@@ -1,4 +1,4 @@
-#include "sampler.h"
+#include "core/algorithms/fd/hycommon/sampler.h"
 
 #include <algorithm>
 #include <memory>
@@ -9,8 +9,8 @@
 #include <boost/dynamic_bitset.hpp>
 #include <boost/thread/future.hpp>
 
-#include "algorithms/fd/hycommon/util/pli_util.h"
-#include "efficiency.h"
+#include "core/algorithms/fd/hycommon/efficiency.h"
+#include "core/algorithms/fd/hycommon/util/pli_util.h"
 
 namespace {
 
diff --git a/src/core/algorithms/fd/hycommon/sampler.h b/src/core/algorithms/fd/hycommon/sampler.h
index 9aaa58fd92..aa9d7d3b15 100644
--- a/src/core/algorithms/fd/hycommon/sampler.h
+++ b/src/core/algorithms/fd/hycommon/sampler.h
@@ -6,11 +6,11 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "all_column_combinations.h"
-#include "config/thread_number/type.h"
-#include "efficiency_threshold.h"
-#include "model/table/position_list_index.h"
-#include "types.h"
+#include "core/algorithms/fd/hycommon/all_column_combinations.h"
+#include "core/algorithms/fd/hycommon/efficiency_threshold.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/position_list_index.h"
 
 namespace boost::asio {
 // Forward declare thread_pool to avoid including boost::asio::thread_pool implementation since
diff --git a/src/core/algorithms/fd/hycommon/types.h b/src/core/algorithms/fd/hycommon/types.h
index 26c232d55c..5f2e625411 100644
--- a/src/core/algorithms/fd/hycommon/types.h
+++ b/src/core/algorithms/fd/hycommon/types.h
@@ -2,7 +2,7 @@
 #include <utility>
 #include <vector>
 
-#include "model/table/column_index.h"
+#include "core/model/table/column_index.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/hycommon/util/pli_util.h b/src/core/algorithms/fd/hycommon/util/pli_util.h
index 5bf1db7fe0..eb6e359765 100644
--- a/src/core/algorithms/fd/hycommon/util/pli_util.h
+++ b/src/core/algorithms/fd/hycommon/util/pli_util.h
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "algorithms/fd/hycommon/types.h"
+#include "core/algorithms/fd/hycommon/types.h"
 
 namespace algos::hy {
 
diff --git a/src/core/algorithms/fd/hycommon/validator_helpers.cpp b/src/core/algorithms/fd/hycommon/validator_helpers.cpp
index 291e7bd261..c0c37d8af5 100644
--- a/src/core/algorithms/fd/hycommon/validator_helpers.cpp
+++ b/src/core/algorithms/fd/hycommon/validator_helpers.cpp
@@ -1,8 +1,8 @@
-#include "validator_helpers.h"
+#include "core/algorithms/fd/hycommon/validator_helpers.h"
 
-#include "algorithms/fd/hycommon/util/pli_util.h"
-#include "algorithms/fd/hyfd/model/fd_tree_vertex.h"
-#include "ucc/hyucc/model/ucc_tree_vertex.h"
+#include "core/algorithms/fd/hycommon/util/pli_util.h"
+#include "core/algorithms/fd/hyfd/model/fd_tree_vertex.h"
+#include "core/algorithms/ucc/hyucc/model/ucc_tree_vertex.h"
 
 namespace algos::hy {
 
diff --git a/src/core/algorithms/fd/hycommon/validator_helpers.h b/src/core/algorithms/fd/hycommon/validator_helpers.h
index 6c95b7fae9..c966fc61af 100644
--- a/src/core/algorithms/fd/hycommon/validator_helpers.h
+++ b/src/core/algorithms/fd/hycommon/validator_helpers.h
@@ -8,8 +8,8 @@
 #include <boost/dynamic_bitset.hpp>
 #include <boost/version.hpp>
 
-#include "types.h"
-#include "util/logger.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/util/logger.h"
 
 #define UNORDERED_FLAT_MAP_AVAILABLE (BOOST_VERSION >= 108100)
 
diff --git a/src/core/algorithms/fd/hyfd/hyfd.cpp b/src/core/algorithms/fd/hyfd/hyfd.cpp
index 7d4c3dd5fd..d443094be6 100644
--- a/src/core/algorithms/fd/hyfd/hyfd.cpp
+++ b/src/core/algorithms/fd/hyfd/hyfd.cpp
@@ -1,4 +1,4 @@
-#include "hyfd.h"
+#include "core/algorithms/fd/hyfd/hyfd.h"
 
 #include <algorithm>
 #include <chrono>
@@ -9,14 +9,14 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/fd/hycommon/preprocessor.h"
-#include "algorithms/fd/hycommon/util/pli_util.h"
-#include "config/names.h"
-#include "config/thread_number/option.h"
-#include "inductor.h"
-#include "sampler.h"
-#include "util/logger.h"
-#include "validator.h"
+#include "core/algorithms/fd/hycommon/preprocessor.h"
+#include "core/algorithms/fd/hycommon/util/pli_util.h"
+#include "core/algorithms/fd/hyfd/inductor.h"
+#include "core/algorithms/fd/hyfd/sampler.h"
+#include "core/algorithms/fd/hyfd/validator.h"
+#include "core/config/names.h"
+#include "core/config/thread_number/option.h"
+#include "core/util/logger.h"
 
 namespace algos::hyfd {
 
diff --git a/src/core/algorithms/fd/hyfd/hyfd.h b/src/core/algorithms/fd/hyfd/hyfd.h
index f93293f53a..7b7e06e2a4 100644
--- a/src/core/algorithms/fd/hyfd/hyfd.h
+++ b/src/core/algorithms/fd/hyfd/hyfd.h
@@ -5,11 +5,11 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/fd/hycommon/types.h"
-#include "algorithms/fd/pli_based_fd_algorithm.h"
-#include "algorithms/fd/raw_fd.h"
-#include "config/thread_number/type.h"
-#include "model/table/position_list_index.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/raw_fd.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos::hyfd {
 
diff --git a/src/core/algorithms/fd/hyfd/hyfd_config.h b/src/core/algorithms/fd/hyfd/hyfd_config.h
index 44fb6a4604..0e2ee9b3b2 100644
--- a/src/core/algorithms/fd/hyfd/hyfd_config.h
+++ b/src/core/algorithms/fd/hyfd/hyfd_config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/fd/hycommon/efficiency_threshold.h"
+#include "core/algorithms/fd/hycommon/efficiency_threshold.h"
 
 namespace algos::hyfd {
 
diff --git a/src/core/algorithms/fd/hyfd/inductor.cpp b/src/core/algorithms/fd/hyfd/inductor.cpp
index 56a792bfc8..b2cbb81976 100644
--- a/src/core/algorithms/fd/hyfd/inductor.cpp
+++ b/src/core/algorithms/fd/hyfd/inductor.cpp
@@ -1,4 +1,4 @@
-#include "inductor.h"
+#include "core/algorithms/fd/hyfd/inductor.h"
 
 #include <boost/dynamic_bitset.hpp>
 
diff --git a/src/core/algorithms/fd/hyfd/inductor.h b/src/core/algorithms/fd/hyfd/inductor.h
index 51864f0b8f..04313f3ef6 100644
--- a/src/core/algorithms/fd/hyfd/inductor.h
+++ b/src/core/algorithms/fd/hyfd/inductor.h
@@ -2,8 +2,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/fd/hyfd/model/fd_tree.h"
-#include "algorithms/fd/hyfd/model/non_fd_list.h"
+#include "core/algorithms/fd/hyfd/model/fd_tree.h"
+#include "core/algorithms/fd/hyfd/model/non_fd_list.h"
 
 namespace algos::hyfd {
 
diff --git a/src/core/algorithms/fd/hyfd/model/fd_tree.cpp b/src/core/algorithms/fd/hyfd/model/fd_tree.cpp
index 3f76ab6b16..500fccb600 100644
--- a/src/core/algorithms/fd/hyfd/model/fd_tree.cpp
+++ b/src/core/algorithms/fd/hyfd/model/fd_tree.cpp
@@ -1,4 +1,4 @@
-#include "fd_tree.h"
+#include "core/algorithms/fd/hyfd/model/fd_tree.h"
 
 #include <memory>
 #include <vector>
diff --git a/src/core/algorithms/fd/hyfd/model/fd_tree.h b/src/core/algorithms/fd/hyfd/model/fd_tree.h
index a1f14094fc..3ab6dd1ea8 100644
--- a/src/core/algorithms/fd/hyfd/model/fd_tree.h
+++ b/src/core/algorithms/fd/hyfd/model/fd_tree.h
@@ -5,8 +5,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/fd/raw_fd.h"
-#include "fd_tree_vertex.h"
+#include "core/algorithms/fd/hyfd/model/fd_tree_vertex.h"
+#include "core/algorithms/fd/raw_fd.h"
 
 namespace algos::hyfd::fd_tree {
 
diff --git a/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.cpp b/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.cpp
index f21517918e..086fc9f356 100644
--- a/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.cpp
+++ b/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.cpp
@@ -1,4 +1,4 @@
-#include "fd_tree_vertex.h"
+#include "core/algorithms/fd/hyfd/model/fd_tree_vertex.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.h b/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.h
index 27b5e0e639..9eb59acb09 100644
--- a/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.h
+++ b/src/core/algorithms/fd/hyfd/model/fd_tree_vertex.h
@@ -6,7 +6,7 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/fd/raw_fd.h"
+#include "core/algorithms/fd/raw_fd.h"
 
 namespace algos::hyfd::fd_tree {
 
diff --git a/src/core/algorithms/fd/hyfd/model/non_fd_list.h b/src/core/algorithms/fd/hyfd/model/non_fd_list.h
index 8724c1b0bd..dd793aef4e 100644
--- a/src/core/algorithms/fd/hyfd/model/non_fd_list.h
+++ b/src/core/algorithms/fd/hyfd/model/non_fd_list.h
@@ -6,7 +6,7 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/fd/hycommon/column_combination_list.h"
+#include "core/algorithms/fd/hycommon/column_combination_list.h"
 
 namespace algos::hyfd {
 
diff --git a/src/core/algorithms/fd/hyfd/sampler.h b/src/core/algorithms/fd/hyfd/sampler.h
index c54833716e..19df214e4b 100644
--- a/src/core/algorithms/fd/hyfd/sampler.h
+++ b/src/core/algorithms/fd/hyfd/sampler.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "algorithms/fd/hycommon/sampler.h"
-#include "algorithms/fd/hyfd/model/non_fd_list.h"
+#include "core/algorithms/fd/hycommon/sampler.h"
+#include "core/algorithms/fd/hyfd/model/non_fd_list.h"
 
 namespace algos::hyfd {
 
diff --git a/src/core/algorithms/fd/hyfd/validator.cpp b/src/core/algorithms/fd/hyfd/validator.cpp
index 9e34734d58..f3fed2cecb 100644
--- a/src/core/algorithms/fd/hyfd/validator.cpp
+++ b/src/core/algorithms/fd/hyfd/validator.cpp
@@ -1,4 +1,4 @@
-#include "validator.h"
+#include "core/algorithms/fd/hyfd/validator.h"
 
 #include <algorithm>
 #include <future>
@@ -9,9 +9,9 @@
 #include <boost/asio/thread_pool.hpp>
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/fd/hycommon/util/pli_util.h"
-#include "algorithms/fd/hycommon/validator_helpers.h"
-#include "hyfd_config.h"
+#include "core/algorithms/fd/hycommon/util/pli_util.h"
+#include "core/algorithms/fd/hycommon/validator_helpers.h"
+#include "core/algorithms/fd/hyfd/hyfd_config.h"
 
 namespace {
 
diff --git a/src/core/algorithms/fd/hyfd/validator.h b/src/core/algorithms/fd/hyfd/validator.h
index 038f6d96a2..e8d2f35635 100644
--- a/src/core/algorithms/fd/hyfd/validator.h
+++ b/src/core/algorithms/fd/hyfd/validator.h
@@ -4,12 +4,12 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/fd/hycommon/primitive_validations.h"
-#include "algorithms/fd/hyfd/model/fd_tree.h"
-#include "algorithms/fd/raw_fd.h"
-#include "config/thread_number/type.h"
-#include "model/table/position_list_index.h"
-#include "types.h"
+#include "core/algorithms/fd/hycommon/primitive_validations.h"
+#include "core/algorithms/fd/hyfd/model/fd_tree.h"
+#include "core/algorithms/fd/raw_fd.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/position_list_index.h"
+#include "core/model/types/types.h"
 
 namespace algos::hyfd {
 
diff --git a/src/core/algorithms/fd/mining_algorithms.h b/src/core/algorithms/fd/mining_algorithms.h
index 91c17f5a90..b041f4f4c7 100644
--- a/src/core/algorithms/fd/mining_algorithms.h
+++ b/src/core/algorithms/fd/mining_algorithms.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "algorithms/fd/aidfd/aid.h"
-#include "algorithms/fd/depminer/depminer.h"
-#include "algorithms/fd/dfd/dfd.h"
-#include "algorithms/fd/eulerfd/eulerfd.h"
-#include "algorithms/fd/fastfds/fastfds.h"
-#include "algorithms/fd/fd_mine/fd_mine.h"
-#include "algorithms/fd/fdep/fdep.h"
-#include "algorithms/fd/fun/fun.h"
-#include "algorithms/fd/hyfd/hyfd.h"
-#include "algorithms/fd/pyro/pyro.h"
-#include "algorithms/fd/sfd/cords.h"
-#include "algorithms/fd/tane/pfdtane.h"
-#include "algorithms/fd/tane/tane.h"
+#include "core/algorithms/fd/aidfd/aid.h"
+#include "core/algorithms/fd/depminer/depminer.h"
+#include "core/algorithms/fd/dfd/dfd.h"
+#include "core/algorithms/fd/eulerfd/eulerfd.h"
+#include "core/algorithms/fd/fastfds/fastfds.h"
+#include "core/algorithms/fd/fd_mine/fd_mine.h"
+#include "core/algorithms/fd/fdep/fdep.h"
+#include "core/algorithms/fd/fun/fun.h"
+#include "core/algorithms/fd/hyfd/hyfd.h"
+#include "core/algorithms/fd/pyro/pyro.h"
+#include "core/algorithms/fd/sfd/cords.h"
+#include "core/algorithms/fd/tane/pfdtane.h"
+#include "core/algorithms/fd/tane/tane.h"
diff --git a/src/core/algorithms/fd/pfd_verifier/pfd_stats_calculator.h b/src/core/algorithms/fd/pfd_verifier/pfd_stats_calculator.h
index 2f086b1497..08e3c1cbe5 100644
--- a/src/core/algorithms/fd/pfd_verifier/pfd_stats_calculator.h
+++ b/src/core/algorithms/fd/pfd_verifier/pfd_stats_calculator.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "config/error/type.h"
-#include "config/error_measure/type.h"
-#include "config/indices/type.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/position_list_index.h"
+#include "core/config/error/type.h"
+#include "core/config/error_measure/type.h"
+#include "core/config/indices/type.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/pfd_verifier/pfd_verifier.cpp b/src/core/algorithms/fd/pfd_verifier/pfd_verifier.cpp
index 394d0b1886..410637272a 100644
--- a/src/core/algorithms/fd/pfd_verifier/pfd_verifier.cpp
+++ b/src/core/algorithms/fd/pfd_verifier/pfd_verifier.cpp
@@ -1,14 +1,14 @@
-#include "algorithms/fd/pfd_verifier/pfd_verifier.h"
+#include "core/algorithms/fd/pfd_verifier/pfd_verifier.h"
 
 #include <chrono>
 #include <memory>
 
-#include "algorithms/algorithm.h"
-#include "config/equal_nulls/option.h"
-#include "config/error_measure/option.h"
-#include "config/indices/option.h"
-#include "config/names.h"
-#include "config/tabular_data/input_table/option.h"
+#include "core/algorithms/algorithm.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/error_measure/option.h"
+#include "core/config/indices/option.h"
+#include "core/config/names.h"
+#include "core/config/tabular_data/input_table/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/pfd_verifier/pfd_verifier.h b/src/core/algorithms/fd/pfd_verifier/pfd_verifier.h
index 89c54aaf15..8130a32fe1 100644
--- a/src/core/algorithms/fd/pfd_verifier/pfd_verifier.h
+++ b/src/core/algorithms/fd/pfd_verifier/pfd_verifier.h
@@ -3,14 +3,14 @@
 #include <memory>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/fd/pfd_verifier/pfd_stats_calculator.h"
-#include "algorithms/fd/tane/enums.h"
-#include "config/equal_nulls/type.h"
-#include "config/error/type.h"
-#include "config/error_measure/type.h"
-#include "config/indices/type.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/fd/pfd_verifier/pfd_stats_calculator.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/error/type.h"
+#include "core/config/error_measure/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/pli_based_fd_algorithm.cpp b/src/core/algorithms/fd/pli_based_fd_algorithm.cpp
index 0ee5110aad..06c21cc575 100644
--- a/src/core/algorithms/fd/pli_based_fd_algorithm.cpp
+++ b/src/core/algorithms/fd/pli_based_fd_algorithm.cpp
@@ -1,7 +1,7 @@
-#include "pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
 
-#include "config/equal_nulls/option.h"
-#include "config/tabular_data/input_table/option.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/tabular_data/input_table/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/pli_based_fd_algorithm.h b/src/core/algorithms/fd/pli_based_fd_algorithm.h
index a620184efe..309a47aec2 100644
--- a/src/core/algorithms/fd/pli_based_fd_algorithm.h
+++ b/src/core/algorithms/fd/pli_based_fd_algorithm.h
@@ -2,10 +2,10 @@
 
 #include <optional>
 
-#include "config/equal_nulls/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "fd_algorithm.h"
-#include "model/table/column_layout_relation_data.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_relation_data.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/pyro/pyro.cpp b/src/core/algorithms/fd/pyro/pyro.cpp
index c73029ea45..9bb34084aa 100644
--- a/src/core/algorithms/fd/pyro/pyro.cpp
+++ b/src/core/algorithms/fd/pyro/pyro.cpp
@@ -1,16 +1,16 @@
-#include "pyro.h"
+#include "core/algorithms/fd/pyro/pyro.h"
 
 #include <chrono>
 #include <mutex>
 #include <thread>
 
-#include "algorithms/fd/pyrocommon/core/fd_g1_strategy.h"
-#include "config/error/option.h"
-#include "config/max_lhs/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/thread_number/option.h"
-#include "util/logger.h"
+#include "core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h"
+#include "core/config/error/option.h"
+#include "core/config/max_lhs/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/thread_number/option.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/pyro/pyro.h b/src/core/algorithms/fd/pyro/pyro.h
index 45b26f17cf..006537edb3 100644
--- a/src/core/algorithms/fd/pyro/pyro.h
+++ b/src/core/algorithms/fd/pyro/pyro.h
@@ -3,9 +3,9 @@
 #include <list>
 #include <mutex>
 
-#include "algorithms/fd/pli_based_fd_algorithm.h"
-#include "algorithms/fd/pyrocommon/core/dependency_consumer.h"
-#include "algorithms/fd/pyrocommon/core/search_space.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_consumer.h"
+#include "core/algorithms/fd/pyrocommon/core/search_space.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.cpp b/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.cpp
index 2da9fe2329..ead034460a 100644
--- a/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.cpp
+++ b/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.cpp
@@ -1,4 +1,4 @@
-#include "dependency_candidate.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_candidate.h"
 
 #include <boost/dynamic_bitset.hpp>
 
diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.h b/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.h
index c30b81877f..0de7c2e8a9 100644
--- a/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.h
+++ b/src/core/algorithms/fd/pyrocommon/core/dependency_candidate.h
@@ -2,8 +2,8 @@
 #include <functional>
 #include <utility>
 
-#include "../model/confidence_interval.h"
-#include "model/table/vertical.h"
+#include "core/algorithms/fd/pyrocommon/model/confidence_interval.h"
+#include "core/model/table/vertical.h"
 
 class DependencyCandidate {
 private:
diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.cpp b/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.cpp
index 4b3626f685..899e6fe204 100644
--- a/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.cpp
+++ b/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.cpp
@@ -1,5 +1,5 @@
 
-#include "dependency_consumer.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_consumer.h"
 
 PartialFD DependencyConsumer::RegisterFd(Vertical const& lhs, Column const& rhs, double error,
                                          double score) const {
diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.h b/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.h
index ce17466ede..3351e5ebe6 100644
--- a/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.h
+++ b/src/core/algorithms/fd/pyrocommon/core/dependency_consumer.h
@@ -3,8 +3,8 @@
 #include <list>
 #include <mutex>
 
-#include "../model/partial_fd.h"
-#include "../model/partial_key.h"
+#include "core/algorithms/fd/pyrocommon/model/partial_fd.h"
+#include "core/algorithms/fd/pyrocommon/model/partial_key.h"
 
 class DependencyConsumer {
 private:
diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.cpp b/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.cpp
index ca12b1f8e7..58752a32b4 100644
--- a/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.cpp
+++ b/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.cpp
@@ -1,6 +1,6 @@
-#include "dependency_strategy.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_strategy.h"
 
-#include "../model/pli_cache.h"
+#include "core/algorithms/fd/pyrocommon/model/pli_cache.h"
 
 bool DependencyStrategy::ShouldResample(Vertical const& vertical, double boost_factor) const {
     if (context_->GetParameters().sample_size <= 0 || vertical.GetArity() < 1) return false;
diff --git a/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.h b/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.h
index 1e787c5722..e09aa357b3 100644
--- a/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.h
+++ b/src/core/algorithms/fd/pyrocommon/core/dependency_strategy.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "dependency_candidate.h"
-#include "dependency_consumer.h"
-#include "model/table/vertical.h"
-#include "profiling_context.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_candidate.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_consumer.h"
+#include "core/algorithms/fd/pyrocommon/core/profiling_context.h"
+#include "core/model/table/vertical.h"
 
 class SearchSpace;
 
diff --git a/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.cpp b/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.cpp
index d64631577f..2e3aedd22a 100644
--- a/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.cpp
+++ b/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.cpp
@@ -1,10 +1,10 @@
-#include "fd_g1_strategy.h"
+#include "core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h"
 
 #include <unordered_map>
 
-#include "../model/pli_cache.h"
-#include "search_space.h"
-#include "util/logger.h"
+#include "core/algorithms/fd/pyrocommon/core/search_space.h"
+#include "core/algorithms/fd/pyrocommon/model/pli_cache.h"
+#include "core/util/logger.h"
 
 unsigned long long FdG1Strategy::nanos_ = 0;
 
diff --git a/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h b/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h
index 8e8c6fe849..a824d5fb30 100644
--- a/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h
+++ b/src/core/algorithms/fd/pyrocommon/core/fd_g1_strategy.h
@@ -2,7 +2,7 @@
 
 #include <boost/format.hpp>
 
-#include "dependency_strategy.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_strategy.h"
 
 class FdG1Strategy : public DependencyStrategy {
 private:
diff --git a/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.cpp b/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.cpp
index a2537b9eda..857cf517a7 100644
--- a/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.cpp
+++ b/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.cpp
@@ -1,9 +1,9 @@
-#include "key_g1_strategy.h"
+#include "core/algorithms/fd/pyrocommon/core/key_g1_strategy.h"
 
 #include <unordered_map>
 
-#include "../model/pli_cache.h"
-#include "search_space.h"
+#include "core/algorithms/fd/pyrocommon/core/search_space.h"
+#include "core/algorithms/fd/pyrocommon/model/pli_cache.h"
 
 double KeyG1Strategy::CalculateKeyError(model::PositionListIndex* pli) const {
     return CalculateKeyError(pli->GetNepAsLong());
diff --git a/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.h b/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.h
index 6d580e93fe..1dc7a2fd04 100644
--- a/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.h
+++ b/src/core/algorithms/fd/pyrocommon/core/key_g1_strategy.h
@@ -1,7 +1,7 @@
 #pragma once
 #include <boost/format.hpp>
 
-#include "dependency_strategy.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_strategy.h"
 
 class KeyG1Strategy : public DependencyStrategy {
 private:
diff --git a/src/core/algorithms/fd/pyrocommon/core/parameters.h b/src/core/algorithms/fd/pyrocommon/core/parameters.h
index 7c8b96b707..878d314272 100644
--- a/src/core/algorithms/fd/pyrocommon/core/parameters.h
+++ b/src/core/algorithms/fd/pyrocommon/core/parameters.h
@@ -2,10 +2,10 @@
 
 #include <string>
 
-#include "config/equal_nulls/type.h"
-#include "config/error/type.h"
-#include "config/max_lhs/type.h"
-#include "config/thread_number/type.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/error/type.h"
+#include "core/config/max_lhs/type.h"
+#include "core/config/thread_number/type.h"
 
 namespace algos::pyro {
 
diff --git a/src/core/algorithms/fd/pyrocommon/core/profiling_context.cpp b/src/core/algorithms/fd/pyrocommon/core/profiling_context.cpp
index 9f5f050992..9c859f0bd2 100644
--- a/src/core/algorithms/fd/pyrocommon/core/profiling_context.cpp
+++ b/src/core/algorithms/fd/pyrocommon/core/profiling_context.cpp
@@ -1,11 +1,11 @@
-#include "profiling_context.h"
+#include "core/algorithms/fd/pyrocommon/core/profiling_context.h"
 
 #include <utility>
 
-#include "../model/list_agree_set_sample.h"
-#include "../model/pli_cache.h"
-#include "model/table/vertical_map.h"
-#include "util/logger.h"
+#include "core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h"
+#include "core/algorithms/fd/pyrocommon/model/pli_cache.h"
+#include "core/model/table/vertical_map.h"
+#include "core/util/logger.h"
 
 using std::shared_ptr;
 
diff --git a/src/core/algorithms/fd/pyrocommon/core/profiling_context.h b/src/core/algorithms/fd/pyrocommon/core/profiling_context.h
index 3e5422ee42..da4edd2a7a 100644
--- a/src/core/algorithms/fd/pyrocommon/core/profiling_context.h
+++ b/src/core/algorithms/fd/pyrocommon/core/profiling_context.h
@@ -3,14 +3,14 @@
 #include <random>
 #include <string>
 
-#include "../model/agree_set_sample.h"
-#include "../model/partial_fd.h"
-#include "../model/partial_key.h"
-#include "cache_eviction_method.h"
-#include "caching_method.h"
-#include "dependency_consumer.h"
-#include "parameters.h"
-#include "util/custom_random.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_consumer.h"
+#include "core/algorithms/fd/pyrocommon/core/parameters.h"
+#include "core/algorithms/fd/pyrocommon/model/agree_set_sample.h"
+#include "core/algorithms/fd/pyrocommon/model/partial_fd.h"
+#include "core/algorithms/fd/pyrocommon/model/partial_key.h"
+#include "core/util/cache_eviction_method.h"
+#include "core/util/caching_method.h"
+#include "core/util/custom_random.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/pyrocommon/core/search_space.cpp b/src/core/algorithms/fd/pyrocommon/core/search_space.cpp
index 770f5683f1..df8a7987aa 100644
--- a/src/core/algorithms/fd/pyrocommon/core/search_space.cpp
+++ b/src/core/algorithms/fd/pyrocommon/core/search_space.cpp
@@ -1,9 +1,9 @@
-#include "search_space.h"
+#include "core/algorithms/fd/pyrocommon/core/search_space.h"
 
 #include <queue>
 #include <variant>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 // TODO: extra careful with const& -> shared_ptr conversions via make_shared-smart pointer may
 // delete the object - pass empty deleter [](*) {}
diff --git a/src/core/algorithms/fd/pyrocommon/core/search_space.h b/src/core/algorithms/fd/pyrocommon/core/search_space.h
index 6e9c1c82ad..a87c37f964 100644
--- a/src/core/algorithms/fd/pyrocommon/core/search_space.h
+++ b/src/core/algorithms/fd/pyrocommon/core/search_space.h
@@ -5,13 +5,13 @@
 #include <set>
 #include <utility>
 
-#include "dependency_candidate.h"
-#include "dependency_strategy.h"
-#include "model/table/relational_schema.h"
-#include "model/table/vertical.h"
-#include "model/table/vertical_map.h"
-#include "profiling_context.h"
-#include "vertical_info.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_candidate.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_strategy.h"
+#include "core/algorithms/fd/pyrocommon/core/profiling_context.h"
+#include "core/algorithms/fd/pyrocommon/core/vertical_info.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/vertical.h"
+#include "core/model/table/vertical_map.h"
 
 class SearchSpace : public std::enable_shared_from_this<SearchSpace> {
 private:
diff --git a/src/core/algorithms/fd/pyrocommon/model/agree_set_sample.cpp b/src/core/algorithms/fd/pyrocommon/model/agree_set_sample.cpp
index 04af39e972..99a0164cba 100644
--- a/src/core/algorithms/fd/pyrocommon/model/agree_set_sample.cpp
+++ b/src/core/algorithms/fd/pyrocommon/model/agree_set_sample.cpp
@@ -1,4 +1,4 @@
-#include "agree_set_sample.h"
+#include "core/algorithms/fd/pyrocommon/model/agree_set_sample.h"
 
 #include <algorithm>
 #include <exception>
diff --git a/src/core/algorithms/fd/pyrocommon/model/agree_set_sample.h b/src/core/algorithms/fd/pyrocommon/model/agree_set_sample.h
index 96f507dc54..8b259f7cdb 100644
--- a/src/core/algorithms/fd/pyrocommon/model/agree_set_sample.h
+++ b/src/core/algorithms/fd/pyrocommon/model/agree_set_sample.h
@@ -7,10 +7,10 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "confidence_interval.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/vertical.h"
-#include "util/custom_random.h"
+#include "core/algorithms/fd/pyrocommon/model/confidence_interval.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/vertical.h"
+#include "core/util/custom_random.h"
 
 namespace model {
 
@@ -73,4 +73,4 @@ class AgreeSetSample {
 }  // namespace model
 
 // include template implementation
-#include "agree_set_sample_impl.h"
+#include "core/algorithms/fd/pyrocommon/model/agree_set_sample_impl.h"
diff --git a/src/core/algorithms/fd/pyrocommon/model/agree_set_sample_impl.h b/src/core/algorithms/fd/pyrocommon/model/agree_set_sample_impl.h
index 9ab4dea268..18242a7614 100644
--- a/src/core/algorithms/fd/pyrocommon/model/agree_set_sample_impl.h
+++ b/src/core/algorithms/fd/pyrocommon/model/agree_set_sample_impl.h
@@ -4,7 +4,7 @@
 #include <random>
 #include <unordered_map>
 
-#include "agree_set_sample.h"
+#include "core/algorithms/fd/pyrocommon/model/agree_set_sample.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/pyrocommon/model/confidence_interval.cpp b/src/core/algorithms/fd/pyrocommon/model/confidence_interval.cpp
index 9c9137abdf..52e34398cb 100644
--- a/src/core/algorithms/fd/pyrocommon/model/confidence_interval.cpp
+++ b/src/core/algorithms/fd/pyrocommon/model/confidence_interval.cpp
@@ -1,4 +1,4 @@
-#include "confidence_interval.h"
+#include "core/algorithms/fd/pyrocommon/model/confidence_interval.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.cpp b/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.cpp
index 26a5fc80c8..443c7e4e01 100644
--- a/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.cpp
+++ b/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.cpp
@@ -1,6 +1,6 @@
-#include "list_agree_set_sample.h"
+#include "core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h"
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h b/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h
index 6e11c95eac..2961872511 100644
--- a/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h
+++ b/src/core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h
@@ -4,7 +4,7 @@
 #include <utility>
 #include <vector>
 
-#include "agree_set_sample.h"
+#include "core/algorithms/fd/pyrocommon/model/agree_set_sample.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/pyrocommon/model/partial_fd.h b/src/core/algorithms/fd/pyrocommon/model/partial_fd.h
index 951f49a2d1..0e832b491a 100644
--- a/src/core/algorithms/fd/pyrocommon/model/partial_fd.h
+++ b/src/core/algorithms/fd/pyrocommon/model/partial_fd.h
@@ -2,8 +2,8 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "model/table/column.h"
-#include "model/table/vertical.h"
+#include "core/model/table/column.h"
+#include "core/model/table/vertical.h"
 
 class PartialFD {
 public:
diff --git a/src/core/algorithms/fd/pyrocommon/model/partial_key.h b/src/core/algorithms/fd/pyrocommon/model/partial_key.h
index c49a46dde0..15d0553e95 100644
--- a/src/core/algorithms/fd/pyrocommon/model/partial_key.h
+++ b/src/core/algorithms/fd/pyrocommon/model/partial_key.h
@@ -2,8 +2,8 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include "model/table/column.h"
-#include "model/table/vertical.h"
+#include "core/model/table/column.h"
+#include "core/model/table/vertical.h"
 
 class PartialKey {
 public:
diff --git a/src/core/algorithms/fd/pyrocommon/model/pli_cache.cpp b/src/core/algorithms/fd/pyrocommon/model/pli_cache.cpp
index 9c4d3a711d..33bddf3f1c 100644
--- a/src/core/algorithms/fd/pyrocommon/model/pli_cache.cpp
+++ b/src/core/algorithms/fd/pyrocommon/model/pli_cache.cpp
@@ -1,9 +1,9 @@
-#include "pli_cache.h"
+#include "core/algorithms/fd/pyrocommon/model/pli_cache.h"
 
 #include <boost/optional.hpp>
 
-#include "model/table/vertical_map.h"
-#include "util/logger.h"
+#include "core/model/table/vertical_map.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/pyrocommon/model/pli_cache.h b/src/core/algorithms/fd/pyrocommon/model/pli_cache.h
index 732c9103a9..6a016beabb 100644
--- a/src/core/algorithms/fd/pyrocommon/model/pli_cache.h
+++ b/src/core/algorithms/fd/pyrocommon/model/pli_cache.h
@@ -4,11 +4,11 @@ class ProfilingContext;
 
 #include <mutex>
 
-#include "../core/profiling_context.h"
-#include "cache_eviction_method.h"
-#include "caching_method.h"
-#include "model/table/column_layout_relation_data.h"
-#include "util/maybe_unused_private_field.h"
+#include "core/algorithms/fd/pyrocommon/core/profiling_context.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/util/cache_eviction_method.h"
+#include "core/util/caching_method.h"
+#include "core/util/maybe_unused_private_field.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/sfd/contingency_table.cpp b/src/core/algorithms/fd/sfd/contingency_table.cpp
index cbed7960a3..0b05fd1b52 100644
--- a/src/core/algorithms/fd/sfd/contingency_table.cpp
+++ b/src/core/algorithms/fd/sfd/contingency_table.cpp
@@ -1,9 +1,9 @@
-#include "contingency_table.h"
+#include "core/algorithms/fd/sfd/contingency_table.h"
 
 #include <boost/math/distributions/chi_squared.hpp>
 
-#include "frequency_handler.h"
-#include "sample.h"
+#include "core/algorithms/fd/sfd/frequency_handler.h"
+#include "core/algorithms/fd/sfd/sample.h"
 
 namespace algos {
 ContingencyTable::ContingencyTable(model::ColumnIndex col_i, model::ColumnIndex col_k,
diff --git a/src/core/algorithms/fd/sfd/contingency_table.h b/src/core/algorithms/fd/sfd/contingency_table.h
index 69c3495888..947edeb647 100644
--- a/src/core/algorithms/fd/sfd/contingency_table.h
+++ b/src/core/algorithms/fd/sfd/contingency_table.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <vector>
 
-#include "frequency_handler.h"
-#include "sample.h"
+#include "core/algorithms/fd/sfd/frequency_handler.h"
+#include "core/algorithms/fd/sfd/sample.h"
 
 namespace algos {
 class ContingencyTable {
diff --git a/src/core/algorithms/fd/sfd/cords.cpp b/src/core/algorithms/fd/sfd/cords.cpp
index 5e5ec75c4f..ff94728b10 100644
--- a/src/core/algorithms/fd/sfd/cords.cpp
+++ b/src/core/algorithms/fd/sfd/cords.cpp
@@ -1,19 +1,19 @@
-#include "cords.h"
+#include "core/algorithms/fd/sfd/cords.h"
 
 #include <chrono>
 #include <utility>
 #include <vector>
 
-#include "config/equal_nulls/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "contingency_table.h"
-#include "frequency_handler.h"
-#include "model/table/column_index.h"
-#include "model/table/typed_column_data.h"
-#include "sample.h"
+#include "core/algorithms/fd/sfd/contingency_table.h"
+#include "core/algorithms/fd/sfd/frequency_handler.h"
+#include "core/algorithms/fd/sfd/sample.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos {
 Cords::Cords() : FDAlgorithm({kFirstPhaseName, kSecondPhaseName}) {
diff --git a/src/core/algorithms/fd/sfd/cords.h b/src/core/algorithms/fd/sfd/cords.h
index bee2a1f149..d8df923982 100644
--- a/src/core/algorithms/fd/sfd/cords.h
+++ b/src/core/algorithms/fd/sfd/cords.h
@@ -4,17 +4,17 @@
 #include <utility>
 #include <vector>
 
-#include "algorithm.h"
-#include "algorithms/fd/fd_algorithm.h"
-#include "config/equal_nulls/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "contingency_table.h"
-#include "correlation.h"
-#include "frequency_handler.h"
-#include "model/table/column.h"
-#include "model/table/column_index.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "sample.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/algorithms/fd/sfd/contingency_table.h"
+#include "core/algorithms/fd/sfd/correlation.h"
+#include "core/algorithms/fd/sfd/frequency_handler.h"
+#include "core/algorithms/fd/sfd/sample.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos {
 class Cords : public FDAlgorithm {
diff --git a/src/core/algorithms/fd/sfd/correlation.h b/src/core/algorithms/fd/sfd/correlation.h
index 2ce2d0f114..6522e4f3b7 100644
--- a/src/core/algorithms/fd/sfd/correlation.h
+++ b/src/core/algorithms/fd/sfd/correlation.h
@@ -2,7 +2,7 @@
 #include <string>
 #include <utility>
 
-#include "model/table/column.h"
+#include "core/model/table/column.h"
 
 namespace algos {
 struct Correlation {
diff --git a/src/core/algorithms/fd/sfd/frequency_handler.cpp b/src/core/algorithms/fd/sfd/frequency_handler.cpp
index 3157d14462..c08bd36880 100644
--- a/src/core/algorithms/fd/sfd/frequency_handler.cpp
+++ b/src/core/algorithms/fd/sfd/frequency_handler.cpp
@@ -1,4 +1,4 @@
-#include "frequency_handler.h"
+#include "core/algorithms/fd/sfd/frequency_handler.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -7,9 +7,9 @@
 #include <utility>
 #include <vector>
 
-#include "model/table/column_index.h"
-#include "model/table/tuple_index.h"
-#include "model/table/typed_column_data.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/tuple_index.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos {
 void FrequencyHandler::InitFrequencyHandler(std::vector<model::TypedColumnData> const &data,
diff --git a/src/core/algorithms/fd/sfd/frequency_handler.h b/src/core/algorithms/fd/sfd/frequency_handler.h
index f9bf42c551..12e95b221f 100644
--- a/src/core/algorithms/fd/sfd/frequency_handler.h
+++ b/src/core/algorithms/fd/sfd/frequency_handler.h
@@ -3,8 +3,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "model/table/column_index.h"
-#include "model/table/typed_column_data.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/sfd/sample.cpp b/src/core/algorithms/fd/sfd/sample.cpp
index 7d70bb2455..e03d615678 100644
--- a/src/core/algorithms/fd/sfd/sample.cpp
+++ b/src/core/algorithms/fd/sfd/sample.cpp
@@ -1,4 +1,4 @@
-#include "sample.h"
+#include "core/algorithms/fd/sfd/sample.h"
 
 #include <chrono>
 #include <random>
@@ -6,8 +6,8 @@
 #include <unordered_set>
 #include <vector>
 
-#include "frequency_handler.h"
-#include "model/table/tuple_index.h"
+#include "core/algorithms/fd/sfd/frequency_handler.h"
+#include "core/model/table/tuple_index.h"
 
 namespace algos {
 Sample::Sample(bool fixed_sample, unsigned long long sample_size, model::TupleIndex rows,
diff --git a/src/core/algorithms/fd/sfd/sample.h b/src/core/algorithms/fd/sfd/sample.h
index db1d50eaff..a05b4c35ba 100644
--- a/src/core/algorithms/fd/sfd/sample.h
+++ b/src/core/algorithms/fd/sfd/sample.h
@@ -5,13 +5,13 @@
 #include <numbers>
 #include <vector>
 
-#include "frequency_handler.h"
-#include "model/table/column.h"
-#include "model/table/column_index.h"
-#include "model/table/relational_schema.h"
-#include "model/table/tuple_index.h"
-#include "model/table/typed_column_data.h"
-#include "model/table/vertical.h"
+#include "core/algorithms/fd/sfd/frequency_handler.h"
+#include "core/model/table/column.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/tuple_index.h"
+#include "core/model/table/typed_column_data.h"
+#include "core/model/table/vertical.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/tane/afd_measures.cpp b/src/core/algorithms/fd/tane/afd_measures.cpp
index b3de4f3146..962bc44d6b 100644
--- a/src/core/algorithms/fd/tane/afd_measures.cpp
+++ b/src/core/algorithms/fd/tane/afd_measures.cpp
@@ -1,4 +1,4 @@
-#include "afd_measures.h"
+#include "core/algorithms/fd/tane/afd_measures.h"
 
 namespace algos {
 using Cluster = model::PositionListIndex::Cluster;
diff --git a/src/core/algorithms/fd/tane/afd_measures.h b/src/core/algorithms/fd/tane/afd_measures.h
index 0bfc542232..bc4a894d5e 100644
--- a/src/core/algorithms/fd/tane/afd_measures.h
+++ b/src/core/algorithms/fd/tane/afd_measures.h
@@ -1,8 +1,8 @@
 
-#include "config/error/type.h"
-#include "enums.h"
-#include "model/table/column_data.h"
-#include "model/table/position_list_index.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/config/error/type.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos {
 config::ErrorType CalculateZeroAryG1(ColumnData const* rhs, unsigned long long num_tuple_pairs);
diff --git a/src/core/algorithms/fd/tane/model/lattice_level.cpp b/src/core/algorithms/fd/tane/model/lattice_level.cpp
index 26cb3f9dd1..0d609ebe17 100644
--- a/src/core/algorithms/fd/tane/model/lattice_level.cpp
+++ b/src/core/algorithms/fd/tane/model/lattice_level.cpp
@@ -1,8 +1,8 @@
-#include "lattice_level.h"
+#include "core/algorithms/fd/tane/model/lattice_level.h"
 
 #include <algorithm>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/tane/model/lattice_level.h b/src/core/algorithms/fd/tane/model/lattice_level.h
index 5caafe96c7..de5fd903f0 100644
--- a/src/core/algorithms/fd/tane/model/lattice_level.h
+++ b/src/core/algorithms/fd/tane/model/lattice_level.h
@@ -3,7 +3,7 @@
 #include <map>
 #include <vector>
 
-#include "lattice_vertex.h"
+#include "core/algorithms/fd/tane/model/lattice_vertex.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/tane/model/lattice_vertex.cpp b/src/core/algorithms/fd/tane/model/lattice_vertex.cpp
index d4b782ef72..b05901c287 100644
--- a/src/core/algorithms/fd/tane/model/lattice_vertex.cpp
+++ b/src/core/algorithms/fd/tane/model/lattice_vertex.cpp
@@ -1,4 +1,4 @@
-#include "lattice_vertex.h"
+#include "core/algorithms/fd/tane/model/lattice_vertex.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/tane/model/lattice_vertex.h b/src/core/algorithms/fd/tane/model/lattice_vertex.h
index 43c20412d6..793b3a262a 100644
--- a/src/core/algorithms/fd/tane/model/lattice_vertex.h
+++ b/src/core/algorithms/fd/tane/model/lattice_vertex.h
@@ -7,9 +7,9 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "model/table/position_list_index.h"
-#include "model/table/relational_schema.h"
-#include "model/table/vertical.h"
+#include "core/model/table/position_list_index.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/vertical.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/fd/tane/pfdtane.cpp b/src/core/algorithms/fd/tane/pfdtane.cpp
index 9d40dabff4..b29988c731 100644
--- a/src/core/algorithms/fd/tane/pfdtane.cpp
+++ b/src/core/algorithms/fd/tane/pfdtane.cpp
@@ -1,12 +1,12 @@
-#include "pfdtane.h"
+#include "core/algorithms/fd/tane/pfdtane.h"
 
 #include <algorithm>
 
-#include "config/error/option.h"
-#include "config/error_measure/option.h"
-#include "enums.h"
-#include "fd/pli_based_fd_algorithm.h"
-#include "model/table/column_data.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/config/error/option.h"
+#include "core/config/error_measure/option.h"
+#include "core/model/table/column_data.h"
 
 namespace algos {
 using Cluster = model::PositionListIndex::Cluster;
diff --git a/src/core/algorithms/fd/tane/pfdtane.h b/src/core/algorithms/fd/tane/pfdtane.h
index a85cf211ef..dbffc877fb 100644
--- a/src/core/algorithms/fd/tane/pfdtane.h
+++ b/src/core/algorithms/fd/tane/pfdtane.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "config/error/type.h"
-#include "enums.h"
-#include "model/table/column_data.h"
-#include "model/table/position_list_index.h"
-#include "tane_common.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/algorithms/fd/tane/tane_common.h"
+#include "core/config/error/type.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/tane/tane.cpp b/src/core/algorithms/fd/tane/tane.cpp
index e94c1e35bd..ec2fd5bd92 100644
--- a/src/core/algorithms/fd/tane/tane.cpp
+++ b/src/core/algorithms/fd/tane/tane.cpp
@@ -1,11 +1,11 @@
-#include "tane.h"
+#include "core/algorithms/fd/tane/tane.h"
 
-#include "afd_measures.h"
-#include "config/error/option.h"
-#include "config/error_measure/option.h"
-#include "enums.h"
-#include "fd/pli_based_fd_algorithm.h"
-#include "model/table/column_data.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/tane/afd_measures.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/config/error/option.h"
+#include "core/config/error_measure/option.h"
+#include "core/model/table/column_data.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/tane/tane.h b/src/core/algorithms/fd/tane/tane.h
index 3f22a599e7..8a46ef0438 100644
--- a/src/core/algorithms/fd/tane/tane.h
+++ b/src/core/algorithms/fd/tane/tane.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "config/error/type.h"
-#include "enums.h"
-#include "model/table/column_data.h"
-#include "model/table/position_list_index.h"
-#include "tane_common.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/algorithms/fd/tane/tane_common.h"
+#include "core/config/error/type.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/fd/tane/tane_common.cpp b/src/core/algorithms/fd/tane/tane_common.cpp
index 8ddeb4910e..3c289a8b84 100644
--- a/src/core/algorithms/fd/tane/tane_common.cpp
+++ b/src/core/algorithms/fd/tane/tane_common.cpp
@@ -1,18 +1,18 @@
-#include "tane_common.h"
+#include "core/algorithms/fd/tane/tane_common.h"
 
 #include <chrono>
 #include <iomanip>
 #include <list>
 #include <memory>
 
-#include "config/error/option.h"
-#include "fd/pli_based_fd_algorithm.h"
-#include "fd/tane/model/lattice_level.h"
-#include "fd/tane/model/lattice_vertex.h"
-#include "model/table/column_data.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/relational_schema.h"
-#include "util/logger.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/tane/model/lattice_level.h"
+#include "core/algorithms/fd/tane/model/lattice_vertex.h"
+#include "core/config/error/option.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/relational_schema.h"
+#include "core/util/logger.h"
 
 namespace algos {
 using boost::dynamic_bitset;
diff --git a/src/core/algorithms/fd/tane/tane_common.h b/src/core/algorithms/fd/tane/tane_common.h
index 35b23ee3db..652f6c78fd 100644
--- a/src/core/algorithms/fd/tane/tane_common.h
+++ b/src/core/algorithms/fd/tane/tane_common.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "algorithms/fd/pli_based_fd_algorithm.h"
-#include "algorithms/fd/tane/model/lattice_level.h"
-#include "config/error/type.h"
-#include "model/table/column_data.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/position_list_index.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/tane/model/lattice_level.h"
+#include "core/config/error/type.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos::tane {
 
diff --git a/src/core/algorithms/fd/verification_algorithms.h b/src/core/algorithms/fd/verification_algorithms.h
index 0cd3216275..19d448b88f 100644
--- a/src/core/algorithms/fd/verification_algorithms.h
+++ b/src/core/algorithms/fd/verification_algorithms.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#include "algorithms/fd/fd_verifier/fd_verifier.h"
-#include "algorithms/fd/pfd_verifier/pfd_verifier.h"
+#include "core/algorithms/fd/fd_verifier/fd_verifier.h"
+#include "core/algorithms/fd/pfd_verifier/pfd_verifier.h"
diff --git a/src/core/algorithms/gfd/comparator.cpp b/src/core/algorithms/gfd/comparator.cpp
index b2af4a0947..bf5a318698 100644
--- a/src/core/algorithms/gfd/comparator.cpp
+++ b/src/core/algorithms/gfd/comparator.cpp
@@ -1,41 +1,41 @@
-#include "algorithms/gfd/comparator.h"
-
-#include <algorithm>
-#include <cstdlib>
-#include <map>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <boost/graph/vf2_sub_graph_iso.hpp>
-
-#include "algorithms/gfd/gfd.h"
-
-namespace gfd::comparator {
-
-bool CompareLiterals(model::Gfd::Literal const& lhs, model::Gfd::Literal const& rhs) {
-    return (lhs == rhs) || ((lhs.first == rhs.second) && (lhs.second == rhs.first));
-}
-
-bool ContainsLiteral(std::vector<model::Gfd::Literal> const& literals,
-                     model::Gfd::Literal const& l) {
-    auto check = [&l](auto const& cur_lit) { return CompareLiterals(cur_lit, l); };
-    return std::ranges::any_of(literals, check);
-}
-
-bool ContainsLiterals(std::vector<model::Gfd::Literal> const& superset,
-                      std::vector<model::Gfd::Literal> const& subset) {
-    auto check = [&superset](auto const& cur_lit) { return ContainsLiteral(superset, cur_lit); };
-    return std::ranges::all_of(subset, check);
-}
-
-bool CompareLiteralSets(std::vector<model::Gfd::Literal> const& lhs,
-                        std::vector<model::Gfd::Literal> const& rhs) {
-    if (lhs.size() != rhs.size()) {
-        return false;
-    }
-    auto check = [&rhs](auto const& cur_lit) { return ContainsLiteral(rhs, cur_lit); };
-    return std::ranges::all_of(lhs, check);
-}
-
-}  // namespace gfd::comparator
+#include "core/algorithms/gfd/comparator.h"
+
+#include <algorithm>
+#include <cstdlib>
+#include <map>
+#include <sstream>
+#include <string>
+#include <vector>
+
+#include <boost/graph/vf2_sub_graph_iso.hpp>
+
+#include "core/algorithms/gfd/gfd.h"
+
+namespace gfd::comparator {
+
+bool CompareLiterals(model::Gfd::Literal const& lhs, model::Gfd::Literal const& rhs) {
+    return (lhs == rhs) || ((lhs.first == rhs.second) && (lhs.second == rhs.first));
+}
+
+bool ContainsLiteral(std::vector<model::Gfd::Literal> const& literals,
+                     model::Gfd::Literal const& l) {
+    auto check = [&l](auto const& cur_lit) { return CompareLiterals(cur_lit, l); };
+    return std::ranges::any_of(literals, check);
+}
+
+bool ContainsLiterals(std::vector<model::Gfd::Literal> const& superset,
+                      std::vector<model::Gfd::Literal> const& subset) {
+    auto check = [&superset](auto const& cur_lit) { return ContainsLiteral(superset, cur_lit); };
+    return std::ranges::all_of(subset, check);
+}
+
+bool CompareLiteralSets(std::vector<model::Gfd::Literal> const& lhs,
+                        std::vector<model::Gfd::Literal> const& rhs) {
+    if (lhs.size() != rhs.size()) {
+        return false;
+    }
+    auto check = [&rhs](auto const& cur_lit) { return ContainsLiteral(rhs, cur_lit); };
+    return std::ranges::all_of(lhs, check);
+}
+
+}  // namespace gfd::comparator
diff --git a/src/core/algorithms/gfd/comparator.h b/src/core/algorithms/gfd/comparator.h
index 35ced85468..6c9ebf83e1 100644
--- a/src/core/algorithms/gfd/comparator.h
+++ b/src/core/algorithms/gfd/comparator.h
@@ -1,19 +1,19 @@
-#pragma once
-
-#include <vector>
-
-#include <boost/graph/vf2_sub_graph_iso.hpp>
-
-#include "algorithms/gfd/gfd.h"
-
-namespace gfd::comparator {
-
-bool CompareLiterals(model::Gfd::Literal const& lhs, model::Gfd::Literal const& rhs);
-bool ContainsLiteral(std::vector<model::Gfd::Literal> const& literals,
-                     model::Gfd::Literal const& l);
-bool ContainsLiterals(std::vector<model::Gfd::Literal> const& superset,
-                      std::vector<model::Gfd::Literal> const& subset);
-bool CompareLiteralSets(std::vector<model::Gfd::Literal> const& lhs,
-                        std::vector<model::Gfd::Literal> const& rhs);
-
-}  // namespace gfd::comparator
+#pragma once
+
+#include <vector>
+
+#include <boost/graph/vf2_sub_graph_iso.hpp>
+
+#include "core/algorithms/gfd/gfd.h"
+
+namespace gfd::comparator {
+
+bool CompareLiterals(model::Gfd::Literal const& lhs, model::Gfd::Literal const& rhs);
+bool ContainsLiteral(std::vector<model::Gfd::Literal> const& literals,
+                     model::Gfd::Literal const& l);
+bool ContainsLiterals(std::vector<model::Gfd::Literal> const& superset,
+                      std::vector<model::Gfd::Literal> const& subset);
+bool CompareLiteralSets(std::vector<model::Gfd::Literal> const& lhs,
+                        std::vector<model::Gfd::Literal> const& rhs);
+
+}  // namespace gfd::comparator
diff --git a/src/core/algorithms/gfd/gfd.cpp b/src/core/algorithms/gfd/gfd.cpp
index 1c178e2fe5..9d163e9cdd 100644
--- a/src/core/algorithms/gfd/gfd.cpp
+++ b/src/core/algorithms/gfd/gfd.cpp
@@ -1,52 +1,52 @@
-#include "algorithms/gfd/gfd.h"
-
-#include <cstdlib>
-#include <sstream>
-#include <string>
-
-#include <boost/graph/vf2_sub_graph_iso.hpp>
-
-#include "algorithms/gfd/comparator.h"
-#include "parser/graph_parser/graph_parser.h"
-
-namespace model {
-
-std::string model::Gfd::ToString() const {
-    std::stringstream gfd_stream;
-    parser::graph_parser::WriteGfd(gfd_stream, *this);
-    return gfd_stream.str();
-}
-
-namespace {
-
-bool IsSub(graph_t const& query, graph_t const& graph) {
-    bool result = false;
-    auto vcmp = [&query, &graph](vertex_t const& fr, vertex_t const& to) {
-        return query[fr].attributes.at("label") == graph[to].attributes.at("label");
-    };
-    auto ecmp = [&query, &graph](edge_t const& fr, edge_t const& to) {
-        return query[fr].label == graph[to].label;
-    };
-    auto callback = [&result](auto, auto) {
-        result = true;
-        return false;
-    };
-    using property_map_type = boost::property_map<graph_t, boost::vertex_index_t>::type;
-    property_map_type query_index_map = boost::get(boost::vertex_index, query);
-    property_map_type graph_index_map = boost::get(boost::vertex_index, graph);
-    std::vector<vertex_t> query_vertex_order = vertex_order_by_mult(query);
-    boost::vf2_subgraph_iso(query, graph, callback, query_index_map, graph_index_map,
-                            query_vertex_order, ecmp, vcmp);
-    return result;
-}
-
-}  // namespace
-
-bool Gfd::operator==(Gfd const& gfd) const {
-    graph_t pat = gfd.GetPattern();
-    return IsSub(pattern_, pat) && IsSub(pat, pattern_) &&
-           gfd::comparator::CompareLiteralSets(premises_, gfd.GetPremises()) &&
-           gfd::comparator::CompareLiteralSets(conclusion_, gfd.GetConclusion());
-}
-
-}  // namespace model
+#include "core/algorithms/gfd/gfd.h"
+
+#include <cstdlib>
+#include <sstream>
+#include <string>
+
+#include <boost/graph/vf2_sub_graph_iso.hpp>
+
+#include "core/algorithms/gfd/comparator.h"
+#include "core/parser/graph_parser/graph_parser.h"
+
+namespace model {
+
+std::string model::Gfd::ToString() const {
+    std::stringstream gfd_stream;
+    parser::graph_parser::WriteGfd(gfd_stream, *this);
+    return gfd_stream.str();
+}
+
+namespace {
+
+bool IsSub(graph_t const& query, graph_t const& graph) {
+    bool result = false;
+    auto vcmp = [&query, &graph](vertex_t const& fr, vertex_t const& to) {
+        return query[fr].attributes.at("label") == graph[to].attributes.at("label");
+    };
+    auto ecmp = [&query, &graph](edge_t const& fr, edge_t const& to) {
+        return query[fr].label == graph[to].label;
+    };
+    auto callback = [&result](auto, auto) {
+        result = true;
+        return false;
+    };
+    using property_map_type = boost::property_map<graph_t, boost::vertex_index_t>::type;
+    property_map_type query_index_map = boost::get(boost::vertex_index, query);
+    property_map_type graph_index_map = boost::get(boost::vertex_index, graph);
+    std::vector<vertex_t> query_vertex_order = vertex_order_by_mult(query);
+    boost::vf2_subgraph_iso(query, graph, callback, query_index_map, graph_index_map,
+                            query_vertex_order, ecmp, vcmp);
+    return result;
+}
+
+}  // namespace
+
+bool Gfd::operator==(Gfd const& gfd) const {
+    graph_t pat = gfd.GetPattern();
+    return IsSub(pattern_, pat) && IsSub(pat, pattern_) &&
+           gfd::comparator::CompareLiteralSets(premises_, gfd.GetPremises()) &&
+           gfd::comparator::CompareLiteralSets(conclusion_, gfd.GetConclusion());
+}
+
+}  // namespace model
diff --git a/src/core/algorithms/gfd/gfd.h b/src/core/algorithms/gfd/gfd.h
index 55828f73f6..3028c80a52 100644
--- a/src/core/algorithms/gfd/gfd.h
+++ b/src/core/algorithms/gfd/gfd.h
@@ -1,67 +1,67 @@
-#pragma once
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "algorithms/gfd/graph_descriptor.h"
-
-namespace model {
-
-class Gfd {
-public:
-    // Defines a specific attribute of the pattern.
-    // The first element is the index of the vertex,
-    // the second is the name of the attribute.
-    // An alias for user convenience.
-    using Token = std::pair<int, std::string>;
-
-    // Concept from the article "Discovering Graph Functional Dependencies"
-    // by Fan Wenfei, Hu Chunming, Liu Xueli, and Lu Ping.
-    // An alias for user convenience.
-    using Literal = std::pair<Token, Token>;
-
-private:
-    graph_t pattern_;
-    std::vector<Literal> premises_;
-    std::vector<Literal> conclusion_;
-
-public:
-    Gfd() = default;
-
-    template <typename T1, typename T2>
-    Gfd(T1&& pattern, T2&& premises, T2&& conclusion)
-        : pattern_(std::forward<T1>(pattern)),
-          premises_(std::forward<T2>(premises)),
-          conclusion_(std::forward<T2>(conclusion)) {}
-
-    graph_t const& GetPattern() const noexcept {
-        return pattern_;
-    }
-
-    std::vector<Literal> const& GetPremises() const noexcept {
-        return premises_;
-    }
-
-    std::vector<Literal> const& GetConclusion() const noexcept {
-        return conclusion_;
-    }
-
-    void SetPattern(graph_t const& pattern) {
-        pattern_ = pattern;
-    }
-
-    void SetPremises(std::vector<Literal> const& premises) {
-        premises_ = premises;
-    }
-
-    void SetConclusion(std::vector<Literal> const& conclusion) {
-        conclusion_ = conclusion;
-    }
-
-    bool operator==(Gfd const& gfd) const;
-    bool operator!=(Gfd const& gfd) const = default;
-
-    std::string ToString() const;
-};
-
-}  // namespace model
+#pragma once
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "core/algorithms/gfd/graph_descriptor.h"
+
+namespace model {
+
+class Gfd {
+public:
+    // Defines a specific attribute of the pattern.
+    // The first element is the index of the vertex,
+    // the second is the name of the attribute.
+    // An alias for user convenience.
+    using Token = std::pair<int, std::string>;
+
+    // Concept from the article "Discovering Graph Functional Dependencies"
+    // by Fan Wenfei, Hu Chunming, Liu Xueli, and Lu Ping.
+    // An alias for user convenience.
+    using Literal = std::pair<Token, Token>;
+
+private:
+    graph_t pattern_;
+    std::vector<Literal> premises_;
+    std::vector<Literal> conclusion_;
+
+public:
+    Gfd() = default;
+
+    template <typename T1, typename T2>
+    Gfd(T1&& pattern, T2&& premises, T2&& conclusion)
+        : pattern_(std::forward<T1>(pattern)),
+          premises_(std::forward<T2>(premises)),
+          conclusion_(std::forward<T2>(conclusion)) {}
+
+    graph_t const& GetPattern() const noexcept {
+        return pattern_;
+    }
+
+    std::vector<Literal> const& GetPremises() const noexcept {
+        return premises_;
+    }
+
+    std::vector<Literal> const& GetConclusion() const noexcept {
+        return conclusion_;
+    }
+
+    void SetPattern(graph_t const& pattern) {
+        pattern_ = pattern;
+    }
+
+    void SetPremises(std::vector<Literal> const& premises) {
+        premises_ = premises;
+    }
+
+    void SetConclusion(std::vector<Literal> const& conclusion) {
+        conclusion_ = conclusion;
+    }
+
+    bool operator==(Gfd const& gfd) const;
+    bool operator!=(Gfd const& gfd) const = default;
+
+    std::string ToString() const;
+};
+
+}  // namespace model
diff --git a/src/core/algorithms/gfd/gfd_miner/gfd_miner.cpp b/src/core/algorithms/gfd/gfd_miner/gfd_miner.cpp
index 81080cbef7..a6b3ba8524 100644
--- a/src/core/algorithms/gfd/gfd_miner/gfd_miner.cpp
+++ b/src/core/algorithms/gfd/gfd_miner/gfd_miner.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/gfd/gfd_miner/gfd_miner.h"
+#include "core/algorithms/gfd/gfd_miner/gfd_miner.h"
 
 #include <algorithm>
 #include <cstdlib>
@@ -16,10 +16,10 @@
 #include <boost/graph/isomorphism.hpp>
 #include <boost/graph/vf2_sub_graph_iso.hpp>
 
-#include "algorithms/gfd/comparator.h"
-#include "config/option_using.h"
-#include "util/logger.h"
-#include "util/timed_invoke.h"
+#include "core/algorithms/gfd/comparator.h"
+#include "core/config/option_using.h"
+#include "core/util/logger.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/gfd/gfd_miner/gfd_miner.h b/src/core/algorithms/gfd/gfd_miner/gfd_miner.h
index 6aee45a8f8..cab23a5ef9 100644
--- a/src/core/algorithms/gfd/gfd_miner/gfd_miner.h
+++ b/src/core/algorithms/gfd/gfd_miner/gfd_miner.h
@@ -4,10 +4,10 @@
 #include <filesystem>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/gfd/gfd.h"
-#include "config/names_and_descriptions.h"
-#include "parser/graph_parser/graph_parser.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/gfd/gfd.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/parser/graph_parser/graph_parser.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/gfd/gfd_validator/balancer.cpp b/src/core/algorithms/gfd/gfd_validator/balancer.cpp
index 94d628c6f1..cb9115f637 100644
--- a/src/core/algorithms/gfd/gfd_validator/balancer.cpp
+++ b/src/core/algorithms/gfd/gfd_validator/balancer.cpp
@@ -1,172 +1,172 @@
-#include "algorithms/gfd/gfd_validator/balancer.h"
-
-#include <algorithm>
-#include <map>
-#include <numeric>
-#include <vector>
-
-std::vector<std::vector<int>> Balancer::Balance(std::vector<int> const& weights,
-                                                int const& processors_num) {
-    m_ = std::min(processors_num, static_cast<int>(weights.size()));
-    result_ = {};
-    if (weights.empty()) {
-        result_.resize(processors_num);
-        return result_;
-    }
-    for (std::size_t i = 0; i < m_; ++i) {
-        // the first value is index
-        std::vector<int> temp = {static_cast<int>(i)};
-        result_.push_back(temp);
-    }
-    // fill processors initially
-    // count optimal
-    optimal_ = 0;
-    std::size_t i = 0;
-    for (int const& weight : weights) {
-        result_.at(i++).push_back(weight);
-        i = i == m_ ? 0 : i;
-        optimal_ += weight;
-    }
-    optimal_ /= m_;
-    // sort processors (for convenience)
-    for (std::vector<int>& processor : result_) {
-        std::sort(processor.begin() + 1, processor.end());
-    }
-    // ALGORITHM
-    DeleteLarge();
-    Prepare();
-    DeleteFirstSmall();
-    DeleteSecondSmall();
-    FullLarge();
-    FullSmall();
-    // delete indices
-    for (std::vector<int>& processor : result_) {
-        processor.erase(processor.begin());
-    }
-    for (std::size_t i = 0; i < processors_num - m_; ++i) {
-        std::vector<int> empty = {};
-        result_.push_back(empty);
-    }
-    return result_;
-}
-
-void Balancer::DeleteLarge() {
-    deleted_large_ = {};
-    for (std::vector<int>& processor : result_) {
-        auto border = processor.end();
-        for (auto it = --processor.end(); it != processor.begin() + 1; --it) {
-            if (*(it - 1) > optimal_ / 2) {
-                deleted_large_.push_back(*it);
-                border = it;
-            } else {
-                break;
-            }
-        }
-        processor.erase(border, processor.end());
-    }
-}
-
-void Balancer::Prepare() {
-    for (std::size_t i = 0; i < m_; ++i) {
-        quality_.emplace(i, std::tuple<int, int, int>(0, 0, 0));
-    }
-    for (std::vector<int> const& processor : result_) {
-        auto last_small = processor.end();
-        auto last = processor.end();
-        if (*(--processor.end()) > optimal_ / 2) {
-            --last_small;
-        }
-        if (processor.begin() + 1 == last_small) {
-            continue;
-        }
-        int a = 0;
-        int b = 0;
-        float sum_small = std::accumulate(processor.begin() + 1, last_small, 0, std::plus<int>());
-        float sum = std::accumulate(processor.begin() + 1, last, 0, std::plus<int>());
-        while (sum_small > optimal_ / 2) {
-            ++a;
-            --last_small;
-            sum_small -= *last_small;
-        }
-        while (sum > optimal_) {
-            ++b;
-            --last;
-            sum -= *last;
-        }
-        std::get<0>(quality_.at(processor.at(0))) = a;
-        std::get<1>(quality_.at(processor.at(0))) = b;
-        std::get<2>(quality_.at(processor.at(0))) = a - b;
-    }
-}
-
-void Balancer::DeleteFirstSmall() {
-    // sort for convenience
-    deleted_small_ = {};
-    std::vector<std::vector<int>> small_processors = {};
-    std::vector<std::vector<int>> large_processors = {};
-    for (std::vector<int> const& processor : result_) {
-        if (*(--processor.end()) > optimal_ / 2) {
-            large_processors.push_back(processor);
-        } else {
-            small_processors.push_back(processor);
-        }
-    }
-    auto c_greater = [this](std::vector<int> const& a, std::vector<int> const& b) {
-        return std::get<2>(quality_.at(a.at(0))) > std::get<2>(quality_.at(b.at(0)));
-    };
-    sort(small_processors.begin(), small_processors.end(), c_greater);
-    sort(large_processors.begin(), large_processors.end(), c_greater);
-    result_.clear();
-    result_.insert(result_.end(), small_processors.begin(), small_processors.end());
-    result_.insert(result_.end(), large_processors.begin(), large_processors.end());
-    large_procs_num_ = large_processors.size();
-    std::size_t larges_num = large_processors.size() + deleted_large_.size();
-    // work
-    border_ = larges_num < m_ ? result_.end() - larges_num : result_.begin();
-    for (auto it = border_; it != result_.end(); ++it) {
-        auto last = it->end();
-        if (*(last - 1) > optimal_ / 2) {
-            --last;
-        }
-        for (auto cur = last - std::get<0>(quality_.at(*it->begin())); cur != last; ++cur) {
-            deleted_small_.push_back(*cur);
-        }
-        it->erase(last - std::get<0>(quality_.at(*it->begin())), last);
-    }
-}
-
-void Balancer::DeleteSecondSmall() {
-    for (auto it = result_.begin(); it != border_; ++it) {
-        auto last = it->end();
-        for (auto cur = last - std::get<1>(quality_.at(*it->begin())); cur != last; ++cur) {
-            deleted_small_.push_back(*cur);
-        }
-        it->erase(last - std::get<1>(quality_.at(*it->begin())), last);
-    }
-}
-
-void Balancer::PutWeight(int const& weight) {
-    sort(result_.begin(), result_.end(), [](std::vector<int> const& a, std::vector<int> const& b) {
-        return std::accumulate(a.begin(), a.end(), 0, std::plus<int>()) <
-               std::accumulate(b.begin(), b.end(), 0, std::plus<int>());
-    });
-    result_.begin()->push_back(weight);
-}
-
-void Balancer::FullLarge() {
-    std::size_t i = 0;
-    for (int const& weight : deleted_large_) {
-        if (i < m_ - large_procs_num_) {
-            (result_.begin() + i)->push_back(weight);
-        } else {
-            PutWeight(weight);
-        }
-        ++i;
-    }
-}
-
-void Balancer::FullSmall() {
-    for (int const& weight : deleted_small_) {
-        PutWeight(weight);
-    }
-}
+#include "core/algorithms/gfd/gfd_validator/balancer.h"
+
+#include <algorithm>
+#include <map>
+#include <numeric>
+#include <vector>
+
+std::vector<std::vector<int>> Balancer::Balance(std::vector<int> const& weights,
+                                                int const& processors_num) {
+    m_ = std::min(processors_num, static_cast<int>(weights.size()));
+    result_ = {};
+    if (weights.empty()) {
+        result_.resize(processors_num);
+        return result_;
+    }
+    for (std::size_t i = 0; i < m_; ++i) {
+        // the first value is index
+        std::vector<int> temp = {static_cast<int>(i)};
+        result_.push_back(temp);
+    }
+    // fill processors initially
+    // count optimal
+    optimal_ = 0;
+    std::size_t i = 0;
+    for (int const& weight : weights) {
+        result_.at(i++).push_back(weight);
+        i = i == m_ ? 0 : i;
+        optimal_ += weight;
+    }
+    optimal_ /= m_;
+    // sort processors (for convenience)
+    for (std::vector<int>& processor : result_) {
+        std::sort(processor.begin() + 1, processor.end());
+    }
+    // ALGORITHM
+    DeleteLarge();
+    Prepare();
+    DeleteFirstSmall();
+    DeleteSecondSmall();
+    FullLarge();
+    FullSmall();
+    // delete indices
+    for (std::vector<int>& processor : result_) {
+        processor.erase(processor.begin());
+    }
+    for (std::size_t i = 0; i < processors_num - m_; ++i) {
+        std::vector<int> empty = {};
+        result_.push_back(empty);
+    }
+    return result_;
+}
+
+void Balancer::DeleteLarge() {
+    deleted_large_ = {};
+    for (std::vector<int>& processor : result_) {
+        auto border = processor.end();
+        for (auto it = --processor.end(); it != processor.begin() + 1; --it) {
+            if (*(it - 1) > optimal_ / 2) {
+                deleted_large_.push_back(*it);
+                border = it;
+            } else {
+                break;
+            }
+        }
+        processor.erase(border, processor.end());
+    }
+}
+
+void Balancer::Prepare() {
+    for (std::size_t i = 0; i < m_; ++i) {
+        quality_.emplace(i, std::tuple<int, int, int>(0, 0, 0));
+    }
+    for (std::vector<int> const& processor : result_) {
+        auto last_small = processor.end();
+        auto last = processor.end();
+        if (*(--processor.end()) > optimal_ / 2) {
+            --last_small;
+        }
+        if (processor.begin() + 1 == last_small) {
+            continue;
+        }
+        int a = 0;
+        int b = 0;
+        float sum_small = std::accumulate(processor.begin() + 1, last_small, 0, std::plus<int>());
+        float sum = std::accumulate(processor.begin() + 1, last, 0, std::plus<int>());
+        while (sum_small > optimal_ / 2) {
+            ++a;
+            --last_small;
+            sum_small -= *last_small;
+        }
+        while (sum > optimal_) {
+            ++b;
+            --last;
+            sum -= *last;
+        }
+        std::get<0>(quality_.at(processor.at(0))) = a;
+        std::get<1>(quality_.at(processor.at(0))) = b;
+        std::get<2>(quality_.at(processor.at(0))) = a - b;
+    }
+}
+
+void Balancer::DeleteFirstSmall() {
+    // sort for convenience
+    deleted_small_ = {};
+    std::vector<std::vector<int>> small_processors = {};
+    std::vector<std::vector<int>> large_processors = {};
+    for (std::vector<int> const& processor : result_) {
+        if (*(--processor.end()) > optimal_ / 2) {
+            large_processors.push_back(processor);
+        } else {
+            small_processors.push_back(processor);
+        }
+    }
+    auto c_greater = [this](std::vector<int> const& a, std::vector<int> const& b) {
+        return std::get<2>(quality_.at(a.at(0))) > std::get<2>(quality_.at(b.at(0)));
+    };
+    sort(small_processors.begin(), small_processors.end(), c_greater);
+    sort(large_processors.begin(), large_processors.end(), c_greater);
+    result_.clear();
+    result_.insert(result_.end(), small_processors.begin(), small_processors.end());
+    result_.insert(result_.end(), large_processors.begin(), large_processors.end());
+    large_procs_num_ = large_processors.size();
+    std::size_t larges_num = large_processors.size() + deleted_large_.size();
+    // work
+    border_ = larges_num < m_ ? result_.end() - larges_num : result_.begin();
+    for (auto it = border_; it != result_.end(); ++it) {
+        auto last = it->end();
+        if (*(last - 1) > optimal_ / 2) {
+            --last;
+        }
+        for (auto cur = last - std::get<0>(quality_.at(*it->begin())); cur != last; ++cur) {
+            deleted_small_.push_back(*cur);
+        }
+        it->erase(last - std::get<0>(quality_.at(*it->begin())), last);
+    }
+}
+
+void Balancer::DeleteSecondSmall() {
+    for (auto it = result_.begin(); it != border_; ++it) {
+        auto last = it->end();
+        for (auto cur = last - std::get<1>(quality_.at(*it->begin())); cur != last; ++cur) {
+            deleted_small_.push_back(*cur);
+        }
+        it->erase(last - std::get<1>(quality_.at(*it->begin())), last);
+    }
+}
+
+void Balancer::PutWeight(int const& weight) {
+    sort(result_.begin(), result_.end(), [](std::vector<int> const& a, std::vector<int> const& b) {
+        return std::accumulate(a.begin(), a.end(), 0, std::plus<int>()) <
+               std::accumulate(b.begin(), b.end(), 0, std::plus<int>());
+    });
+    result_.begin()->push_back(weight);
+}
+
+void Balancer::FullLarge() {
+    std::size_t i = 0;
+    for (int const& weight : deleted_large_) {
+        if (i < m_ - large_procs_num_) {
+            (result_.begin() + i)->push_back(weight);
+        } else {
+            PutWeight(weight);
+        }
+        ++i;
+    }
+}
+
+void Balancer::FullSmall() {
+    for (int const& weight : deleted_small_) {
+        PutWeight(weight);
+    }
+}
diff --git a/src/core/algorithms/gfd/gfd_validator/egfd_validator.cpp b/src/core/algorithms/gfd/gfd_validator/egfd_validator.cpp
index d84dd3ffee..32103501fe 100644
--- a/src/core/algorithms/gfd/gfd_validator/egfd_validator.cpp
+++ b/src/core/algorithms/gfd/gfd_validator/egfd_validator.cpp
@@ -1,14 +1,14 @@
-#include "algorithms/gfd/gfd_validator/egfd_validator.h"
+#include "core/algorithms/gfd/gfd_validator/egfd_validator.h"
 
 #include <iostream>
 
 #include <boost/graph/vf2_sub_graph_iso.hpp>
 
-#include "config/equal_nulls/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "util/logger.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/util/logger.h"
 
 namespace {
 
diff --git a/src/core/algorithms/gfd/gfd_validator/egfd_validator.h b/src/core/algorithms/gfd/gfd_validator/egfd_validator.h
index 19c0dc1c35..dc476fc41a 100644
--- a/src/core/algorithms/gfd/gfd_validator/egfd_validator.h
+++ b/src/core/algorithms/gfd/gfd_validator/egfd_validator.h
@@ -1,26 +1,26 @@
-#pragma once
-#include "algorithms/gfd/gfd.h"
-#include "algorithms/gfd/gfd_validator/gfd_handler.h"
-#include "config/names_and_descriptions.h"
-
-namespace algos {
-
-namespace egfd_validator {
-
-using CPI = std::map<std::pair<model::vertex_t, model::vertex_t>,
-                     std::map<model::vertex_t, std::set<model::vertex_t>>>;
-
-}  // namespace egfd_validator
-
-class EGfdValidator : public GfdHandler {
-public:
-    std::vector<model::Gfd> GenerateSatisfiedGfds(model::graph_t const& graph,
-                                                  std::vector<model::Gfd> const& gfds);
-
-    EGfdValidator() : GfdHandler() {};
-
-    EGfdValidator(model::graph_t graph_, std::vector<model::Gfd> gfds_)
-        : GfdHandler(graph_, gfds_) {}
-};
-
-}  // namespace algos
+#pragma once
+#include "core/algorithms/gfd/gfd.h"
+#include "core/algorithms/gfd/gfd_validator/gfd_handler.h"
+#include "core/config/names_and_descriptions.h"
+
+namespace algos {
+
+namespace egfd_validator {
+
+using CPI = std::map<std::pair<model::vertex_t, model::vertex_t>,
+                     std::map<model::vertex_t, std::set<model::vertex_t>>>;
+
+}  // namespace egfd_validator
+
+class EGfdValidator : public GfdHandler {
+public:
+    std::vector<model::Gfd> GenerateSatisfiedGfds(model::graph_t const& graph,
+                                                  std::vector<model::Gfd> const& gfds);
+
+    EGfdValidator() : GfdHandler() {};
+
+    EGfdValidator(model::graph_t graph_, std::vector<model::Gfd> gfds_)
+        : GfdHandler(graph_, gfds_) {}
+};
+
+}  // namespace algos
diff --git a/src/core/algorithms/gfd/gfd_validator/gfd_handler.cpp b/src/core/algorithms/gfd/gfd_validator/gfd_handler.cpp
index 0f83971a6e..bf49c2ed4b 100644
--- a/src/core/algorithms/gfd/gfd_validator/gfd_handler.cpp
+++ b/src/core/algorithms/gfd/gfd_validator/gfd_handler.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/gfd/gfd_validator/gfd_handler.h"
+#include "core/algorithms/gfd/gfd_validator/gfd_handler.h"
 
 #include <iostream>
 #include <set>
@@ -9,12 +9,12 @@
 #include <boost/graph/floyd_warshall_shortest.hpp>
 #include <boost/graph/vf2_sub_graph_iso.hpp>
 
-#include "config/equal_nulls/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "config/thread_number/option.h"
-#include "util/logger.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/config/thread_number/option.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/gfd/gfd_validator/gfd_handler.h b/src/core/algorithms/gfd/gfd_validator/gfd_handler.h
index 34d56709cb..3a46662592 100644
--- a/src/core/algorithms/gfd/gfd_validator/gfd_handler.h
+++ b/src/core/algorithms/gfd/gfd_validator/gfd_handler.h
@@ -1,43 +1,43 @@
-#pragma once
-#include <vector>
-
-#include "algorithms/algorithm.h"
-#include "algorithms/gfd/gfd.h"
-#include "config/names_and_descriptions.h"
-#include "parser/graph_parser/graph_parser.h"
-
-namespace algos {
-
-class GfdHandler : public Algorithm {
-protected:
-    std::filesystem::path graph_path_;
-    std::vector<std::filesystem::path> gfd_paths_;
-
-    model::graph_t graph_;
-    std::vector<model::Gfd> gfds_;
-    std::vector<model::Gfd> result_;
-
-    unsigned long long ExecuteInternal();
-
-    void ResetState() final;
-    void LoadDataInternal() final;
-
-    void RegisterOptions();
-
-public:
-    virtual std::vector<model::Gfd> GenerateSatisfiedGfds(model::graph_t const& graph,
-                                                          std::vector<model::Gfd> const& gfds) = 0;
-
-    GfdHandler();
-
-    GfdHandler(model::graph_t graph_, std::vector<model::Gfd> gfds_)
-        : Algorithm({}), graph_(graph_), gfds_(gfds_) {
-        ExecutePrepare();
-    }
-
-    std::vector<model::Gfd> GfdList() {
-        return result_;
-    }
-};
-
-}  // namespace algos
+#pragma once
+#include <vector>
+
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/gfd/gfd.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/parser/graph_parser/graph_parser.h"
+
+namespace algos {
+
+class GfdHandler : public Algorithm {
+protected:
+    std::filesystem::path graph_path_;
+    std::vector<std::filesystem::path> gfd_paths_;
+
+    model::graph_t graph_;
+    std::vector<model::Gfd> gfds_;
+    std::vector<model::Gfd> result_;
+
+    unsigned long long ExecuteInternal();
+
+    void ResetState() final;
+    void LoadDataInternal() final;
+
+    void RegisterOptions();
+
+public:
+    virtual std::vector<model::Gfd> GenerateSatisfiedGfds(model::graph_t const& graph,
+                                                          std::vector<model::Gfd> const& gfds) = 0;
+
+    GfdHandler();
+
+    GfdHandler(model::graph_t graph_, std::vector<model::Gfd> gfds_)
+        : Algorithm({}), graph_(graph_), gfds_(gfds_) {
+        ExecutePrepare();
+    }
+
+    std::vector<model::Gfd> GfdList() {
+        return result_;
+    }
+};
+
+}  // namespace algos
diff --git a/src/core/algorithms/gfd/gfd_validator/gfd_validator.cpp b/src/core/algorithms/gfd/gfd_validator/gfd_validator.cpp
index 6d067bfd96..96ad143432 100644
--- a/src/core/algorithms/gfd/gfd_validator/gfd_validator.cpp
+++ b/src/core/algorithms/gfd/gfd_validator/gfd_validator.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/gfd/gfd_validator/gfd_validator.h"
+#include "core/algorithms/gfd/gfd_validator/gfd_validator.h"
 
 #include <iostream>
 #include <set>
@@ -9,13 +9,13 @@
 #include <boost/graph/floyd_warshall_shortest.hpp>
 #include <boost/graph/vf2_sub_graph_iso.hpp>
 
-#include "algorithms/gfd/gfd_validator/balancer.h"
-#include "config/equal_nulls/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "config/thread_number/option.h"
-#include "util/logger.h"
+#include "core/algorithms/gfd/gfd_validator/balancer.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/config/thread_number/option.h"
+#include "core/util/logger.h"
 
 namespace {
 
diff --git a/src/core/algorithms/gfd/gfd_validator/gfd_validator.h b/src/core/algorithms/gfd/gfd_validator/gfd_validator.h
index 563c0d89d5..4059ff2a2e 100644
--- a/src/core/algorithms/gfd/gfd_validator/gfd_validator.h
+++ b/src/core/algorithms/gfd/gfd_validator/gfd_validator.h
@@ -1,33 +1,33 @@
-#pragma once
-#include <thread>
-
-#include "algorithms/algorithm.h"
-#include "algorithms/gfd/gfd.h"
-#include "algorithms/gfd/gfd_validator/gfd_handler.h"
-#include "config/names_and_descriptions.h"
-#include "config/thread_number/type.h"
-
-namespace algos {
-
-namespace gfd_validator {
-
-using Request = std::tuple<int, model::vertex_t, int, std::vector<model::vertex_t>>;
-using Message = std::tuple<int, model::vertex_t, model::vertex_t>;
-
-}  // namespace gfd_validator
-
-class GfdValidator : public GfdHandler {
-private:
-    config::ThreadNumType threads_num_;
-
-public:
-    std::vector<model::Gfd> GenerateSatisfiedGfds(model::graph_t const& graph,
-                                                  std::vector<model::Gfd> const& gfds);
-
-    GfdValidator();
-
-    GfdValidator(model::graph_t graph_, std::vector<model::Gfd> gfds_)
-        : GfdHandler(graph_, gfds_) {}
-};
-
-}  // namespace algos
+#pragma once
+#include <thread>
+
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/gfd/gfd.h"
+#include "core/algorithms/gfd/gfd_validator/gfd_handler.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/thread_number/type.h"
+
+namespace algos {
+
+namespace gfd_validator {
+
+using Request = std::tuple<int, model::vertex_t, int, std::vector<model::vertex_t>>;
+using Message = std::tuple<int, model::vertex_t, model::vertex_t>;
+
+}  // namespace gfd_validator
+
+class GfdValidator : public GfdHandler {
+private:
+    config::ThreadNumType threads_num_;
+
+public:
+    std::vector<model::Gfd> GenerateSatisfiedGfds(model::graph_t const& graph,
+                                                  std::vector<model::Gfd> const& gfds);
+
+    GfdValidator();
+
+    GfdValidator(model::graph_t graph_, std::vector<model::Gfd> gfds_)
+        : GfdHandler(graph_, gfds_) {}
+};
+
+}  // namespace algos
diff --git a/src/core/algorithms/gfd/gfd_validator/naivegfd_validator.cpp b/src/core/algorithms/gfd/gfd_validator/naivegfd_validator.cpp
index 6c1a7d9c47..d67d3c3f10 100644
--- a/src/core/algorithms/gfd/gfd_validator/naivegfd_validator.cpp
+++ b/src/core/algorithms/gfd/gfd_validator/naivegfd_validator.cpp
@@ -1,12 +1,12 @@
-#include "algorithms/gfd/gfd_validator/naivegfd_validator.h"
+#include "core/algorithms/gfd/gfd_validator/naivegfd_validator.h"
 
 #include <iostream>
 #include <set>
 
 #include <boost/graph/vf2_sub_graph_iso.hpp>
 
-#include "algorithms/gfd/gfd.h"
-#include "util/logger.h"
+#include "core/algorithms/gfd/gfd.h"
+#include "core/util/logger.h"
 
 namespace {
 
diff --git a/src/core/algorithms/gfd/gfd_validator/naivegfd_validator.h b/src/core/algorithms/gfd/gfd_validator/naivegfd_validator.h
index 656dc8ac1a..42e0db7ab8 100644
--- a/src/core/algorithms/gfd/gfd_validator/naivegfd_validator.h
+++ b/src/core/algorithms/gfd/gfd_validator/naivegfd_validator.h
@@ -1,21 +1,21 @@
-#pragma once
-#include <vector>
-
-#include "algorithms/algorithm.h"
-#include "algorithms/gfd/gfd.h"
-#include "algorithms/gfd/gfd_validator/gfd_handler.h"
-
-namespace algos {
-
-class NaiveGfdValidator : public GfdHandler {
-public:
-    std::vector<model::Gfd> GenerateSatisfiedGfds(model::graph_t const& graph,
-                                                  std::vector<model::Gfd> const& gfds);
-
-    NaiveGfdValidator() : GfdHandler() {};
-
-    NaiveGfdValidator(model::graph_t graph_, std::vector<model::Gfd> gfds_)
-        : GfdHandler(graph_, gfds_) {}
-};
-
-}  // namespace algos
+#pragma once
+#include <vector>
+
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/gfd/gfd.h"
+#include "core/algorithms/gfd/gfd_validator/gfd_handler.h"
+
+namespace algos {
+
+class NaiveGfdValidator : public GfdHandler {
+public:
+    std::vector<model::Gfd> GenerateSatisfiedGfds(model::graph_t const& graph,
+                                                  std::vector<model::Gfd> const& gfds);
+
+    NaiveGfdValidator() : GfdHandler() {};
+
+    NaiveGfdValidator(model::graph_t graph_, std::vector<model::Gfd> gfds_)
+        : GfdHandler(graph_, gfds_) {}
+};
+
+}  // namespace algos
diff --git a/src/core/algorithms/gfd/gfd_validator/verification_algorithms.h b/src/core/algorithms/gfd/gfd_validator/verification_algorithms.h
index 9532f20beb..acee5f3c2e 100644
--- a/src/core/algorithms/gfd/gfd_validator/verification_algorithms.h
+++ b/src/core/algorithms/gfd/gfd_validator/verification_algorithms.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "algorithms/gfd/gfd_validator/egfd_validator.h"
-#include "algorithms/gfd/gfd_validator/gfd_validator.h"
-#include "algorithms/gfd/gfd_validator/naivegfd_validator.h"
+#include "core/algorithms/gfd/gfd_validator/egfd_validator.h"
+#include "core/algorithms/gfd/gfd_validator/gfd_validator.h"
+#include "core/algorithms/gfd/gfd_validator/naivegfd_validator.h"
diff --git a/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.cpp b/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.cpp
index 4361c4a8ac..d2ceb999f2 100644
--- a/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.cpp
+++ b/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.cpp
@@ -1,4 +1,4 @@
-#include "apriori_candidate_generator.h"
+#include "core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h"
 
 #include <algorithm>
 #include <unordered_set>
diff --git a/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h b/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h
index d0b9e96c23..23ed07e48e 100644
--- a/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h
+++ b/src/core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/ind/faida/util/simple_ind.h"
+#include "core/algorithms/ind/faida/util/simple_ind.h"
 
 namespace algos::faida::apriori_candidate_generator {
 
diff --git a/src/core/algorithms/ind/faida/faida.cpp b/src/core/algorithms/ind/faida/faida.cpp
index 9cdd9d67fa..5aed90b22c 100644
--- a/src/core/algorithms/ind/faida/faida.cpp
+++ b/src/core/algorithms/ind/faida/faida.cpp
@@ -1,13 +1,13 @@
-#include "faida.h"
-
-#include "algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h"
-#include "algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/thread_number/option.h"
-#include "max_arity/option.h"
-#include "model/table/column.h"
-#include "util/logger.h"
+#include "core/algorithms/ind/faida/faida.h"
+
+#include "core/algorithms/ind/faida/candidate_generation/apriori_candidate_generator.h"
+#include "core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h"
+#include "core/config/max_arity/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/thread_number/option.h"
+#include "core/model/table/column.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/faida/faida.h b/src/core/algorithms/ind/faida/faida.h
index 5934610423..243a9c9a11 100644
--- a/src/core/algorithms/ind/faida/faida.h
+++ b/src/core/algorithms/ind/faida/faida.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "algorithms/ind/faida/inclusion_testing/iinclusion_tester.h"
-#include "algorithms/ind/faida/preprocessing/preprocessor.h"
-#include "algorithms/ind/faida/util/simple_ind.h"
-#include "algorithms/ind/ind_algorithm.h"
-#include "config/max_arity/type.h"
-#include "config/thread_number/type.h"
+#include "core/algorithms/ind/faida/inclusion_testing/iinclusion_tester.h"
+#include "core/algorithms/ind/faida/preprocessing/preprocessor.h"
+#include "core/algorithms/ind/faida/util/simple_ind.h"
+#include "core/algorithms/ind/ind_algorithm.h"
+#include "core/config/max_arity/type.h"
+#include "core/config/thread_number/type.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/faida/hashing/hashing.h b/src/core/algorithms/ind/faida/hashing/hashing.h
index cc5ee99b5a..d22d714a1d 100644
--- a/src/core/algorithms/ind/faida/hashing/hashing.h
+++ b/src/core/algorithms/ind/faida/hashing/hashing.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "murmur_hash_3.h"
+#include "core/algorithms/ind/faida/hashing/murmur_hash_3.h"
 
 namespace algos::faida::hashing {
 
diff --git a/src/core/algorithms/ind/faida/hashing/murmur_hash_3.cpp b/src/core/algorithms/ind/faida/hashing/murmur_hash_3.cpp
index a22e59007a..59ef792cc7 100644
--- a/src/core/algorithms/ind/faida/hashing/murmur_hash_3.cpp
+++ b/src/core/algorithms/ind/faida/hashing/murmur_hash_3.cpp
@@ -10,7 +10,7 @@
 // clang-format off
 // NOLINTBEGIN(readability-identifier-naming)
 
-#include "murmur_hash_3.h"
+#include "core/algorithms/ind/faida/hashing/murmur_hash_3.h"
 
 //-----------------------------------------------------------------------------
 // Platform-specific functions and macros
diff --git a/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.cpp b/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.cpp
index e272dc58d3..7b707f58a1 100644
--- a/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.cpp
+++ b/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.cpp
@@ -1,10 +1,10 @@
-#include "combined_inclusion_tester.h"
+#include "core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h"
 
 #ifdef __AVX2__
-#include "immintrin.h"
+#include <immintrin.h>
 #endif
-#include "algorithms/ind/faida/hashing/hashing.h"
-#include "util/parallel_for.h"
+#include "core/algorithms/ind/faida/hashing/hashing.h"
+#include "core/util/parallel_for.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h b/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h
index 778088e0e7..dc41ee5969 100644
--- a/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h
+++ b/src/core/algorithms/ind/faida/inclusion_testing/combined_inclusion_tester.h
@@ -2,10 +2,10 @@
 
 #include <hash_table8.hpp>
 
-#include "algorithms/ind/faida/preprocessing/preprocessor.h"
-#include "hll_data.h"
-#include "iinclusion_tester.h"
-#include "sampled_inverted_index.h"
+#include "core/algorithms/ind/faida/inclusion_testing/hll_data.h"
+#include "core/algorithms/ind/faida/inclusion_testing/iinclusion_tester.h"
+#include "core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h"
+#include "core/algorithms/ind/faida/preprocessing/preprocessor.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/inclusion_testing/hll_data.h b/src/core/algorithms/ind/faida/inclusion_testing/hll_data.h
index 9fda796ba8..57526f2f2d 100644
--- a/src/core/algorithms/ind/faida/inclusion_testing/hll_data.h
+++ b/src/core/algorithms/ind/faida/inclusion_testing/hll_data.h
@@ -2,7 +2,7 @@
 
 #include <optional>
 
-#include "hyperloglog.h"
+#include "core/algorithms/ind/faida/inclusion_testing/hyperloglog.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/inclusion_testing/iinclusion_tester.h b/src/core/algorithms/ind/faida/inclusion_testing/iinclusion_tester.h
index 7772b03af5..bf679e18aa 100644
--- a/src/core/algorithms/ind/faida/inclusion_testing/iinclusion_tester.h
+++ b/src/core/algorithms/ind/faida/inclusion_testing/iinclusion_tester.h
@@ -6,9 +6,9 @@
 
 #include <boost/align/aligned_allocator.hpp>
 
-#include "algorithms/ind/faida/preprocessing/abstract_column_store.h"
-#include "algorithms/ind/faida/preprocessing/irow_iterator.h"
-#include "algorithms/ind/faida/util/simple_cc.h"
+#include "core/algorithms/ind/faida/preprocessing/abstract_column_store.h"
+#include "core/algorithms/ind/faida/preprocessing/irow_iterator.h"
+#include "core/algorithms/ind/faida/util/simple_cc.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.cpp b/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.cpp
index 60fc271527..65f6cfdfe4 100644
--- a/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.cpp
+++ b/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.cpp
@@ -1,4 +1,4 @@
-#include "sampled_inverted_index.h"
+#include "core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h b/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h
index 9744024f86..921e7a1f46 100644
--- a/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h
+++ b/src/core/algorithms/ind/faida/inclusion_testing/sampled_inverted_index.h
@@ -8,8 +8,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/ind/faida/util/simple_ind.h"
-#include "hll_data.h"
+#include "core/algorithms/ind/faida/inclusion_testing/hll_data.h"
+#include "core/algorithms/ind/faida/util/simple_ind.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.cpp b/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.cpp
index c218fecd87..19d52cfee7 100644
--- a/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.cpp
+++ b/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.cpp
@@ -1,9 +1,9 @@
-#include "abstract_column_store.h"
+#include "core/algorithms/ind/faida/preprocessing/abstract_column_store.h"
 
 #include <fstream>
 
-#include "algorithms/ind/faida/hashing/hashing.h"
-#include "model/table/column.h"
+#include "core/algorithms/ind/faida/hashing/hashing.h"
+#include "core/model/table/column.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.h b/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.h
index afac10b641..b58b7dd554 100644
--- a/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.h
+++ b/src/core/algorithms/ind/faida/preprocessing/abstract_column_store.h
@@ -3,12 +3,12 @@
 #include <filesystem>
 #include <fstream>
 
-#include "algorithms/ind/faida/hashing/hashing.h"
-#include "irow_iterator.h"
-#include "model/table/column_index.h"
-#include "model/table/idataset_stream.h"
-#include "model/table/relational_schema.h"
-#include "model/table/table_index.h"
+#include "core/algorithms/ind/faida/hashing/hashing.h"
+#include "core/algorithms/ind/faida/preprocessing/irow_iterator.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/idataset_stream.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/table_index.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.cpp b/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.cpp
index c6b0e79885..7330a9f23d 100644
--- a/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.cpp
+++ b/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.cpp
@@ -1,6 +1,6 @@
-#include "hashed_column_store.h"
+#include "core/algorithms/ind/faida/preprocessing/hashed_column_store.h"
 
-#include "model/table/column.h"
+#include "core/model/table/column.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.h b/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.h
index de64cb18b3..dacec901bd 100644
--- a/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.h
+++ b/src/core/algorithms/ind/faida/preprocessing/hashed_column_store.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "abstract_column_store.h"
+#include "core/algorithms/ind/faida/preprocessing/abstract_column_store.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/preprocessing/preprocessor.cpp b/src/core/algorithms/ind/faida/preprocessing/preprocessor.cpp
index 02375d06a5..73aa90bcf5 100644
--- a/src/core/algorithms/ind/faida/preprocessing/preprocessor.cpp
+++ b/src/core/algorithms/ind/faida/preprocessing/preprocessor.cpp
@@ -1,8 +1,8 @@
-#include "preprocessor.h"
+#include "core/algorithms/ind/faida/preprocessing/preprocessor.h"
 
 #include <cassert>
 
-#include "algorithms/ind/faida/hashing/hashing.h"
+#include "core/algorithms/ind/faida/hashing/hashing.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/preprocessing/preprocessor.h b/src/core/algorithms/ind/faida/preprocessing/preprocessor.h
index fc5910e2df..9a416dcaa9 100644
--- a/src/core/algorithms/ind/faida/preprocessing/preprocessor.h
+++ b/src/core/algorithms/ind/faida/preprocessing/preprocessor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "hashed_column_store.h"
+#include "core/algorithms/ind/faida/preprocessing/hashed_column_store.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/util/simple_cc.h b/src/core/algorithms/ind/faida/util/simple_cc.h
index a460004a17..8bd2ec6021 100644
--- a/src/core/algorithms/ind/faida/util/simple_cc.h
+++ b/src/core/algorithms/ind/faida/util/simple_cc.h
@@ -4,9 +4,9 @@
 #include <numeric>
 #include <vector>
 
-#include "model/table/column_combination.h"
-#include "model/table/table_index.h"
-#include "table/column_index.h"
+#include "core/model/table/column_combination.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/table_index.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/util/simple_ind.cpp b/src/core/algorithms/ind/faida/util/simple_ind.cpp
index 6203226d92..ae732dd68b 100644
--- a/src/core/algorithms/ind/faida/util/simple_ind.cpp
+++ b/src/core/algorithms/ind/faida/util/simple_ind.cpp
@@ -1,6 +1,6 @@
-#include "simple_ind.h"
+#include "core/algorithms/ind/faida/util/simple_ind.h"
 
-#include "cassert"
+#include <cassert>
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/faida/util/simple_ind.h b/src/core/algorithms/ind/faida/util/simple_ind.h
index 8fc51ad8b8..0ab6f15f96 100644
--- a/src/core/algorithms/ind/faida/util/simple_ind.h
+++ b/src/core/algorithms/ind/faida/util/simple_ind.h
@@ -4,8 +4,8 @@
 #include <memory>
 #include <utility>
 
-#include "algorithms/ind/faida/hashing/hashing.h"
-#include "simple_cc.h"
+#include "core/algorithms/ind/faida/hashing/hashing.h"
+#include "core/algorithms/ind/faida/util/simple_cc.h"
 
 namespace algos::faida {
 
diff --git a/src/core/algorithms/ind/ind.cpp b/src/core/algorithms/ind/ind.cpp
index 85d42148fb..5aa6b83722 100644
--- a/src/core/algorithms/ind/ind.cpp
+++ b/src/core/algorithms/ind/ind.cpp
@@ -1,8 +1,8 @@
-#include "ind.h"
+#include "core/algorithms/ind/ind.h"
 
 #include <sstream>
 
-#include "model/table/column.h"
+#include "core/model/table/column.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/ind/ind.h b/src/core/algorithms/ind/ind.h
index 061e2fc4bf..0c36c8f93c 100644
--- a/src/core/algorithms/ind/ind.h
+++ b/src/core/algorithms/ind/ind.h
@@ -3,10 +3,10 @@
 #include <memory>
 #include <string>
 
-#include "config/error/type.h"
-#include "model/table/column_combination.h"
-#include "model/table/relational_schema.h"
-#include "model/table/vertical.h"
+#include "core/config/error/type.h"
+#include "core/model/table/column_combination.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/vertical.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/ind/ind_algorithm.cpp b/src/core/algorithms/ind/ind_algorithm.cpp
index 2d126d9e9c..bd73ea44ab 100644
--- a/src/core/algorithms/ind/ind_algorithm.cpp
+++ b/src/core/algorithms/ind/ind_algorithm.cpp
@@ -1,7 +1,7 @@
-#include "ind_algorithm.h"
+#include "core/algorithms/ind/ind_algorithm.h"
 
-#include "config/names_and_descriptions.h"
-#include "config/tabular_data/input_tables/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/tabular_data/input_tables/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/ind_algorithm.h b/src/core/algorithms/ind/ind_algorithm.h
index 4187642864..abca6ee19b 100644
--- a/src/core/algorithms/ind/ind_algorithm.h
+++ b/src/core/algorithms/ind/ind_algorithm.h
@@ -4,12 +4,12 @@
 #include <string_view>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "error/type.h"
-#include "ind.h"
-#include "model/table/relational_schema.h"
-#include "tabular_data/input_tables_type.h"
-#include "util/primitive_collection.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/ind/ind.h"
+#include "core/config/error/type.h"
+#include "core/config/tabular_data/input_tables_type.h"
+#include "core/model/table/relational_schema.h"
+#include "core/util/primitive_collection.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/ind_verifier/ind_verifier.cpp b/src/core/algorithms/ind/ind_verifier/ind_verifier.cpp
index dfa5d8f104..ec74e8b19d 100644
--- a/src/core/algorithms/ind/ind_verifier/ind_verifier.cpp
+++ b/src/core/algorithms/ind/ind_verifier/ind_verifier.cpp
@@ -3,7 +3,7 @@
  *
  * Algorithm for veryfing AIND implementation.
  */
-#include "ind_verifier.h"
+#include "core/algorithms/ind/ind_verifier/ind_verifier.h"
 
 #include <set>
 #include <sstream>
@@ -11,15 +11,14 @@
 
 #include <boost/functional/hash.hpp>
 
-#include "config/indices/option.h"
-#include "config/tabular_data/input_tables/option.h"
-#include "indices/option.h"
-#include "model/table/dataset_stream_projection.h"
-#include "model/table/table_index.h"
-#include "table/dataset_stream_fixed.h"
-#include "table/tuple_index.h"
-#include "tabular_data/input_table_type.h"
-#include "timed_invoke.h"
+#include "core/config/indices/option.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/config/tabular_data/input_tables/option.h"
+#include "core/model/table/dataset_stream_fixed.h"
+#include "core/model/table/dataset_stream_projection.h"
+#include "core/model/table/table_index.h"
+#include "core/model/table/tuple_index.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/ind_verifier/ind_verifier.h b/src/core/algorithms/ind/ind_verifier/ind_verifier.h
index f59fa06b54..3ca0dca81e 100644
--- a/src/core/algorithms/ind/ind_verifier/ind_verifier.h
+++ b/src/core/algorithms/ind/ind_verifier/ind_verifier.h
@@ -5,11 +5,11 @@
  */
 #pragma once
 
-#include "algorithms/algorithm.h"
-#include "config/indices/type.h"
-#include "error/type.h"
-#include "table/tuple_index.h"
-#include "tabular_data/input_tables_type.h"
+#include "core/algorithms/algorithm.h"
+#include "core/config/error/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_tables_type.h"
+#include "core/model/table/tuple_index.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/mind/mind.cpp b/src/core/algorithms/ind/mind/mind.cpp
index 11c8209394..481fb22e73 100644
--- a/src/core/algorithms/ind/mind/mind.cpp
+++ b/src/core/algorithms/ind/mind/mind.cpp
@@ -3,22 +3,22 @@
  *
  * Mind algorithm class methods definition
  */
-#include "mind.h"
+#include "core/algorithms/ind/mind/mind.h"
 
 #include <algorithm>
 #include <unordered_set>
 
-#include "algorithms/create_algorithm.h"
-#include "config/error/option.h"
-#include "config/names_and_descriptions.h"
-#include "error/type.h"
-#include "ind/ind_algorithm.h"
-#include "max_arity/option.h"
-#include "model/table/dataset_stream_projection.h"
-#include "table/column_combination.h"
-#include "table/dataset_stream_fixed.h"
-#include "tabular_data/input_table_type.h"
-#include "util/timed_invoke.h"
+#include "core/algorithms/create_algorithm.h"
+#include "core/algorithms/ind/ind_algorithm.h"
+#include "core/config/error/option.h"
+#include "core/config/error/type.h"
+#include "core/config/max_arity/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_combination.h"
+#include "core/model/table/dataset_stream_fixed.h"
+#include "core/model/table/dataset_stream_projection.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/mind/mind.h b/src/core/algorithms/ind/mind/mind.h
index e8191708a8..cc113c92fe 100644
--- a/src/core/algorithms/ind/mind/mind.h
+++ b/src/core/algorithms/ind/mind/mind.h
@@ -8,10 +8,10 @@
 #include <memory>
 #include <optional>
 
-#include "algorithms/ind/ind_algorithm.h"
-#include "config/error/type.h"
-#include "config/max_arity/type.h"
-#include "raw_ind.h"
+#include "core/algorithms/ind/ind_algorithm.h"
+#include "core/algorithms/ind/mind/raw_ind.h"
+#include "core/config/error/type.h"
+#include "core/config/max_arity/type.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/mind/raw_ind.h b/src/core/algorithms/ind/mind/raw_ind.h
index 2cfd985e48..83eb53c5b7 100644
--- a/src/core/algorithms/ind/mind/raw_ind.h
+++ b/src/core/algorithms/ind/mind/raw_ind.h
@@ -7,7 +7,7 @@
 
 #include <sstream>
 
-#include "model/table/column_combination.h"
+#include "core/model/table/column_combination.h"
 
 namespace algos::mind {
 
diff --git a/src/core/algorithms/ind/mining_algorithms.h b/src/core/algorithms/ind/mining_algorithms.h
index 6bcfa4b4ee..bf97de3c40 100644
--- a/src/core/algorithms/ind/mining_algorithms.h
+++ b/src/core/algorithms/ind/mining_algorithms.h
@@ -1,3 +1,3 @@
-#include "algorithms/ind/faida/faida.h"
-#include "algorithms/ind/mind/mind.h"
-#include "algorithms/ind/spider/spider.h"
+#include "core/algorithms/ind/faida/faida.h"
+#include "core/algorithms/ind/mind/mind.h"
+#include "core/algorithms/ind/spider/spider.h"
diff --git a/src/core/algorithms/ind/spider/attribute.cpp b/src/core/algorithms/ind/spider/attribute.cpp
index ae9fa8bea3..0d71627204 100644
--- a/src/core/algorithms/ind/spider/attribute.cpp
+++ b/src/core/algorithms/ind/spider/attribute.cpp
@@ -3,7 +3,7 @@
  *
  * Attribute class methods definition
  */
-#include "attribute.h"
+#include "core/algorithms/ind/spider/attribute.h"
 
 namespace algos::spider {
 
diff --git a/src/core/algorithms/ind/spider/attribute.h b/src/core/algorithms/ind/spider/attribute.h
index 1b3574e9df..94e4f61340 100644
--- a/src/core/algorithms/ind/spider/attribute.h
+++ b/src/core/algorithms/ind/spider/attribute.h
@@ -11,11 +11,11 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "config/error/type.h"
-#include "model/table/column_combination.h"
-#include "model/table/column_domain_iterator.h"
-#include "model/table/column_index.h"
-#include "util/bitset_utils.h"
+#include "core/config/error/type.h"
+#include "core/model/table/column_combination.h"
+#include "core/model/table/column_domain_iterator.h"
+#include "core/model/table/column_index.h"
+#include "core/util/bitset_utils.h"
 
 namespace algos::spider {
 
diff --git a/src/core/algorithms/ind/spider/spider.cpp b/src/core/algorithms/ind/spider/spider.cpp
index 5afc621867..9a858aed84 100644
--- a/src/core/algorithms/ind/spider/spider.cpp
+++ b/src/core/algorithms/ind/spider/spider.cpp
@@ -3,21 +3,21 @@
  *
  * Spider algorithm class methods definition
  */
-#include "spider.h"
+#include "core/algorithms/ind/spider/spider.h"
 
 #include <functional>
 #include <queue>
 #include <string>
 #include <type_traits>
 
-#include "attribute.h"
-#include "config/equal_nulls/option.h"
-#include "config/error/option.h"
-#include "config/mem_limit/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/thread_number/option.h"
-#include "util/timed_invoke.h"
+#include "core/algorithms/ind/spider/attribute.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/error/option.h"
+#include "core/config/mem_limit/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/thread_number/option.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/spider/spider.h b/src/core/algorithms/ind/spider/spider.h
index 56b22dad05..8f9b524226 100644
--- a/src/core/algorithms/ind/spider/spider.h
+++ b/src/core/algorithms/ind/spider/spider.h
@@ -6,12 +6,12 @@
 #pragma once
 #include <vector>
 
-#include "algorithms/ind/ind_algorithm.h"
-#include "config/equal_nulls/type.h"
-#include "config/error/type.h"
-#include "config/mem_limit/type.h"
-#include "config/thread_number/type.h"
-#include "model/table/column_domain.h"
+#include "core/algorithms/ind/ind_algorithm.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/error/type.h"
+#include "core/config/mem_limit/type.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/column_domain.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ind/verification_algorithms.h b/src/core/algorithms/ind/verification_algorithms.h
index fe356420c0..5432d481cd 100644
--- a/src/core/algorithms/ind/verification_algorithms.h
+++ b/src/core/algorithms/ind/verification_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/ind/ind_verifier/ind_verifier.h"
+#include "core/algorithms/ind/ind_verifier/ind_verifier.h"
diff --git a/src/core/algorithms/md/column_match.h b/src/core/algorithms/md/column_match.h
index 244dedb006..f2e2a4acf8 100644
--- a/src/core/algorithms/md/column_match.h
+++ b/src/core/algorithms/md/column_match.h
@@ -3,7 +3,7 @@
 #include <cstddef>
 #include <string>
 
-#include "model/index.h"
+#include "core/model/index.h"
 
 namespace model::md {
 
diff --git a/src/core/algorithms/md/column_similarity_classifier.h b/src/core/algorithms/md/column_similarity_classifier.h
index ae016572ac..e845d13bb6 100644
--- a/src/core/algorithms/md/column_similarity_classifier.h
+++ b/src/core/algorithms/md/column_similarity_classifier.h
@@ -2,8 +2,8 @@
 
 #include <cstddef>
 
-#include "algorithms/md/decision_boundary.h"
-#include "model/index.h"
+#include "core/algorithms/md/decision_boundary.h"
+#include "core/model/index.h"
 
 namespace model::md {
 
diff --git a/src/core/algorithms/md/hymd/column_match_info.h b/src/core/algorithms/md/hymd/column_match_info.h
index 2df62bae92..27ed462862 100644
--- a/src/core/algorithms/md/hymd/column_match_info.h
+++ b/src/core/algorithms/md/hymd/column_match_info.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/md/hymd/indexes/column_similarity_info.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/indexes/column_similarity_info.h"
+#include "core/model/index.h"
 
 namespace algos::hymd {
 
diff --git a/src/core/algorithms/md/hymd/compressed_record.h b/src/core/algorithms/md/hymd/compressed_record.h
index 8125eaa291..4c5f14b1a4 100644
--- a/src/core/algorithms/md/hymd/compressed_record.h
+++ b/src/core/algorithms/md/hymd/compressed_record.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "algorithms/md/hymd/table_identifiers.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
 
 namespace algos::hymd {
 using CompressedRecord = std::vector<ValueIdentifier>;
diff --git a/src/core/algorithms/md/hymd/hymd.cpp b/src/core/algorithms/md/hymd/hymd.cpp
index c727be5918..170a0d1560 100644
--- a/src/core/algorithms/md/hymd/hymd.cpp
+++ b/src/core/algorithms/md/hymd/hymd.cpp
@@ -1,28 +1,28 @@
-#include "algorithms/md/hymd/hymd.h"
+#include "core/algorithms/md/hymd/hymd.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <limits>
 
-#include "algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h"
-#include "algorithms/md/hymd/lattice/md_lattice.h"
-#include "algorithms/md/hymd/lattice/single_level_func.h"
-#include "algorithms/md/hymd/lattice_traverser.h"
-#include "algorithms/md/hymd/lowest_bound.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
-#include "algorithms/md/hymd/record_pair_inferrer.h"
-#include "algorithms/md/hymd/similarity_data.h"
-#include "algorithms/md/hymd/utility/index_range.h"
-#include "algorithms/md/hymd/utility/inverse_permutation.h"
-#include "algorithms/md/hymd/utility/md_less.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/thread_number/option.h"
-#include "model/index.h"
-#include "model/table/column.h"
-#include "util/get_preallocated_vector.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/algorithms/md/hymd/lattice/single_level_func.h"
+#include "core/algorithms/md/hymd/lattice_traverser.h"
+#include "core/algorithms/md/hymd/lowest_bound.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
+#include "core/algorithms/md/hymd/record_pair_inferrer.h"
+#include "core/algorithms/md/hymd/similarity_data.h"
+#include "core/algorithms/md/hymd/utility/index_range.h"
+#include "core/algorithms/md/hymd/utility/inverse_permutation.h"
+#include "core/algorithms/md/hymd/utility/md_less.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/thread_number/option.h"
+#include "core/model/index.h"
+#include "core/model/table/column.h"
+#include "core/util/get_preallocated_vector.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace {
 using namespace algos::hymd;
diff --git a/src/core/algorithms/md/hymd/hymd.h b/src/core/algorithms/md/hymd/hymd.h
index ef87f5876d..700b7c9765 100644
--- a/src/core/algorithms/md/hymd/hymd.h
+++ b/src/core/algorithms/md/hymd/hymd.h
@@ -4,15 +4,15 @@
 #include <memory>
 #include <vector>
 
-#include "algorithms/md/hymd/enums.h"
-#include "algorithms/md/hymd/indexes/records_info.h"
-#include "algorithms/md/hymd/lattice/md_lattice_node_info.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match.h"
-#include "algorithms/md/hymd/similarity_data.h"
-#include "algorithms/md/md_algorithm.h"
-#include "config/tabular_data/input_table_type.h"
-#include "config/thread_number/type.h"
-#include "model/table/relational_schema.h"
+#include "core/algorithms/md/hymd/enums.h"
+#include "core/algorithms/md/hymd/indexes/records_info.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice_node_info.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match.h"
+#include "core/algorithms/md/hymd/similarity_data.h"
+#include "core/algorithms/md/md_algorithm.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/relational_schema.h"
 
 namespace algos::hymd {
 
diff --git a/src/core/algorithms/md/hymd/indexes/column_similarity_info.h b/src/core/algorithms/md/hymd/indexes/column_similarity_info.h
index 881854d8ac..870434496f 100644
--- a/src/core/algorithms/md/hymd/indexes/column_similarity_info.h
+++ b/src/core/algorithms/md/hymd/indexes/column_similarity_info.h
@@ -3,12 +3,12 @@
 #include <cstddef>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/indexes/similarity_index.h"
-#include "algorithms/md/hymd/indexes/similarity_matrix.h"
-#include "algorithms/md/hymd/lhs_ccv_ids_info.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/preprocessing/similarity.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/indexes/similarity_index.h"
+#include "core/algorithms/md/hymd/indexes/similarity_matrix.h"
+#include "core/algorithms/md/hymd/lhs_ccv_ids_info.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/preprocessing/similarity.h"
 
 namespace algos::hymd::indexes {
 struct ColumnMatchSimilarityInfo {
diff --git a/src/core/algorithms/md/hymd/indexes/compressed_records.h b/src/core/algorithms/md/hymd/indexes/compressed_records.h
index 7b29da3fbc..baad3a45b8 100644
--- a/src/core/algorithms/md/hymd/indexes/compressed_records.h
+++ b/src/core/algorithms/md/hymd/indexes/compressed_records.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "algorithms/md/hymd/compressed_record.h"
+#include "core/algorithms/md/hymd/compressed_record.h"
 
 namespace algos::hymd::indexes {
 using CompressedRecords = std::vector<CompressedRecord>;
diff --git a/src/core/algorithms/md/hymd/indexes/dictionary_compressor.cpp b/src/core/algorithms/md/hymd/indexes/dictionary_compressor.cpp
index ac90cfcd9f..81e932c5ad 100644
--- a/src/core/algorithms/md/hymd/indexes/dictionary_compressor.cpp
+++ b/src/core/algorithms/md/hymd/indexes/dictionary_compressor.cpp
@@ -1,9 +1,9 @@
-#include "algorithms/md/hymd/indexes/dictionary_compressor.h"
+#include "core/algorithms/md/hymd/indexes/dictionary_compressor.h"
 
 #include <cstddef>
 
-#include "model/index.h"
-#include "util/desbordante_assume.h"
+#include "core/model/index.h"
+#include "core/util/desbordante_assume.h"
 
 namespace algos::hymd::indexes {
 
diff --git a/src/core/algorithms/md/hymd/indexes/dictionary_compressor.h b/src/core/algorithms/md/hymd/indexes/dictionary_compressor.h
index 4c873b053a..ecad9b2d8f 100644
--- a/src/core/algorithms/md/hymd/indexes/dictionary_compressor.h
+++ b/src/core/algorithms/md/hymd/indexes/dictionary_compressor.h
@@ -3,10 +3,10 @@
 #include <cstddef>
 #include <vector>
 
-#include "algorithms/md/hymd/indexes/compressed_records.h"
-#include "algorithms/md/hymd/indexes/keyed_position_list_index.h"
-#include "model/index.h"
-#include "model/table/idataset_stream.h"
+#include "core/algorithms/md/hymd/indexes/compressed_records.h"
+#include "core/algorithms/md/hymd/indexes/keyed_position_list_index.h"
+#include "core/model/index.h"
+#include "core/model/table/idataset_stream.h"
 
 namespace algos::hymd::indexes {
 
diff --git a/src/core/algorithms/md/hymd/indexes/global_value_identifier.h b/src/core/algorithms/md/hymd/indexes/global_value_identifier.h
index 0b159335c3..d647c2df63 100644
--- a/src/core/algorithms/md/hymd/indexes/global_value_identifier.h
+++ b/src/core/algorithms/md/hymd/indexes/global_value_identifier.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "model/index.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::indexes {
 using GlobalValueIdentifier = model::Index;
diff --git a/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.cpp b/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.cpp
index d2a0856341..186c6151e5 100644
--- a/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.cpp
+++ b/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/md/hymd/indexes/keyed_position_list_index.h"
+#include "core/algorithms/md/hymd/indexes/keyed_position_list_index.h"
 
 namespace algos::hymd::indexes {
 
diff --git a/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.h b/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.h
index f321fea7ec..6fc597ba6f 100644
--- a/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.h
+++ b/src/core/algorithms/md/hymd/indexes/keyed_position_list_index.h
@@ -3,10 +3,10 @@
 #include <unordered_map>
 #include <vector>
 
-#include "algorithms/md/hymd/indexes/global_value_identifier.h"
-#include "algorithms/md/hymd/indexes/pli_cluster.h"
-#include "algorithms/md/hymd/table_identifiers.h"
-#include "util/desbordante_assume.h"
+#include "core/algorithms/md/hymd/indexes/global_value_identifier.h"
+#include "core/algorithms/md/hymd/indexes/pli_cluster.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
+#include "core/util/desbordante_assume.h"
 
 namespace algos::hymd::indexes {
 
diff --git a/src/core/algorithms/md/hymd/indexes/pli_cluster.h b/src/core/algorithms/md/hymd/indexes/pli_cluster.h
index fad4d045fd..3fe9900319 100644
--- a/src/core/algorithms/md/hymd/indexes/pli_cluster.h
+++ b/src/core/algorithms/md/hymd/indexes/pli_cluster.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "algorithms/md/hymd/table_identifiers.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
 
 namespace algos::hymd::indexes {
 using PliCluster = std::vector<RecordIdentifier>;
diff --git a/src/core/algorithms/md/hymd/indexes/records_info.cpp b/src/core/algorithms/md/hymd/indexes/records_info.cpp
index 89032442d2..caf972d114 100644
--- a/src/core/algorithms/md/hymd/indexes/records_info.cpp
+++ b/src/core/algorithms/md/hymd/indexes/records_info.cpp
@@ -1,12 +1,12 @@
-#include "algorithms/md/hymd/indexes/records_info.h"
+#include "core/algorithms/md/hymd/indexes/records_info.h"
 
 #include <string>
 #include <vector>
 
 #include <boost/unordered/unordered_flat_map.hpp>
 
-#include "algorithms/md/hymd/indexes/global_value_identifier.h"
-#include "util/logger.h"
+#include "core/algorithms/md/hymd/indexes/global_value_identifier.h"
+#include "core/util/logger.h"
 
 namespace {
 using namespace algos::hymd::indexes;
diff --git a/src/core/algorithms/md/hymd/indexes/records_info.h b/src/core/algorithms/md/hymd/indexes/records_info.h
index 2251e52a3e..03054bc296 100644
--- a/src/core/algorithms/md/hymd/indexes/records_info.h
+++ b/src/core/algorithms/md/hymd/indexes/records_info.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/md/hymd/indexes/dictionary_compressor.h"
+#include "core/algorithms/md/hymd/indexes/dictionary_compressor.h"
 
 namespace algos::hymd::indexes {
 
diff --git a/src/core/algorithms/md/hymd/indexes/similarity_index.cpp b/src/core/algorithms/md/hymd/indexes/similarity_index.cpp
index 2dc160d532..2f2b5a338d 100644
--- a/src/core/algorithms/md/hymd/indexes/similarity_index.cpp
+++ b/src/core/algorithms/md/hymd/indexes/similarity_index.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/md/hymd/indexes/similarity_index.h"
+#include "core/algorithms/md/hymd/indexes/similarity_index.h"
 
 #include <ranges>
 
diff --git a/src/core/algorithms/md/hymd/indexes/similarity_index.h b/src/core/algorithms/md/hymd/indexes/similarity_index.h
index 3625f00886..0ec0e52ab4 100644
--- a/src/core/algorithms/md/hymd/indexes/similarity_index.h
+++ b/src/core/algorithms/md/hymd/indexes/similarity_index.h
@@ -8,9 +8,9 @@
 #include <boost/container/flat_map.hpp>
 #include <boost/unordered/unordered_flat_set.hpp>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/table_identifiers.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::indexes {
 using EndIdMap = boost::container::flat_map<ColumnClassifierValueId, model::Index, std::greater<>>;
diff --git a/src/core/algorithms/md/hymd/indexes/similarity_matrix.h b/src/core/algorithms/md/hymd/indexes/similarity_matrix.h
index 8c88afae8e..ef222493f7 100644
--- a/src/core/algorithms/md/hymd/indexes/similarity_matrix.h
+++ b/src/core/algorithms/md/hymd/indexes/similarity_matrix.h
@@ -4,8 +4,8 @@
 
 #include <boost/unordered/unordered_flat_map.hpp>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/table_identifiers.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
 
 namespace algos::hymd::indexes {
 using SimilarityMatrixRow =
diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.cpp b/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.cpp
index 455d8a95b4..743b4174f7 100644
--- a/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.cpp
+++ b/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.cpp
@@ -1,8 +1,8 @@
-#include "algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h"
+#include "core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h"
 
 #include <cassert>
 
-#include "algorithms/md/hymd/utility/reserve_more.h"
+#include "core/algorithms/md/hymd/utility/reserve_more.h"
 
 namespace algos::hymd::lattice::cardinality {
 using namespace algos::hymd;
diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h b/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h
index eeb9666b30..0f280b8dea 100644
--- a/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h
+++ b/src/core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h
@@ -5,10 +5,10 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/md/hymd/lattice/md_lattice.h"
-#include "algorithms/md/hymd/lattice/node_base.h"
-#include "algorithms/md/hymd/lattice/validation_info.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/algorithms/md/hymd/lattice/node_base.h"
+#include "core/algorithms/md/hymd/lattice/validation_info.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::lattice::cardinality {
 
diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.cpp b/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.cpp
index e41d161b25..e8e90b3158 100644
--- a/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.cpp
+++ b/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.cpp
@@ -1,8 +1,8 @@
-#include "algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h"
+#include "core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h"
 
-#include "algorithms/md/hymd/lattice/rhs.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "util/erase_if_replace.h"
+#include "core/algorithms/md/hymd/lattice/rhs.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/util/erase_if_replace.h"
 
 namespace algos::hymd::lattice::cardinality {
 
diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h b/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h
index 70953d6ac3..0a884f85b5 100644
--- a/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h
+++ b/src/core/algorithms/md/hymd/lattice/cardinality/min_picking_level_getter.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h"
-#include "algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h"
-#include "algorithms/md/hymd/lattice/level_getter.h"
-#include "algorithms/md/hymd/lattice/md_lattice.h"
-#include "algorithms/md/hymd/md_lhs.h"
+#include "core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h"
+#include "core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h"
+#include "core/algorithms/md/hymd/lattice/level_getter.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
 
 namespace algos::hymd::lattice::cardinality {
 
diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.cpp b/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.cpp
index 1c24f60531..a4f351f8e0 100644
--- a/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.cpp
+++ b/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.cpp
@@ -1,10 +1,10 @@
-#include "algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h"
+#include "core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h"
 
 #include <algorithm>
 #include <cassert>
 
-#include "algorithms/md/hymd/md_lhs.h"
-#include "util/desbordante_assume.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
+#include "core/util/desbordante_assume.h"
 
 namespace algos::hymd::lattice::cardinality {
 
diff --git a/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h b/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h
index 2dbc86cb2b..c0c8a8b208 100644
--- a/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h
+++ b/src/core/algorithms/md/hymd/lattice/cardinality/one_by_one_min_picker.h
@@ -5,10 +5,10 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/md/hymd/lattice/md_lattice_node_info.h"
-#include "algorithms/md/hymd/lattice/validation_info.h"
-#include "algorithms/md/hymd/md_lhs.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice_node_info.h"
+#include "core/algorithms/md/hymd/lattice/validation_info.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::lattice::cardinality {
 
diff --git a/src/core/algorithms/md/hymd/lattice/level_getter.h b/src/core/algorithms/md/hymd/lattice/level_getter.h
index dd58420b82..9013bb324f 100644
--- a/src/core/algorithms/md/hymd/lattice/level_getter.h
+++ b/src/core/algorithms/md/hymd/lattice/level_getter.h
@@ -3,8 +3,8 @@
 #include <cstddef>
 #include <vector>
 
-#include "algorithms/md/hymd/lattice/md_lattice.h"
-#include "algorithms/md/hymd/lattice/validation_info.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/algorithms/md/hymd/lattice/validation_info.h"
 
 namespace algos::hymd::lattice {
 
diff --git a/src/core/algorithms/md/hymd/lattice/lhs_specialization.h b/src/core/algorithms/md/hymd/lattice/lhs_specialization.h
index 58e1a9ab23..3d83b6a54c 100644
--- a/src/core/algorithms/md/hymd/lattice/lhs_specialization.h
+++ b/src/core/algorithms/md/hymd/lattice/lhs_specialization.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/md/hymd/md_lhs.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
 
 namespace algos::hymd::lattice {
 struct SpecializationData {
diff --git a/src/core/algorithms/md/hymd/lattice/md.h b/src/core/algorithms/md/hymd/lattice/md.h
index 4499bc528f..485e0c1205 100644
--- a/src/core/algorithms/md/hymd/lattice/md.h
+++ b/src/core/algorithms/md/hymd/lattice/md.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/md/hymd/md_element.h"
-#include "algorithms/md/hymd/md_lhs.h"
+#include "core/algorithms/md/hymd/md_element.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
 
 namespace algos::hymd::lattice {
 struct Md {
diff --git a/src/core/algorithms/md/hymd/lattice/md_lattice.cpp b/src/core/algorithms/md/hymd/lattice/md_lattice.cpp
index 3fa8ee57c2..aa0dd49b29 100644
--- a/src/core/algorithms/md/hymd/lattice/md_lattice.cpp
+++ b/src/core/algorithms/md/hymd/lattice/md_lattice.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
 
 #include <algorithm>
 #include <cassert>
@@ -6,16 +6,16 @@
 #include <numeric>
 #include <type_traits>
 
-#include "algorithms/md/hymd/lattice/md_specialization.h"
-#include "algorithms/md/hymd/lattice/multi_md_specialization.h"
-#include "algorithms/md/hymd/lattice/rhs.h"
-#include "algorithms/md/hymd/lattice/spec_generalization_checker.h"
-#include "algorithms/md/hymd/lattice/total_generalization_checker.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/utility/index_range.h"
-#include "algorithms/md/hymd/utility/zip.h"
-#include "util/desbordante_assume.h"
-#include "util/erase_if_replace.h"
+#include "core/algorithms/md/hymd/lattice/md_specialization.h"
+#include "core/algorithms/md/hymd/lattice/multi_md_specialization.h"
+#include "core/algorithms/md/hymd/lattice/rhs.h"
+#include "core/algorithms/md/hymd/lattice/spec_generalization_checker.h"
+#include "core/algorithms/md/hymd/lattice/total_generalization_checker.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/utility/index_range.h"
+#include "core/algorithms/md/hymd/utility/zip.h"
+#include "core/util/desbordante_assume.h"
+#include "core/util/erase_if_replace.h"
 
 namespace {
 using model::Index;
diff --git a/src/core/algorithms/md/hymd/lattice/md_lattice.h b/src/core/algorithms/md/hymd/lattice/md_lattice.h
index 6c1c5385ed..8a1aa520c6 100644
--- a/src/core/algorithms/md/hymd/lattice/md_lattice.h
+++ b/src/core/algorithms/md/hymd/lattice/md_lattice.h
@@ -8,20 +8,20 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/md/hymd/lattice/md.h"
-#include "algorithms/md/hymd/lattice/md_lattice_node_info.h"
-#include "algorithms/md/hymd/lattice/md_node.h"
-#include "algorithms/md/hymd/lattice/node_base.h"
-#include "algorithms/md/hymd/lattice/rhs.h"
-#include "algorithms/md/hymd/lattice/single_level_func.h"
-#include "algorithms/md/hymd/lattice/support_node.h"
-#include "algorithms/md/hymd/lhs_ccv_ids_info.h"
-#include "algorithms/md/hymd/md_element.h"
-#include "algorithms/md/hymd/md_lhs.h"
-#include "algorithms/md/hymd/pair_comparison_result.h"
-#include "algorithms/md/hymd/rhss.h"
-#include "algorithms/md/hymd/utility/invalidated_rhss.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/lattice/md.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice_node_info.h"
+#include "core/algorithms/md/hymd/lattice/md_node.h"
+#include "core/algorithms/md/hymd/lattice/node_base.h"
+#include "core/algorithms/md/hymd/lattice/rhs.h"
+#include "core/algorithms/md/hymd/lattice/single_level_func.h"
+#include "core/algorithms/md/hymd/lattice/support_node.h"
+#include "core/algorithms/md/hymd/lhs_ccv_ids_info.h"
+#include "core/algorithms/md/hymd/md_element.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
+#include "core/algorithms/md/hymd/pair_comparison_result.h"
+#include "core/algorithms/md/hymd/rhss.h"
+#include "core/algorithms/md/hymd/utility/invalidated_rhss.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::lattice {
 
diff --git a/src/core/algorithms/md/hymd/lattice/md_lattice_node_info.h b/src/core/algorithms/md/hymd/lattice/md_lattice_node_info.h
index b3395fc7f0..e6a2d339c6 100644
--- a/src/core/algorithms/md/hymd/lattice/md_lattice_node_info.h
+++ b/src/core/algorithms/md/hymd/lattice/md_lattice_node_info.h
@@ -2,9 +2,9 @@
 
 #include <algorithm>
 
-#include "algorithms/md/hymd/lattice/md_node.h"
-#include "algorithms/md/hymd/lattice/rhs.h"
-#include "algorithms/md/hymd/md_lhs.h"
+#include "core/algorithms/md/hymd/lattice/md_node.h"
+#include "core/algorithms/md/hymd/lattice/rhs.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
 
 namespace algos::hymd::lattice {
 
diff --git a/src/core/algorithms/md/hymd/lattice/md_node.h b/src/core/algorithms/md/hymd/lattice/md_node.h
index ffaac3e622..fb3710aa94 100644
--- a/src/core/algorithms/md/hymd/lattice/md_node.h
+++ b/src/core/algorithms/md/hymd/lattice/md_node.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/lattice/md.h"
-#include "algorithms/md/hymd/lattice/md_specialization.h"
-#include "algorithms/md/hymd/lattice/multi_md.h"
-#include "algorithms/md/hymd/lattice/node_base.h"
-#include "algorithms/md/hymd/lattice/rhs.h"
-#include "algorithms/md/hymd/utility/exclusion_list.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/lattice/md.h"
+#include "core/algorithms/md/hymd/lattice/md_specialization.h"
+#include "core/algorithms/md/hymd/lattice/multi_md.h"
+#include "core/algorithms/md/hymd/lattice/node_base.h"
+#include "core/algorithms/md/hymd/lattice/rhs.h"
+#include "core/algorithms/md/hymd/utility/exclusion_list.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::lattice {
 class MdNode : public NodeBase<MdNode> {
diff --git a/src/core/algorithms/md/hymd/lattice/md_specialization.h b/src/core/algorithms/md/hymd/lattice/md_specialization.h
index e3e450cd0c..c58cab6ed2 100644
--- a/src/core/algorithms/md/hymd/lattice/md_specialization.h
+++ b/src/core/algorithms/md/hymd/lattice/md_specialization.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "algorithms/md/hymd/lattice/lhs_specialization.h"
-#include "algorithms/md/hymd/lattice/md.h"
-#include "algorithms/md/hymd/md_element.h"
+#include "core/algorithms/md/hymd/lattice/lhs_specialization.h"
+#include "core/algorithms/md/hymd/lattice/md.h"
+#include "core/algorithms/md/hymd/md_element.h"
 
 namespace algos::hymd::lattice {
 struct MdSpecialization {
diff --git a/src/core/algorithms/md/hymd/lattice/multi_md.h b/src/core/algorithms/md/hymd/lattice/multi_md.h
index 50c41a07e8..4747f521fd 100644
--- a/src/core/algorithms/md/hymd/lattice/multi_md.h
+++ b/src/core/algorithms/md/hymd/lattice/multi_md.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "algorithms/md/hymd/lattice/md.h"
-#include "algorithms/md/hymd/md_element.h"
-#include "algorithms/md/hymd/md_lhs.h"
-#include "algorithms/md/hymd/utility/exclusion_list.h"
+#include "core/algorithms/md/hymd/lattice/md.h"
+#include "core/algorithms/md/hymd/md_element.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
+#include "core/algorithms/md/hymd/utility/exclusion_list.h"
 
 namespace algos::hymd::lattice {
 struct MultiMd {
diff --git a/src/core/algorithms/md/hymd/lattice/multi_md_specialization.h b/src/core/algorithms/md/hymd/lattice/multi_md_specialization.h
index eba432dabd..932dda775a 100644
--- a/src/core/algorithms/md/hymd/lattice/multi_md_specialization.h
+++ b/src/core/algorithms/md/hymd/lattice/multi_md_specialization.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "algorithms/md/hymd/lattice/lhs_specialization.h"
-#include "algorithms/md/hymd/lattice/md.h"
-#include "algorithms/md/hymd/lattice/multi_md.h"
-#include "algorithms/md/hymd/md_element.h"
-#include "algorithms/md/hymd/utility/exclusion_list.h"
+#include "core/algorithms/md/hymd/lattice/lhs_specialization.h"
+#include "core/algorithms/md/hymd/lattice/md.h"
+#include "core/algorithms/md/hymd/lattice/multi_md.h"
+#include "core/algorithms/md/hymd/md_element.h"
+#include "core/algorithms/md/hymd/utility/exclusion_list.h"
 
 namespace algos::hymd::lattice {
 struct MultiMdSpecialization {
diff --git a/src/core/algorithms/md/hymd/lattice/node_base.h b/src/core/algorithms/md/hymd/lattice/node_base.h
index 1830211a75..7ababfbef8 100644
--- a/src/core/algorithms/md/hymd/lattice/node_base.h
+++ b/src/core/algorithms/md/hymd/lattice/node_base.h
@@ -6,10 +6,10 @@
 #include <type_traits>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/md_lhs.h"
-#include "model/index.h"
-#include "util/desbordante_assume.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
+#include "core/model/index.h"
+#include "core/util/desbordante_assume.h"
 
 namespace algos::hymd::lattice {
 
diff --git a/src/core/algorithms/md/hymd/lattice/rhs.h b/src/core/algorithms/md/hymd/lattice/rhs.h
index f620dd09b7..490f23eb84 100644
--- a/src/core/algorithms/md/hymd/lattice/rhs.h
+++ b/src/core/algorithms/md/hymd/lattice/rhs.h
@@ -5,11 +5,11 @@
 #include <memory>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "model/index.h"
-#include "util/desbordante_assume.h"
-#include "util/get_preallocated_vector.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/model/index.h"
+#include "core/util/desbordante_assume.h"
+#include "core/util/get_preallocated_vector.h"
 
 namespace algos::hymd::lattice {
 struct Rhs {
diff --git a/src/core/algorithms/md/hymd/lattice/single_level_func.h b/src/core/algorithms/md/hymd/lattice/single_level_func.h
index 6224c2b777..fc97b420e6 100644
--- a/src/core/algorithms/md/hymd/lattice/single_level_func.h
+++ b/src/core/algorithms/md/hymd/lattice/single_level_func.h
@@ -3,8 +3,8 @@
 #include <cstddef>
 #include <functional>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::lattice {
 using SingleLevelFunc = std::function<std::size_t(ColumnClassifierValueId, model::Index)>;
diff --git a/src/core/algorithms/md/hymd/lattice/spec_generalization_checker.h b/src/core/algorithms/md/hymd/lattice/spec_generalization_checker.h
index 6377efc24f..d0050149f5 100644
--- a/src/core/algorithms/md/hymd/lattice/spec_generalization_checker.h
+++ b/src/core/algorithms/md/hymd/lattice/spec_generalization_checker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/md/hymd/lattice/lhs_specialization.h"
-#include "algorithms/md/hymd/lattice/total_generalization_checker.h"
+#include "core/algorithms/md/hymd/lattice/lhs_specialization.h"
+#include "core/algorithms/md/hymd/lattice/total_generalization_checker.h"
 
 namespace algos::hymd::lattice {
 template <typename NodeType, typename Specialization = NodeType::Specialization>
diff --git a/src/core/algorithms/md/hymd/lattice/support_node.h b/src/core/algorithms/md/hymd/lattice/support_node.h
index 1f0a799e7d..6fc829ffd4 100644
--- a/src/core/algorithms/md/hymd/lattice/support_node.h
+++ b/src/core/algorithms/md/hymd/lattice/support_node.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/lattice/lhs_specialization.h"
-#include "algorithms/md/hymd/lattice/node_base.h"
-#include "algorithms/md/hymd/md_lhs.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/lattice/lhs_specialization.h"
+#include "core/algorithms/md/hymd/lattice/node_base.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
 
 namespace algos::hymd::lattice {
 class SupportNode : public NodeBase<SupportNode> {
diff --git a/src/core/algorithms/md/hymd/lattice/total_generalization_checker.h b/src/core/algorithms/md/hymd/lattice/total_generalization_checker.h
index 3439dca6e8..f8ebf5c648 100644
--- a/src/core/algorithms/md/hymd/lattice/total_generalization_checker.h
+++ b/src/core/algorithms/md/hymd/lattice/total_generalization_checker.h
@@ -2,9 +2,9 @@
 
 #include <type_traits>
 
-#include "algorithms/md/hymd/md_element.h"
-#include "algorithms/md/hymd/md_lhs.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/md_element.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::lattice {
 template <typename NodeType, typename Unspecialized = NodeType::Specialization::Unspecialized>
diff --git a/src/core/algorithms/md/hymd/lattice/validation_info.h b/src/core/algorithms/md/hymd/lattice/validation_info.h
index 1591008250..c46fabdf87 100644
--- a/src/core/algorithms/md/hymd/lattice/validation_info.h
+++ b/src/core/algorithms/md/hymd/lattice/validation_info.h
@@ -4,8 +4,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/md/hymd/lattice/md_lattice.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::lattice {
 
diff --git a/src/core/algorithms/md/hymd/lattice_traverser.cpp b/src/core/algorithms/md/hymd/lattice_traverser.cpp
index 3c5be85589..56f0ac9c5b 100644
--- a/src/core/algorithms/md/hymd/lattice_traverser.cpp
+++ b/src/core/algorithms/md/hymd/lattice_traverser.cpp
@@ -1,9 +1,9 @@
-#include "algorithms/md/hymd/lattice_traverser.h"
+#include "core/algorithms/md/hymd/lattice_traverser.h"
 
 #include <ranges>
 
-#include "algorithms/md/hymd/utility/zip.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/utility/zip.h"
+#include "core/model/index.h"
 
 namespace algos::hymd {
 auto LatticeTraverser::AdjustLattice(std::vector<lattice::ValidationInfo>& validations,
diff --git a/src/core/algorithms/md/hymd/lattice_traverser.h b/src/core/algorithms/md/hymd/lattice_traverser.h
index 00b0c8b51e..6519d8c59b 100644
--- a/src/core/algorithms/md/hymd/lattice_traverser.h
+++ b/src/core/algorithms/md/hymd/lattice_traverser.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "algorithms/md/hymd/indexes/dictionary_compressor.h"
-#include "algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h"
-#include "algorithms/md/hymd/lattice/level_getter.h"
-#include "algorithms/md/hymd/lattice/md_lattice.h"
-#include "algorithms/md/hymd/recommendation.h"
-#include "algorithms/md/hymd/similarity_data.h"
-#include "algorithms/md/hymd/validator.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/hymd/indexes/dictionary_compressor.h"
+#include "core/algorithms/md/hymd/lattice/cardinality/min_picker_lattice.h"
+#include "core/algorithms/md/hymd/lattice/level_getter.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/algorithms/md/hymd/recommendation.h"
+#include "core/algorithms/md/hymd/similarity_data.h"
+#include "core/algorithms/md/hymd/validator.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace algos::hymd {
 
diff --git a/src/core/algorithms/md/hymd/lhs_ccv_ids_info.h b/src/core/algorithms/md/hymd/lhs_ccv_ids_info.h
index 08263f5855..6d3aa10c75 100644
--- a/src/core/algorithms/md/hymd/lhs_ccv_ids_info.h
+++ b/src/core/algorithms/md/hymd/lhs_ccv_ids_info.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
 
 namespace algos::hymd {
 struct LhsCCVIdsInfo {
diff --git a/src/core/algorithms/md/hymd/lowest_bound.h b/src/core/algorithms/md/hymd/lowest_bound.h
index 73b3ad8942..acb4598be3 100644
--- a/src/core/algorithms/md/hymd/lowest_bound.h
+++ b/src/core/algorithms/md/hymd/lowest_bound.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/md/decision_boundary.h"
+#include "core/algorithms/md/decision_boundary.h"
 
 namespace algos::hymd {
 constexpr model::md::DecisionBoundary kLowestBound = 0.0;
diff --git a/src/core/algorithms/md/hymd/lowest_cc_value_id.h b/src/core/algorithms/md/hymd/lowest_cc_value_id.h
index 2b4326a28f..5dab0d541f 100644
--- a/src/core/algorithms/md/hymd/lowest_cc_value_id.h
+++ b/src/core/algorithms/md/hymd/lowest_cc_value_id.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
 
 namespace algos::hymd {
 constexpr ColumnClassifierValueId kLowestCCValueId = 0;
diff --git a/src/core/algorithms/md/hymd/md_element.h b/src/core/algorithms/md/hymd/md_element.h
index 8e10567a9b..040857ea77 100644
--- a/src/core/algorithms/md/hymd/md_element.h
+++ b/src/core/algorithms/md/hymd/md_element.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/model/index.h"
 
 namespace algos::hymd {
 struct MdElement {
diff --git a/src/core/algorithms/md/hymd/md_lhs.h b/src/core/algorithms/md/hymd/md_lhs.h
index b11e304ab7..08bb6f0d37 100644
--- a/src/core/algorithms/md/hymd/md_lhs.h
+++ b/src/core/algorithms/md/hymd/md_lhs.h
@@ -3,9 +3,9 @@
 #include <cstddef>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "model/index.h"
-#include "util/py_tuple_hash.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/model/index.h"
+#include "core/util/py_tuple_hash.h"
 
 namespace algos::hymd {
 struct LhsNode {
diff --git a/src/core/algorithms/md/hymd/pair_comparison_result.h b/src/core/algorithms/md/hymd/pair_comparison_result.h
index 0461f37a6f..3de1ace090 100644
--- a/src/core/algorithms/md/hymd/pair_comparison_result.h
+++ b/src/core/algorithms/md/hymd/pair_comparison_result.h
@@ -2,13 +2,13 @@
 
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/lhs_ccv_ids_info.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/md_lhs.h"
-#include "algorithms/md/hymd/utility/zip.h"
-#include "util/desbordante_assume.h"
-#include "util/py_tuple_hash.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/lhs_ccv_ids_info.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/md_lhs.h"
+#include "core/algorithms/md/hymd/utility/zip.h"
+#include "core/util/desbordante_assume.h"
+#include "core/util/py_tuple_hash.h"
 
 namespace algos::hymd {
 // "Similarity set" if using the terminology from "Efficient Discovery of Matching Dependencies".
diff --git a/src/core/algorithms/md/hymd/preprocessing/build_indexes.h b/src/core/algorithms/md/hymd/preprocessing/build_indexes.h
index 09d0d4c14d..56c9daa536 100644
--- a/src/core/algorithms/md/hymd/preprocessing/build_indexes.h
+++ b/src/core/algorithms/md/hymd/preprocessing/build_indexes.h
@@ -8,13 +8,13 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/indexes/column_similarity_info.h"
-#include "algorithms/md/hymd/indexes/pli_cluster.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/preprocessing/valid_table_results.h"
-#include "algorithms/md/hymd/table_identifiers.h"
-#include "util/desbordante_assume.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/indexes/column_similarity_info.h"
+#include "core/algorithms/md/hymd/indexes/pli_cluster.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/preprocessing/valid_table_results.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
+#include "core/util/desbordante_assume.h"
 
 namespace algos::hymd::preprocessing {
 inline void SortAllRows(EnumeratedValidTableResults& tr_res) {
diff --git a/src/core/algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h b/src/core/algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h
index 6b8b2bb843..df858f60dc 100644
--- a/src/core/algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h
+++ b/src/core/algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h
@@ -4,8 +4,8 @@
 #include <ranges>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
 
 namespace algos::hymd::preprocessing::ccv_id_pickers {
 template <typename T>
diff --git a/src/core/algorithms/md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h b/src/core/algorithms/md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h
index 06a10f4d0e..927599a5b5 100644
--- a/src/core/algorithms/md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h
+++ b/src/core/algorithms/md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h
@@ -3,8 +3,8 @@
 #include <functional>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/preprocessing/similarity.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/preprocessing/similarity.h"
 
 namespace algos::hymd::preprocessing::ccv_id_pickers {
 template <typename T>
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h
index 98022e977a..b2604cbf72 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h
@@ -3,19 +3,19 @@
 #include <memory>
 #include <type_traits>
 
-#include "algorithms/md/hymd/indexes/column_similarity_info.h"
-#include "algorithms/md/hymd/indexes/keyed_position_list_index.h"
-#include "algorithms/md/hymd/lowest_bound.h"
-#include "algorithms/md/hymd/preprocessing/build_indexes.h"
-#include "algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h"
-#include "algorithms/md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h"
-#include "algorithms/md/hymd/preprocessing/encode_results.h"
-#include "algorithms/md/hymd/preprocessing/similarity.h"
-#include "algorithms/md/hymd/preprocessing/valid_table_results.h"
-#include "config/exceptions.h"
-#include "util/argument_type.h"
-#include "util/get_preallocated_vector.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/hymd/indexes/column_similarity_info.h"
+#include "core/algorithms/md/hymd/indexes/keyed_position_list_index.h"
+#include "core/algorithms/md/hymd/lowest_bound.h"
+#include "core/algorithms/md/hymd/preprocessing/build_indexes.h"
+#include "core/algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h"
+#include "core/algorithms/md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h"
+#include "core/algorithms/md/hymd/preprocessing/encode_results.h"
+#include "core/algorithms/md/hymd/preprocessing/similarity.h"
+#include "core/algorithms/md/hymd/preprocessing/valid_table_results.h"
+#include "core/config/exceptions.h"
+#include "core/util/argument_type.h"
+#include "core/util/get_preallocated_vector.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 template <typename ComparerCreatorSupplier, bool Symmetric, bool EqMax, bool MultiThreaded = true>
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/column_match.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/column_match.h
index f7ae458629..4312176db4 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/column_match.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/column_match.h
@@ -2,10 +2,10 @@
 
 #include <string>
 
-#include "algorithms/md/hymd/indexes/column_similarity_info.h"
-#include "algorithms/md/hymd/indexes/records_info.h"
-#include "model/table/relational_schema.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/hymd/indexes/column_similarity_info.h"
+#include "core/algorithms/md/hymd/indexes/records_info.h"
+#include "core/model/table/relational_schema.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h
index 90326a528c..4acba3bb4b 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h
@@ -7,11 +7,11 @@
 #include <variant>
 #include <vector>
 
-#include "algorithms/md/hymd/indexes/global_value_identifier.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match.h"
-#include "config/exceptions.h"
-#include "model/index.h"
-#include "model/table/column.h"
+#include "core/algorithms/md/hymd/indexes/global_value_identifier.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match.h"
+#include "core/config/exceptions.h"
+#include "core/model/index.h"
+#include "core/model/table/column.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 using ColumnIdentifier = std::variant<std::string, model::Index>;
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/date_difference.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/date_difference.h
index f0dddefe87..23c6c1516a 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/date_difference.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/date_difference.h
@@ -3,8 +3,8 @@
 #include <array>
 #include <cstdlib>
 
-#include "algorithms/md/hymd/preprocessing/column_matches/lv_normalized.h"
-#include "config/exceptions.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/lv_normalized.h"
+#include "core/config/exceptions.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 inline size_t DateDifference(model::Date const& left, model::Date const& right) {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/equality.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/equality.h
index cf4a654876..1ce56c766b 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/equality.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/equality.h
@@ -6,12 +6,12 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/md/hymd/indexes/column_similarity_info.h"
-#include "algorithms/md/hymd/indexes/keyed_position_list_index.h"
-#include "algorithms/md/hymd/lowest_bound.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/transformed_columns_holder.h"
-#include "algorithms/md/hymd/preprocessing/similarity.h"
+#include "core/algorithms/md/hymd/indexes/column_similarity_info.h"
+#include "core/algorithms/md/hymd/indexes/keyed_position_list_index.h"
+#include "core/algorithms/md/hymd/lowest_bound.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/transformed_columns_holder.h"
+#include "core/algorithms/md/hymd/preprocessing/similarity.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 namespace detail {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/jaccard.cpp b/src/core/algorithms/md/hymd/preprocessing/column_matches/jaccard.cpp
index a75d1d545d..dfd527f1f5 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/jaccard.cpp
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/jaccard.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/md/hymd/preprocessing/column_matches/jaccard.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/jaccard.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/jaccard.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/jaccard.h
index 40e5740ace..de1c189556 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/jaccard.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/jaccard.h
@@ -4,8 +4,8 @@
 #include <string>
 #include <unordered_set>
 
-#include "algorithms/md/hymd/preprocessing/column_matches/pairwise.h"
-#include "algorithms/md/hymd/utility/intersection_size.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/pairwise.h"
+#include "core/algorithms/md/hymd/utility/intersection_size.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 namespace similarity_measures {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/lcs.cpp b/src/core/algorithms/md/hymd/preprocessing/column_matches/lcs.cpp
index 00f09f12ea..6100086e70 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/lcs.cpp
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/lcs.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/md/hymd/preprocessing/column_matches/lcs.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/lcs.h"
 
 #include <algorithm>
 #include <string>
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/lcs.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/lcs.h
index e4e08e98e1..0453d4a31c 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/lcs.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/lcs.h
@@ -4,9 +4,9 @@
 #include <string>
 #include <utility>
 
-#include "algorithms/md/hymd/preprocessing/column_matches/pairwise.h"
-#include "config/exceptions.h"
-#include "model/types/string_type.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/pairwise.h"
+#include "core/config/exceptions.h"
+#include "core/model/types/string_type.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 namespace similarity_measures {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.cpp b/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.cpp
index ff7d2c8ecb..e37e2d5b11 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.cpp
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.cpp
@@ -1,13 +1,13 @@
-#include "algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
 
 #include <algorithm>
 #include <cstddef>
 #include <numeric>
 
-#include "algorithms/md/hymd/lowest_bound.h"
-#include "model/index.h"
-#include "model/types/string_type.h"
-#include "util/desbordante_assume.h"
+#include "core/algorithms/md/hymd/lowest_bound.h"
+#include "core/model/index.h"
+#include "core/model/types/string_type.h"
+#include "core/util/desbordante_assume.h"
 
 namespace {
 using namespace algos::hymd;
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h
index 4e7a38c9bc..7877f130d7 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h
@@ -3,13 +3,13 @@
 #include <memory>
 #include <vector>
 
-#include "algorithms/md/hymd/indexes/keyed_position_list_index.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/single_transformer.h"
-#include "algorithms/md/hymd/preprocessing/similarity.h"
-#include "algorithms/md/hymd/utility/make_unique_for_overwrite.h"
-#include "model/types/builtin.h"
+#include "core/algorithms/md/hymd/indexes/keyed_position_list_index.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/single_transformer.h"
+#include "core/algorithms/md/hymd/preprocessing/similarity.h"
+#include "core/algorithms/md/hymd/utility/make_unique_for_overwrite.h"
+#include "core/model/types/builtin.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 namespace detail {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/lv_normalized.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/lv_normalized.h
index a0d6bd0996..e45c07cb8d 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/lv_normalized.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/lv_normalized.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "algorithms/md/hymd/lowest_bound.h"
-#include "algorithms/md/hymd/preprocessing/build_indexes.h"
-#include "algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h"
-#include "algorithms/md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/single_transformer.h"
-#include "algorithms/md/hymd/preprocessing/encode_results.h"
-#include "algorithms/md/hymd/preprocessing/valid_table_results.h"
-#include "util/argument_type.h"
-#include "util/get_preallocated_vector.h"
+#include "core/algorithms/md/hymd/lowest_bound.h"
+#include "core/algorithms/md/hymd/preprocessing/build_indexes.h"
+#include "core/algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h"
+#include "core/algorithms/md/hymd/preprocessing/ccv_id_pickers/pick_lhs_ccv_ids_type.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/single_transformer.h"
+#include "core/algorithms/md/hymd/preprocessing/encode_results.h"
+#include "core/algorithms/md/hymd/preprocessing/valid_table_results.h"
+#include "core/util/argument_type.h"
+#include "core/util/get_preallocated_vector.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 using DistanceFunction = std::function<size_t(std::byte const*, std::byte const*)>;
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.cpp b/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.cpp
index 3c021b164a..bc32b00771 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.cpp
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.cpp
@@ -1,11 +1,11 @@
-#include "algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h"
 
 #include <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include "algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.h"
 
 namespace {
 std::vector<std::string> Tokenize(std::string const& text) {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h
index 44f6bedcc6..214a5ff781 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h
@@ -4,7 +4,7 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/md/hymd/preprocessing/column_matches/pairwise.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/pairwise.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 namespace similarity_measures {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/number_difference.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/number_difference.h
index 5a89e66980..68e4a7d0cd 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/number_difference.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/number_difference.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/md/hymd/preprocessing/column_matches/lv_normalized.h"
-#include "config/exceptions.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/lv_normalized.h"
+#include "core/config/exceptions.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 inline double NumberDifference(model::Double left, model::Double right) {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/pairwise.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/pairwise.h
index 609e062461..31d603021d 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/pairwise.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/pairwise.h
@@ -2,14 +2,14 @@
 
 #include <type_traits>
 
-#include "algorithms/md/hymd/lowest_bound.h"
-#include "algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/single_transformer.h"
-#include "algorithms/md/hymd/preprocessing/similarity.h"
-#include "model/types/builtin.h"
-#include "util/argument_type.h"
+#include "core/algorithms/md/hymd/lowest_bound.h"
+#include "core/algorithms/md/hymd/preprocessing/ccv_id_pickers/index_uniform.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/single_transformer.h"
+#include "core/algorithms/md/hymd/preprocessing/similarity.h"
+#include "core/model/types/builtin.h"
+#include "core/util/argument_type.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 namespace detail {
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/single_transformer.h b/src/core/algorithms/md/hymd/preprocessing/column_matches/single_transformer.h
index d8b87eecb5..fec3fe5b71 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/single_transformer.h
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/single_transformer.h
@@ -6,10 +6,10 @@
 #include <variant>
 #include <vector>
 
-#include "algorithms/md/hymd/indexes/global_value_identifier.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/transformed_columns_holder.h"
-#include "model/types/builtin.h"
-#include "util/desbordante_assume.h"
+#include "core/algorithms/md/hymd/indexes/global_value_identifier.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/transformed_columns_holder.h"
+#include "core/model/types/builtin.h"
+#include "core/util/desbordante_assume.h"
 
 namespace algos::hymd::preprocessing::column_matches {
 template <typename ReturnType>
diff --git a/src/core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.cpp b/src/core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.cpp
index 0017d93614..200e9046e0 100644
--- a/src/core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.cpp
+++ b/src/core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.h"
 
 #include <algorithm>
 #include <vector>
diff --git a/src/core/algorithms/md/hymd/preprocessing/encode_results.h b/src/core/algorithms/md/hymd/preprocessing/encode_results.h
index 901b98cd27..537ac4d570 100644
--- a/src/core/algorithms/md/hymd/preprocessing/encode_results.h
+++ b/src/core/algorithms/md/hymd/preprocessing/encode_results.h
@@ -8,11 +8,11 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/preprocessing/valid_table_results.h"
-#include "algorithms/md/hymd/table_identifiers.h"
-#include "util/desbordante_assume.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/preprocessing/valid_table_results.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
+#include "core/util/desbordante_assume.h"
 
 namespace algos::hymd::preprocessing {
 
diff --git a/src/core/algorithms/md/hymd/preprocessing/similarity.h b/src/core/algorithms/md/hymd/preprocessing/similarity.h
index 159ab42c60..21e3aaae7f 100644
--- a/src/core/algorithms/md/hymd/preprocessing/similarity.h
+++ b/src/core/algorithms/md/hymd/preprocessing/similarity.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/md/decision_boundary.h"
+#include "core/algorithms/md/decision_boundary.h"
 
 namespace algos::hymd::preprocessing {
 using Similarity = model::md::DecisionBoundary;
diff --git a/src/core/algorithms/md/hymd/preprocessing/valid_table_results.h b/src/core/algorithms/md/hymd/preprocessing/valid_table_results.h
index d65231545a..0765298fce 100644
--- a/src/core/algorithms/md/hymd/preprocessing/valid_table_results.h
+++ b/src/core/algorithms/md/hymd/preprocessing/valid_table_results.h
@@ -4,8 +4,8 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/table_identifiers.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
 
 namespace algos::hymd::preprocessing {
 template <typename ResultType>
diff --git a/src/core/algorithms/md/hymd/recommendation.h b/src/core/algorithms/md/hymd/recommendation.h
index c962ccaa1c..493127fdb0 100644
--- a/src/core/algorithms/md/hymd/recommendation.h
+++ b/src/core/algorithms/md/hymd/recommendation.h
@@ -4,10 +4,10 @@
 #include <functional>
 #include <unordered_set>
 
-#include "algorithms/md/hymd/compressed_record.h"
-#include "algorithms/md/hymd/table_identifiers.h"
-#include "algorithms/md/hymd/utility/java_hash.h"
-#include "util/py_tuple_hash.h"
+#include "core/algorithms/md/hymd/compressed_record.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
+#include "core/algorithms/md/hymd/utility/java_hash.h"
+#include "core/util/py_tuple_hash.h"
 
 namespace algos::hymd {
 struct Recommendation {
diff --git a/src/core/algorithms/md/hymd/record_pair_inferrer.cpp b/src/core/algorithms/md/hymd/record_pair_inferrer.cpp
index 9a2bd16777..af3d847dfc 100644
--- a/src/core/algorithms/md/hymd/record_pair_inferrer.cpp
+++ b/src/core/algorithms/md/hymd/record_pair_inferrer.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/md/hymd/record_pair_inferrer.h"
+#include "core/algorithms/md/hymd/record_pair_inferrer.h"
 
 #include <algorithm>
 #include <atomic>
@@ -6,9 +6,9 @@
 #include <ranges>
 #include <vector>
 
-#include "algorithms/md/hymd/utility/index_range.h"
-#include "util/get_preallocated_vector.h"
-#include "util/logger.h"
+#include "core/algorithms/md/hymd/utility/index_range.h"
+#include "core/util/get_preallocated_vector.h"
+#include "core/util/logger.h"
 
 namespace {
 algos::hymd::ColumnClassifierValueId GetCCVId(algos::hymd::indexes::SimilarityMatrixRow const& row,
diff --git a/src/core/algorithms/md/hymd/record_pair_inferrer.h b/src/core/algorithms/md/hymd/record_pair_inferrer.h
index d477238614..b232dffce3 100644
--- a/src/core/algorithms/md/hymd/record_pair_inferrer.h
+++ b/src/core/algorithms/md/hymd/record_pair_inferrer.h
@@ -9,13 +9,13 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/md/hymd/lattice/md_lattice.h"
-#include "algorithms/md/hymd/lhs_ccv_ids_info.h"
-#include "algorithms/md/hymd/pair_comparison_result.h"
-#include "algorithms/md/hymd/recommendation.h"
-#include "algorithms/md/hymd/similarity_data.h"
-#include "util/desbordante_assume.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/algorithms/md/hymd/lhs_ccv_ids_info.h"
+#include "core/algorithms/md/hymd/pair_comparison_result.h"
+#include "core/algorithms/md/hymd/recommendation.h"
+#include "core/algorithms/md/hymd/similarity_data.h"
+#include "core/util/desbordante_assume.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace algos::hymd {
 
diff --git a/src/core/algorithms/md/hymd/rhss.h b/src/core/algorithms/md/hymd/rhss.h
index 05371ce53d..0ae78b7eca 100644
--- a/src/core/algorithms/md/hymd/rhss.h
+++ b/src/core/algorithms/md/hymd/rhss.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "algorithms/md/hymd/md_element.h"
+#include "core/algorithms/md/hymd/md_element.h"
 
 namespace algos::hymd {
 using Rhss = std::vector<MdElement>;
diff --git a/src/core/algorithms/md/hymd/similarity_data.cpp b/src/core/algorithms/md/hymd/similarity_data.cpp
index fb75fd5e28..367c1249fa 100644
--- a/src/core/algorithms/md/hymd/similarity_data.cpp
+++ b/src/core/algorithms/md/hymd/similarity_data.cpp
@@ -1,16 +1,16 @@
-#include "algorithms/md/hymd/similarity_data.h"
+#include "core/algorithms/md/hymd/similarity_data.h"
 
 #include <algorithm>
 #include <numeric>
 #include <ranges>
 #include <span>
 
-#include "algorithms/md/hymd/indexes/column_similarity_info.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/utility/index_range.h"
-#include "algorithms/md/hymd/utility/make_unique_for_overwrite.h"
-#include "model/index.h"
-#include "util/get_preallocated_vector.h"
+#include "core/algorithms/md/hymd/indexes/column_similarity_info.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/utility/index_range.h"
+#include "core/algorithms/md/hymd/utility/make_unique_for_overwrite.h"
+#include "core/model/index.h"
+#include "core/util/get_preallocated_vector.h"
 
 namespace algos::hymd {
 
diff --git a/src/core/algorithms/md/hymd/similarity_data.h b/src/core/algorithms/md/hymd/similarity_data.h
index 28201ab203..c409eb8448 100644
--- a/src/core/algorithms/md/hymd/similarity_data.h
+++ b/src/core/algorithms/md/hymd/similarity_data.h
@@ -7,16 +7,16 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/md/decision_boundary.h"
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/column_match_info.h"
-#include "algorithms/md/hymd/indexes/records_info.h"
-#include "algorithms/md/hymd/lattice/rhs.h"
-#include "algorithms/md/hymd/lhs_ccv_ids_info.h"
-#include "algorithms/md/hymd/pair_comparison_result.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match.h"
-#include "model/index.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/decision_boundary.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/column_match_info.h"
+#include "core/algorithms/md/hymd/indexes/records_info.h"
+#include "core/algorithms/md/hymd/lattice/rhs.h"
+#include "core/algorithms/md/hymd/lhs_ccv_ids_info.h"
+#include "core/algorithms/md/hymd/pair_comparison_result.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match.h"
+#include "core/model/index.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace algos::hymd {
 
diff --git a/src/core/algorithms/md/hymd/table_identifiers.h b/src/core/algorithms/md/hymd/table_identifiers.h
index 5c0459ce0d..922e2f1f03 100644
--- a/src/core/algorithms/md/hymd/table_identifiers.h
+++ b/src/core/algorithms/md/hymd/table_identifiers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "model/index.h"
+#include "core/model/index.h"
 
 namespace algos::hymd {
 using ValueIdentifier = model::Index;
diff --git a/src/core/algorithms/md/hymd/utility/exclusion_list.h b/src/core/algorithms/md/hymd/utility/exclusion_list.h
index c8d91ac9cc..8235c75d34 100644
--- a/src/core/algorithms/md/hymd/utility/exclusion_list.h
+++ b/src/core/algorithms/md/hymd/utility/exclusion_list.h
@@ -6,8 +6,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "model/index.h"
-#include "util/bitset_utils.h"
+#include "core/model/index.h"
+#include "core/util/bitset_utils.h"
 
 namespace algos::hymd::utility {
 template <typename T>
diff --git a/src/core/algorithms/md/hymd/utility/invalidated_rhss.h b/src/core/algorithms/md/hymd/utility/invalidated_rhss.h
index 089f8ef6b7..8b60436f84 100644
--- a/src/core/algorithms/md/hymd/utility/invalidated_rhss.h
+++ b/src/core/algorithms/md/hymd/utility/invalidated_rhss.h
@@ -4,10 +4,10 @@
 #include <iterator>
 #include <vector>
 
-#include "algorithms/md/hymd/column_classifier_value_id.h"
-#include "algorithms/md/hymd/md_element.h"
-#include "algorithms/md/hymd/rhss.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/column_classifier_value_id.h"
+#include "core/algorithms/md/hymd/md_element.h"
+#include "core/algorithms/md/hymd/rhss.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::utility {
 class InvalidatedRhss {
diff --git a/src/core/algorithms/md/hymd/utility/inverse_permutation.h b/src/core/algorithms/md/hymd/utility/inverse_permutation.h
index 3a1ae0b391..156aa6ee48 100644
--- a/src/core/algorithms/md/hymd/utility/inverse_permutation.h
+++ b/src/core/algorithms/md/hymd/utility/inverse_permutation.h
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "model/index.h"
+#include "core/model/index.h"
 
 namespace algos::hymd::utility {
 // swap should swap indices too
diff --git a/src/core/algorithms/md/hymd/utility/md_less.h b/src/core/algorithms/md/hymd/utility/md_less.h
index 2fd17e17b1..95a22e8d00 100644
--- a/src/core/algorithms/md/hymd/utility/md_less.h
+++ b/src/core/algorithms/md/hymd/utility/md_less.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/md/hymd/lowest_bound.h"
-#include "algorithms/md/md.h"
+#include "core/algorithms/md/hymd/lowest_bound.h"
+#include "core/algorithms/md/md.h"
 
 namespace algos::hymd::utility {
 
diff --git a/src/core/algorithms/md/hymd/utility/size_t_vector_hash.h b/src/core/algorithms/md/hymd/utility/size_t_vector_hash.h
index 1c1f5c9b50..8f7768c6a6 100644
--- a/src/core/algorithms/md/hymd/utility/size_t_vector_hash.h
+++ b/src/core/algorithms/md/hymd/utility/size_t_vector_hash.h
@@ -5,7 +5,7 @@
 #include <functional>
 #include <vector>
 
-#include "util/py_tuple_hash.h"
+#include "core/util/py_tuple_hash.h"
 
 namespace std {
 template <>
diff --git a/src/core/algorithms/md/hymd/utility/trivial_array.h b/src/core/algorithms/md/hymd/utility/trivial_array.h
index f77eef00a6..535dbec868 100644
--- a/src/core/algorithms/md/hymd/utility/trivial_array.h
+++ b/src/core/algorithms/md/hymd/utility/trivial_array.h
@@ -6,9 +6,9 @@
 #include <span>
 #include <type_traits>
 
-#include "algorithms/md/hymd/utility/make_unique_for_overwrite.h"
-#include "algorithms/md/hymd/utility/zip.h"
-#include "util/py_tuple_hash.h"
+#include "core/algorithms/md/hymd/utility/make_unique_for_overwrite.h"
+#include "core/algorithms/md/hymd/utility/zip.h"
+#include "core/util/py_tuple_hash.h"
 
 namespace algos::hymd::utility {
 template <typename T>
diff --git a/src/core/algorithms/md/hymd/validator.cpp b/src/core/algorithms/md/hymd/validator.cpp
index 95c3a74a81..545185ec78 100644
--- a/src/core/algorithms/md/hymd/validator.cpp
+++ b/src/core/algorithms/md/hymd/validator.cpp
@@ -1,25 +1,25 @@
-#include "algorithms/md/hymd/validator.h"
+#include "core/algorithms/md/hymd/validator.h"
 
 #include <cassert>
 #include <functional>
 #include <vector>
 
-#include "algorithms/md/hymd/indexes/records_info.h"
-#include "algorithms/md/hymd/lattice/rhs.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/table_identifiers.h"
-#include "algorithms/md/hymd/utility/index_range.h"
-#include "algorithms/md/hymd/utility/invalidated_rhss.h"
-#include "algorithms/md/hymd/utility/java_hash.h"
-#include "algorithms/md/hymd/utility/reserve_more.h"
-#include "algorithms/md/hymd/utility/size_t_vector_hash.h"
-#include "algorithms/md/hymd/utility/trivial_array.h"
-#include "algorithms/md/hymd/utility/zip.h"
-#include "model/index.h"
-#include "util/bitset_utils.h"
-#include "util/erase_if_replace.h"
-#include "util/get_preallocated_vector.h"
-#include "util/py_tuple_hash.h"
+#include "core/algorithms/md/hymd/indexes/records_info.h"
+#include "core/algorithms/md/hymd/lattice/rhs.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
+#include "core/algorithms/md/hymd/utility/index_range.h"
+#include "core/algorithms/md/hymd/utility/invalidated_rhss.h"
+#include "core/algorithms/md/hymd/utility/java_hash.h"
+#include "core/algorithms/md/hymd/utility/reserve_more.h"
+#include "core/algorithms/md/hymd/utility/size_t_vector_hash.h"
+#include "core/algorithms/md/hymd/utility/trivial_array.h"
+#include "core/algorithms/md/hymd/utility/zip.h"
+#include "core/model/index.h"
+#include "core/util/bitset_utils.h"
+#include "core/util/erase_if_replace.h"
+#include "core/util/get_preallocated_vector.h"
+#include "core/util/py_tuple_hash.h"
 
 namespace algos::hymd {
 using indexes::CompressedRecords;
diff --git a/src/core/algorithms/md/hymd/validator.h b/src/core/algorithms/md/hymd/validator.h
index fa206a5695..ac72485490 100644
--- a/src/core/algorithms/md/hymd/validator.h
+++ b/src/core/algorithms/md/hymd/validator.h
@@ -4,15 +4,15 @@
 #include <unordered_set>
 #include <vector>
 
-#include "algorithms/md/hymd/column_match_info.h"
-#include "algorithms/md/hymd/indexes/records_info.h"
-#include "algorithms/md/hymd/lattice/md_lattice.h"
-#include "algorithms/md/hymd/lattice/validation_info.h"
-#include "algorithms/md/hymd/recommendation.h"
-#include "algorithms/md/hymd/table_identifiers.h"
-#include "algorithms/md/hymd/utility/invalidated_rhss.h"
-#include "model/index.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/hymd/column_match_info.h"
+#include "core/algorithms/md/hymd/indexes/records_info.h"
+#include "core/algorithms/md/hymd/lattice/md_lattice.h"
+#include "core/algorithms/md/hymd/lattice/validation_info.h"
+#include "core/algorithms/md/hymd/recommendation.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
+#include "core/algorithms/md/hymd/utility/invalidated_rhss.h"
+#include "core/model/index.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace algos::hymd {
 
diff --git a/src/core/algorithms/md/lhs_column_similarity_classifier.h b/src/core/algorithms/md/lhs_column_similarity_classifier.h
index e692462739..2dbe8a121e 100644
--- a/src/core/algorithms/md/lhs_column_similarity_classifier.h
+++ b/src/core/algorithms/md/lhs_column_similarity_classifier.h
@@ -2,9 +2,9 @@
 
 #include <optional>
 
-#include "algorithms/md/column_similarity_classifier.h"
-#include "algorithms/md/decision_boundary.h"
-#include "model/index.h"
+#include "core/algorithms/md/column_similarity_classifier.h"
+#include "core/algorithms/md/decision_boundary.h"
+#include "core/model/index.h"
 
 namespace model::md {
 
diff --git a/src/core/algorithms/md/md.cpp b/src/core/algorithms/md/md.cpp
index 7a77af18eb..f5a126022f 100644
--- a/src/core/algorithms/md/md.cpp
+++ b/src/core/algorithms/md/md.cpp
@@ -1,9 +1,9 @@
-#include "algorithms/md/md.h"
+#include "core/algorithms/md/md.h"
 
 #include <ranges>
 
-#include "model/table/column.h"
-#include "util/get_preallocated_vector.h"
+#include "core/model/table/column.h"
+#include "core/util/get_preallocated_vector.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/md/md.h b/src/core/algorithms/md/md.h
index 70b37e8a5e..8d3ae82798 100644
--- a/src/core/algorithms/md/md.h
+++ b/src/core/algorithms/md/md.h
@@ -2,12 +2,12 @@
 
 #include <memory>
 
-#include "algorithms/md/column_match.h"
-#include "algorithms/md/column_similarity_classifier.h"
-#include "algorithms/md/decision_boundary.h"
-#include "algorithms/md/lhs_column_similarity_classifier.h"
-#include "model/index.h"
-#include "model/table/relational_schema.h"
+#include "core/algorithms/md/column_match.h"
+#include "core/algorithms/md/column_similarity_classifier.h"
+#include "core/algorithms/md/decision_boundary.h"
+#include "core/algorithms/md/lhs_column_similarity_classifier.h"
+#include "core/model/index.h"
+#include "core/model/table/relational_schema.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/md/md_algorithm.h b/src/core/algorithms/md/md_algorithm.h
index 7c4c4a5c34..d9f3f41fce 100644
--- a/src/core/algorithms/md/md_algorithm.h
+++ b/src/core/algorithms/md/md_algorithm.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "algorithms/algorithm.h"
-#include "algorithms/md/md.h"
-#include "util/primitive_collection.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/md/md.h"
+#include "core/util/primitive_collection.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/md/md_verifier/cmptr.h b/src/core/algorithms/md/md_verifier/cmptr.h
index a7f366538c..fba9dfb0d2 100644
--- a/src/core/algorithms/md/md_verifier/cmptr.h
+++ b/src/core/algorithms/md/md_verifier/cmptr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match.h"
 
 namespace algos::md {
 using CMPtr = std::shared_ptr<hymd::preprocessing::column_matches::ColumnMatch>;
diff --git a/src/core/algorithms/md/md_verifier/column_similarity_classifier.h b/src/core/algorithms/md/md_verifier/column_similarity_classifier.h
index 8f072af989..d2e92bab68 100644
--- a/src/core/algorithms/md/md_verifier/column_similarity_classifier.h
+++ b/src/core/algorithms/md/md_verifier/column_similarity_classifier.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match.h"
-#include "algorithms/md/md_verifier/cmptr.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match.h"
+#include "core/algorithms/md/md_verifier/cmptr.h"
 
 namespace algos::md {
 class ColumnSimilarityClassifier {
diff --git a/src/core/algorithms/md/md_verifier/highlights/highlights.h b/src/core/algorithms/md/md_verifier/highlights/highlights.h
index b71defdd44..32b33d06ae 100644
--- a/src/core/algorithms/md/md_verifier/highlights/highlights.h
+++ b/src/core/algorithms/md/md_verifier/highlights/highlights.h
@@ -2,11 +2,11 @@
 
 #include <sstream>
 
-#include "algorithms/md/hymd/table_identifiers.h"
-#include "algorithms/md/md.h"
-#include "algorithms/md/similarity.h"
-#include "config/indices/type.h"
-#include "model/index.h"
+#include "core/algorithms/md/hymd/table_identifiers.h"
+#include "core/algorithms/md/md.h"
+#include "core/algorithms/md/similarity.h"
+#include "core/config/indices/type.h"
+#include "core/model/index.h"
 
 namespace algos::md {
 class MDHighlights {
diff --git a/src/core/algorithms/md/md_verifier/md_verifier.cpp b/src/core/algorithms/md/md_verifier/md_verifier.cpp
index dba095540c..1df0d32723 100644
--- a/src/core/algorithms/md/md_verifier/md_verifier.cpp
+++ b/src/core/algorithms/md/md_verifier/md_verifier.cpp
@@ -1,22 +1,22 @@
-#include "algorithms/md/md_verifier/md_verifier.h"
+#include "core/algorithms/md/md_verifier/md_verifier.h"
 
 #include <algorithm>
 #include <optional>
 
-#include "algorithms/md/hymd/utility/index_range.h"
-#include "algorithms/md/lhs_column_similarity_classifier.h"
-#include "algorithms/md/md_verifier/cmptr.h"
-#include "algorithms/md/md_verifier/validation/validation.h"
-#include "config/equal_nulls/option.h"
-#include "config/exceptions.h"
-#include "config/indices/option.h"
-#include "config/indices/type.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "config/thread_number/option.h"
-#include "util/timed_invoke.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/hymd/utility/index_range.h"
+#include "core/algorithms/md/lhs_column_similarity_classifier.h"
+#include "core/algorithms/md/md_verifier/cmptr.h"
+#include "core/algorithms/md/md_verifier/validation/validation.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/exceptions.h"
+#include "core/config/indices/option.h"
+#include "core/config/indices/type.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/config/thread_number/option.h"
+#include "core/util/timed_invoke.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace {
 struct PoolHolder {
diff --git a/src/core/algorithms/md/md_verifier/md_verifier.h b/src/core/algorithms/md/md_verifier/md_verifier.h
index c99b96638e..998c2ad540 100644
--- a/src/core/algorithms/md/md_verifier/md_verifier.h
+++ b/src/core/algorithms/md/md_verifier/md_verifier.h
@@ -2,17 +2,17 @@
 
 #include <optional>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/md/column_match.h"
-#include "algorithms/md/decision_boundary.h"
-#include "algorithms/md/md_algorithm.h"
-#include "algorithms/md/md_verifier/cmptr.h"
-#include "algorithms/md/md_verifier/column_similarity_classifier.h"
-#include "algorithms/md/md_verifier/highlights/highlights.h"
-#include "algorithms/md/md_verifier/validation/validation.h"
-#include "config/tabular_data/input_table_type.h"
-#include "config/thread_number/type.h"
-#include "model/table/relational_schema.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/md/column_match.h"
+#include "core/algorithms/md/decision_boundary.h"
+#include "core/algorithms/md/md_algorithm.h"
+#include "core/algorithms/md/md_verifier/cmptr.h"
+#include "core/algorithms/md/md_verifier/column_similarity_classifier.h"
+#include "core/algorithms/md/md_verifier/highlights/highlights.h"
+#include "core/algorithms/md/md_verifier/validation/validation.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/relational_schema.h"
 
 namespace algos::md {
 
diff --git a/src/core/algorithms/md/md_verifier/validation/validation.cpp b/src/core/algorithms/md/md_verifier/validation/validation.cpp
index 82c43cee0a..223c8ecc04 100644
--- a/src/core/algorithms/md/md_verifier/validation/validation.cpp
+++ b/src/core/algorithms/md/md_verifier/validation/validation.cpp
@@ -1,13 +1,13 @@
-#include "algorithms/md/md_verifier/validation/validation.h"
+#include "core/algorithms/md/md_verifier/validation/validation.h"
 
 #include <ranges>
 
 #include <boost/hof/first_of.hpp>
 
-#include "algorithms/md/hymd/indexes/records_info.h"
-#include "algorithms/md/hymd/similarity_data.h"
-#include "algorithms/md/hymd/utility/index_range.h"
-#include "util/worker_thread_pool.h"
+#include "core/algorithms/md/hymd/indexes/records_info.h"
+#include "core/algorithms/md/hymd/similarity_data.h"
+#include "core/algorithms/md/hymd/utility/index_range.h"
+#include "core/util/worker_thread_pool.h"
 
 namespace algos::md {
 
diff --git a/src/core/algorithms/md/md_verifier/validation/validation.h b/src/core/algorithms/md/md_verifier/validation/validation.h
index 9a6392383a..8f94b863b7 100644
--- a/src/core/algorithms/md/md_verifier/validation/validation.h
+++ b/src/core/algorithms/md/md_verifier/validation/validation.h
@@ -4,15 +4,15 @@
 #include <variant>
 #include <vector>
 
-#include "algorithms/md/column_match.h"
-#include "algorithms/md/column_similarity_classifier.h"
-#include "algorithms/md/decision_boundary.h"
-#include "algorithms/md/hymd/column_match_info.h"
-#include "algorithms/md/hymd/similarity_data.h"
-#include "algorithms/md/md_verifier/cmptr.h"
-#include "algorithms/md/md_verifier/highlights/highlights.h"
-#include "algorithms/md/similarity.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/algorithms/md/column_match.h"
+#include "core/algorithms/md/column_similarity_classifier.h"
+#include "core/algorithms/md/decision_boundary.h"
+#include "core/algorithms/md/hymd/column_match_info.h"
+#include "core/algorithms/md/hymd/similarity_data.h"
+#include "core/algorithms/md/md_verifier/cmptr.h"
+#include "core/algorithms/md/md_verifier/highlights/highlights.h"
+#include "core/algorithms/md/similarity.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace algos::md {
 
diff --git a/src/core/algorithms/md/mining_algorithms.h b/src/core/algorithms/md/mining_algorithms.h
index e70d0af98e..0c28e1e0b5 100644
--- a/src/core/algorithms/md/mining_algorithms.h
+++ b/src/core/algorithms/md/mining_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/md/hymd/hymd.h"
+#include "core/algorithms/md/hymd/hymd.h"
diff --git a/src/core/algorithms/md/similarity.h b/src/core/algorithms/md/similarity.h
index 6c4844306f..76d6758a4c 100644
--- a/src/core/algorithms/md/similarity.h
+++ b/src/core/algorithms/md/similarity.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/md/hymd/preprocessing/similarity.h"
+#include "core/algorithms/md/hymd/preprocessing/similarity.h"
 
 namespace model::md {
 using Similarity = algos::hymd::preprocessing::Similarity;
diff --git a/src/core/algorithms/md/verification_algorithms.h b/src/core/algorithms/md/verification_algorithms.h
index a5459ade8d..76adfe2aea 100644
--- a/src/core/algorithms/md/verification_algorithms.h
+++ b/src/core/algorithms/md/verification_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/md/md_verifier/md_verifier.h"
\ No newline at end of file
+#include "core/algorithms/md/md_verifier/md_verifier.h"
\ No newline at end of file
diff --git a/src/core/algorithms/metric/aliases.h b/src/core/algorithms/metric/aliases.h
index 080d572255..f737d750bd 100644
--- a/src/core/algorithms/metric/aliases.h
+++ b/src/core/algorithms/metric/aliases.h
@@ -4,7 +4,7 @@
 #include <functional>
 #include <vector>
 
-#include "model/table/position_list_index.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos::metric {
 
diff --git a/src/core/algorithms/metric/highlight.h b/src/core/algorithms/metric/highlight.h
index 5173f953fa..d2cb03f90b 100644
--- a/src/core/algorithms/metric/highlight.h
+++ b/src/core/algorithms/metric/highlight.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "aliases.h"
+#include "core/algorithms/metric/aliases.h"
 
 namespace algos::metric {
 
diff --git a/src/core/algorithms/metric/highlight_calculator.cpp b/src/core/algorithms/metric/highlight_calculator.cpp
index 16bf2fbf60..d01010caad 100644
--- a/src/core/algorithms/metric/highlight_calculator.cpp
+++ b/src/core/algorithms/metric/highlight_calculator.cpp
@@ -1,8 +1,8 @@
-#include "algorithms/metric/highlight_calculator.h"
+#include "core/algorithms/metric/highlight_calculator.h"
 
 #include <algorithm>
 
-#include "util/convex_hull.h"
+#include "core/util/convex_hull.h"
 
 namespace {
 
diff --git a/src/core/algorithms/metric/highlight_calculator.h b/src/core/algorithms/metric/highlight_calculator.h
index 824a166d33..1b47cc8b3a 100644
--- a/src/core/algorithms/metric/highlight_calculator.h
+++ b/src/core/algorithms/metric/highlight_calculator.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "algorithms/metric/highlight.h"
-#include "algorithms/metric/points.h"
-#include "config/indices/type.h"
-#include "model/table/column_layout_typed_relation_data.h"
+#include "core/algorithms/metric/highlight.h"
+#include "core/algorithms/metric/points.h"
+#include "core/config/indices/type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos::metric {
 
diff --git a/src/core/algorithms/metric/metric_verifier.cpp b/src/core/algorithms/metric/metric_verifier.cpp
index 74c3e175be..383a158180 100644
--- a/src/core/algorithms/metric/metric_verifier.cpp
+++ b/src/core/algorithms/metric/metric_verifier.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/metric/metric_verifier.h"
+#include "core/algorithms/metric/metric_verifier.h"
 
 #include <algorithm>
 #include <cassert>
@@ -8,13 +8,13 @@
 #include <string>
 #include <utility>
 
-#include "config/equal_nulls/option.h"
-#include "config/exceptions.h"
-#include "config/indices/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "util/logger.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/exceptions.h"
+#include "core/config/indices/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/util/logger.h"
 
 namespace algos::metric {
 
diff --git a/src/core/algorithms/metric/metric_verifier.h b/src/core/algorithms/metric/metric_verifier.h
index 1f8c6fcc6e..e2da55de1d 100644
--- a/src/core/algorithms/metric/metric_verifier.h
+++ b/src/core/algorithms/metric/metric_verifier.h
@@ -9,19 +9,19 @@
 #include <unordered_map>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/metric/aliases.h"
-#include "algorithms/metric/enums.h"
-#include "algorithms/metric/highlight_calculator.h"
-#include "algorithms/metric/points.h"
-#include "algorithms/metric/points_calculator.h"
-#include "config/equal_nulls/type.h"
-#include "config/indices/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "util/convex_hull.h"
-#include "util/qgram_vector.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/metric/aliases.h"
+#include "core/algorithms/metric/enums.h"
+#include "core/algorithms/metric/highlight_calculator.h"
+#include "core/algorithms/metric/points.h"
+#include "core/algorithms/metric/points_calculator.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/util/convex_hull.h"
+#include "core/util/qgram_vector.h"
 
 namespace algos::metric {
 
diff --git a/src/core/algorithms/metric/points.h b/src/core/algorithms/metric/points.h
index 8c06014e0a..7a0b1fa66d 100644
--- a/src/core/algorithms/metric/points.h
+++ b/src/core/algorithms/metric/points.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "algorithms/metric/highlight.h"
+#include "core/algorithms/metric/highlight.h"
 
 namespace algos::metric {
 
diff --git a/src/core/algorithms/metric/points_calculator.cpp b/src/core/algorithms/metric/points_calculator.cpp
index 6affad9a64..1fe2f11900 100644
--- a/src/core/algorithms/metric/points_calculator.cpp
+++ b/src/core/algorithms/metric/points_calculator.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/metric/points_calculator.h"
+#include "core/algorithms/metric/points_calculator.h"
 
 namespace {
 
diff --git a/src/core/algorithms/metric/points_calculator.h b/src/core/algorithms/metric/points_calculator.h
index 31cd5388ff..160243c4f9 100644
--- a/src/core/algorithms/metric/points_calculator.h
+++ b/src/core/algorithms/metric/points_calculator.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "algorithms/metric/points.h"
-#include "config/indices/type.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "util/convex_hull.h"
+#include "core/algorithms/metric/points.h"
+#include "core/config/indices/type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/util/convex_hull.h"
 
 namespace algos::metric {
 
diff --git a/src/core/algorithms/metric/verification_algorithms.h b/src/core/algorithms/metric/verification_algorithms.h
index d6abda57db..9574934157 100644
--- a/src/core/algorithms/metric/verification_algorithms.h
+++ b/src/core/algorithms/metric/verification_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/metric/metric_verifier.h"
+#include "core/algorithms/metric/metric_verifier.h"
diff --git a/src/core/algorithms/nar/des/des.cpp b/src/core/algorithms/nar/des/des.cpp
index 44514e5bf1..62365116eb 100644
--- a/src/core/algorithms/nar/des/des.cpp
+++ b/src/core/algorithms/nar/des/des.cpp
@@ -1,4 +1,4 @@
-#include "des.h"
+#include "core/algorithms/nar/des/des.h"
 
 #include <algorithm>
 #include <chrono>
@@ -6,11 +6,11 @@
 #include <memory>
 #include <vector>
 
-#include "algorithms/nar/value_range.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "model/types/types.h"
+#include "core/algorithms/nar/value_range.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/types/types.h"
 
 namespace algos::des {
 using model::ValueRange;
diff --git a/src/core/algorithms/nar/des/des.h b/src/core/algorithms/nar/des/des.h
index 4e236f2a6c..9ee96ab0d9 100644
--- a/src/core/algorithms/nar/des/des.h
+++ b/src/core/algorithms/nar/des/des.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "algorithms/nar/nar_algorithm.h"
-#include "config/names.h"
-#include "differential_functions.h"
-#include "encoded_nar.h"
-#include "enums.h"
-#include "rng.h"
+#include "core/algorithms/nar/des/differential_functions.h"
+#include "core/algorithms/nar/des/encoded_nar.h"
+#include "core/algorithms/nar/des/enums.h"
+#include "core/algorithms/nar/des/rng.h"
+#include "core/algorithms/nar/nar_algorithm.h"
+#include "core/config/names.h"
 
 namespace algos::des {
 using FeatureDomains = std::vector<std::shared_ptr<model::ValueRange>> const;
diff --git a/src/core/algorithms/nar/des/differential_functions.cpp b/src/core/algorithms/nar/des/differential_functions.cpp
index ef35d4b272..3acd10bdea 100644
--- a/src/core/algorithms/nar/des/differential_functions.cpp
+++ b/src/core/algorithms/nar/des/differential_functions.cpp
@@ -1,4 +1,4 @@
-#include "differential_functions.h"
+#include "core/algorithms/nar/des/differential_functions.h"
 
 #include <algorithm>
 
diff --git a/src/core/algorithms/nar/des/differential_functions.h b/src/core/algorithms/nar/des/differential_functions.h
index a972e9cf0f..ec3d77fb95 100644
--- a/src/core/algorithms/nar/des/differential_functions.h
+++ b/src/core/algorithms/nar/des/differential_functions.h
@@ -2,9 +2,9 @@
 
 #include <enum.h>
 
-#include "encoded_nar.h"
-#include "enums.h"
-#include "rng.h"
+#include "core/algorithms/nar/des/encoded_nar.h"
+#include "core/algorithms/nar/des/enums.h"
+#include "core/algorithms/nar/des/rng.h"
 
 namespace algos::des {
 
diff --git a/src/core/algorithms/nar/des/encoded_nar.cpp b/src/core/algorithms/nar/des/encoded_nar.cpp
index e19fef9937..1bfc5cae5d 100644
--- a/src/core/algorithms/nar/des/encoded_nar.cpp
+++ b/src/core/algorithms/nar/des/encoded_nar.cpp
@@ -1,7 +1,7 @@
-#include "encoded_nar.h"
+#include "core/algorithms/nar/des/encoded_nar.h"
 
-#include "algorithms/nar/value_range.h"
-#include "model/types/types.h"
+#include "core/algorithms/nar/value_range.h"
+#include "core/model/types/types.h"
 
 namespace algos::des {
 
diff --git a/src/core/algorithms/nar/des/encoded_nar.h b/src/core/algorithms/nar/des/encoded_nar.h
index b93a60ec27..6a8320d91d 100644
--- a/src/core/algorithms/nar/des/encoded_nar.h
+++ b/src/core/algorithms/nar/des/encoded_nar.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "algorithms/nar/nar.h"
-#include "encoded_value_range.h"
-#include "model/table/column_layout_typed_relation_data.h"
+#include "core/algorithms/nar/des/encoded_value_range.h"
+#include "core/algorithms/nar/nar.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos::des {
 using model::NAR;
diff --git a/src/core/algorithms/nar/des/encoded_value_range.cpp b/src/core/algorithms/nar/des/encoded_value_range.cpp
index 6774900d17..da012269c9 100644
--- a/src/core/algorithms/nar/des/encoded_value_range.cpp
+++ b/src/core/algorithms/nar/des/encoded_value_range.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/nar/des/encoded_value_range.h"
+#include "core/algorithms/nar/des/encoded_value_range.h"
 
 namespace algos::des {
 
diff --git a/src/core/algorithms/nar/des/encoded_value_range.h b/src/core/algorithms/nar/des/encoded_value_range.h
index 5de5fa88e0..3f929a1dcd 100644
--- a/src/core/algorithms/nar/des/encoded_value_range.h
+++ b/src/core/algorithms/nar/des/encoded_value_range.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/nar/value_range.h"
-#include "rng.h"
+#include "core/algorithms/nar/des/rng.h"
+#include "core/algorithms/nar/value_range.h"
 
 namespace algos::des {
 
diff --git a/src/core/algorithms/nar/mining_algorithms.h b/src/core/algorithms/nar/mining_algorithms.h
index 83ec620341..fba1f3e8ac 100644
--- a/src/core/algorithms/nar/mining_algorithms.h
+++ b/src/core/algorithms/nar/mining_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "des/des.h"
+#include "core/algorithms/nar/des/des.h"
diff --git a/src/core/algorithms/nar/nar.cpp b/src/core/algorithms/nar/nar.cpp
index b5645fedd2..e25a1fb414 100644
--- a/src/core/algorithms/nar/nar.cpp
+++ b/src/core/algorithms/nar/nar.cpp
@@ -1,4 +1,4 @@
-#include "nar.h"
+#include "core/algorithms/nar/nar.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/nar/nar.h b/src/core/algorithms/nar/nar.h
index 7a48dfb6ea..52a4777b2c 100644
--- a/src/core/algorithms/nar/nar.h
+++ b/src/core/algorithms/nar/nar.h
@@ -2,9 +2,9 @@
 
 #include <vector>
 
-#include "model/table/column_layout_typed_relation_data.h"
-#include "model/types/types.h"
-#include "value_range.h"
+#include "core/algorithms/nar/value_range.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/model/types/types.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/nar/nar_algorithm.cpp b/src/core/algorithms/nar/nar_algorithm.cpp
index 6610647c24..a2e34897c4 100644
--- a/src/core/algorithms/nar/nar_algorithm.cpp
+++ b/src/core/algorithms/nar/nar_algorithm.cpp
@@ -1,8 +1,8 @@
-#include "nar_algorithm.h"
+#include "core/algorithms/nar/nar_algorithm.h"
 
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/nar/nar_algorithm.h b/src/core/algorithms/nar/nar_algorithm.h
index 415f2d23b6..61460c73c1 100644
--- a/src/core/algorithms/nar/nar_algorithm.h
+++ b/src/core/algorithms/nar/nar_algorithm.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "algorithms/algorithm.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "nar.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/nar/nar.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/nar/value_range.cpp b/src/core/algorithms/nar/value_range.cpp
index 9dda976199..57577066f2 100644
--- a/src/core/algorithms/nar/value_range.cpp
+++ b/src/core/algorithms/nar/value_range.cpp
@@ -1,4 +1,4 @@
-#include "value_range.h"
+#include "core/algorithms/nar/value_range.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/nar/value_range.h b/src/core/algorithms/nar/value_range.h
index 88026d35df..9bebc41baa 100644
--- a/src/core/algorithms/nar/value_range.h
+++ b/src/core/algorithms/nar/value_range.h
@@ -2,8 +2,8 @@
 
 #include <enum.h>
 
-#include "model/table/column_layout_typed_relation_data.h"
-#include "model/types/type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/model/types/type.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/nd/nd.cpp b/src/core/algorithms/nd/nd.cpp
index 7697b9db30..fd88caa227 100644
--- a/src/core/algorithms/nd/nd.cpp
+++ b/src/core/algorithms/nd/nd.cpp
@@ -1,9 +1,9 @@
-#include "algorithms/nd/nd.h"
+#include "core/algorithms/nd/nd.h"
 
 #include <algorithm>
 
-#include "algorithms/nd/util/get_vertical_names.h"
-#include "util/range_to_string.h"
+#include "core/algorithms/nd/util/get_vertical_names.h"
+#include "core/util/range_to_string.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/nd/nd.h b/src/core/algorithms/nd/nd.h
index 314ca1780d..a7b43b2754 100644
--- a/src/core/algorithms/nd/nd.h
+++ b/src/core/algorithms/nd/nd.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "model/table/column.h"
-#include "model/table/vertical.h"
+#include "core/model/table/column.h"
+#include "core/model/table/vertical.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/nd/nd_verifier/nd_verifier.cpp b/src/core/algorithms/nd/nd_verifier/nd_verifier.cpp
index 49add388c5..360a9b0aa3 100644
--- a/src/core/algorithms/nd/nd_verifier/nd_verifier.cpp
+++ b/src/core/algorithms/nd/nd_verifier/nd_verifier.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/nd/nd_verifier/nd_verifier.h"
+#include "core/algorithms/nd/nd_verifier/nd_verifier.h"
 
 #include <chrono>
 #include <cstddef>
@@ -7,22 +7,22 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/nd/nd_verifier/util/stats_calculator.h"
-#include "algorithms/nd/nd_verifier/util/value_combination.h"
-#include "config/descriptions.h"
-#include "config/equal_nulls/option.h"
-#include "config/indices/option.h"
-#include "config/names.h"
-#include "config/option.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "model/table/typed_column_data.h"
-#include "model/types/builtin.h"
-#include "model/types/type.h"
-#include "util/logger.h"
-#include "util/range_to_string.h"
-#include "util/timed_invoke.h"
+#include "core/algorithms/nd/nd_verifier/util/stats_calculator.h"
+#include "core/algorithms/nd/nd_verifier/util/value_combination.h"
+#include "core/config/descriptions.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/indices/option.h"
+#include "core/config/names.h"
+#include "core/config/option.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/model/table/typed_column_data.h"
+#include "core/model/types/builtin.h"
+#include "core/model/types/type.h"
+#include "core/util/logger.h"
+#include "core/util/range_to_string.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos::nd_verifier {
 
diff --git a/src/core/algorithms/nd/nd_verifier/nd_verifier.h b/src/core/algorithms/nd/nd_verifier/nd_verifier.h
index 6c2ccf1a1f..b483aac8e3 100644
--- a/src/core/algorithms/nd/nd_verifier/nd_verifier.h
+++ b/src/core/algorithms/nd/nd_verifier/nd_verifier.h
@@ -5,16 +5,16 @@
 #include <unordered_map>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/nd/nd.h"
-#include "algorithms/nd/nd_verifier/util/highlight.h"
-#include "algorithms/nd/nd_verifier/util/stats_calculator.h"
-#include "algorithms/nd/nd_verifier/util/value_combination.h"
-#include "config/equal_nulls/type.h"
-#include "config/indices/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "model/types/builtin.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/nd/nd.h"
+#include "core/algorithms/nd/nd_verifier/util/highlight.h"
+#include "core/algorithms/nd/nd_verifier/util/stats_calculator.h"
+#include "core/algorithms/nd/nd_verifier/util/value_combination.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/model/types/builtin.h"
 
 namespace algos::nd_verifier {
 
diff --git a/src/core/algorithms/nd/nd_verifier/util/highlight.cpp b/src/core/algorithms/nd/nd_verifier/util/highlight.cpp
index 1504de3563..05eb2cb3f1 100644
--- a/src/core/algorithms/nd/nd_verifier/util/highlight.cpp
+++ b/src/core/algorithms/nd/nd_verifier/util/highlight.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/nd/nd_verifier/util/highlight.h"
+#include "core/algorithms/nd/nd_verifier/util/highlight.h"
 
 #include <algorithm>
 #include <memory>
@@ -7,8 +7,8 @@
 #include <unordered_set>
 #include <vector>
 
-#include "algorithms/nd/nd_verifier/util/value_combination.h"
-#include "util/range_to_string.h"
+#include "core/algorithms/nd/nd_verifier/util/value_combination.h"
+#include "core/util/range_to_string.h"
 
 namespace algos::nd_verifier::util {
 
diff --git a/src/core/algorithms/nd/nd_verifier/util/highlight.h b/src/core/algorithms/nd/nd_verifier/util/highlight.h
index 0b6f5ade44..f86f5580ee 100644
--- a/src/core/algorithms/nd/nd_verifier/util/highlight.h
+++ b/src/core/algorithms/nd/nd_verifier/util/highlight.h
@@ -6,7 +6,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "algorithms/nd/nd_verifier/util/value_combination.h"
+#include "core/algorithms/nd/nd_verifier/util/value_combination.h"
 
 namespace algos::nd_verifier::util {
 
diff --git a/src/core/algorithms/nd/nd_verifier/util/stats_calculator.cpp b/src/core/algorithms/nd/nd_verifier/util/stats_calculator.cpp
index 0fdc3ff97a..63a734b705 100644
--- a/src/core/algorithms/nd/nd_verifier/util/stats_calculator.cpp
+++ b/src/core/algorithms/nd/nd_verifier/util/stats_calculator.cpp
@@ -1,13 +1,13 @@
-#include "algorithms/nd/nd_verifier/util/stats_calculator.h"
+#include "core/algorithms/nd/nd_verifier/util/stats_calculator.h"
 
 #include <memory>
 #include <stdexcept>
 #include <string>
 #include <vector>
 
-#include "algorithms/nd/nd.h"
-#include "algorithms/nd/nd_verifier/util/value_combination.h"
-#include "util/logger.h"
+#include "core/algorithms/nd/nd.h"
+#include "core/algorithms/nd/nd_verifier/util/value_combination.h"
+#include "core/util/logger.h"
 
 namespace algos::nd_verifier::util {
 
diff --git a/src/core/algorithms/nd/nd_verifier/util/stats_calculator.h b/src/core/algorithms/nd/nd_verifier/util/stats_calculator.h
index 540a1d62e3..11da59bf1e 100644
--- a/src/core/algorithms/nd/nd_verifier/util/stats_calculator.h
+++ b/src/core/algorithms/nd/nd_verifier/util/stats_calculator.h
@@ -6,9 +6,9 @@
 #include <unordered_set>
 #include <vector>
 
-#include "algorithms/nd/nd.h"
-#include "algorithms/nd/nd_verifier/util/highlight.h"
-#include "algorithms/nd/nd_verifier/util/value_combination.h"
+#include "core/algorithms/nd/nd.h"
+#include "core/algorithms/nd/nd_verifier/util/highlight.h"
+#include "core/algorithms/nd/nd_verifier/util/value_combination.h"
 
 namespace algos::nd_verifier::util {
 
diff --git a/src/core/algorithms/nd/nd_verifier/util/value_combination.cpp b/src/core/algorithms/nd/nd_verifier/util/value_combination.cpp
index 0075c3d77e..48040f3c0a 100644
--- a/src/core/algorithms/nd/nd_verifier/util/value_combination.cpp
+++ b/src/core/algorithms/nd/nd_verifier/util/value_combination.cpp
@@ -1,11 +1,11 @@
-#include "algorithms/nd/nd_verifier/util/value_combination.h"
+#include "core/algorithms/nd/nd_verifier/util/value_combination.h"
 
 #include <ostream>
 #include <sstream>
 #include <string>
 
-#include "model/types/create_type.h"
-#include "model/types/mixed_type.h"
+#include "core/model/types/create_type.h"
+#include "core/model/types/mixed_type.h"
 
 namespace algos::nd_verifier::util {
 
diff --git a/src/core/algorithms/nd/nd_verifier/util/value_combination.h b/src/core/algorithms/nd/nd_verifier/util/value_combination.h
index d1c85852bf..91c6bd88d4 100644
--- a/src/core/algorithms/nd/nd_verifier/util/value_combination.h
+++ b/src/core/algorithms/nd/nd_verifier/util/value_combination.h
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 
-#include "model/types/builtin.h"
+#include "core/model/types/builtin.h"
 
 namespace algos::nd_verifier::util {
 
diff --git a/src/core/algorithms/nd/util/get_vertical_names.cpp b/src/core/algorithms/nd/util/get_vertical_names.cpp
index ee6adf052b..615220b580 100644
--- a/src/core/algorithms/nd/util/get_vertical_names.cpp
+++ b/src/core/algorithms/nd/util/get_vertical_names.cpp
@@ -1,11 +1,11 @@
-#include "algorithms/nd/util/get_vertical_names.h"
+#include "core/algorithms/nd/util/get_vertical_names.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
-#include "model/table/column.h"
-#include "model/table/vertical.h"
+#include "core/model/table/column.h"
+#include "core/model/table/vertical.h"
 
 namespace algos::nd::util {
 
diff --git a/src/core/algorithms/nd/util/get_vertical_names.h b/src/core/algorithms/nd/util/get_vertical_names.h
index 19cb3dacb2..8658e40114 100644
--- a/src/core/algorithms/nd/util/get_vertical_names.h
+++ b/src/core/algorithms/nd/util/get_vertical_names.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#include "model/table/vertical.h"
+#include "core/model/table/vertical.h"
 
 namespace algos::nd::util {
 
diff --git a/src/core/algorithms/od/fastod/fastod.cpp b/src/core/algorithms/od/fastod/fastod.cpp
index 1ec3200a91..3da5f63263 100644
--- a/src/core/algorithms/od/fastod/fastod.cpp
+++ b/src/core/algorithms/od/fastod/fastod.cpp
@@ -1,14 +1,14 @@
-#include "fastod.h"
+#include "core/algorithms/od/fastod/fastod.h"
 
 #include <memory>
 
 #include <boost/unordered/unordered_map.hpp>
 
-#include "config/tabular_data/input_table/option.h"
-#include "config/time_limit/option.h"
-#include "error/option.h"
-#include "util/logger.h"
-#include "util/timed_invoke.h"
+#include "core/config/error/option.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/config/time_limit/option.h"
+#include "core/util/logger.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/od/fastod/fastod.h b/src/core/algorithms/od/fastod/fastod.h
index 834d89aa14..fa12a6aa0b 100644
--- a/src/core/algorithms/od/fastod/fastod.h
+++ b/src/core/algorithms/od/fastod/fastod.h
@@ -7,15 +7,15 @@
 #include <unordered_set>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/od/fastod/model/attribute_pair.h"
-#include "algorithms/od/fastod/model/attribute_set.h"
-#include "algorithms/od/fastod/model/canonical_od.h"
-#include "algorithms/od/fastod/storage/partition_cache.h"
-#include "algorithms/od/fastod/util/timer.h"
-#include "config/tabular_data/input_table_type.h"
-#include "config/time_limit/type.h"
-#include "error/type.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/od/fastod/model/attribute_pair.h"
+#include "core/algorithms/od/fastod/model/attribute_set.h"
+#include "core/algorithms/od/fastod/model/canonical_od.h"
+#include "core/algorithms/od/fastod/storage/partition_cache.h"
+#include "core/algorithms/od/fastod/util/timer.h"
+#include "core/config/error/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/config/time_limit/type.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/od/fastod/model/attribute_pair.cpp b/src/core/algorithms/od/fastod/model/attribute_pair.cpp
index fe10e4382b..fd8e887eda 100644
--- a/src/core/algorithms/od/fastod/model/attribute_pair.cpp
+++ b/src/core/algorithms/od/fastod/model/attribute_pair.cpp
@@ -1,4 +1,4 @@
-#include "attribute_pair.h"
+#include "core/algorithms/od/fastod/model/attribute_pair.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/model/attribute_pair.h b/src/core/algorithms/od/fastod/model/attribute_pair.h
index 1c7a00a41b..e2bd336aa9 100644
--- a/src/core/algorithms/od/fastod/model/attribute_pair.h
+++ b/src/core/algorithms/od/fastod/model/attribute_pair.h
@@ -2,8 +2,8 @@
 
 #include <string>
 
-#include "algorithms/od/fastod/hashing/hashing.h"
-#include "model/table/column_index.h"
+#include "core/algorithms/od/fastod/hashing/hashing.h"
+#include "core/model/table/column_index.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/model/attribute_set.cpp b/src/core/algorithms/od/fastod/model/attribute_set.cpp
index 53160e7dd4..697c4cc76d 100644
--- a/src/core/algorithms/od/fastod/model/attribute_set.cpp
+++ b/src/core/algorithms/od/fastod/model/attribute_set.cpp
@@ -1,4 +1,4 @@
-#include "attribute_set.h"
+#include "core/algorithms/od/fastod/model/attribute_set.h"
 
 #include <sstream>
 
diff --git a/src/core/algorithms/od/fastod/model/attribute_set.h b/src/core/algorithms/od/fastod/model/attribute_set.h
index aa047265a7..77be2195ad 100644
--- a/src/core/algorithms/od/fastod/model/attribute_set.h
+++ b/src/core/algorithms/od/fastod/model/attribute_set.h
@@ -9,8 +9,8 @@
 
 #include <boost/functional/hash.hpp>
 
-#include "model/table/column_index.h"
-#include "model/types/bitset.h"
+#include "core/model/table/column_index.h"
+#include "core/model/types/bitset.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/model/canonical_od.cpp b/src/core/algorithms/od/fastod/model/canonical_od.cpp
index f1005453ce..e8c2452ee4 100644
--- a/src/core/algorithms/od/fastod/model/canonical_od.cpp
+++ b/src/core/algorithms/od/fastod/model/canonical_od.cpp
@@ -1,8 +1,8 @@
-#include "canonical_od.h"
+#include "core/algorithms/od/fastod/model/canonical_od.h"
 
 #include <sstream>
 
-#include "algorithms/od/fastod/partitions/complex_stripped_partition.h"
+#include "core/algorithms/od/fastod/partitions/complex_stripped_partition.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/model/canonical_od.h b/src/core/algorithms/od/fastod/model/canonical_od.h
index a12e6a5a0e..ae52305134 100644
--- a/src/core/algorithms/od/fastod/model/canonical_od.h
+++ b/src/core/algorithms/od/fastod/model/canonical_od.h
@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include "algorithms/od/fastod/hashing/hashing.h"
-#include "algorithms/od/fastod/od_ordering.h"
-#include "algorithms/od/fastod/storage/partition_cache.h"
-#include "attribute_pair.h"
-#include "error/type.h"
+#include "core/algorithms/od/fastod/hashing/hashing.h"
+#include "core/algorithms/od/fastod/model/attribute_pair.h"
+#include "core/algorithms/od/fastod/od_ordering.h"
+#include "core/algorithms/od/fastod/storage/partition_cache.h"
+#include "core/config/error/type.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/model/removal_set.h b/src/core/algorithms/od/fastod/model/removal_set.h
index 4f6e340c07..57196633f4 100644
--- a/src/core/algorithms/od/fastod/model/removal_set.h
+++ b/src/core/algorithms/od/fastod/model/removal_set.h
@@ -3,7 +3,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "model/table/tuple_index.h"
+#include "core/model/table/tuple_index.h"
 
 namespace algos::od {
 
diff --git a/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.cpp b/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.cpp
index b043c0e373..0d6b720926 100644
--- a/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.cpp
+++ b/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.cpp
@@ -1,4 +1,4 @@
-#include "complex_stripped_partition.h"
+#include "core/algorithms/od/fastod/partitions/complex_stripped_partition.h"
 
 #include <sstream>
 
diff --git a/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.h b/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.h
index 1052399a35..4736e60aa5 100644
--- a/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.h
+++ b/src/core/algorithms/od/fastod/partitions/complex_stripped_partition.h
@@ -4,10 +4,10 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/od/fastod/model/removal_set.h"
-#include "algorithms/od/fastod/od_ordering.h"
-#include "algorithms/od/fastod/storage/data_frame.h"
-#include "table/tuple_index.h"
+#include "core/algorithms/od/fastod/model/removal_set.h"
+#include "core/algorithms/od/fastod/od_ordering.h"
+#include "core/algorithms/od/fastod/storage/data_frame.h"
+#include "core/model/table/tuple_index.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.cpp b/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.cpp
index b23b7f8842..10025e2508 100644
--- a/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.cpp
+++ b/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.cpp
@@ -1,6 +1,6 @@
 // This part of code not currently used
 
-#include "range_based_stripped_partition.h"
+#include "core/algorithms/od/fastod/partitions/range_based_stripped_partition.h"
 
 #include <sstream>
 
diff --git a/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.h b/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.h
index 597715349b..1baf799c66 100644
--- a/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.h
+++ b/src/core/algorithms/od/fastod/partitions/range_based_stripped_partition.h
@@ -5,8 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/od/fastod/storage/data_frame.h"
-#include "stripped_partition.h"
+#include "core/algorithms/od/fastod/partitions/stripped_partition.h"
+#include "core/algorithms/od/fastod/storage/data_frame.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/partitions/stripped_partition.cpp b/src/core/algorithms/od/fastod/partitions/stripped_partition.cpp
index 46bb8f35f8..0e6db7e68b 100644
--- a/src/core/algorithms/od/fastod/partitions/stripped_partition.cpp
+++ b/src/core/algorithms/od/fastod/partitions/stripped_partition.cpp
@@ -1,6 +1,6 @@
 // This part of code not currently used
 
-#include "stripped_partition.h"
+#include "core/algorithms/od/fastod/partitions/stripped_partition.h"
 
 #include <sstream>
 
diff --git a/src/core/algorithms/od/fastod/partitions/stripped_partition.h b/src/core/algorithms/od/fastod/partitions/stripped_partition.h
index 40467beb33..ece2bdd383 100644
--- a/src/core/algorithms/od/fastod/partitions/stripped_partition.h
+++ b/src/core/algorithms/od/fastod/partitions/stripped_partition.h
@@ -5,7 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "range_based_stripped_partition.h"
+#include "core/algorithms/od/fastod/partitions/range_based_stripped_partition.h"
+#include "core/algorithms/od/fastod/storage/data_frame.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/storage/data_frame.cpp b/src/core/algorithms/od/fastod/storage/data_frame.cpp
index 8d6c908984..eccf687c4d 100644
--- a/src/core/algorithms/od/fastod/storage/data_frame.cpp
+++ b/src/core/algorithms/od/fastod/storage/data_frame.cpp
@@ -1,10 +1,10 @@
-#include "data_frame.h"
+#include "core/algorithms/od/fastod/storage/data_frame.h"
 
 #include <memory>
 #include <stdexcept>
 
-#include "algorithms/od/fastod/util/type_util.h"
-#include "csv_parser/csv_parser.h"
+#include "core/algorithms/od/fastod/util/type_util.h"
+#include "core/parser/csv_parser/csv_parser.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/storage/data_frame.h b/src/core/algorithms/od/fastod/storage/data_frame.h
index 91a5736f2f..7c80ff1f85 100644
--- a/src/core/algorithms/od/fastod/storage/data_frame.h
+++ b/src/core/algorithms/od/fastod/storage/data_frame.h
@@ -4,10 +4,10 @@
 #include <optional>
 #include <vector>
 
-#include "algorithms/od/fastod/model/attribute_set.h"
-#include "config/equal_nulls/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "table/column_layout_typed_relation_data.h"
+#include "core/algorithms/od/fastod/model/attribute_set.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/storage/partition_cache.h b/src/core/algorithms/od/fastod/storage/partition_cache.h
index b20bcefb87..62d01e53b6 100644
--- a/src/core/algorithms/od/fastod/storage/partition_cache.h
+++ b/src/core/algorithms/od/fastod/storage/partition_cache.h
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include "algorithms/od/fastod/model/attribute_set.h"
-#include "algorithms/od/fastod/partitions/complex_stripped_partition.h"
-#include "cache_with_limit.h"
+#include "core/algorithms/od/fastod/model/attribute_set.h"
+#include "core/algorithms/od/fastod/partitions/complex_stripped_partition.h"
+#include "core/algorithms/od/fastod/storage/cache_with_limit.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/util/timer.cpp b/src/core/algorithms/od/fastod/util/timer.cpp
index ede2ccc5a4..fc044f74b2 100644
--- a/src/core/algorithms/od/fastod/util/timer.cpp
+++ b/src/core/algorithms/od/fastod/util/timer.cpp
@@ -1,4 +1,4 @@
-#include "timer.h"
+#include "core/algorithms/od/fastod/util/timer.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/fastod/util/type_util.cpp b/src/core/algorithms/od/fastod/util/type_util.cpp
index d3f1b43304..3e0db5d0f5 100644
--- a/src/core/algorithms/od/fastod/util/type_util.cpp
+++ b/src/core/algorithms/od/fastod/util/type_util.cpp
@@ -1,4 +1,4 @@
-#include "type_util.h"
+#include "core/algorithms/od/fastod/util/type_util.h"
 
 #include <string>
 
diff --git a/src/core/algorithms/od/fastod/util/type_util.h b/src/core/algorithms/od/fastod/util/type_util.h
index 0372b03831..4c548ab80f 100644
--- a/src/core/algorithms/od/fastod/util/type_util.h
+++ b/src/core/algorithms/od/fastod/util/type_util.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "algorithms/od/fastod/storage/data_frame.h"
-#include "model/types/builtin.h"
+#include "core/algorithms/od/fastod/storage/data_frame.h"
+#include "core/model/types/builtin.h"
 
 namespace algos::fastod {
 
diff --git a/src/core/algorithms/od/mining_algorithms.h b/src/core/algorithms/od/mining_algorithms.h
index 8091a813cf..4640e91951 100644
--- a/src/core/algorithms/od/mining_algorithms.h
+++ b/src/core/algorithms/od/mining_algorithms.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#include "algorithms/od/fastod/fastod.h"
-#include "algorithms/od/order/order.h"
+#include "core/algorithms/od/fastod/fastod.h"
+#include "core/algorithms/od/order/order.h"
diff --git a/src/core/algorithms/od/order/dependency_checker.cpp b/src/core/algorithms/od/order/dependency_checker.cpp
index 96bd1561e8..0514551fb6 100644
--- a/src/core/algorithms/od/order/dependency_checker.cpp
+++ b/src/core/algorithms/od/order/dependency_checker.cpp
@@ -1,9 +1,9 @@
-#include "dependency_checker.h"
+#include "core/algorithms/od/order/dependency_checker.h"
 
 #include <algorithm>
 #include <unordered_set>
 
-#include "model/table/tuple_index.h"
+#include "core/model/table/tuple_index.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/dependency_checker.h b/src/core/algorithms/od/order/dependency_checker.h
index 933665d8de..9d38567d21 100644
--- a/src/core/algorithms/od/order/dependency_checker.h
+++ b/src/core/algorithms/od/order/dependency_checker.h
@@ -2,7 +2,7 @@
 
 #include <enum.h>
 
-#include "sorted_partitions.h"
+#include "core/algorithms/od/order/sorted_partitions.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/list_lattice.cpp b/src/core/algorithms/od/order/list_lattice.cpp
index 63c4aa2705..49e3618065 100644
--- a/src/core/algorithms/od/order/list_lattice.cpp
+++ b/src/core/algorithms/od/order/list_lattice.cpp
@@ -1,6 +1,6 @@
-#include "list_lattice.h"
+#include "core/algorithms/od/order/list_lattice.h"
 
-#include "order_utility.h"
+#include "core/algorithms/od/order/order_utility.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/list_lattice.h b/src/core/algorithms/od/order/list_lattice.h
index bb8b589fe2..f1a4dbab59 100644
--- a/src/core/algorithms/od/order/list_lattice.h
+++ b/src/core/algorithms/od/order/list_lattice.h
@@ -3,7 +3,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "order_utility.h"
+#include "core/algorithms/od/order/order_utility.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/list_od.h b/src/core/algorithms/od/order/list_od.h
index 4be3cb651c..351d907dc2 100644
--- a/src/core/algorithms/od/order/list_od.h
+++ b/src/core/algorithms/od/order/list_od.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "order_utility.h"
+#include "core/algorithms/od/order/order_utility.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/order.cpp b/src/core/algorithms/od/order/order.cpp
index e9ce52ba10..646a4c5092 100644
--- a/src/core/algorithms/od/order/order.cpp
+++ b/src/core/algorithms/od/order/order.cpp
@@ -1,18 +1,18 @@
-#include "order.h"
+#include "core/algorithms/od/order/order.h"
 
 #include <algorithm>
 #include <iostream>
 #include <memory>
 #include <utility>
 
-#include "config/names_and_descriptions.h"
-#include "config/tabular_data/input_table/option.h"
-#include "dependency_checker.h"
-#include "list_lattice.h"
-#include "model/table/tuple_index.h"
-#include "model/types/types.h"
-#include "order_utility.h"
-#include "util/logger.h"
+#include "core/algorithms/od/order/dependency_checker.h"
+#include "core/algorithms/od/order/list_lattice.h"
+#include "core/algorithms/od/order/order_utility.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/model/table/tuple_index.h"
+#include "core/model/types/types.h"
+#include "core/util/logger.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/order.h b/src/core/algorithms/od/order/order.h
index 94ad6f8cc8..3b5084f1a3 100644
--- a/src/core/algorithms/od/order/order.h
+++ b/src/core/algorithms/od/order/order.h
@@ -4,13 +4,13 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "algorithms/algorithm.h"
-#include "config/tabular_data/input_table_type.h"
-#include "dependency_checker.h"
-#include "list_lattice.h"
-#include "model/table/column_layout_typed_relation_data.h"
-#include "order_utility.h"
-#include "sorted_partitions.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/od/order/dependency_checker.h"
+#include "core/algorithms/od/order/list_lattice.h"
+#include "core/algorithms/od/order/order_utility.h"
+#include "core/algorithms/od/order/sorted_partitions.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/order_utility.cpp b/src/core/algorithms/od/order/order_utility.cpp
index 73e29d4b96..22c0e8b088 100644
--- a/src/core/algorithms/od/order/order_utility.cpp
+++ b/src/core/algorithms/od/order/order_utility.cpp
@@ -1,9 +1,9 @@
-#include "order_utility.h"
+#include "core/algorithms/od/order/order_utility.h"
 
-#include "list_lattice.h"
-#include "model/table/column_index.h"
-#include "model/table/typed_column_data.h"
-#include "util/logger.h"
+#include "core/algorithms/od/order/list_lattice.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/typed_column_data.h"
+#include "core/util/logger.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/order_utility.h b/src/core/algorithms/od/order/order_utility.h
index cfa4a2b69b..ad7161d6a2 100644
--- a/src/core/algorithms/od/order/order_utility.h
+++ b/src/core/algorithms/od/order/order_utility.h
@@ -6,9 +6,9 @@
 
 #include <boost/container_hash/hash.hpp>
 
-#include "model/table/column_index.h"
-#include "model/table/tuple_index.h"
-#include "model/table/typed_column_data.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/tuple_index.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace algos::order {
 using Node = std::vector<model::ColumnIndex>;
diff --git a/src/core/algorithms/od/order/sorted_partitions.cpp b/src/core/algorithms/od/order/sorted_partitions.cpp
index bf3dc09147..d56ab04571 100644
--- a/src/core/algorithms/od/order/sorted_partitions.cpp
+++ b/src/core/algorithms/od/order/sorted_partitions.cpp
@@ -1,9 +1,9 @@
-#include "sorted_partitions.h"
+#include "core/algorithms/od/order/sorted_partitions.h"
 
 #include <unordered_map>
 #include <vector>
 
-#include "model/table/tuple_index.h"
+#include "core/model/table/tuple_index.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/order/sorted_partitions.h b/src/core/algorithms/od/order/sorted_partitions.h
index 5c30148902..7914819494 100644
--- a/src/core/algorithms/od/order/sorted_partitions.h
+++ b/src/core/algorithms/od/order/sorted_partitions.h
@@ -4,7 +4,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "model/table/tuple_index.h"
+#include "core/model/table/tuple_index.h"
 
 namespace algos::order {
 
diff --git a/src/core/algorithms/od/set_based_verifier/verifier.cpp b/src/core/algorithms/od/set_based_verifier/verifier.cpp
index 10e1e44742..d1d18df356 100644
--- a/src/core/algorithms/od/set_based_verifier/verifier.cpp
+++ b/src/core/algorithms/od/set_based_verifier/verifier.cpp
@@ -1,15 +1,15 @@
-#include "verifier.h"
+#include "core/algorithms/od/set_based_verifier/verifier.h"
 
 #include <stdexcept>
 
-#include "algorithms/od/fastod/model/canonical_od.h"
-#include "config/column_index/option.h"
-#include "config/indices/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/tabular_data/input_table/option.h"
-#include "util/logger.h"
-#include "util/range_to_string.h"
-#include "util/timed_invoke.h"
+#include "core/algorithms/od/fastod/model/canonical_od.h"
+#include "core/config/column_index/option.h"
+#include "core/config/indices/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/util/logger.h"
+#include "core/util/range_to_string.h"
+#include "core/util/timed_invoke.h"
 
 namespace algos::od {
 
diff --git a/src/core/algorithms/od/set_based_verifier/verifier.h b/src/core/algorithms/od/set_based_verifier/verifier.h
index 3396870513..3eb2055195 100644
--- a/src/core/algorithms/od/set_based_verifier/verifier.h
+++ b/src/core/algorithms/od/set_based_verifier/verifier.h
@@ -2,13 +2,13 @@
 
 #include <cstddef>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/od/fastod/od_ordering.h"
-#include "algorithms/od/fastod/storage/data_frame.h"
-#include "algorithms/od/fastod/storage/partition_cache.h"
-#include "config/indices/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "od/fastod/model/removal_set.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/od/fastod/model/removal_set.h"
+#include "core/algorithms/od/fastod/od_ordering.h"
+#include "core/algorithms/od/fastod/storage/data_frame.h"
+#include "core/algorithms/od/fastod/storage/partition_cache.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace algos::od {
 
diff --git a/src/core/algorithms/statistics/algorithms.h b/src/core/algorithms/statistics/algorithms.h
index 19ffe640a3..cf3e4a9bc1 100644
--- a/src/core/algorithms/statistics/algorithms.h
+++ b/src/core/algorithms/statistics/algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "algorithms/statistics/data_stats.h"
+#include "core/algorithms/statistics/data_stats.h"
diff --git a/src/core/algorithms/statistics/data_stats.cpp b/src/core/algorithms/statistics/data_stats.cpp
index 121b044c8a..cfd66d8348 100644
--- a/src/core/algorithms/statistics/data_stats.cpp
+++ b/src/core/algorithms/statistics/data_stats.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/statistics/data_stats.h"
+#include "core/algorithms/statistics/data_stats.h"
 
 #include <set>
 
@@ -6,9 +6,9 @@
 #include <boost/asio/thread_pool.hpp>
 #include <boost/thread.hpp>
 
-#include "config/equal_nulls/option.h"
-#include "config/tabular_data/input_table/option.h"
-#include "config/thread_number/option.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/tabular_data/input_table/option.h"
+#include "core/config/thread_number/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/statistics/data_stats.h b/src/core/algorithms/statistics/data_stats.h
index f9939a6b42..1b5f27b6b3 100644
--- a/src/core/algorithms/statistics/data_stats.h
+++ b/src/core/algorithms/statistics/data_stats.h
@@ -2,12 +2,12 @@
 
 #include <set>
 
-#include "algorithms/fd/fd_algorithm.h"
-#include "algorithms/statistics/statistic.h"
-#include "config/equal_nulls/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "config/thread_number/type.h"
-#include "model/table/column_layout_typed_relation_data.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/algorithms/statistics/statistic.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/statistics/statistic.cpp b/src/core/algorithms/statistics/statistic.cpp
index bddffd1b5c..2a92d40490 100644
--- a/src/core/algorithms/statistics/statistic.cpp
+++ b/src/core/algorithms/statistics/statistic.cpp
@@ -1,4 +1,4 @@
-#include "statistic.h"
+#include "core/algorithms/statistics/statistic.h"
 
 #include <memory>
 
diff --git a/src/core/algorithms/statistics/statistic.h b/src/core/algorithms/statistics/statistic.h
index 2da1d8ff7a..697adccaa1 100644
--- a/src/core/algorithms/statistics/statistic.h
+++ b/src/core/algorithms/statistics/statistic.h
@@ -2,7 +2,7 @@
 
 #include <unordered_map>
 
-#include "types.h"
+#include "core/model/types/types.h"
 
 namespace algos {
 class Statistic {
diff --git a/src/core/algorithms/ucc/hpivalid/hpivalid.cpp b/src/core/algorithms/ucc/hpivalid/hpivalid.cpp
index 0480c9c545..48c1631ce6 100644
--- a/src/core/algorithms/ucc/hpivalid/hpivalid.cpp
+++ b/src/core/algorithms/ucc/hpivalid/hpivalid.cpp
@@ -1,15 +1,15 @@
-#include "algorithms/ucc/hpivalid/hpivalid.h"
+#include "core/algorithms/ucc/hpivalid/hpivalid.h"
 
 #include <deque>
 #include <utility>
 #include <vector>
 
-#include "algorithms/fd/hycommon/preprocessor.h"
-#include "algorithms/fd/hycommon/types.h"
-#include "algorithms/ucc/hpivalid/config.h"
-#include "algorithms/ucc/hpivalid/result_collector.h"
-#include "algorithms/ucc/hpivalid/tree_search.h"
-#include "util/logger.h"
+#include "core/algorithms/fd/hycommon/preprocessor.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/algorithms/ucc/hpivalid/config.h"
+#include "core/algorithms/ucc/hpivalid/result_collector.h"
+#include "core/algorithms/ucc/hpivalid/tree_search.h"
+#include "core/util/logger.h"
 
 // see algorithms/ucc/hpivalid/LICENSE
 
diff --git a/src/core/algorithms/ucc/hpivalid/hpivalid.h b/src/core/algorithms/ucc/hpivalid/hpivalid.h
index 33c1c656db..19b0e9ce02 100644
--- a/src/core/algorithms/ucc/hpivalid/hpivalid.h
+++ b/src/core/algorithms/ucc/hpivalid/hpivalid.h
@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include "algorithms/ucc/hpivalid/config.h"
-#include "algorithms/ucc/hpivalid/pli_table.h"
-#include "algorithms/ucc/hpivalid/result_collector.h"
-#include "algorithms/ucc/ucc_algorithm.h"
-#include "model/table/column_layout_relation_data.h"
+#include "core/algorithms/ucc/hpivalid/config.h"
+#include "core/algorithms/ucc/hpivalid/pli_table.h"
+#include "core/algorithms/ucc/hpivalid/result_collector.h"
+#include "core/algorithms/ucc/ucc_algorithm.h"
+#include "core/model/table/column_layout_relation_data.h"
 
 // see algorithms/ucc/hpivalid/LICENSE
 
diff --git a/src/core/algorithms/ucc/hpivalid/hypergraph.cpp b/src/core/algorithms/ucc/hpivalid/hypergraph.cpp
index 5753647dec..163cc527a6 100644
--- a/src/core/algorithms/ucc/hpivalid/hypergraph.cpp
+++ b/src/core/algorithms/ucc/hpivalid/hypergraph.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/ucc/hpivalid/hypergraph.h"
+#include "core/algorithms/ucc/hpivalid/hypergraph.h"
 
 // see algorithms/ucc/hpivalid/LICENSE
 
diff --git a/src/core/algorithms/ucc/hpivalid/pli_table.h b/src/core/algorithms/ucc/hpivalid/pli_table.h
index 10fbd18e30..76d701b34c 100644
--- a/src/core/algorithms/ucc/hpivalid/pli_table.h
+++ b/src/core/algorithms/ucc/hpivalid/pli_table.h
@@ -4,9 +4,9 @@
 #include <limits>
 #include <vector>
 
-#include "algorithms/fd/hycommon/types.h"
-#include "model/table/position_list_index.h"
-#include "model/table/tuple_index.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/model/table/position_list_index.h"
+#include "core/model/table/tuple_index.h"
 
 // see algorithms/ucc/hpivalid/LICENSE
 
diff --git a/src/core/algorithms/ucc/hpivalid/result_collector.cpp b/src/core/algorithms/ucc/hpivalid/result_collector.cpp
index 9e5fb30b99..ad7b1b9f8b 100644
--- a/src/core/algorithms/ucc/hpivalid/result_collector.cpp
+++ b/src/core/algorithms/ucc/hpivalid/result_collector.cpp
@@ -1,11 +1,11 @@
-#include "algorithms/ucc/hpivalid/result_collector.h"
+#include "core/algorithms/ucc/hpivalid/result_collector.h"
 
 #include <chrono>
 #include <sstream>
 #include <string>
 #include <vector>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 // see algorithms/ucc/hpivalid/LICENSE
 
diff --git a/src/core/algorithms/ucc/hpivalid/result_collector.h b/src/core/algorithms/ucc/hpivalid/result_collector.h
index 53961d8f2d..80d6bc066f 100644
--- a/src/core/algorithms/ucc/hpivalid/result_collector.h
+++ b/src/core/algorithms/ucc/hpivalid/result_collector.h
@@ -4,11 +4,11 @@
 #include <string>
 #include <vector>
 
-#include "algorithms/ucc/hpivalid/enums.h"
-#include "algorithms/ucc/hpivalid/hypergraph.h"
-#include "algorithms/ucc/raw_ucc.h"
-#include "algorithms/ucc/ucc_algorithm.h"
-#include "model/table/column_layout_relation_data.h"
+#include "core/algorithms/ucc/hpivalid/enums.h"
+#include "core/algorithms/ucc/hpivalid/hypergraph.h"
+#include "core/algorithms/ucc/raw_ucc.h"
+#include "core/algorithms/ucc/ucc_algorithm.h"
+#include "core/model/table/column_layout_relation_data.h"
 
 // see algorithms/ucc/hpivalid/LICENSE
 
diff --git a/src/core/algorithms/ucc/hpivalid/tree_search.cpp b/src/core/algorithms/ucc/hpivalid/tree_search.cpp
index 78e7c7b5c5..9524abb689 100644
--- a/src/core/algorithms/ucc/hpivalid/tree_search.cpp
+++ b/src/core/algorithms/ucc/hpivalid/tree_search.cpp
@@ -1,4 +1,4 @@
-#include "algorithms/ucc/hpivalid/tree_search.h"
+#include "core/algorithms/ucc/hpivalid/tree_search.h"
 
 #include <algorithm>
 #include <cstddef>
@@ -10,10 +10,10 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/ucc/hpivalid/config.h"
-#include "algorithms/ucc/hpivalid/pli_table.h"
-#include "algorithms/ucc/hpivalid/result_collector.h"
-#include "util/logger.h"
+#include "core/algorithms/ucc/hpivalid/config.h"
+#include "core/algorithms/ucc/hpivalid/pli_table.h"
+#include "core/algorithms/ucc/hpivalid/result_collector.h"
+#include "core/util/logger.h"
 
 // see algorithms/ucc/hpivalid/LICENSE
 
diff --git a/src/core/algorithms/ucc/hpivalid/tree_search.h b/src/core/algorithms/ucc/hpivalid/tree_search.h
index a312fe7787..f74dd89eb3 100644
--- a/src/core/algorithms/ucc/hpivalid/tree_search.h
+++ b/src/core/algorithms/ucc/hpivalid/tree_search.h
@@ -5,8 +5,8 @@
 #include <stack>
 #include <vector>
 
-#include "algorithms/ucc/hpivalid/hypergraph.h"
-#include "model/table/position_list_index.h"
+#include "core/algorithms/ucc/hpivalid/hypergraph.h"
+#include "core/model/table/position_list_index.h"
 
 // see algorithms/ucc/hpivalid/LICENSE
 
diff --git a/src/core/algorithms/ucc/hyucc/hyucc.cpp b/src/core/algorithms/ucc/hyucc/hyucc.cpp
index ad8910c287..d37d92febb 100644
--- a/src/core/algorithms/ucc/hyucc/hyucc.cpp
+++ b/src/core/algorithms/ucc/hyucc/hyucc.cpp
@@ -1,13 +1,13 @@
-#include "hyucc.h"
+#include "core/algorithms/ucc/hyucc/hyucc.h"
 
 #include <chrono>
 
-#include "fd/hycommon/types.h"
-#include "inductor.h"
-#include "preprocessor.h"
-#include "sampler.h"
-#include "util/logger.h"
-#include "validator.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/algorithms/ucc/hyucc/inductor.h"
+#include "core/algorithms/ucc/hyucc/preprocessor.h"
+#include "core/algorithms/ucc/hyucc/sampler.h"
+#include "core/algorithms/ucc/hyucc/validator.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ucc/hyucc/hyucc.h b/src/core/algorithms/ucc/hyucc/hyucc.h
index bb15bf7a0c..8daf6aa1b2 100644
--- a/src/core/algorithms/ucc/hyucc/hyucc.h
+++ b/src/core/algorithms/ucc/hyucc/hyucc.h
@@ -2,12 +2,12 @@
 
 #include <memory>
 
-#include "config/thread_number/option.h"
-#include "config/thread_number/type.h"
-#include "fd/hycommon/types.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/idataset_stream.h"
-#include "ucc/ucc_algorithm.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/algorithms/ucc/ucc_algorithm.h"
+#include "core/config/thread_number/option.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/idataset_stream.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ucc/hyucc/inductor.cpp b/src/core/algorithms/ucc/hyucc/inductor.cpp
index 22d9398ee6..02e13f7fe7 100644
--- a/src/core/algorithms/ucc/hyucc/inductor.cpp
+++ b/src/core/algorithms/ucc/hyucc/inductor.cpp
@@ -1,4 +1,4 @@
-#include "inductor.h"
+#include "core/algorithms/ucc/hyucc/inductor.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/hyucc/inductor.h b/src/core/algorithms/ucc/hyucc/inductor.h
index 6ff399b330..53b0d8db47 100644
--- a/src/core/algorithms/ucc/hyucc/inductor.h
+++ b/src/core/algorithms/ucc/hyucc/inductor.h
@@ -2,9 +2,9 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "algorithms/ucc/hyucc/model/non_ucc_list.h"
-#include "algorithms/ucc/hyucc/model/ucc_tree.h"
-#include "algorithms/ucc/raw_ucc.h"
+#include "core/algorithms/ucc/hyucc/model/non_ucc_list.h"
+#include "core/algorithms/ucc/hyucc/model/ucc_tree.h"
+#include "core/algorithms/ucc/raw_ucc.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/hyucc/model/non_ucc_list.h b/src/core/algorithms/ucc/hyucc/model/non_ucc_list.h
index 6d6b201738..cd6b7e2e3f 100644
--- a/src/core/algorithms/ucc/hyucc/model/non_ucc_list.h
+++ b/src/core/algorithms/ucc/hyucc/model/non_ucc_list.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fd/hycommon/column_combination_list.h"
+#include "core/algorithms/fd/hycommon/column_combination_list.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/hyucc/model/ucc_tree.cpp b/src/core/algorithms/ucc/hyucc/model/ucc_tree.cpp
index c16d11293a..2afb6f3373 100644
--- a/src/core/algorithms/ucc/hyucc/model/ucc_tree.cpp
+++ b/src/core/algorithms/ucc/hyucc/model/ucc_tree.cpp
@@ -1,4 +1,4 @@
-#include "ucc_tree.h"
+#include "core/algorithms/ucc/hyucc/model/ucc_tree.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/hyucc/model/ucc_tree.h b/src/core/algorithms/ucc/hyucc/model/ucc_tree.h
index f29490135d..3d57a9bc9f 100644
--- a/src/core/algorithms/ucc/hyucc/model/ucc_tree.h
+++ b/src/core/algorithms/ucc/hyucc/model/ucc_tree.h
@@ -4,7 +4,7 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "ucc_tree_vertex.h"
+#include "core/algorithms/ucc/hyucc/model/ucc_tree_vertex.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/hyucc/model/ucc_tree_vertex.cpp b/src/core/algorithms/ucc/hyucc/model/ucc_tree_vertex.cpp
index eb89cc8afb..5e575fe96d 100644
--- a/src/core/algorithms/ucc/hyucc/model/ucc_tree_vertex.cpp
+++ b/src/core/algorithms/ucc/hyucc/model/ucc_tree_vertex.cpp
@@ -1,4 +1,4 @@
-#include "ucc_tree_vertex.h"
+#include "core/algorithms/ucc/hyucc/model/ucc_tree_vertex.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/hyucc/preprocessor.h b/src/core/algorithms/ucc/hyucc/preprocessor.h
index 7eb77fb111..191754200a 100644
--- a/src/core/algorithms/ucc/hyucc/preprocessor.h
+++ b/src/core/algorithms/ucc/hyucc/preprocessor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fd/hycommon/preprocessor.h"
+#include "core/algorithms/fd/hycommon/preprocessor.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/hyucc/sampler.h b/src/core/algorithms/ucc/hyucc/sampler.h
index a0a8466c51..909ff58795 100644
--- a/src/core/algorithms/ucc/hyucc/sampler.h
+++ b/src/core/algorithms/ucc/hyucc/sampler.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "config/thread_number/type.h"
-#include "fd/hycommon/sampler.h"
-#include "fd/hycommon/types.h"
-#include "ucc/hyucc/model/non_ucc_list.h"
+#include "core/algorithms/fd/hycommon/sampler.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/algorithms/ucc/hyucc/model/non_ucc_list.h"
+#include "core/config/thread_number/type.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/hyucc/validator.cpp b/src/core/algorithms/ucc/hyucc/validator.cpp
index 902e002a87..cc38f50c34 100644
--- a/src/core/algorithms/ucc/hyucc/validator.cpp
+++ b/src/core/algorithms/ucc/hyucc/validator.cpp
@@ -1,13 +1,13 @@
-#include "validator.h"
+#include "core/algorithms/ucc/hyucc/validator.h"
 
 #include <future>
 
 #include <boost/asio/post.hpp>
 #include <boost/asio/thread_pool.hpp>
 
-#include "fd/hycommon/efficiency_threshold.h"
-#include "fd/hycommon/validator_helpers.h"
-#include "ucc/hyucc/model/ucc_tree_vertex.h"
+#include "core/algorithms/fd/hycommon/efficiency_threshold.h"
+#include "core/algorithms/fd/hycommon/validator_helpers.h"
+#include "core/algorithms/ucc/hyucc/model/ucc_tree_vertex.h"
 
 namespace {
 
diff --git a/src/core/algorithms/ucc/hyucc/validator.h b/src/core/algorithms/ucc/hyucc/validator.h
index 7367a41265..54b3bdd28f 100644
--- a/src/core/algorithms/ucc/hyucc/validator.h
+++ b/src/core/algorithms/ucc/hyucc/validator.h
@@ -4,12 +4,12 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/ucc/hyucc/model/ucc_tree.h"
-#include "algorithms/ucc/raw_ucc.h"
-#include "config/thread_number/type.h"
-#include "fd/hycommon/primitive_validations.h"
-#include "fd/hycommon/types.h"
-#include "model/table/position_list_index.h"
+#include "core/algorithms/fd/hycommon/primitive_validations.h"
+#include "core/algorithms/fd/hycommon/types.h"
+#include "core/algorithms/ucc/hyucc/model/ucc_tree.h"
+#include "core/algorithms/ucc/raw_ucc.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/position_list_index.h"
 
 namespace algos::hyucc {
 
diff --git a/src/core/algorithms/ucc/mining_algorithms.h b/src/core/algorithms/ucc/mining_algorithms.h
index ba32ced832..ed487c1dac 100644
--- a/src/core/algorithms/ucc/mining_algorithms.h
+++ b/src/core/algorithms/ucc/mining_algorithms.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "algorithms/ucc/hpivalid/hpivalid.h"
-#include "algorithms/ucc/hyucc/hyucc.h"
-#include "algorithms/ucc/pyroucc/pyroucc.h"
+#include "core/algorithms/ucc/hpivalid/hpivalid.h"
+#include "core/algorithms/ucc/hyucc/hyucc.h"
+#include "core/algorithms/ucc/pyroucc/pyroucc.h"
diff --git a/src/core/algorithms/ucc/pyroucc/pyroucc.cpp b/src/core/algorithms/ucc/pyroucc/pyroucc.cpp
index 78ae3c336f..7d3316fe37 100644
--- a/src/core/algorithms/ucc/pyroucc/pyroucc.cpp
+++ b/src/core/algorithms/ucc/pyroucc/pyroucc.cpp
@@ -1,15 +1,15 @@
-#include "algorithms/ucc/pyroucc/pyroucc.h"
+#include "core/algorithms/ucc/pyroucc/pyroucc.h"
 
 #include <chrono>
 #include <mutex>
 #include <thread>
 
-#include "algorithms/fd/pyrocommon/core/key_g1_strategy.h"
-#include "config/error/option.h"
-#include "config/max_lhs/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "util/logger.h"
+#include "core/algorithms/fd/pyrocommon/core/key_g1_strategy.h"
+#include "core/config/error/option.h"
+#include "core/config/max_lhs/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/util/logger.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ucc/pyroucc/pyroucc.h b/src/core/algorithms/ucc/pyroucc/pyroucc.h
index e658afdf7f..1a781bd73c 100644
--- a/src/core/algorithms/ucc/pyroucc/pyroucc.h
+++ b/src/core/algorithms/ucc/pyroucc/pyroucc.h
@@ -3,10 +3,10 @@
 #include <list>
 #include <mutex>
 
-#include "algorithms/fd/pli_based_fd_algorithm.h"
-#include "algorithms/fd/pyrocommon/core/dependency_consumer.h"
-#include "algorithms/fd/pyrocommon/core/search_space.h"
-#include "ucc/ucc_algorithm.h"
+#include "core/algorithms/fd/pli_based_fd_algorithm.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_consumer.h"
+#include "core/algorithms/fd/pyrocommon/core/search_space.h"
+#include "core/algorithms/ucc/ucc_algorithm.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ucc/ucc.h b/src/core/algorithms/ucc/ucc.h
index ce889bcdd1..ac255843a8 100644
--- a/src/core/algorithms/ucc/ucc.h
+++ b/src/core/algorithms/ucc/ucc.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "model/table/vertical.h"
+#include "core/model/table/vertical.h"
 
 namespace model {
 
diff --git a/src/core/algorithms/ucc/ucc_algorithm.cpp b/src/core/algorithms/ucc/ucc_algorithm.cpp
index 89762dd61a..92a59a84af 100644
--- a/src/core/algorithms/ucc/ucc_algorithm.cpp
+++ b/src/core/algorithms/ucc/ucc_algorithm.cpp
@@ -1,7 +1,7 @@
-#include "ucc_algorithm.h"
+#include "core/algorithms/ucc/ucc_algorithm.h"
 
-#include "config/equal_nulls/option.h"
-#include "config/tabular_data/input_table/option.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/tabular_data/input_table/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ucc/ucc_algorithm.h b/src/core/algorithms/ucc/ucc_algorithm.h
index 2ac880fdd2..27031c998a 100644
--- a/src/core/algorithms/ucc/ucc_algorithm.h
+++ b/src/core/algorithms/ucc/ucc_algorithm.h
@@ -4,11 +4,11 @@
 #include <string_view>
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "config/equal_nulls/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "ucc.h"
-#include "util/primitive_collection.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/ucc/ucc.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/util/primitive_collection.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ucc/ucc_verifier/ucc_stats_calculator.h b/src/core/algorithms/ucc/ucc_verifier/ucc_stats_calculator.h
index d276bbf62b..4b82387c2a 100644
--- a/src/core/algorithms/ucc/ucc_verifier/ucc_stats_calculator.h
+++ b/src/core/algorithms/ucc/ucc_verifier/ucc_stats_calculator.h
@@ -2,10 +2,10 @@
 
 #include <vector>
 
-#include "config/equal_nulls/type.h"
-#include "config/indices/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_layout_relation_data.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_relation_data.h"
 
 namespace algos {
 class UCCStatsCalculator {
diff --git a/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.cpp b/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.cpp
index 8292c8cfee..040f1332b2 100644
--- a/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.cpp
+++ b/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.cpp
@@ -1,14 +1,14 @@
-#include "ucc_verifier.h"
+#include "core/algorithms/ucc/ucc_verifier/ucc_verifier.h"
 
 #include <chrono>
 #include <numeric>
 #include <stdexcept>
 
-#include "config/equal_nulls/option.h"
-#include "config/indices/option.h"
-#include "config/names_and_descriptions.h"
-#include "config/option_using.h"
-#include "config/tabular_data/input_table/option.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/indices/option.h"
+#include "core/config/names_and_descriptions.h"
+#include "core/config/option_using.h"
+#include "core/config/tabular_data/input_table/option.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.h b/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.h
index 69258e67c1..bfc41003ff 100644
--- a/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.h
+++ b/src/core/algorithms/ucc/ucc_verifier/ucc_verifier.h
@@ -2,12 +2,12 @@
 
 #include <vector>
 
-#include "algorithms/algorithm.h"
-#include "algorithms/ucc/ucc_verifier/ucc_stats_calculator.h"
-#include "config/equal_nulls/type.h"
-#include "config/indices/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_layout_relation_data.h"
+#include "core/algorithms/algorithm.h"
+#include "core/algorithms/ucc/ucc_verifier/ucc_stats_calculator.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_layout_relation_data.h"
 
 namespace algos {
 
diff --git a/src/core/algorithms/ucc/verification_algorithms.h b/src/core/algorithms/ucc/verification_algorithms.h
index da3ac3fcc9..a88c86c2a8 100644
--- a/src/core/algorithms/ucc/verification_algorithms.h
+++ b/src/core/algorithms/ucc/verification_algorithms.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include "ucc/ucc_verifier/ucc_verifier.h"
+#include "core/algorithms/ucc/ucc_verifier/ucc_verifier.h"
diff --git a/src/core/config/column_index/option.cpp b/src/core/config/column_index/option.cpp
index dc00da15f8..c38eaa17c6 100644
--- a/src/core/config/column_index/option.cpp
+++ b/src/core/config/column_index/option.cpp
@@ -1,6 +1,6 @@
-#include "config/column_index/option.h"
+#include "core/config/column_index/option.h"
 
-#include "config/column_index/validate_index.h"
+#include "core/config/column_index/validate_index.h"
 
 namespace config {
 
diff --git a/src/core/config/column_index/option.h b/src/core/config/column_index/option.h
index 856ded9c33..87330df193 100644
--- a/src/core/config/column_index/option.h
+++ b/src/core/config/column_index/option.h
@@ -2,8 +2,8 @@
 
 #include <string_view>
 
-#include "config/column_index/type.h"
-#include "config/common_option.h"
+#include "core/config/column_index/type.h"
+#include "core/config/common_option.h"
 
 namespace config {
 
diff --git a/src/core/config/column_index/type.h b/src/core/config/column_index/type.h
index d3176272f5..a17cee39db 100644
--- a/src/core/config/column_index/type.h
+++ b/src/core/config/column_index/type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "model/table/column_index.h"
+#include "core/model/table/column_index.h"
 
 namespace config {
 using IndexType = model::ColumnIndex;
diff --git a/src/core/config/column_index/validate_index.cpp b/src/core/config/column_index/validate_index.cpp
index ed70c541cf..91ff9ffa59 100644
--- a/src/core/config/column_index/validate_index.cpp
+++ b/src/core/config/column_index/validate_index.cpp
@@ -1,6 +1,6 @@
-#include "config/column_index/validate_index.h"
+#include "core/config/column_index/validate_index.h"
 
-#include "config/exceptions.h"
+#include "core/config/exceptions.h"
 
 namespace config {
 
diff --git a/src/core/config/column_index/validate_index.h b/src/core/config/column_index/validate_index.h
index 96e7215466..29434c9ea7 100644
--- a/src/core/config/column_index/validate_index.h
+++ b/src/core/config/column_index/validate_index.h
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 
-#include "config/indices/type.h"
+#include "core/config/indices/type.h"
 
 namespace config {
 void ValidateIndex(IndexType value, size_t cols_count);
diff --git a/src/core/config/common_option.h b/src/core/config/common_option.h
index 135050394c..d850b25f91 100644
--- a/src/core/config/common_option.h
+++ b/src/core/config/common_option.h
@@ -6,7 +6,7 @@
 
 #include <boost/functional/overloaded_function.hpp>
 
-#include "config/option.h"
+#include "core/config/option.h"
 
 namespace config {
 
diff --git a/src/core/config/custom_random_seed/option.cpp b/src/core/config/custom_random_seed/option.cpp
index 525d5cd5de..044426501b 100644
--- a/src/core/config/custom_random_seed/option.cpp
+++ b/src/core/config/custom_random_seed/option.cpp
@@ -1,8 +1,8 @@
-#include "config/custom_random_seed/option.h"
+#include "core/config/custom_random_seed/option.h"
 
 #include <utility>
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 extern CommonOption<CustomRandomSeedType> const kCustomRandomFlagOpt{
diff --git a/src/core/config/custom_random_seed/option.h b/src/core/config/custom_random_seed/option.h
index 1c46d1782e..6e823cfc82 100644
--- a/src/core/config/custom_random_seed/option.h
+++ b/src/core/config/custom_random_seed/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/custom_random_seed/type.h"
+#include "core/config/common_option.h"
+#include "core/config/custom_random_seed/type.h"
 
 namespace config {
 extern CommonOption<CustomRandomSeedType> const kCustomRandomFlagOpt;
diff --git a/src/core/config/descriptions.h b/src/core/config/descriptions.h
index 5a9a731eaf..07db57a95c 100644
--- a/src/core/config/descriptions.h
+++ b/src/core/config/descriptions.h
@@ -3,13 +3,13 @@
 #include <sstream>
 #include <string>
 
-#include "algorithms/cfd/enums.h"
-#include "algorithms/fd/tane/enums.h"
-#include "algorithms/md/hymd/enums.h"
-#include "algorithms/metric/enums.h"
-#include "algorithms/nar/des/enums.h"
-#include "algorithms/od/fastod/od_ordering.h"
-#include "util/enum_to_available_values.h"
+#include "core/algorithms/cfd/enums.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/algorithms/md/hymd/enums.h"
+#include "core/algorithms/metric/enums.h"
+#include "core/algorithms/nar/des/enums.h"
+#include "core/algorithms/od/fastod/od_ordering.h"
+#include "core/util/enum_to_available_values.h"
 
 namespace config::descriptions {
 
diff --git a/src/core/config/equal_nulls/option.cpp b/src/core/config/equal_nulls/option.cpp
index 6ae3b16217..c171687e1e 100644
--- a/src/core/config/equal_nulls/option.cpp
+++ b/src/core/config/equal_nulls/option.cpp
@@ -1,6 +1,6 @@
-#include "config/equal_nulls/option.h"
+#include "core/config/equal_nulls/option.h"
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kEqualNulls, descriptions::kDEqualNulls;
diff --git a/src/core/config/equal_nulls/option.h b/src/core/config/equal_nulls/option.h
index fb34b164b8..95e962aabf 100644
--- a/src/core/config/equal_nulls/option.h
+++ b/src/core/config/equal_nulls/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/equal_nulls/type.h"
+#include "core/config/common_option.h"
+#include "core/config/equal_nulls/type.h"
 
 namespace config {
 extern CommonOption<EqNullsType> const kEqualNullsOpt;
diff --git a/src/core/config/error/option.cpp b/src/core/config/error/option.cpp
index 1a61b77c79..41320c6965 100644
--- a/src/core/config/error/option.cpp
+++ b/src/core/config/error/option.cpp
@@ -1,7 +1,7 @@
-#include "config/error/option.h"
+#include "core/config/error/option.h"
 
-#include "config/exceptions.h"
-#include "config/names_and_descriptions.h"
+#include "core/config/exceptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kError, descriptions::kDError;
diff --git a/src/core/config/error/option.h b/src/core/config/error/option.h
index 20be77cac7..d21903cadb 100644
--- a/src/core/config/error/option.h
+++ b/src/core/config/error/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/error/type.h"
+#include "core/config/common_option.h"
+#include "core/config/error/type.h"
 
 namespace config {
 
diff --git a/src/core/config/error_measure/option.cpp b/src/core/config/error_measure/option.cpp
index b3bb6c06cb..bcbd042eb8 100644
--- a/src/core/config/error_measure/option.cpp
+++ b/src/core/config/error_measure/option.cpp
@@ -1,7 +1,7 @@
-#include "config/error_measure/option.h"
+#include "core/config/error_measure/option.h"
 
-#include "config/names_and_descriptions.h"
-#include "fd/tane/enums.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kPfdErrorMeasure, names::kAfdErrorMeasure, descriptions::kDPfdErrorMeasure,
diff --git a/src/core/config/error_measure/option.h b/src/core/config/error_measure/option.h
index d667578928..9ecd1463f2 100644
--- a/src/core/config/error_measure/option.h
+++ b/src/core/config/error_measure/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/error_measure/type.h"
+#include "core/config/common_option.h"
+#include "core/config/error_measure/type.h"
 
 namespace config {
 
diff --git a/src/core/config/error_measure/type.h b/src/core/config/error_measure/type.h
index 0f515b6905..58efbcdd95 100644
--- a/src/core/config/error_measure/type.h
+++ b/src/core/config/error_measure/type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "fd/tane/enums.h"
+#include "core/algorithms/fd/tane/enums.h"
 
 namespace config {
 using PfdErrorMeasureType = algos::PfdErrorMeasure;
diff --git a/src/core/config/indices/option.cpp b/src/core/config/indices/option.cpp
index 00436685d8..2e9894f124 100644
--- a/src/core/config/indices/option.cpp
+++ b/src/core/config/indices/option.cpp
@@ -1,10 +1,10 @@
-#include "config/indices/option.h"
+#include "core/config/indices/option.h"
 
 #include <algorithm>
 
-#include "config/column_index/validate_index.h"
-#include "config/exceptions.h"
-#include "config/names_and_descriptions.h"
+#include "core/config/column_index/validate_index.h"
+#include "core/config/exceptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 
diff --git a/src/core/config/indices/option.h b/src/core/config/indices/option.h
index d138c1f1d6..7e3e3a3873 100644
--- a/src/core/config/indices/option.h
+++ b/src/core/config/indices/option.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include "config/common_option.h"
-#include "config/indices/type.h"
+#include "core/config/common_option.h"
+#include "core/config/indices/type.h"
 
 namespace config {
 
diff --git a/src/core/config/indices/type.h b/src/core/config/indices/type.h
index 1c5e6d64d1..edbf1a1622 100644
--- a/src/core/config/indices/type.h
+++ b/src/core/config/indices/type.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "config/column_index/type.h"
+#include "core/config/column_index/type.h"
 
 namespace config {
 using IndicesType = std::vector<IndexType>;
diff --git a/src/core/config/ioption.h b/src/core/config/ioption.h
index cd457367af..272b342969 100644
--- a/src/core/config/ioption.h
+++ b/src/core/config/ioption.h
@@ -5,7 +5,7 @@
 #include <typeindex>
 #include <vector>
 
-#include "boost/any.hpp"
+#include <boost/any.hpp>
 
 namespace config {
 struct OptValue {
diff --git a/src/core/config/max_arity/option.cpp b/src/core/config/max_arity/option.cpp
index b979881c65..3117b5734e 100644
--- a/src/core/config/max_arity/option.cpp
+++ b/src/core/config/max_arity/option.cpp
@@ -1,8 +1,8 @@
-#include "config/max_arity/option.h"
+#include "core/config/max_arity/option.h"
 
 #include <limits>
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kMaximumArity, descriptions::kDMaximumArity;
diff --git a/src/core/config/max_arity/option.h b/src/core/config/max_arity/option.h
index 08a98e1a99..1d7f086104 100644
--- a/src/core/config/max_arity/option.h
+++ b/src/core/config/max_arity/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/max_arity/type.h"
+#include "core/config/common_option.h"
+#include "core/config/max_arity/type.h"
 
 namespace config {
 extern CommonOption<MaxArityType> const kMaxArityOpt;
diff --git a/src/core/config/max_arity/type.h b/src/core/config/max_arity/type.h
index 5f2a373b3f..09ff0ae422 100644
--- a/src/core/config/max_arity/type.h
+++ b/src/core/config/max_arity/type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "model/table/arity_index.h"
+#include "core/model/table/arity_index.h"
 
 namespace config {
 using MaxArityType = model::ArityIndex;
diff --git a/src/core/config/max_lhs/option.cpp b/src/core/config/max_lhs/option.cpp
index 42422eaa7c..c3fa58d78e 100644
--- a/src/core/config/max_lhs/option.cpp
+++ b/src/core/config/max_lhs/option.cpp
@@ -1,8 +1,8 @@
-#include "config/max_lhs/option.h"
+#include "core/config/max_lhs/option.h"
 
 #include <limits>
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kMaximumLhs, descriptions::kDMaximumLhs;
diff --git a/src/core/config/max_lhs/option.h b/src/core/config/max_lhs/option.h
index 483aa62748..ef62712f20 100644
--- a/src/core/config/max_lhs/option.h
+++ b/src/core/config/max_lhs/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/max_lhs/type.h"
+#include "core/config/common_option.h"
+#include "core/config/max_lhs/type.h"
 
 namespace config {
 extern CommonOption<MaxLhsType> const kMaxLhsOpt;
diff --git a/src/core/config/mem_limit/option.cpp b/src/core/config/mem_limit/option.cpp
index 709dd277c3..9edf286265 100644
--- a/src/core/config/mem_limit/option.cpp
+++ b/src/core/config/mem_limit/option.cpp
@@ -1,6 +1,6 @@
-#include "config/mem_limit/option.h"
+#include "core/config/mem_limit/option.h"
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kMemLimitMB, descriptions::kDMemLimitMB;
diff --git a/src/core/config/mem_limit/option.h b/src/core/config/mem_limit/option.h
index 5db4184dee..c027b594db 100644
--- a/src/core/config/mem_limit/option.h
+++ b/src/core/config/mem_limit/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/mem_limit/type.h"
+#include "core/config/common_option.h"
+#include "core/config/mem_limit/type.h"
 
 namespace config {
 extern CommonOption<MemLimitMBType> const kMemLimitMbOpt;
diff --git a/src/core/config/names_and_descriptions.h b/src/core/config/names_and_descriptions.h
index 4a89f12ed6..6b0be5f01c 100644
--- a/src/core/config/names_and_descriptions.h
+++ b/src/core/config/names_and_descriptions.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#include "config/descriptions.h"
-#include "config/names.h"
+#include "core/config/descriptions.h"
+#include "core/config/names.h"
diff --git a/src/core/config/option.h b/src/core/config/option.h
index f39746a230..5d6b648b3c 100644
--- a/src/core/config/option.h
+++ b/src/core/config/option.h
@@ -7,8 +7,8 @@
 
 #include <boost/any.hpp>
 
-#include "config/exceptions.h"
-#include "config/ioption.h"
+#include "core/config/exceptions.h"
+#include "core/config/ioption.h"
 
 namespace config {
 
diff --git a/src/core/config/tabular_data/crud_operations/delete/option.cpp b/src/core/config/tabular_data/crud_operations/delete/option.cpp
index 9b118473c5..74fb9d9042 100644
--- a/src/core/config/tabular_data/crud_operations/delete/option.cpp
+++ b/src/core/config/tabular_data/crud_operations/delete/option.cpp
@@ -1,6 +1,6 @@
-#include "config/tabular_data/crud_operations/delete/option.h"
+#include "core/config/tabular_data/crud_operations/delete/option.h"
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kDeleteStatements, descriptions::kDDeleteStatements;
diff --git a/src/core/config/tabular_data/crud_operations/delete/option.h b/src/core/config/tabular_data/crud_operations/delete/option.h
index 7bd09db0fe..ba66576a86 100644
--- a/src/core/config/tabular_data/crud_operations/delete/option.h
+++ b/src/core/config/tabular_data/crud_operations/delete/option.h
@@ -3,8 +3,8 @@
 #include <cstddef>
 #include <unordered_set>
 
-#include "config/common_option.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/config/common_option.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace config {
 extern CommonOption<std::unordered_set<size_t>> const kDeleteStatementsOpt;
diff --git a/src/core/config/tabular_data/crud_operations/insert/option.cpp b/src/core/config/tabular_data/crud_operations/insert/option.cpp
index 3d10fe6616..4e3104579a 100644
--- a/src/core/config/tabular_data/crud_operations/insert/option.cpp
+++ b/src/core/config/tabular_data/crud_operations/insert/option.cpp
@@ -1,6 +1,6 @@
-#include "config/tabular_data/crud_operations/insert/option.h"
+#include "core/config/tabular_data/crud_operations/insert/option.h"
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kInsertStatements, descriptions::kDInsertStatements;
diff --git a/src/core/config/tabular_data/crud_operations/insert/option.h b/src/core/config/tabular_data/crud_operations/insert/option.h
index 688ecd40de..89a6896c04 100644
--- a/src/core/config/tabular_data/crud_operations/insert/option.h
+++ b/src/core/config/tabular_data/crud_operations/insert/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/config/common_option.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace config {
 extern CommonOption<InputTable> const kInsertStatementsOpt;
diff --git a/src/core/config/tabular_data/crud_operations/operations.h b/src/core/config/tabular_data/crud_operations/operations.h
index b1c8f8b8d1..87f7073fa8 100644
--- a/src/core/config/tabular_data/crud_operations/operations.h
+++ b/src/core/config/tabular_data/crud_operations/operations.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "config/names.h"
-#include "delete/option.h"
-#include "insert/option.h"
-#include "update/option.h"
+#include "core/config/names.h"
+#include "core/config/tabular_data/crud_operations/delete/option.h"
+#include "core/config/tabular_data/crud_operations/insert/option.h"
+#include "core/config/tabular_data/crud_operations/update/option.h"
 
 std::vector<std::string_view> const kCrudOptions{config::names::kInsertStatements,
                                                  config::names::kDeleteStatements,
diff --git a/src/core/config/tabular_data/crud_operations/update/option.cpp b/src/core/config/tabular_data/crud_operations/update/option.cpp
index 4bc4457d97..ac3b49c43e 100644
--- a/src/core/config/tabular_data/crud_operations/update/option.cpp
+++ b/src/core/config/tabular_data/crud_operations/update/option.cpp
@@ -1,6 +1,6 @@
-#include "config/tabular_data/crud_operations/update/option.h"
+#include "core/config/tabular_data/crud_operations/update/option.h"
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kUpdateStatements, descriptions::kDUpdateStatements;
diff --git a/src/core/config/tabular_data/crud_operations/update/option.h b/src/core/config/tabular_data/crud_operations/update/option.h
index f5fd1e7e8e..8a2b418cd5 100644
--- a/src/core/config/tabular_data/crud_operations/update/option.h
+++ b/src/core/config/tabular_data/crud_operations/update/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/config/common_option.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace config {
 extern CommonOption<InputTable> const kUpdateStatementsOpt;
diff --git a/src/core/config/tabular_data/input_table/option.cpp b/src/core/config/tabular_data/input_table/option.cpp
index 5722084fa5..7ffcc3081f 100644
--- a/src/core/config/tabular_data/input_table/option.cpp
+++ b/src/core/config/tabular_data/input_table/option.cpp
@@ -1,6 +1,6 @@
-#include "config/tabular_data/input_table/option.h"
+#include "core/config/tabular_data/input_table/option.h"
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kTable, descriptions::kDTable;
diff --git a/src/core/config/tabular_data/input_table/option.h b/src/core/config/tabular_data/input_table/option.h
index 7d31c476c5..9acd87f6eb 100644
--- a/src/core/config/tabular_data/input_table/option.h
+++ b/src/core/config/tabular_data/input_table/option.h
@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "config/common_option.h"
-#include "config/tabular_data/input_table_type.h"
+#include "core/config/common_option.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace config {
 extern CommonOption<InputTable> const kTableOpt;
diff --git a/src/core/config/tabular_data/input_table_type.h b/src/core/config/tabular_data/input_table_type.h
index 1706d5ea3b..73119b6082 100644
--- a/src/core/config/tabular_data/input_table_type.h
+++ b/src/core/config/tabular_data/input_table_type.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "model/table/idataset_stream.h"
+#include "core/model/table/idataset_stream.h"
 
 namespace config {
 using InputTable = std::shared_ptr<model::IDatasetStream>;
diff --git a/src/core/config/tabular_data/input_tables/option.cpp b/src/core/config/tabular_data/input_tables/option.cpp
index 8343b1a8fe..5c984a7e9b 100644
--- a/src/core/config/tabular_data/input_tables/option.cpp
+++ b/src/core/config/tabular_data/input_tables/option.cpp
@@ -1,8 +1,8 @@
-#include "config/tabular_data/input_tables/option.h"
+#include "core/config/tabular_data/input_tables/option.h"
 
 #include <cassert>
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 
diff --git a/src/core/config/tabular_data/input_tables/option.h b/src/core/config/tabular_data/input_tables/option.h
index 598b5c9ccc..b088f3b354 100644
--- a/src/core/config/tabular_data/input_tables/option.h
+++ b/src/core/config/tabular_data/input_tables/option.h
@@ -2,8 +2,8 @@
 
 #include <limits>
 
-#include "config/common_option.h"
-#include "config/tabular_data/input_tables_type.h"
+#include "core/config/common_option.h"
+#include "core/config/tabular_data/input_tables_type.h"
 
 namespace config {
 
diff --git a/src/core/config/tabular_data/input_tables_type.h b/src/core/config/tabular_data/input_tables_type.h
index 30d264e870..2985d69ef9 100644
--- a/src/core/config/tabular_data/input_tables_type.h
+++ b/src/core/config/tabular_data/input_tables_type.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "input_table_type.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace config {
 using InputTables = std::vector<InputTable>;
diff --git a/src/core/config/thread_number/option.cpp b/src/core/config/thread_number/option.cpp
index 06afd25d3c..3512490110 100644
--- a/src/core/config/thread_number/option.cpp
+++ b/src/core/config/thread_number/option.cpp
@@ -1,9 +1,9 @@
-#include "config/thread_number/option.h"
+#include "core/config/thread_number/option.h"
 
 #include <thread>
 
-#include "config/exceptions.h"
-#include "config/names_and_descriptions.h"
+#include "core/config/exceptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kThreads, descriptions::kDThreads;
diff --git a/src/core/config/thread_number/option.h b/src/core/config/thread_number/option.h
index 39cab961e0..72f77f750a 100644
--- a/src/core/config/thread_number/option.h
+++ b/src/core/config/thread_number/option.h
@@ -2,8 +2,8 @@
 
 #include <thread>
 
-#include "config/common_option.h"
-#include "config/thread_number/type.h"
+#include "core/config/common_option.h"
+#include "core/config/thread_number/type.h"
 
 namespace config {
 extern CommonOption<ThreadNumType> const kThreadNumberOpt;
diff --git a/src/core/config/time_limit/option.cpp b/src/core/config/time_limit/option.cpp
index 211f8710bf..b47ad18666 100644
--- a/src/core/config/time_limit/option.cpp
+++ b/src/core/config/time_limit/option.cpp
@@ -1,6 +1,6 @@
-#include "config/time_limit/option.h"
+#include "core/config/time_limit/option.h"
 
-#include "config/names_and_descriptions.h"
+#include "core/config/names_and_descriptions.h"
 
 namespace config {
 using names::kTimeLimitSeconds, descriptions::kDTimeLimitSeconds;
diff --git a/src/core/config/time_limit/option.h b/src/core/config/time_limit/option.h
index 568b0effd5..c3f363fa56 100644
--- a/src/core/config/time_limit/option.h
+++ b/src/core/config/time_limit/option.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "config/common_option.h"
-#include "config/time_limit/type.h"
+#include "core/config/common_option.h"
+#include "core/config/time_limit/type.h"
 
 namespace config {
 extern CommonOption<TimeLimitSecondsType> const kTimeLimitSecondsOpt;
diff --git a/src/core/model/table/abstract_column_data.h b/src/core/model/table/abstract_column_data.h
index 6368e0c1b9..da24cd78c4 100644
--- a/src/core/model/table/abstract_column_data.h
+++ b/src/core/model/table/abstract_column_data.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "column.h"
+#include "core/model/table/column.h"
 
 namespace model {
 
diff --git a/src/core/model/table/agree_set_factory.cpp b/src/core/model/table/agree_set_factory.cpp
index 96b843c5b9..1992e95808 100644
--- a/src/core/model/table/agree_set_factory.cpp
+++ b/src/core/model/table/agree_set_factory.cpp
@@ -1,4 +1,4 @@
-#include "agree_set_factory.h"
+#include "core/model/table/agree_set_factory.h"
 
 #include <atomic>
 #include <condition_variable>
@@ -14,9 +14,9 @@
 #include <boost/thread.hpp>
 #include <boost/thread/future.hpp>
 
-#include "identifier_set.h"
-#include "parallel_for.h"
-#include "util/logger.h"
+#include "core/model/table/identifier_set.h"
+#include "core/util/logger.h"
+#include "core/util/parallel_for.h"
 
 namespace model {
 
diff --git a/src/core/model/table/agree_set_factory.h b/src/core/model/table/agree_set_factory.h
index 47686b2071..362b766a8b 100644
--- a/src/core/model/table/agree_set_factory.h
+++ b/src/core/model/table/agree_set_factory.h
@@ -8,10 +8,10 @@
 
 #include <boost/functional/hash.hpp>
 
-#include "algorithms/fd/fd_algorithm.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/vertical.h"
-#include "util/custom_hashes.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/vertical.h"
+#include "core/util/custom_hashes.h"
 
 namespace model {
 
diff --git a/src/core/model/table/block_data.cpp b/src/core/model/table/block_data.cpp
index b1922c1729..87e28d2df7 100644
--- a/src/core/model/table/block_data.cpp
+++ b/src/core/model/table/block_data.cpp
@@ -3,7 +3,7 @@
  *
  * BlockData and ColumnData classes methods definition
  */
-#include "block_data.h"
+#include "core/model/table/block_data.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/core/model/table/block_data.h b/src/core/model/table/block_data.h
index 8275e54caa..6737ea2285 100644
--- a/src/core/model/table/block_data.h
+++ b/src/core/model/table/block_data.h
@@ -9,8 +9,8 @@
 #include <string_view>
 #include <vector>
 
-#include "column_index.h"
-#include "table/idataset_stream.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/idataset_stream.h"
 
 namespace model {
 
diff --git a/src/core/model/table/block_dataset_stream.h b/src/core/model/table/block_dataset_stream.h
index 26637096d1..9a728790a0 100644
--- a/src/core/model/table/block_dataset_stream.h
+++ b/src/core/model/table/block_dataset_stream.h
@@ -10,9 +10,9 @@
 #include <numeric>
 #include <string>
 
-#include "block_data.h"
-#include "dataset_stream_wrapper.h"
-#include "util/logger.h"
+#include "core/model/table/block_data.h"
+#include "core/model/table/dataset_stream_wrapper.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/model/table/column.cpp b/src/core/model/table/column.cpp
index 52f7e2c504..6aef149fff 100644
--- a/src/core/model/table/column.cpp
+++ b/src/core/model/table/column.cpp
@@ -1,6 +1,6 @@
-#include "column.h"
+#include "core/model/table/column.h"
 
-#include "vertical.h"
+#include "core/model/table/vertical.h"
 
 using namespace std;
 
diff --git a/src/core/model/table/column.h b/src/core/model/table/column.h
index daa35c0997..f8013b45b6 100644
--- a/src/core/model/table/column.h
+++ b/src/core/model/table/column.h
@@ -5,8 +5,8 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "column_index.h"
-#include "relational_schema.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/relational_schema.h"
 
 class Column {
 public:
diff --git a/src/core/model/table/column_combination.cpp b/src/core/model/table/column_combination.cpp
index 16b5dba0d3..aa9b432f23 100644
--- a/src/core/model/table/column_combination.cpp
+++ b/src/core/model/table/column_combination.cpp
@@ -1,4 +1,4 @@
-#include "column_combination.h"
+#include "core/model/table/column_combination.h"
 
 #include <algorithm>
 #include <sstream>
diff --git a/src/core/model/table/column_combination.h b/src/core/model/table/column_combination.h
index bb597436d3..25cc2b427e 100644
--- a/src/core/model/table/column_combination.h
+++ b/src/core/model/table/column_combination.h
@@ -4,9 +4,9 @@
 #include <string>
 #include <vector>
 
-#include "arity_index.h"
-#include "column_index.h"
-#include "table_index.h"
+#include "core/model/table/arity_index.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/table_index.h"
 
 namespace model {
 
diff --git a/src/core/model/table/column_data.h b/src/core/model/table/column_data.h
index 8a48c43081..0ea3a66ff3 100644
--- a/src/core/model/table/column_data.h
+++ b/src/core/model/table/column_data.h
@@ -7,9 +7,9 @@
 
 #include <vector>
 
-#include "abstract_column_data.h"
-#include "column.h"
-#include "position_list_index.h"
+#include "core/model/table/abstract_column_data.h"
+#include "core/model/table/column.h"
+#include "core/model/table/position_list_index.h"
 
 class ColumnData final : public model::AbstractColumnData {
     std::shared_ptr<model::PositionListIndex> position_list_index_;
diff --git a/src/core/model/table/column_domain.cpp b/src/core/model/table/column_domain.cpp
index 3bdd556fe3..bea6b3b3e1 100644
--- a/src/core/model/table/column_domain.cpp
+++ b/src/core/model/table/column_domain.cpp
@@ -3,7 +3,7 @@
  *
  * implementation of partition reader classes and domain creation manager
  */
-#include "column_domain.h"
+#include "core/model/table/column_domain.h"
 
 #include <algorithm>
 #include <cmath>
@@ -11,11 +11,11 @@
 #include <numeric>
 #include <string>
 
-#include "config/thread_number/type.h"
-#include "model/table/block_dataset_stream.h"
-#include "model/table/dataset_stream_fixed.h"
-#include "util/logger.h"
-#include "util/parallel_for.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/block_dataset_stream.h"
+#include "core/model/table/dataset_stream_fixed.h"
+#include "core/util/logger.h"
+#include "core/util/parallel_for.h"
 
 namespace model {
 
diff --git a/src/core/model/table/column_domain.h b/src/core/model/table/column_domain.h
index 67b72975ac..03f4ddfe87 100644
--- a/src/core/model/table/column_domain.h
+++ b/src/core/model/table/column_domain.h
@@ -14,10 +14,10 @@
 #include <string>
 #include <vector>
 
-#include "column_combination.h"
-#include "config/mem_limit/type.h"
-#include "config/thread_number/type.h"
-#include "idataset_stream.h"
+#include "core/config/mem_limit/type.h"
+#include "core/config/thread_number/type.h"
+#include "core/model/table/column_combination.h"
+#include "core/model/table/idataset_stream.h"
 
 namespace model {
 
diff --git a/src/core/model/table/column_domain_iterator.cpp b/src/core/model/table/column_domain_iterator.cpp
index d08f666f43..0fd13339e4 100644
--- a/src/core/model/table/column_domain_iterator.cpp
+++ b/src/core/model/table/column_domain_iterator.cpp
@@ -3,7 +3,7 @@
  *
  * implementation of the column domain data iterator
  */
-#include "column_domain_iterator.h"
+#include "core/model/table/column_domain_iterator.h"
 
 #include <cassert>
 
diff --git a/src/core/model/table/column_domain_iterator.h b/src/core/model/table/column_domain_iterator.h
index b38b629cea..f4bda3bd94 100644
--- a/src/core/model/table/column_domain_iterator.h
+++ b/src/core/model/table/column_domain_iterator.h
@@ -9,7 +9,7 @@
 #include <queue>
 #include <vector>
 
-#include "column_domain.h"
+#include "core/model/table/column_domain.h"
 
 namespace model {
 
diff --git a/src/core/model/table/column_layout_relation_data.cpp b/src/core/model/table/column_layout_relation_data.cpp
index d78f21feae..2a1a258065 100644
--- a/src/core/model/table/column_layout_relation_data.cpp
+++ b/src/core/model/table/column_layout_relation_data.cpp
@@ -2,13 +2,13 @@
 // Created by Ilya Vologin
 // https://github.com/cupertank
 //
-#include "column_layout_relation_data.h"
+#include "core/model/table/column_layout_relation_data.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 std::vector<int> ColumnLayoutRelationData::GetTuple(int tuple_index) const {
     int num_columns = schema_->GetNumColumns();
diff --git a/src/core/model/table/column_layout_relation_data.h b/src/core/model/table/column_layout_relation_data.h
index eca7243cce..99e554a819 100644
--- a/src/core/model/table/column_layout_relation_data.h
+++ b/src/core/model/table/column_layout_relation_data.h
@@ -8,10 +8,10 @@
 #include <cmath>
 #include <vector>
 
-#include "column_data.h"
-#include "idataset_stream.h"
-#include "relation_data.h"
-#include "relational_schema.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/idataset_stream.h"
+#include "core/model/table/relation_data.h"
+#include "core/model/table/relational_schema.h"
 
 class ColumnLayoutRelationData final : public RelationData {
 public:
diff --git a/src/core/model/table/column_layout_typed_relation_data.cpp b/src/core/model/table/column_layout_typed_relation_data.cpp
index 0a01a71b71..9382a225e2 100644
--- a/src/core/model/table/column_layout_typed_relation_data.cpp
+++ b/src/core/model/table/column_layout_typed_relation_data.cpp
@@ -1,6 +1,6 @@
-#include "column_layout_typed_relation_data.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/model/table/column_layout_typed_relation_data.h b/src/core/model/table/column_layout_typed_relation_data.h
index 78c1dab15e..93dc4dad01 100644
--- a/src/core/model/table/column_layout_typed_relation_data.h
+++ b/src/core/model/table/column_layout_typed_relation_data.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "idataset_stream.h"
-#include "relation_data.h"
-#include "typed_column_data.h"
+#include "core/model/table/idataset_stream.h"
+#include "core/model/table/relation_data.h"
+#include "core/model/table/typed_column_data.h"
 
 namespace model {
 
diff --git a/src/core/model/table/dataset_stream_fixed.h b/src/core/model/table/dataset_stream_fixed.h
index ebd6f85d4d..93c9491fae 100644
--- a/src/core/model/table/dataset_stream_fixed.h
+++ b/src/core/model/table/dataset_stream_fixed.h
@@ -2,9 +2,9 @@
 
 #include <memory>
 
-#include "dataset_stream_wrapper.h"
-#include "idataset_stream.h"
-#include "util/logger.h"
+#include "core/model/table/dataset_stream_wrapper.h"
+#include "core/model/table/idataset_stream.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/model/table/dataset_stream_projection.h b/src/core/model/table/dataset_stream_projection.h
index 5c3e6dbaf0..ca045782d2 100644
--- a/src/core/model/table/dataset_stream_projection.h
+++ b/src/core/model/table/dataset_stream_projection.h
@@ -12,9 +12,9 @@
 #include <utility>
 #include <vector>
 
-#include "model/table/column_index.h"
-#include "model/table/dataset_stream_wrapper.h"
-#include "model/table/idataset_stream.h"
+#include "core/model/table/column_index.h"
+#include "core/model/table/dataset_stream_wrapper.h"
+#include "core/model/table/idataset_stream.h"
 
 namespace model {
 
diff --git a/src/core/model/table/dataset_stream_wrapper.h b/src/core/model/table/dataset_stream_wrapper.h
index f7633f55e2..8a049d881f 100644
--- a/src/core/model/table/dataset_stream_wrapper.h
+++ b/src/core/model/table/dataset_stream_wrapper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "idataset_stream.h"
+#include "core/model/table/idataset_stream.h"
 
 namespace model {
 
diff --git a/src/core/model/table/dynamic_position_list_index.cpp b/src/core/model/table/dynamic_position_list_index.cpp
index b75438da36..34bebae323 100644
--- a/src/core/model/table/dynamic_position_list_index.cpp
+++ b/src/core/model/table/dynamic_position_list_index.cpp
@@ -1,4 +1,4 @@
-#include "model/table/dynamic_position_list_index.h"
+#include "core/model/table/dynamic_position_list_index.h"
 
 #include <algorithm>
 #include <chrono>
diff --git a/src/core/model/table/dynamic_position_list_index.h b/src/core/model/table/dynamic_position_list_index.h
index 0b63e05068..050cd0395d 100644
--- a/src/core/model/table/dynamic_position_list_index.h
+++ b/src/core/model/table/dynamic_position_list_index.h
@@ -3,7 +3,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "model/table/column.h"
+#include "core/model/table/column.h"
 
 class ColumnLayoutRelationData;
 
diff --git a/src/core/model/table/dynamic_table_data.h b/src/core/model/table/dynamic_table_data.h
index cd9a7f2b54..6bef883193 100644
--- a/src/core/model/table/dynamic_table_data.h
+++ b/src/core/model/table/dynamic_table_data.h
@@ -5,9 +5,9 @@
 #include <unordered_set>
 #include <vector>
 
-#include "config/exceptions.h"
-#include "config/tabular_data/input_table_type.h"
-#include "util/logger.h"
+#include "core/config/exceptions.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/model/table/identifier_set.cpp b/src/core/model/table/identifier_set.cpp
index 9db78f5333..b5571e9bd7 100644
--- a/src/core/model/table/identifier_set.cpp
+++ b/src/core/model/table/identifier_set.cpp
@@ -1,4 +1,4 @@
-#include "identifier_set.h"
+#include "core/model/table/identifier_set.h"
 
 namespace model {
 
diff --git a/src/core/model/table/identifier_set.h b/src/core/model/table/identifier_set.h
index e7f69810a9..58fd56bc32 100644
--- a/src/core/model/table/identifier_set.h
+++ b/src/core/model/table/identifier_set.h
@@ -3,9 +3,9 @@
 #include <memory>
 #include <vector>
 
-#include "model/table/column_data.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/vertical.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/vertical.h"
 
 namespace model {
 
diff --git a/src/core/model/table/position_list_index.cpp b/src/core/model/table/position_list_index.cpp
index 78a5aa0f65..fe0915959b 100644
--- a/src/core/model/table/position_list_index.cpp
+++ b/src/core/model/table/position_list_index.cpp
@@ -3,7 +3,7 @@
 // https://github.com/cupertank
 //
 
-#include "position_list_index.h"
+#include "core/model/table/position_list_index.h"
 
 #include <algorithm>
 #include <chrono>
@@ -15,9 +15,9 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/vertical.h"
-#include "util/logger.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/vertical.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/model/table/position_list_index.h b/src/core/model/table/position_list_index.h
index 7a225dfd41..4112623aad 100644
--- a/src/core/model/table/position_list_index.h
+++ b/src/core/model/table/position_list_index.h
@@ -9,7 +9,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "model/table/column.h"
+#include "core/model/table/column.h"
 
 class ColumnLayoutRelationData;
 
diff --git a/src/core/model/table/relation_data.h b/src/core/model/table/relation_data.h
index d835d734e8..9b2e1a03f0 100644
--- a/src/core/model/table/relation_data.h
+++ b/src/core/model/table/relation_data.h
@@ -7,8 +7,8 @@
 
 #include <vector>
 
-#include "column_data.h"
-#include "relational_schema.h"
+#include "core/model/table/column_data.h"
+#include "core/model/table/relational_schema.h"
 
 template <typename T>
 class AbstractRelationData {
diff --git a/src/core/model/table/relational_schema.cpp b/src/core/model/table/relational_schema.cpp
index a7b94e2c2c..9f09be04f8 100644
--- a/src/core/model/table/relational_schema.cpp
+++ b/src/core/model/table/relational_schema.cpp
@@ -1,10 +1,10 @@
-#include "relational_schema.h"
+#include "core/model/table/relational_schema.h"
 
 #include <memory>
 #include <utility>
 
-#include "vertical.h"
-#include "vertical_map.h"
+#include "core/model/table/vertical.h"
+#include "core/model/table/vertical_map.h"
 
 RelationalSchema::RelationalSchema(std::string name) : columns_(), name_(std::move(name)) {}
 
diff --git a/src/core/model/table/relational_schema.h b/src/core/model/table/relational_schema.h
index 84d140b571..e69ee8c65a 100644
--- a/src/core/model/table/relational_schema.h
+++ b/src/core/model/table/relational_schema.h
@@ -14,7 +14,7 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "bitset_utils.h"
+#include "core/util/bitset_utils.h"
 
 class Column;
 
diff --git a/src/core/model/table/typed_column_data.cpp b/src/core/model/table/typed_column_data.cpp
index b546866594..915a1599d7 100644
--- a/src/core/model/table/typed_column_data.cpp
+++ b/src/core/model/table/typed_column_data.cpp
@@ -1,10 +1,10 @@
-#include "typed_column_data.h"
+#include "core/model/table/typed_column_data.h"
 
 #include <bitset>
 #include <cstddef>
 
-#include "column_layout_typed_relation_data.h"
-#include "create_type.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/model/types/create_type.h"
 
 namespace {
 
diff --git a/src/core/model/table/typed_column_data.h b/src/core/model/table/typed_column_data.h
index 310c02516a..ecc48f7998 100644
--- a/src/core/model/table/typed_column_data.h
+++ b/src/core/model/table/typed_column_data.h
@@ -6,10 +6,10 @@
 
 #include <boost/regex.hpp>
 
-#include "abstract_column_data.h"
-#include "idataset_stream.h"
-#include "model/types/types.h"
-#include "relation_data.h"
+#include "core/model/table/abstract_column_data.h"
+#include "core/model/table/idataset_stream.h"
+#include "core/model/table/relation_data.h"
+#include "core/model/types/types.h"
 
 namespace model {
 
diff --git a/src/core/model/table/vertical.cpp b/src/core/model/table/vertical.cpp
index 6a259278ef..8a9995156a 100644
--- a/src/core/model/table/vertical.cpp
+++ b/src/core/model/table/vertical.cpp
@@ -1,4 +1,4 @@
-#include "vertical.h"
+#include "core/model/table/vertical.h"
 
 #include <utility>
 
diff --git a/src/core/model/table/vertical.h b/src/core/model/table/vertical.h
index 5af6e3f0eb..a3fa8f475f 100644
--- a/src/core/model/table/vertical.h
+++ b/src/core/model/table/vertical.h
@@ -11,7 +11,7 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "column.h"
+#include "core/model/table/column.h"
 
 class Vertical {
 private:
diff --git a/src/core/model/table/vertical_map.cpp b/src/core/model/table/vertical_map.cpp
index 9a1130a214..535414d793 100644
--- a/src/core/model/table/vertical_map.cpp
+++ b/src/core/model/table/vertical_map.cpp
@@ -1,4 +1,4 @@
-#include "vertical_map.h"
+#include "core/model/table/vertical_map.h"
 
 #include <exception>
 #include <mutex>
@@ -6,10 +6,10 @@
 #include <shared_mutex>
 #include <unordered_set>
 
-#include "fd/pyrocommon/core/dependency_candidate.h"
-#include "fd/pyrocommon/core/vertical_info.h"
-#include "fd/pyrocommon/model/agree_set_sample.h"
-#include "position_list_index.h"
+#include "core/algorithms/fd/pyrocommon/core/dependency_candidate.h"
+#include "core/algorithms/fd/pyrocommon/core/vertical_info.h"
+#include "core/algorithms/fd/pyrocommon/model/agree_set_sample.h"
+#include "core/model/table/position_list_index.h"
 
 namespace model {
 
diff --git a/src/core/model/table/vertical_map.h b/src/core/model/table/vertical_map.h
index 1b77e2b027..06e33b03d6 100644
--- a/src/core/model/table/vertical_map.h
+++ b/src/core/model/table/vertical_map.h
@@ -8,7 +8,7 @@
 
 #include <boost/dynamic_bitset.hpp>
 
-#include "util/custom_hashes.h"
+#include "core/util/custom_hashes.h"
 
 namespace model {
 
diff --git a/src/core/model/transaction/itemset.cpp b/src/core/model/transaction/itemset.cpp
index b968c6a1d5..6d01ed822f 100644
--- a/src/core/model/transaction/itemset.cpp
+++ b/src/core/model/transaction/itemset.cpp
@@ -1,4 +1,4 @@
-#include "itemset.h"
+#include "core/model/transaction/itemset.h"
 
 #include <algorithm>
 
diff --git a/src/core/model/transaction/transactional_data.cpp b/src/core/model/transaction/transactional_data.cpp
index c50fd7a52c..5edc644ac1 100644
--- a/src/core/model/transaction/transactional_data.cpp
+++ b/src/core/model/transaction/transactional_data.cpp
@@ -1,4 +1,4 @@
-#include "transactional_data.h"
+#include "core/model/transaction/transactional_data.h"
 
 #include <cassert>
 #include <stdexcept>
diff --git a/src/core/model/transaction/transactional_data.h b/src/core/model/transaction/transactional_data.h
index 4828b9be0a..dfca8a9b2f 100644
--- a/src/core/model/transaction/transactional_data.h
+++ b/src/core/model/transaction/transactional_data.h
@@ -5,9 +5,9 @@
 #include <unordered_map>
 #include <vector>
 
-#include "itemset.h"
-#include "model/table/idataset_stream.h"
-#include "transactional_input_format.h"
+#include "core/model/table/idataset_stream.h"
+#include "core/model/transaction/itemset.h"
+#include "core/model/transaction/transactional_input_format.h"
 
 namespace model {
 
diff --git a/src/core/model/types/big_int_type.h b/src/core/model/types/big_int_type.h
index 829854d2c3..256a241887 100644
--- a/src/core/model/types/big_int_type.h
+++ b/src/core/model/types/big_int_type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "string_type.h"
+#include "core/model/types/string_type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/bitset.h b/src/core/model/types/bitset.h
index a47b33e6fd..747b2c239c 100644
--- a/src/core/model/types/bitset.h
+++ b/src/core/model/types/bitset.h
@@ -81,7 +81,7 @@
 
 #include <boost/container_hash/hash.hpp>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace model {
 
diff --git a/src/core/model/types/create_type.cpp b/src/core/model/types/create_type.cpp
index 63b251fc11..dab13df35a 100644
--- a/src/core/model/types/create_type.cpp
+++ b/src/core/model/types/create_type.cpp
@@ -1,15 +1,15 @@
-#include "create_type.h"
+#include "core/model/types/create_type.h"
 
-#include "big_int_type.h"
-#include "date_type.h"
-#include "double_type.h"
-#include "empty_type.h"
-#include "int_type.h"
-#include "mixed_type.h"
-#include "null_type.h"
-#include "numeric_type.h"
-#include "string_type.h"
-#include "undefined_type.h"
+#include "core/model/types/big_int_type.h"
+#include "core/model/types/date_type.h"
+#include "core/model/types/double_type.h"
+#include "core/model/types/empty_type.h"
+#include "core/model/types/int_type.h"
+#include "core/model/types/mixed_type.h"
+#include "core/model/types/null_type.h"
+#include "core/model/types/numeric_type.h"
+#include "core/model/types/string_type.h"
+#include "core/model/types/undefined_type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/create_type.h b/src/core/model/types/create_type.h
index 7b0cfe2470..41c8e6cbff 100644
--- a/src/core/model/types/create_type.h
+++ b/src/core/model/types/create_type.h
@@ -4,7 +4,7 @@
 
 #include <boost/pointer_cast.hpp>
 
-#include "type.h"
+#include "core/model/types/type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/date_type.h b/src/core/model/types/date_type.h
index 7bce68480c..2f855c2d7b 100644
--- a/src/core/model/types/date_type.h
+++ b/src/core/model/types/date_type.h
@@ -6,8 +6,8 @@
 
 #include <boost/date_time/gregorian/gregorian.hpp>
 
-#include "imetrizable_type.h"
-#include "type.h"
+#include "core/model/types/imetrizable_type.h"
+#include "core/model/types/type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/double_type.h b/src/core/model/types/double_type.h
index 5357ecab9a..3ee08793ff 100644
--- a/src/core/model/types/double_type.h
+++ b/src/core/model/types/double_type.h
@@ -5,7 +5,7 @@
 #include <boost/math/special_functions/next.hpp>
 #include <boost/math/special_functions/relative_difference.hpp>
 
-#include "numeric_type.h"
+#include "core/model/types/numeric_type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/empty_type.h b/src/core/model/types/empty_type.h
index d1825dbac4..391f21826b 100644
--- a/src/core/model/types/empty_type.h
+++ b/src/core/model/types/empty_type.h
@@ -2,7 +2,7 @@
 
 #include <cassert>
 
-#include "type.h"
+#include "core/model/types/type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/imetrizable_type.h b/src/core/model/types/imetrizable_type.h
index 3fe6f41f0e..44ab7383f5 100644
--- a/src/core/model/types/imetrizable_type.h
+++ b/src/core/model/types/imetrizable_type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "type.h"
+#include "core/model/types/type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/int_type.h b/src/core/model/types/int_type.h
index ba4d3c7305..c3edcabda1 100644
--- a/src/core/model/types/int_type.h
+++ b/src/core/model/types/int_type.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "numeric_type.h"
+#include "core/model/types/numeric_type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/mixed_type.h b/src/core/model/types/mixed_type.h
index 10e87ccd00..9df3d08ed1 100644
--- a/src/core/model/types/mixed_type.h
+++ b/src/core/model/types/mixed_type.h
@@ -4,17 +4,17 @@
 #include <memory>
 #include <unordered_map>
 
-#include "big_int_type.h"
-#include "create_type.h"
-#include "date_type.h"
-#include "double_type.h"
-#include "empty_type.h"
-#include "int_type.h"
-#include "null_type.h"
-#include "numeric_type.h"
-#include "string_type.h"
-#include "type.h"
-#include "undefined_type.h"
+#include "core/model/types/big_int_type.h"
+#include "core/model/types/create_type.h"
+#include "core/model/types/date_type.h"
+#include "core/model/types/double_type.h"
+#include "core/model/types/empty_type.h"
+#include "core/model/types/int_type.h"
+#include "core/model/types/null_type.h"
+#include "core/model/types/numeric_type.h"
+#include "core/model/types/string_type.h"
+#include "core/model/types/type.h"
+#include "core/model/types/undefined_type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/null_type.h b/src/core/model/types/null_type.h
index 0779c87c10..1244518233 100644
--- a/src/core/model/types/null_type.h
+++ b/src/core/model/types/null_type.h
@@ -2,7 +2,7 @@
 
 #include <atomic>
 
-#include "type.h"
+#include "core/model/types/type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/numeric_type.h b/src/core/model/types/numeric_type.h
index d56f4c6be2..38ee80b200 100644
--- a/src/core/model/types/numeric_type.h
+++ b/src/core/model/types/numeric_type.h
@@ -5,8 +5,8 @@
 #include <limits>
 #include <sstream>
 
-#include "imetrizable_type.h"
-#include "type.h"
+#include "core/model/types/imetrizable_type.h"
+#include "core/model/types/type.h"
 
 namespace model {
 
diff --git a/src/core/model/types/string_type.h b/src/core/model/types/string_type.h
index f55a8ed5f1..cdb806d0bb 100644
--- a/src/core/model/types/string_type.h
+++ b/src/core/model/types/string_type.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "imetrizable_type.h"
-#include "type.h"
-#include "util/levenshtein_distance.h"
+#include "core/model/types/imetrizable_type.h"
+#include "core/model/types/type.h"
+#include "core/util/levenshtein_distance.h"
 
 namespace model {
 
diff --git a/src/core/model/types/type.h b/src/core/model/types/type.h
index 638b520d08..47a250627e 100644
--- a/src/core/model/types/type.h
+++ b/src/core/model/types/type.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <sstream>
 
-#include "builtin.h"
+#include "core/model/types/builtin.h"
 
 namespace model {
 
diff --git a/src/core/model/types/types.h b/src/core/model/types/types.h
index dc3c78fee0..8dbdfbb6a3 100644
--- a/src/core/model/types/types.h
+++ b/src/core/model/types/types.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "big_int_type.h"
-#include "create_type.h"
-#include "date_type.h"
-#include "double_type.h"
-#include "empty_type.h"
-#include "int_type.h"
-#include "mixed_type.h"
-#include "null_type.h"
-#include "string_type.h"
+#include "core/model/types/big_int_type.h"
+#include "core/model/types/create_type.h"
+#include "core/model/types/date_type.h"
+#include "core/model/types/double_type.h"
+#include "core/model/types/empty_type.h"
+#include "core/model/types/int_type.h"
+#include "core/model/types/mixed_type.h"
+#include "core/model/types/null_type.h"
+#include "core/model/types/string_type.h"
diff --git a/src/core/model/types/undefined_type.h b/src/core/model/types/undefined_type.h
index b0eaabd47d..df2dbc23f9 100644
--- a/src/core/model/types/undefined_type.h
+++ b/src/core/model/types/undefined_type.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "empty_type.h"
-#include "null_type.h"
+#include "core/model/types/empty_type.h"
+#include "core/model/types/null_type.h"
 
 namespace model {
 
diff --git a/src/core/parser/csv_parser/csv_parser.cpp b/src/core/parser/csv_parser/csv_parser.cpp
index cb6ae0b4a0..03673e9bc6 100644
--- a/src/core/parser/csv_parser/csv_parser.cpp
+++ b/src/core/parser/csv_parser/csv_parser.cpp
@@ -1,4 +1,4 @@
-#include "csv_parser.h"
+#include "core/parser/csv_parser/csv_parser.h"
 
 #include <cassert>
 #include <cstddef>
diff --git a/src/core/parser/csv_parser/csv_parser.h b/src/core/parser/csv_parser/csv_parser.h
index b8ce70e736..44b6ab17c6 100644
--- a/src/core/parser/csv_parser/csv_parser.h
+++ b/src/core/parser/csv_parser/csv_parser.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "model/table/idataset_stream.h"
+#include "core/model/table/idataset_stream.h"
 
 struct CSVConfig {
     std::filesystem::path path;
diff --git a/src/core/parser/graph_parser/graph_parser.cpp b/src/core/parser/graph_parser/graph_parser.cpp
index ed0c59cf98..c37857756b 100644
--- a/src/core/parser/graph_parser/graph_parser.cpp
+++ b/src/core/parser/graph_parser/graph_parser.cpp
@@ -1,179 +1,179 @@
-#include "graph_parser.h"
-
-#include <boost/algorithm/string.hpp>
-#include <boost/bind/bind.hpp>
-#include <boost/graph/adjacency_list.hpp>
-#include <boost/graph/graphviz.hpp>
-#include <boost/property_map/function_property_map.hpp>
-
-namespace parser {
-
-namespace {
-
-std::vector<std::string> Split(std::string str, std::string sep) {
-    std::vector<std::string> result = {};
-    if (str == "") {
-        return result;
-    }
-    size_t pos = 0;
-    while ((pos = str.find(sep)) != std::string::npos) {
-        result.push_back(str.substr(0, pos));
-        str.erase(0, pos + sep.length());
-    }
-    result.push_back(str);
-    return result;
-};
-
-std::vector<model::Gfd::Literal> ParseLiterals(std::istream& stream) {
-    std::vector<model::Gfd::Literal> result = {};
-
-    std::string line;
-    std::getline(stream, line);
-    boost::algorithm::trim(line);
-    auto tokens = Split(line, " ");
-    for (auto token : tokens) {
-        auto custom_names = Split(token, "=");
-        auto names1 = Split(custom_names.at(0), ".");
-        int index1 = names1.size() == 1 ? -1 : stoi(names1.at(0));
-        std::string name1 = *(--names1.end());
-        model::Gfd::Token t1(index1, name1);
-
-        auto names2 = Split(custom_names.at(1), ".");
-        int index2 = names2.size() == 1 ? -1 : stoi(names2.at(0));
-        std::string name2 = *(--names2.end());
-        model::Gfd::Token t2(index2, name2);
-
-        result.push_back(model::Gfd::Literal(t1, t2));
-    }
-
-    return result;
-};
-
-void WriteLiterals(std::ostream& stream, std::vector<model::Gfd::Literal> const& literals) {
-    for (model::Gfd::Literal const& l : literals) {
-        std::string token;
-
-        model::Gfd::Token fst_token = l.first;
-        token = fst_token.first == -1 ? "" : (std::to_string(fst_token.first) + ".");
-        token += fst_token.second;
-        stream << token;
-
-        stream << "=";
-
-        model::Gfd::Token snd_token = l.second;
-        token = snd_token.first == -1 ? "" : (std::to_string(snd_token.first) + ".");
-        token += snd_token.second;
-        stream << token;
-
-        stream << " ";
-    }
-    stream << std::endl;
-};
-
-}  // namespace
-
-namespace graph_parser {
-
-using AMap =
-        boost::property_map<model::graph_t,
-                            std::unordered_map<std::string, std::string> model::Vertex::*>::type;
-using RMap = boost::property_map<model::graph_t, std::string model::Edge::*>::type;
-
-namespace {
-struct NewAttr {
-    using Ptr = boost::shared_ptr<boost::dynamic_property_map>;
-
-private:
-    template <typename PMap>
-    static Ptr MakeDyn(PMap m) {
-        using DM = boost::detail::dynamic_property_map_adaptor<PMap>;
-        boost::shared_ptr<DM> sp = boost::make_shared<DM>(m);
-        return boost::static_pointer_cast<boost::dynamic_property_map>(sp);
-    }
-
-public:
-    AMap attrs;
-
-    NewAttr(AMap a) : attrs(a) {}
-
-    Ptr operator()(std::string const& name, boost::any const& descr, boost::any const&) const {
-        if (typeid(model::vertex_t) == descr.type())
-            return MakeDyn(boost::make_function_property_map<model::vertex_t>(
-                    boost::bind(*this, boost::placeholders::_1, name)));
-
-        return Ptr();
-    };
-
-    using result_type = std::string&;
-
-    std::string& operator()(model::vertex_t v, std::string const& name) const {
-        return attrs[v][name];
-    }
-};
-}  // namespace
-
-model::graph_t ReadGraph(std::istream& stream) {
-    model::graph_t result;
-    NewAttr newattr(boost::get(&model::Vertex::attributes, result));
-    boost::dynamic_properties dp(newattr);
-    dp.property("label", boost::get(&model::Edge::label, result));
-    dp.property("node_id", boost::get(&model::Vertex::node_id, result));
-    read_graphviz(stream, result, dp);
-    return result;
-};
-
-model::graph_t ReadGraph(std::filesystem::path const& path) {
-    std::ifstream f(path);
-    model::graph_t result = ReadGraph(f);
-    f.close();
-    return result;
-};
-
-void WriteGraph(std::ostream& stream, model::graph_t const& result) {
-    using ConstAMap =
-            boost::property_map<model::graph_t, std::unordered_map<std::string, std::string>
-                                                        model::Vertex::*>::const_type;
-    using ConstRMap = boost::property_map<model::graph_t, std::string model::Edge::*>::const_type;
-
-    boost::attributes_writer<ConstAMap> vw(boost::get(&model::Vertex::attributes, result));
-    boost::label_writer<ConstRMap> ew(boost::get(&model::Edge::label, result));
-    write_graphviz(stream, result, vw, ew);
-};
-
-void WriteGraph(std::filesystem::path const& path, model::graph_t const& result) {
-    std::ofstream f(path);
-    WriteGraph(f, result);
-    f.close();
-};
-
-model::Gfd ReadGfd(std::istream& stream) {
-    model::Gfd result;
-    result.SetPremises(ParseLiterals(stream));
-    result.SetConclusion(ParseLiterals(stream));
-    result.SetPattern(ReadGraph(stream));
-    return result;
-};
-
-model::Gfd ReadGfd(std::filesystem::path const& path) {
-    std::ifstream f(path);
-    model::Gfd result = ReadGfd(f);
-    f.close();
-    return result;
-};
-
-void WriteGfd(std::ostream& stream, model::Gfd const& result) {
-    WriteLiterals(stream, result.GetPremises());
-    WriteLiterals(stream, result.GetConclusion());
-    model::graph_t pattern = result.GetPattern();
-    WriteGraph(stream, pattern);
-};
-
-void WriteGfd(std::filesystem::path const& path, model::Gfd const& result) {
-    std::ofstream f(path);
-    WriteGfd(f, result);
-    f.close();
-};
-
-}  // namespace graph_parser
-
-}  // namespace parser
+#include "core/parser/graph_parser/graph_parser.h"
+
+#include <boost/algorithm/string.hpp>
+#include <boost/bind/bind.hpp>
+#include <boost/graph/adjacency_list.hpp>
+#include <boost/graph/graphviz.hpp>
+#include <boost/property_map/function_property_map.hpp>
+
+namespace parser {
+
+namespace {
+
+std::vector<std::string> Split(std::string str, std::string sep) {
+    std::vector<std::string> result = {};
+    if (str == "") {
+        return result;
+    }
+    size_t pos = 0;
+    while ((pos = str.find(sep)) != std::string::npos) {
+        result.push_back(str.substr(0, pos));
+        str.erase(0, pos + sep.length());
+    }
+    result.push_back(str);
+    return result;
+};
+
+std::vector<model::Gfd::Literal> ParseLiterals(std::istream& stream) {
+    std::vector<model::Gfd::Literal> result = {};
+
+    std::string line;
+    std::getline(stream, line);
+    boost::algorithm::trim(line);
+    auto tokens = Split(line, " ");
+    for (auto token : tokens) {
+        auto custom_names = Split(token, "=");
+        auto names1 = Split(custom_names.at(0), ".");
+        int index1 = names1.size() == 1 ? -1 : stoi(names1.at(0));
+        std::string name1 = *(--names1.end());
+        model::Gfd::Token t1(index1, name1);
+
+        auto names2 = Split(custom_names.at(1), ".");
+        int index2 = names2.size() == 1 ? -1 : stoi(names2.at(0));
+        std::string name2 = *(--names2.end());
+        model::Gfd::Token t2(index2, name2);
+
+        result.push_back(model::Gfd::Literal(t1, t2));
+    }
+
+    return result;
+};
+
+void WriteLiterals(std::ostream& stream, std::vector<model::Gfd::Literal> const& literals) {
+    for (model::Gfd::Literal const& l : literals) {
+        std::string token;
+
+        model::Gfd::Token fst_token = l.first;
+        token = fst_token.first == -1 ? "" : (std::to_string(fst_token.first) + ".");
+        token += fst_token.second;
+        stream << token;
+
+        stream << "=";
+
+        model::Gfd::Token snd_token = l.second;
+        token = snd_token.first == -1 ? "" : (std::to_string(snd_token.first) + ".");
+        token += snd_token.second;
+        stream << token;
+
+        stream << " ";
+    }
+    stream << std::endl;
+};
+
+}  // namespace
+
+namespace graph_parser {
+
+using AMap =
+        boost::property_map<model::graph_t,
+                            std::unordered_map<std::string, std::string> model::Vertex::*>::type;
+using RMap = boost::property_map<model::graph_t, std::string model::Edge::*>::type;
+
+namespace {
+struct NewAttr {
+    using Ptr = boost::shared_ptr<boost::dynamic_property_map>;
+
+private:
+    template <typename PMap>
+    static Ptr MakeDyn(PMap m) {
+        using DM = boost::detail::dynamic_property_map_adaptor<PMap>;
+        boost::shared_ptr<DM> sp = boost::make_shared<DM>(m);
+        return boost::static_pointer_cast<boost::dynamic_property_map>(sp);
+    }
+
+public:
+    AMap attrs;
+
+    NewAttr(AMap a) : attrs(a) {}
+
+    Ptr operator()(std::string const& name, boost::any const& descr, boost::any const&) const {
+        if (typeid(model::vertex_t) == descr.type())
+            return MakeDyn(boost::make_function_property_map<model::vertex_t>(
+                    boost::bind(*this, boost::placeholders::_1, name)));
+
+        return Ptr();
+    };
+
+    using result_type = std::string&;
+
+    std::string& operator()(model::vertex_t v, std::string const& name) const {
+        return attrs[v][name];
+    }
+};
+}  // namespace
+
+model::graph_t ReadGraph(std::istream& stream) {
+    model::graph_t result;
+    NewAttr newattr(boost::get(&model::Vertex::attributes, result));
+    boost::dynamic_properties dp(newattr);
+    dp.property("label", boost::get(&model::Edge::label, result));
+    dp.property("node_id", boost::get(&model::Vertex::node_id, result));
+    read_graphviz(stream, result, dp);
+    return result;
+};
+
+model::graph_t ReadGraph(std::filesystem::path const& path) {
+    std::ifstream f(path);
+    model::graph_t result = ReadGraph(f);
+    f.close();
+    return result;
+};
+
+void WriteGraph(std::ostream& stream, model::graph_t const& result) {
+    using ConstAMap =
+            boost::property_map<model::graph_t, std::unordered_map<std::string, std::string>
+                                                        model::Vertex::*>::const_type;
+    using ConstRMap = boost::property_map<model::graph_t, std::string model::Edge::*>::const_type;
+
+    boost::attributes_writer<ConstAMap> vw(boost::get(&model::Vertex::attributes, result));
+    boost::label_writer<ConstRMap> ew(boost::get(&model::Edge::label, result));
+    write_graphviz(stream, result, vw, ew);
+};
+
+void WriteGraph(std::filesystem::path const& path, model::graph_t const& result) {
+    std::ofstream f(path);
+    WriteGraph(f, result);
+    f.close();
+};
+
+model::Gfd ReadGfd(std::istream& stream) {
+    model::Gfd result;
+    result.SetPremises(ParseLiterals(stream));
+    result.SetConclusion(ParseLiterals(stream));
+    result.SetPattern(ReadGraph(stream));
+    return result;
+};
+
+model::Gfd ReadGfd(std::filesystem::path const& path) {
+    std::ifstream f(path);
+    model::Gfd result = ReadGfd(f);
+    f.close();
+    return result;
+};
+
+void WriteGfd(std::ostream& stream, model::Gfd const& result) {
+    WriteLiterals(stream, result.GetPremises());
+    WriteLiterals(stream, result.GetConclusion());
+    model::graph_t pattern = result.GetPattern();
+    WriteGraph(stream, pattern);
+};
+
+void WriteGfd(std::filesystem::path const& path, model::Gfd const& result) {
+    std::ofstream f(path);
+    WriteGfd(f, result);
+    f.close();
+};
+
+}  // namespace graph_parser
+
+}  // namespace parser
diff --git a/src/core/parser/graph_parser/graph_parser.h b/src/core/parser/graph_parser/graph_parser.h
index 0deffc2914..7e4d6aa658 100644
--- a/src/core/parser/graph_parser/graph_parser.h
+++ b/src/core/parser/graph_parser/graph_parser.h
@@ -1,28 +1,28 @@
-#pragma once
-#include <filesystem>
-#include <fstream>
-#include <string>
-#include <vector>
-
-#include "algorithms/gfd/gfd.h"
-#include "algorithms/gfd/graph_descriptor.h"
-
-namespace parser {
-
-namespace graph_parser {
-
-model::graph_t ReadGraph(std::istream& stream);
-model::graph_t ReadGraph(std::filesystem::path const& path);
-
-void WriteGraph(std::ostream& stream, model::graph_t const& result);
-void WriteGraph(std::filesystem::path const& path, model::graph_t const& result);
-
-model::Gfd ReadGfd(std::istream& stream);
-model::Gfd ReadGfd(std::filesystem::path const& path);
-
-void WriteGfd(std::ostream& stream, model::Gfd const& result);
-void WriteGfd(std::filesystem::path const& path, model::Gfd const& result);
-
-}  // namespace graph_parser
-
-}  // namespace parser
+#pragma once
+#include <filesystem>
+#include <fstream>
+#include <string>
+#include <vector>
+
+#include "core/algorithms/gfd/gfd.h"
+#include "core/algorithms/gfd/graph_descriptor.h"
+
+namespace parser {
+
+namespace graph_parser {
+
+model::graph_t ReadGraph(std::istream& stream);
+model::graph_t ReadGraph(std::filesystem::path const& path);
+
+void WriteGraph(std::ostream& stream, model::graph_t const& result);
+void WriteGraph(std::filesystem::path const& path, model::graph_t const& result);
+
+model::Gfd ReadGfd(std::istream& stream);
+model::Gfd ReadGfd(std::filesystem::path const& path);
+
+void WriteGfd(std::ostream& stream, model::Gfd const& result);
+void WriteGfd(std::filesystem::path const& path, model::Gfd const& result);
+
+}  // namespace graph_parser
+
+}  // namespace parser
diff --git a/src/core/util/auto_join_thread.h b/src/core/util/auto_join_thread.h
index 55572654e1..55cbf57df1 100644
--- a/src/core/util/auto_join_thread.h
+++ b/src/core/util/auto_join_thread.h
@@ -3,7 +3,7 @@
 #include <stdexcept>
 #include <thread>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace util::jthread {
 
diff --git a/src/core/util/convex_hull.cpp b/src/core/util/convex_hull.cpp
index 838ad5907d..081b835786 100644
--- a/src/core/util/convex_hull.cpp
+++ b/src/core/util/convex_hull.cpp
@@ -1,4 +1,4 @@
-#include "convex_hull.h"
+#include "core/util/convex_hull.h"
 
 #include <algorithm>
 
diff --git a/src/core/util/create_dd.cpp b/src/core/util/create_dd.cpp
index 0286eb30ff..01d42a92cc 100644
--- a/src/core/util/create_dd.cpp
+++ b/src/core/util/create_dd.cpp
@@ -1,4 +1,4 @@
-#include "create_dd.h"
+#include "core/util/create_dd.h"
 
 namespace util::dd {
 model::DFStringConstraint CreateDf(std::string_view const& col_name, double const lower_bound,
diff --git a/src/core/util/create_dd.h b/src/core/util/create_dd.h
index 43ddd6cf2a..80ec9a32f5 100644
--- a/src/core/util/create_dd.h
+++ b/src/core/util/create_dd.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "algorithms/dd/dd.h"
+#include "core/algorithms/dd/dd.h"
 
 namespace util::dd {
 model::DFStringConstraint CreateDf(std::string_view const& col_name, double lower_bound,
diff --git a/src/core/util/custom_hashes.h b/src/core/util/custom_hashes.h
index a1f03c7ea2..0d039ce4e6 100644
--- a/src/core/util/custom_hashes.h
+++ b/src/core/util/custom_hashes.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "model/table/relational_schema.h"
-#include "model/table/vertical.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/vertical.h"
 
 class CustomHashing {
 private:
diff --git a/src/core/util/levenshtein_distance.cpp b/src/core/util/levenshtein_distance.cpp
index 8c3b13d6b5..d664606d24 100644
--- a/src/core/util/levenshtein_distance.cpp
+++ b/src/core/util/levenshtein_distance.cpp
@@ -1,4 +1,4 @@
-#include "levenshtein_distance.h"
+#include "core/util/levenshtein_distance.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/core/util/parallel_for.h b/src/core/util/parallel_for.h
index 0100566301..a03a891cb7 100644
--- a/src/core/util/parallel_for.h
+++ b/src/core/util/parallel_for.h
@@ -5,7 +5,7 @@
 #include <thread>
 #include <vector>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace util {
 
diff --git a/src/core/util/progress.cpp b/src/core/util/progress.cpp
index 08d8c40a79..069380de10 100644
--- a/src/core/util/progress.cpp
+++ b/src/core/util/progress.cpp
@@ -1,4 +1,4 @@
-#include "progress.h"
+#include "core/util/progress.h"
 
 namespace util {
 
diff --git a/src/core/util/qgram_vector.cpp b/src/core/util/qgram_vector.cpp
index ebe8100e38..cdea23e362 100644
--- a/src/core/util/qgram_vector.cpp
+++ b/src/core/util/qgram_vector.cpp
@@ -1,4 +1,4 @@
-#include "qgram_vector.h"
+#include "core/util/qgram_vector.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/core/util/worker_thread_pool.cpp b/src/core/util/worker_thread_pool.cpp
index 2ca2cbf420..17f9bee838 100644
--- a/src/core/util/worker_thread_pool.cpp
+++ b/src/core/util/worker_thread_pool.cpp
@@ -1,4 +1,4 @@
-#include "util/worker_thread_pool.h"
+#include "core/util/worker_thread_pool.h"
 
 #include <cassert>
 
diff --git a/src/core/util/worker_thread_pool.h b/src/core/util/worker_thread_pool.h
index 37e2cb9e9b..ce66ad43f9 100644
--- a/src/core/util/worker_thread_pool.h
+++ b/src/core/util/worker_thread_pool.h
@@ -10,10 +10,10 @@
 #include <variant>
 #include <vector>
 
-#include "model/index.h"
-#include "util/auto_join_thread.h"
-#include "util/barrier.h"
-#include "util/desbordante_assume.h"
+#include "core/model/index.h"
+#include "core/util/auto_join_thread.h"
+#include "core/util/barrier.h"
+#include "core/util/desbordante_assume.h"
 
 namespace util {
 class WorkerThreadPool {
diff --git a/src/python_bindings/CMakeLists.txt b/src/python_bindings/CMakeLists.txt
index ce39953f69..4c13df5402 100644
--- a/src/python_bindings/CMakeLists.txt
+++ b/src/python_bindings/CMakeLists.txt
@@ -23,9 +23,6 @@ target_link_libraries(
     ${BINDINGS_NAME} PRIVATE ${CMAKE_PROJECT_NAME} # Desbordante core static library
 )
 
-# Enable local header inclusion
-include_directories(".")
-
 # ---- Installation Setup ----
 
 if(PYTHON STREQUAL "INSTALL")
diff --git a/src/python_bindings/ac/bind_ac.cpp b/src/python_bindings/ac/bind_ac.cpp
index e80bdb3034..5c95e3c73e 100644
--- a/src/python_bindings/ac/bind_ac.cpp
+++ b/src/python_bindings/ac/bind_ac.cpp
@@ -1,12 +1,12 @@
-#include "bind_ac.h"
+#include "python_bindings/ac/bind_ac.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/algebraic_constraints/ac.h"
-#include "algorithms/algebraic_constraints/mining_algorithms.h"
-#include "model/types/create_type.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/algebraic_constraints/ac.h"
+#include "core/algorithms/algebraic_constraints/mining_algorithms.h"
+#include "core/model/types/create_type.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 std::unique_ptr<model::INumericType> CreateNumericTypeFromTypeId(model::TypeId type_id) {
diff --git a/src/python_bindings/ar/bind_ar.cpp b/src/python_bindings/ar/bind_ar.cpp
index 93e7273bac..1af0462b5e 100644
--- a/src/python_bindings/ar/bind_ar.cpp
+++ b/src/python_bindings/ar/bind_ar.cpp
@@ -1,11 +1,11 @@
-#include "bind_ar.h"
+#include "python_bindings/ar/bind_ar.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/association_rules/ar.h"
-#include "algorithms/association_rules/mining_algorithms.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/association_rules/ar.h"
+#include "core/algorithms/association_rules/mining_algorithms.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/bind_main_classes.cpp b/src/python_bindings/bind_main_classes.cpp
index 2f3ea88a16..95a9d2ddc1 100644
--- a/src/python_bindings/bind_main_classes.cpp
+++ b/src/python_bindings/bind_main_classes.cpp
@@ -1,4 +1,4 @@
-#include "bind_main_classes.h"
+#include "python_bindings/bind_main_classes.h"
 
 #include <typeindex>
 #include <typeinfo>
@@ -6,13 +6,13 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/algorithm.h"
-#include "config/exceptions.h"
-#include "config/names.h"
-#include "py_util/get_py_type.h"
-#include "py_util/opt_to_py.h"
-#include "py_util/py_to_any.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/algorithm.h"
+#include "core/config/exceptions.h"
+#include "core/config/names.h"
+#include "python_bindings/py_util/get_py_type.h"
+#include "python_bindings/py_util/opt_to_py.h"
+#include "python_bindings/py_util/py_to_any.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/bindings.cpp b/src/python_bindings/bindings.cpp
index 381552951f..c8ff0bbfe7 100644
--- a/src/python_bindings/bindings.cpp
+++ b/src/python_bindings/bindings.cpp
@@ -3,37 +3,37 @@
 
 #include <pybind11/pybind11.h>
 
-#include "ac/bind_ac.h"
-#include "ar/bind_ar.h"
-#include "bind_main_classes.h"
-#include "cfd/bind_cfd.h"
-#include "cfd/bind_cfd_verification.h"
-#include "data/bind_data_types.h"
-#include "dc/bind_dc_verification.h"
-#include "dc/bind_fastadc.h"
-#include "dd/bind_dd_verification.h"
-#include "dd/bind_split.h"
-#include "dynamic/bind_dynamic_fd_verification.h"
-#include "fd/bind_fd.h"
-#include "fd/bind_fd_verification.h"
-#include "gfd/bind_gfd.h"
-#include "gfd/bind_gfd_verification.h"
-#include "ind/bind_ind.h"
-#include "ind/bind_ind_verification.h"
-#include "md/bind_md.h"
-#include "md/bind_md_verification.h"
-#include "mfd/bind_mfd_verification.h"
-#include "nar/bind_nar.h"
-#include "nd/bind_nd.h"
-#include "nd/bind_nd_verification.h"
-#include "od/bind_od.h"
-#include "od/bind_od_verification.h"
-#include "pfd/bind_pfd_verification.h"
-#include "py_util/logging.h"
-#include "sfd/bind_sfd.h"
-#include "statistics/bind_statistics.h"
-#include "ucc/bind_ucc.h"
-#include "ucc/bind_ucc_verification.h"
+#include "python_bindings/ac/bind_ac.h"
+#include "python_bindings/ar/bind_ar.h"
+#include "python_bindings/bind_main_classes.h"
+#include "python_bindings/cfd/bind_cfd.h"
+#include "python_bindings/cfd/bind_cfd_verification.h"
+#include "python_bindings/data/bind_data_types.h"
+#include "python_bindings/dc/bind_dc_verification.h"
+#include "python_bindings/dc/bind_fastadc.h"
+#include "python_bindings/dd/bind_dd_verification.h"
+#include "python_bindings/dd/bind_split.h"
+#include "python_bindings/dynamic/bind_dynamic_fd_verification.h"
+#include "python_bindings/fd/bind_fd.h"
+#include "python_bindings/fd/bind_fd_verification.h"
+#include "python_bindings/gfd/bind_gfd.h"
+#include "python_bindings/gfd/bind_gfd_verification.h"
+#include "python_bindings/ind/bind_ind.h"
+#include "python_bindings/ind/bind_ind_verification.h"
+#include "python_bindings/md/bind_md.h"
+#include "python_bindings/md/bind_md_verification.h"
+#include "python_bindings/mfd/bind_mfd_verification.h"
+#include "python_bindings/nar/bind_nar.h"
+#include "python_bindings/nd/bind_nd.h"
+#include "python_bindings/nd/bind_nd_verification.h"
+#include "python_bindings/od/bind_od.h"
+#include "python_bindings/od/bind_od_verification.h"
+#include "python_bindings/pfd/bind_pfd_verification.h"
+#include "python_bindings/py_util/logging.h"
+#include "python_bindings/sfd/bind_sfd.h"
+#include "python_bindings/statistics/bind_statistics.h"
+#include "python_bindings/ucc/bind_ucc.h"
+#include "python_bindings/ucc/bind_ucc_verification.h"
 
 namespace python_bindings {
 
diff --git a/src/python_bindings/cfd/bind_cfd.cpp b/src/python_bindings/cfd/bind_cfd.cpp
index 3013b551ef..d7c2a44779 100644
--- a/src/python_bindings/cfd/bind_cfd.cpp
+++ b/src/python_bindings/cfd/bind_cfd.cpp
@@ -1,11 +1,11 @@
-#include "cfd/bind_cfd.h"
+#include "python_bindings/cfd/bind_cfd.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/cfd/fd_first_algorithm.h"
-#include "algorithms/cfd/model/raw_cfd.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/cfd/fd_first_algorithm.h"
+#include "core/algorithms/cfd/model/raw_cfd.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace py = pybind11;
 
diff --git a/src/python_bindings/cfd/bind_cfd_verification.cpp b/src/python_bindings/cfd/bind_cfd_verification.cpp
index dc8b143968..dfe77b34ce 100644
--- a/src/python_bindings/cfd/bind_cfd_verification.cpp
+++ b/src/python_bindings/cfd/bind_cfd_verification.cpp
@@ -1,9 +1,9 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/cfd/cfd_verifier/cfd_verifier.h"
-#include "algorithms/cfd/cfd_verifier/highlight.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/cfd/cfd_verifier/cfd_verifier.h"
+#include "core/algorithms/cfd/cfd_verifier/highlight.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/data/bind_data_types.cpp b/src/python_bindings/data/bind_data_types.cpp
index 4f7669e81e..748150a920 100644
--- a/src/python_bindings/data/bind_data_types.cpp
+++ b/src/python_bindings/data/bind_data_types.cpp
@@ -1,10 +1,10 @@
-#include "bind_data_types.h"
+#include "python_bindings/data/bind_data_types.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "config/tabular_data/input_table_type.h"
-#include "model/table/column_combination.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/table/column_combination.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/dc/bind_dc_verification.cpp b/src/python_bindings/dc/bind_dc_verification.cpp
index 0633c39909..ace4c5be15 100644
--- a/src/python_bindings/dc/bind_dc_verification.cpp
+++ b/src/python_bindings/dc/bind_dc_verification.cpp
@@ -1,11 +1,11 @@
-#include "dc/bind_dc_verification.h"
+#include "python_bindings/dc/bind_dc_verification.h"
 
 #include <pybind11/complex.h>
 #include <pybind11/stl.h>
 #include <pybind11/stl_bind.h>
 
-#include "algorithms/dc/verifier/dc_verifier.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/dc/verifier/dc_verifier.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace python_bindings {
 
diff --git a/src/python_bindings/dc/bind_fastadc.cpp b/src/python_bindings/dc/bind_fastadc.cpp
index 85067e7003..059a57d565 100644
--- a/src/python_bindings/dc/bind_fastadc.cpp
+++ b/src/python_bindings/dc/bind_fastadc.cpp
@@ -1,11 +1,11 @@
-#include "bind_fastadc.h"
+#include "python_bindings/dc/bind_fastadc.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/dc/FastADC/fastadc.h"
-#include "py_util/bind_primitive.h"
-#include "py_util/table_serialization.h"
+#include "core/algorithms/dc/FastADC/fastadc.h"
+#include "python_bindings/py_util/bind_primitive.h"
+#include "python_bindings/py_util/table_serialization.h"
 
 namespace py = pybind11;
 using namespace algos::fastadc;
diff --git a/src/python_bindings/dd/bind_dd_verification.cpp b/src/python_bindings/dd/bind_dd_verification.cpp
index facfcbd0f7..6033367c78 100644
--- a/src/python_bindings/dd/bind_dd_verification.cpp
+++ b/src/python_bindings/dd/bind_dd_verification.cpp
@@ -1,13 +1,13 @@
-#include "bind_dd_verification.h"
+#include "python_bindings/dd/bind_dd_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/dd/dd.h"
-#include "algorithms/dd/dd_verifier/dd_verifier.h"
-#include "algorithms/dd/dd_verifier/highlight.h"
-#include "py_util/bind_primitive.h"
-#include "util/create_dd.h"
+#include "core/algorithms/dd/dd.h"
+#include "core/algorithms/dd/dd_verifier/dd_verifier.h"
+#include "core/algorithms/dd/dd_verifier/highlight.h"
+#include "core/util/create_dd.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace python_bindings {
 namespace py = pybind11;
diff --git a/src/python_bindings/dd/bind_split.cpp b/src/python_bindings/dd/bind_split.cpp
index 2d5870ce6d..9012597bd6 100644
--- a/src/python_bindings/dd/bind_split.cpp
+++ b/src/python_bindings/dd/bind_split.cpp
@@ -1,12 +1,12 @@
-#include "bind_split.h"
+#include "python_bindings/dd/bind_split.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/dd/dd.h"
-#include "algorithms/dd/mining_algorithms.h"
-#include "py_util/bind_primitive.h"
-#include "util/create_dd.h"
+#include "core/algorithms/dd/dd.h"
+#include "core/algorithms/dd/mining_algorithms.h"
+#include "core/util/create_dd.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/dynamic/bind_dynamic_fd_verification.cpp b/src/python_bindings/dynamic/bind_dynamic_fd_verification.cpp
index a479ea1f97..2cda39c39f 100644
--- a/src/python_bindings/dynamic/bind_dynamic_fd_verification.cpp
+++ b/src/python_bindings/dynamic/bind_dynamic_fd_verification.cpp
@@ -1,15 +1,15 @@
-#include "dynamic/bind_dynamic_fd_verification.h"
+#include "python_bindings/dynamic/bind_dynamic_fd_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/fd/fd_verifier/dynamic_fd_verifier.h"
-#include "algorithms/fd/verification_algorithms.h"
-#include "config/names.h"
-#include "config/tabular_data/crud_operations/operations.h"
-#include "py_util/bind_primitive.h"
-#include "py_util/py_to_any.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h"
+#include "core/algorithms/fd/verification_algorithms.h"
+#include "core/config/names.h"
+#include "core/config/tabular_data/crud_operations/operations.h"
+#include "python_bindings/py_util/bind_primitive.h"
+#include "python_bindings/py_util/py_to_any.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/fd/bind_fd.cpp b/src/python_bindings/fd/bind_fd.cpp
index bc67af264e..79c4ef047f 100644
--- a/src/python_bindings/fd/bind_fd.cpp
+++ b/src/python_bindings/fd/bind_fd.cpp
@@ -1,15 +1,15 @@
-#include "bind_fd.h"
+#include "python_bindings/fd/bind_fd.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/fd/fd.h"
-#include "algorithms/fd/fd_algorithm.h"
-#include "algorithms/fd/mining_algorithms.h"
-#include "config/indices/type.h"
-#include "py_util/bind_primitive.h"
-#include "py_util/table_serialization.h"
-#include "util/bitset_utils.h"
+#include "core/algorithms/fd/fd.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/algorithms/fd/mining_algorithms.h"
+#include "core/config/indices/type.h"
+#include "core/util/bitset_utils.h"
+#include "python_bindings/py_util/bind_primitive.h"
+#include "python_bindings/py_util/table_serialization.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/fd/bind_fd_verification.cpp b/src/python_bindings/fd/bind_fd_verification.cpp
index ca65c64236..3b91e0b629 100644
--- a/src/python_bindings/fd/bind_fd_verification.cpp
+++ b/src/python_bindings/fd/bind_fd_verification.cpp
@@ -1,12 +1,12 @@
-#include "bind_fd_verification.h"
+#include "python_bindings/fd/bind_fd_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/fd/fd_verifier/fd_verifier.h"
-#include "algorithms/fd/fd_verifier/highlight.h"
-#include "algorithms/fd/verification_algorithms.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/fd/fd_verifier/fd_verifier.h"
+#include "core/algorithms/fd/fd_verifier/highlight.h"
+#include "core/algorithms/fd/verification_algorithms.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/gfd/bind_gfd.cpp b/src/python_bindings/gfd/bind_gfd.cpp
index a2af5bc470..e6305e7d9e 100644
--- a/src/python_bindings/gfd/bind_gfd.cpp
+++ b/src/python_bindings/gfd/bind_gfd.cpp
@@ -1,10 +1,10 @@
-#include "gfd/bind_gfd.h"
+#include "python_bindings/gfd/bind_gfd.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/gfd/gfd_miner/gfd_miner.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/gfd/gfd_miner/gfd_miner.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace python_bindings {
 void BindGfd(pybind11::module_& main_module) {
diff --git a/src/python_bindings/gfd/bind_gfd_verification.cpp b/src/python_bindings/gfd/bind_gfd_verification.cpp
index c12d33e175..cea3ce3e76 100644
--- a/src/python_bindings/gfd/bind_gfd_verification.cpp
+++ b/src/python_bindings/gfd/bind_gfd_verification.cpp
@@ -1,10 +1,10 @@
-#include "gfd/bind_gfd_verification.h"
+#include "python_bindings/gfd/bind_gfd_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/gfd/gfd_validator/verification_algorithms.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/gfd/gfd_validator/verification_algorithms.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/ind/bind_ind.cpp b/src/python_bindings/ind/bind_ind.cpp
index 8419572afa..2a5c8a8b7a 100644
--- a/src/python_bindings/ind/bind_ind.cpp
+++ b/src/python_bindings/ind/bind_ind.cpp
@@ -1,12 +1,12 @@
-#include "ind/bind_ind.h"
+#include "python_bindings/ind/bind_ind.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/ind/ind.h"
-#include "algorithms/ind/ind_algorithm.h"
-#include "algorithms/ind/mining_algorithms.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/ind/ind.h"
+#include "core/algorithms/ind/ind_algorithm.h"
+#include "core/algorithms/ind/mining_algorithms.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace py = pybind11;
 
diff --git a/src/python_bindings/ind/bind_ind_verification.cpp b/src/python_bindings/ind/bind_ind_verification.cpp
index 6cc8aaec86..06e966b293 100644
--- a/src/python_bindings/ind/bind_ind_verification.cpp
+++ b/src/python_bindings/ind/bind_ind_verification.cpp
@@ -1,10 +1,10 @@
-#include "bind_ind_verification.h"
+#include "python_bindings/ind/bind_ind_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/ind/verification_algorithms.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/ind/verification_algorithms.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/md/bind_md.cpp b/src/python_bindings/md/bind_md.cpp
index 6aff965fdf..62ea9ea949 100644
--- a/src/python_bindings/md/bind_md.cpp
+++ b/src/python_bindings/md/bind_md.cpp
@@ -1,4 +1,4 @@
-#include "md/bind_md.h"
+#include "python_bindings/md/bind_md.h"
 
 #include <pybind11/cast.h>
 #include <pybind11/functional.h>
@@ -6,18 +6,18 @@
 #include <pybind11/stl.h>
 #include <pybind11/typing.h>
 
-#include "algorithms/md/hymd/preprocessing/column_matches/date_difference.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/equality.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/jaccard.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/lcs.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/number_difference.h"
-#include "algorithms/md/md.h"
-#include "algorithms/md/mining_algorithms.h"
-#include "md/object_similarity_measure.h"
-#include "py_util/bind_primitive.h"
-#include "py_util/table_serialization.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/date_difference.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/equality.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/jaccard.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/lcs.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/number_difference.h"
+#include "core/algorithms/md/md.h"
+#include "core/algorithms/md/mining_algorithms.h"
+#include "python_bindings/md/object_similarity_measure.h"
+#include "python_bindings/py_util/bind_primitive.h"
+#include "python_bindings/py_util/table_serialization.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/md/bind_md_verification.cpp b/src/python_bindings/md/bind_md_verification.cpp
index f7bd7b3fc2..5b9de79d72 100644
--- a/src/python_bindings/md/bind_md_verification.cpp
+++ b/src/python_bindings/md/bind_md_verification.cpp
@@ -1,12 +1,12 @@
-#include "md/bind_md_verification.h"
+#include "python_bindings/md/bind_md_verification.h"
 
 #include <pybind11/stl.h>
 
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match.h"
-#include "algorithms/md/md_verifier/column_similarity_classifier.h"
-#include "algorithms/md/md_verifier/highlights/highlights.h"
-#include "algorithms/md/md_verifier/md_verifier.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match.h"
+#include "core/algorithms/md/md_verifier/column_similarity_classifier.h"
+#include "core/algorithms/md/md_verifier/highlights/highlights.h"
+#include "core/algorithms/md/md_verifier/md_verifier.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/md/object_similarity_measure.h b/src/python_bindings/md/object_similarity_measure.h
index 8025823f6f..20e2f40926 100644
--- a/src/python_bindings/md/object_similarity_measure.h
+++ b/src/python_bindings/md/object_similarity_measure.h
@@ -7,12 +7,12 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/md/hymd/lowest_bound.h"
-#include "algorithms/md/hymd/lowest_cc_value_id.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/single_transformer.h"
-#include "algorithms/md/hymd/preprocessing/similarity.h"
+#include "core/algorithms/md/hymd/lowest_bound.h"
+#include "core/algorithms/md/hymd/lowest_cc_value_id.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/basic_calculator.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/single_transformer.h"
+#include "core/algorithms/md/hymd/preprocessing/similarity.h"
 
 namespace python_bindings {
 namespace detail {
diff --git a/src/python_bindings/mfd/bind_mfd_verification.cpp b/src/python_bindings/mfd/bind_mfd_verification.cpp
index 6e7d3bfd71..8e8299cc19 100644
--- a/src/python_bindings/mfd/bind_mfd_verification.cpp
+++ b/src/python_bindings/mfd/bind_mfd_verification.cpp
@@ -1,11 +1,11 @@
-#include "bind_mfd_verification.h"
+#include "python_bindings/mfd/bind_mfd_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/metric/highlight.h"
-#include "algorithms/metric/verification_algorithms.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/metric/highlight.h"
+#include "core/algorithms/metric/verification_algorithms.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/nar/bind_nar.cpp b/src/python_bindings/nar/bind_nar.cpp
index e712a73286..2b4d80fd0d 100644
--- a/src/python_bindings/nar/bind_nar.cpp
+++ b/src/python_bindings/nar/bind_nar.cpp
@@ -1,10 +1,10 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/nar/mining_algorithms.h"
-#include "algorithms/nar/nar.h"
-#include "algorithms/nar/value_range.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/nar/mining_algorithms.h"
+#include "core/algorithms/nar/nar.h"
+#include "core/algorithms/nar/value_range.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace py = pybind11;
 
diff --git a/src/python_bindings/nd/bind_nd.cpp b/src/python_bindings/nd/bind_nd.cpp
index fd2a16b5e8..55bcff66b2 100644
--- a/src/python_bindings/nd/bind_nd.cpp
+++ b/src/python_bindings/nd/bind_nd.cpp
@@ -1,10 +1,10 @@
-#include "nd/bind_nd.h"
+#include "python_bindings/nd/bind_nd.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/nd/nd.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/nd/nd.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace py = pybind11;
 
diff --git a/src/python_bindings/nd/bind_nd_verification.cpp b/src/python_bindings/nd/bind_nd_verification.cpp
index 96a88dd90c..4bb1c992a4 100644
--- a/src/python_bindings/nd/bind_nd_verification.cpp
+++ b/src/python_bindings/nd/bind_nd_verification.cpp
@@ -1,11 +1,11 @@
-#include "bind_nd_verification.h"
+#include "python_bindings/nd/bind_nd_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/nd/nd_verifier/nd_verifier.h"
-#include "algorithms/nd/nd_verifier/util/highlight.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/nd/nd_verifier/nd_verifier.h"
+#include "core/algorithms/nd/nd_verifier/util/highlight.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/od/bind_od.cpp b/src/python_bindings/od/bind_od.cpp
index 8abcea3350..e37bd99da2 100644
--- a/src/python_bindings/od/bind_od.cpp
+++ b/src/python_bindings/od/bind_od.cpp
@@ -1,15 +1,15 @@
-#include "bind_od.h"
+#include "python_bindings/od/bind_od.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/od/fastod/fastod.h"
-#include "algorithms/od/fastod/model/canonical_od.h"
-#include "algorithms/od/mining_algorithms.h"
-#include "algorithms/od/order/list_od.h"
-#include "config/indices/type.h"
-#include "py_util/bind_primitive.h"
-#include "util/bitset_utils.h"
+#include "core/algorithms/od/fastod/fastod.h"
+#include "core/algorithms/od/fastod/model/canonical_od.h"
+#include "core/algorithms/od/mining_algorithms.h"
+#include "core/algorithms/od/order/list_od.h"
+#include "core/config/indices/type.h"
+#include "core/util/bitset_utils.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/od/bind_od_verification.cpp b/src/python_bindings/od/bind_od_verification.cpp
index cdd9f1d836..e9db4c02d4 100644
--- a/src/python_bindings/od/bind_od_verification.cpp
+++ b/src/python_bindings/od/bind_od_verification.cpp
@@ -1,10 +1,10 @@
-#include "bind_od_verification.h"
+#include "python_bindings/od/bind_od_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/od/set_based_verifier//verifier.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/od/set_based_verifier/verifier.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/pfd/bind_pfd_verification.cpp b/src/python_bindings/pfd/bind_pfd_verification.cpp
index edd5ffea6d..106c54d8ea 100644
--- a/src/python_bindings/pfd/bind_pfd_verification.cpp
+++ b/src/python_bindings/pfd/bind_pfd_verification.cpp
@@ -1,10 +1,10 @@
-#include "bind_pfd_verification.h"
+#include "python_bindings/pfd/bind_pfd_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/fd/pfd_verifier/pfd_verifier.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/fd/pfd_verifier/pfd_verifier.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/py_util/bind_primitive.h b/src/python_bindings/py_util/bind_primitive.h
index 3a4e741685..26c70ae39c 100644
--- a/src/python_bindings/py_util/bind_primitive.h
+++ b/src/python_bindings/py_util/bind_primitive.h
@@ -8,8 +8,8 @@
 
 #include <pybind11/pybind11.h>
 
-#include "algorithms/algorithm.h"
-#include "util/mem_ptr_deduce.h"
+#include "core/algorithms/algorithm.h"
+#include "core/util/mem_ptr_deduce.h"
 
 namespace python_bindings {
 
diff --git a/src/python_bindings/py_util/create_dataframe_reader.cpp b/src/python_bindings/py_util/create_dataframe_reader.cpp
index ce9e4c8127..57cce899aa 100644
--- a/src/python_bindings/py_util/create_dataframe_reader.cpp
+++ b/src/python_bindings/py_util/create_dataframe_reader.cpp
@@ -1,7 +1,7 @@
-#include "create_dataframe_reader.h"
+#include "python_bindings/py_util/create_dataframe_reader.h"
 
-#include "config/exceptions.h"
-#include "py_util/dataframe_reader.h"
+#include "core/config/exceptions.h"
+#include "python_bindings/py_util/dataframe_reader.h"
 
 namespace python_bindings {
 
diff --git a/src/python_bindings/py_util/create_dataframe_reader.h b/src/python_bindings/py_util/create_dataframe_reader.h
index 705a57be0c..4b2d342bce 100644
--- a/src/python_bindings/py_util/create_dataframe_reader.h
+++ b/src/python_bindings/py_util/create_dataframe_reader.h
@@ -2,7 +2,7 @@
 
 #include <pybind11/pybind11.h>
 
-#include "config/tabular_data/input_table_type.h"
+#include "core/config/tabular_data/input_table_type.h"
 
 namespace python_bindings {
 config::InputTable CreateDataFrameReader(pybind11::handle dataframe,
diff --git a/src/python_bindings/py_util/dataframe_reader.cpp b/src/python_bindings/py_util/dataframe_reader.cpp
index 3013df0b57..afe688d980 100644
--- a/src/python_bindings/py_util/dataframe_reader.cpp
+++ b/src/python_bindings/py_util/dataframe_reader.cpp
@@ -1,4 +1,4 @@
-#include "dataframe_reader.h"
+#include "python_bindings/py_util/dataframe_reader.h"
 
 #include <string>
 #include <utility>
@@ -9,7 +9,7 @@
 #include <pybind11/pytypes.h>
 #include <pybind11/stl.h>
 
-#include "model/types/builtin.h"
+#include "core/model/types/builtin.h"
 
 namespace python_bindings {
 
diff --git a/src/python_bindings/py_util/dataframe_reader.h b/src/python_bindings/py_util/dataframe_reader.h
index 00526305ba..7f44d087bc 100644
--- a/src/python_bindings/py_util/dataframe_reader.h
+++ b/src/python_bindings/py_util/dataframe_reader.h
@@ -2,7 +2,7 @@
 
 #include <pybind11/pybind11.h>
 
-#include "model/table/idataset_stream.h"
+#include "core/model/table/idataset_stream.h"
 
 namespace python_bindings {
 
diff --git a/src/python_bindings/py_util/get_py_type.cpp b/src/python_bindings/py_util/get_py_type.cpp
index ec23264c32..7b9b9f4064 100644
--- a/src/python_bindings/py_util/get_py_type.cpp
+++ b/src/python_bindings/py_util/get_py_type.cpp
@@ -1,4 +1,4 @@
-#include "get_py_type.h"
+#include "python_bindings/py_util/get_py_type.h"
 
 #include <functional>
 #include <typeinfo>
@@ -8,19 +8,19 @@
 #include <Python.h>
 #include <pybind11/stl/filesystem.h>
 
-#include "algorithms/cfd/enums.h"
-#include "algorithms/dd/dd.h"
-#include "algorithms/md/hymd/enums.h"
-#include "algorithms/md/hymd/hymd.h"
-#include "algorithms/md/md_verifier/column_similarity_classifier.h"
-#include "algorithms/metric/enums.h"
-#include "association_rules/ar_algorithm_enums.h"
-#include "config/custom_random_seed/type.h"
-#include "config/error_measure/type.h"
-#include "config/tabular_data/input_table_type.h"
-#include "config/tabular_data/input_tables_type.h"
-#include "model/table/column_combination.h"
-#include "od/fastod/od_ordering.h"
+#include "core/algorithms/association_rules/ar_algorithm_enums.h"
+#include "core/algorithms/cfd/enums.h"
+#include "core/algorithms/dd/dd.h"
+#include "core/algorithms/md/hymd/enums.h"
+#include "core/algorithms/md/hymd/hymd.h"
+#include "core/algorithms/md/md_verifier/column_similarity_classifier.h"
+#include "core/algorithms/metric/enums.h"
+#include "core/algorithms/od/fastod/od_ordering.h"
+#include "core/config/custom_random_seed/type.h"
+#include "core/config/error_measure/type.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/config/tabular_data/input_tables_type.h"
+#include "core/model/table/column_combination.h"
 
 namespace py = pybind11;
 
diff --git a/src/python_bindings/py_util/logging.cpp b/src/python_bindings/py_util/logging.cpp
index 7e5f62bd2c..3038a5a0d4 100644
--- a/src/python_bindings/py_util/logging.cpp
+++ b/src/python_bindings/py_util/logging.cpp
@@ -1,4 +1,4 @@
-#include "py_util/logging.h"
+#include "python_bindings/py_util/logging.h"
 
 #include <memory>
 #include <mutex>
@@ -18,7 +18,7 @@
 #include <spdlog/sinks/base_sink.h>
 #include <spdlog/spdlog.h>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/py_util/opt_to_py.cpp b/src/python_bindings/py_util/opt_to_py.cpp
index 6108b00cc5..5873b31d18 100644
--- a/src/python_bindings/py_util/opt_to_py.cpp
+++ b/src/python_bindings/py_util/opt_to_py.cpp
@@ -1,4 +1,4 @@
-#include "opt_to_py.h"
+#include "python_bindings/py_util/opt_to_py.h"
 
 #include <functional>
 #include <typeinfo>
@@ -6,17 +6,17 @@
 
 #include <pybind11/stl.h>
 
-#include "algorithms/dd/dd.h"
-#include "algorithms/md/hymd/enums.h"
-#include "algorithms/metric/enums.h"
-#include "association_rules/ar_algorithm_enums.h"
-#include "config/custom_random_seed/type.h"
-#include "config/equal_nulls/type.h"
-#include "config/error/type.h"
-#include "config/indices/type.h"
-#include "config/max_lhs/type.h"
-#include "config/thread_number/type.h"
-#include "od/fastod/od_ordering.h"
+#include "core/algorithms/association_rules/ar_algorithm_enums.h"
+#include "core/algorithms/dd/dd.h"
+#include "core/algorithms/md/hymd/enums.h"
+#include "core/algorithms/metric/enums.h"
+#include "core/algorithms/od/fastod/od_ordering.h"
+#include "core/config/custom_random_seed/type.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/error/type.h"
+#include "core/config/indices/type.h"
+#include "core/config/max_lhs/type.h"
+#include "core/config/thread_number/type.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/py_util/py_to_any.cpp b/src/python_bindings/py_util/py_to_any.cpp
index 4cf6cc09d5..aec6eb1339 100644
--- a/src/python_bindings/py_util/py_to_any.cpp
+++ b/src/python_bindings/py_util/py_to_any.cpp
@@ -6,23 +6,23 @@
 #include <pybind11/stl.h>
 #include <pybind11/stl/filesystem.h>
 
-#include "algorithms/algebraic_constraints/bin_operation_enum.h"
-#include "algorithms/cfd/enums.h"
-#include "algorithms/dd/dd.h"
-#include "algorithms/md/hymd/enums.h"
-#include "algorithms/md/hymd/hymd.h"
-#include "algorithms/md/md_verifier/column_similarity_classifier.h"
-#include "algorithms/metric/enums.h"
-#include "association_rules/ar_algorithm_enums.h"
-#include "config/custom_random_seed/type.h"
-#include "config/error_measure/type.h"
-#include "config/exceptions.h"
-#include "config/tabular_data/input_table_type.h"
-#include "config/tabular_data/input_tables_type.h"
-#include "od/fastod/od_ordering.h"
-#include "parser/csv_parser/csv_parser.h"
-#include "py_util/create_dataframe_reader.h"
-#include "util/enum_to_available_values.h"
+#include "core/algorithms/algebraic_constraints/bin_operation_enum.h"
+#include "core/algorithms/association_rules/ar_algorithm_enums.h"
+#include "core/algorithms/cfd/enums.h"
+#include "core/algorithms/dd/dd.h"
+#include "core/algorithms/md/hymd/enums.h"
+#include "core/algorithms/md/hymd/hymd.h"
+#include "core/algorithms/md/md_verifier/column_similarity_classifier.h"
+#include "core/algorithms/metric/enums.h"
+#include "core/algorithms/od/fastod/od_ordering.h"
+#include "core/config/custom_random_seed/type.h"
+#include "core/config/error_measure/type.h"
+#include "core/config/exceptions.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/config/tabular_data/input_tables_type.h"
+#include "core/parser/csv_parser/csv_parser.h"
+#include "core/util/enum_to_available_values.h"
+#include "python_bindings/py_util/create_dataframe_reader.h"
 
 namespace {
 
diff --git a/src/python_bindings/py_util/table_serialization.cpp b/src/python_bindings/py_util/table_serialization.cpp
index 73f6ee92c4..a26def589f 100644
--- a/src/python_bindings/py_util/table_serialization.cpp
+++ b/src/python_bindings/py_util/table_serialization.cpp
@@ -1,4 +1,4 @@
-#include "table_serialization.h"
+#include "python_bindings/py_util/table_serialization.h"
 
 #include <utility>
 
diff --git a/src/python_bindings/py_util/table_serialization.h b/src/python_bindings/py_util/table_serialization.h
index 601d4896cc..93a25d9a87 100644
--- a/src/python_bindings/py_util/table_serialization.h
+++ b/src/python_bindings/py_util/table_serialization.h
@@ -4,10 +4,10 @@
 
 #include <pybind11/pybind11.h>
 
-#include "model/table/column.h"
-#include "model/table/column_combination.h"
-#include "model/table/relational_schema.h"
-#include "model/table/vertical.h"
+#include "core/model/table/column.h"
+#include "core/model/table/column_combination.h"
+#include "core/model/table/relational_schema.h"
+#include "core/model/table/vertical.h"
 
 namespace py = pybind11;
 
diff --git a/src/python_bindings/sfd/bind_sfd.cpp b/src/python_bindings/sfd/bind_sfd.cpp
index 6a33784d6f..b9ce8c515c 100644
--- a/src/python_bindings/sfd/bind_sfd.cpp
+++ b/src/python_bindings/sfd/bind_sfd.cpp
@@ -1,14 +1,14 @@
-#include "bind_sfd.h"
+#include "python_bindings/sfd/bind_sfd.h"
 
 #include <algorithm>
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/fd/sfd/cords.h"
-#include "algorithms/fd/sfd/correlation.h"
-#include "py_util/bind_primitive.h"
-#include "py_util/table_serialization.h"
+#include "core/algorithms/fd/sfd/cords.h"
+#include "core/algorithms/fd/sfd/correlation.h"
+#include "python_bindings/py_util/bind_primitive.h"
+#include "python_bindings/py_util/table_serialization.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/statistics/bind_statistics.cpp b/src/python_bindings/statistics/bind_statistics.cpp
index 5a23403be0..41afba07d1 100644
--- a/src/python_bindings/statistics/bind_statistics.cpp
+++ b/src/python_bindings/statistics/bind_statistics.cpp
@@ -1,10 +1,10 @@
-#include "bind_statistics.h"
+#include "python_bindings/statistics/bind_statistics.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/statistics/data_stats.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/statistics/data_stats.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/ucc/bind_ucc.cpp b/src/python_bindings/ucc/bind_ucc.cpp
index 436a31f31e..bcbc89c13a 100644
--- a/src/python_bindings/ucc/bind_ucc.cpp
+++ b/src/python_bindings/ucc/bind_ucc.cpp
@@ -1,4 +1,4 @@
-#include "bind_ucc.h"
+#include "python_bindings/ucc/bind_ucc.h"
 
 #include <cstddef>
 #include <vector>
@@ -6,13 +6,13 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/ucc/mining_algorithms.h"
-#include "algorithms/ucc/ucc.h"
-#include "config/indices/type.h"
-#include "model/table/column.h"
-#include "py_util/bind_primitive.h"
-#include "py_util/table_serialization.h"
-#include "util/bitset_utils.h"
+#include "core/algorithms/ucc/mining_algorithms.h"
+#include "core/algorithms/ucc/ucc.h"
+#include "core/config/indices/type.h"
+#include "core/model/table/column.h"
+#include "core/util/bitset_utils.h"
+#include "python_bindings/py_util/bind_primitive.h"
+#include "python_bindings/py_util/table_serialization.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/python_bindings/ucc/bind_ucc_verification.cpp b/src/python_bindings/ucc/bind_ucc_verification.cpp
index e7e8646a7a..09556a1950 100644
--- a/src/python_bindings/ucc/bind_ucc_verification.cpp
+++ b/src/python_bindings/ucc/bind_ucc_verification.cpp
@@ -1,10 +1,10 @@
-#include "bind_ucc_verification.h"
+#include "python_bindings/ucc/bind_ucc_verification.h"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include "algorithms/ucc/verification_algorithms.h"
-#include "py_util/bind_primitive.h"
+#include "core/algorithms/ucc/verification_algorithms.h"
+#include "python_bindings/py_util/bind_primitive.h"
 
 namespace {
 namespace py = pybind11;
diff --git a/src/tests/benchmark/adc_benchmark.h b/src/tests/benchmark/adc_benchmark.h
index f52db44ddd..0db1dd9d8e 100644
--- a/src/tests/benchmark/adc_benchmark.h
+++ b/src/tests/benchmark/adc_benchmark.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "algorithms/dc/FastADC/fastadc.h"
-#include "all_csv_configs.h"
-#include "benchmark_comparer.h"
-#include "benchmark_runner.h"
+#include "core/algorithms/dc/FastADC/fastadc.h"
+#include "tests/benchmark/benchmark_comparer.h"
+#include "tests/benchmark/benchmark_runner.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace benchmark {
 
diff --git a/src/tests/benchmark/benchmark_cli.cpp b/src/tests/benchmark/benchmark_cli.cpp
index 45b54ae866..a9b3143428 100644
--- a/src/tests/benchmark/benchmark_cli.cpp
+++ b/src/tests/benchmark/benchmark_cli.cpp
@@ -1,4 +1,4 @@
-#include "benchmark_cli.h"
+#include "tests/benchmark/benchmark_cli.h"
 
 #include <boost/program_options.hpp>
 
diff --git a/src/tests/benchmark/benchmark_comparer.cpp b/src/tests/benchmark/benchmark_comparer.cpp
index d9ac518dc8..a80f03884c 100644
--- a/src/tests/benchmark/benchmark_comparer.cpp
+++ b/src/tests/benchmark/benchmark_comparer.cpp
@@ -1,4 +1,4 @@
-#include "benchmark_comparer.h"
+#include "tests/benchmark/benchmark_comparer.h"
 
 #include <iomanip>
 #include <iostream>
diff --git a/src/tests/benchmark/benchmark_runner.h b/src/tests/benchmark/benchmark_runner.h
index 9a26f5fa5c..25d8e8b108 100644
--- a/src/tests/benchmark/benchmark_runner.h
+++ b/src/tests/benchmark/benchmark_runner.h
@@ -9,9 +9,9 @@
 
 #include <boost/core/demangle.hpp>
 
-#include "algorithms/algo_factory.h"
-#include "config/names.h"
-#include "parser/csv_parser/csv_parser.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/config/names.h"
+#include "core/parser/csv_parser/csv_parser.h"
 
 namespace benchmark {
 using BenchmarkBody = std::function<void()>;
diff --git a/src/tests/benchmark/dd_benchmark.h b/src/tests/benchmark/dd_benchmark.h
index 3dd61399b7..b8fba0585a 100644
--- a/src/tests/benchmark/dd_benchmark.h
+++ b/src/tests/benchmark/dd_benchmark.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "algorithms/dd/split/split.h"
-#include "all_csv_configs.h"
-#include "benchmark_comparer.h"
-#include "benchmark_runner.h"
+#include "core/algorithms/dd/split/split.h"
+#include "tests/benchmark/benchmark_comparer.h"
+#include "tests/benchmark/benchmark_runner.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace benchmark {
 
diff --git a/src/tests/benchmark/fd_benchmark.h b/src/tests/benchmark/fd_benchmark.h
index fa3883a787..fd5fb37ee6 100644
--- a/src/tests/benchmark/fd_benchmark.h
+++ b/src/tests/benchmark/fd_benchmark.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "algorithms/fd/aidfd/aid.h"
-#include "algorithms/fd/eulerfd/eulerfd.h"
-#include "algorithms/fd/hyfd/hyfd.h"
-#include "algorithms/fd/pyro/pyro.h"
-#include "algorithms/fd/tane/tane.h"
-#include "all_csv_configs.h"
-#include "benchmark_comparer.h"
-#include "benchmark_runner.h"
-#include "config/max_lhs/type.h"
-#include "config/names.h"
-#include "config/thread_number/type.h"
+#include "core/algorithms/fd/aidfd/aid.h"
+#include "core/algorithms/fd/eulerfd/eulerfd.h"
+#include "core/algorithms/fd/hyfd/hyfd.h"
+#include "core/algorithms/fd/pyro/pyro.h"
+#include "core/algorithms/fd/tane/tane.h"
+#include "core/config/max_lhs/type.h"
+#include "core/config/names.h"
+#include "core/config/thread_number/type.h"
+#include "tests/benchmark/benchmark_comparer.h"
+#include "tests/benchmark/benchmark_runner.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace benchmark {
 
diff --git a/src/tests/benchmark/ind_benchmark.h b/src/tests/benchmark/ind_benchmark.h
index 3efb2b56dc..0f24c95319 100644
--- a/src/tests/benchmark/ind_benchmark.h
+++ b/src/tests/benchmark/ind_benchmark.h
@@ -3,15 +3,15 @@
 #include <cmath>
 #include <string>
 
-#include "algorithms/ind/faida/faida.h"
-#include "algorithms/ind/mind/mind.h"
-#include "all_csv_configs.h"
-#include "benchmark_comparer.h"
-#include "benchmark_runner.h"
-#include "config/error/type.h"
-#include "config/names.h"
-#include "config/thread_number/type.h"
-#include "csv_config_util.h"
+#include "core/algorithms/ind/faida/faida.h"
+#include "core/algorithms/ind/mind/mind.h"
+#include "core/config/error/type.h"
+#include "core/config/names.h"
+#include "core/config/thread_number/type.h"
+#include "tests/benchmark/benchmark_comparer.h"
+#include "tests/benchmark/benchmark_runner.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace benchmark {
 
diff --git a/src/tests/benchmark/main.cpp b/src/tests/benchmark/main.cpp
index a44b654803..92f67d748a 100644
--- a/src/tests/benchmark/main.cpp
+++ b/src/tests/benchmark/main.cpp
@@ -7,17 +7,17 @@
 #include <boost/program_options/options_description.hpp>
 #include <boost/program_options/variables_map.hpp>
 
-#include "adc_benchmark.h"
-#include "benchmark_cli.h"
-#include "benchmark_comparer.h"
-#include "benchmark_results_io.h"
-#include "benchmark_runner.h"
-#include "dd_benchmark.h"
-#include "fd_benchmark.h"
-#include "ind_benchmark.h"
-#include "md_benchmark.h"
-#include "nar_benchmark.h"
-#include "util/logger.h"
+#include "core/util/logger.h"
+#include "tests/benchmark/adc_benchmark.h"
+#include "tests/benchmark/benchmark_cli.h"
+#include "tests/benchmark/benchmark_comparer.h"
+#include "tests/benchmark/benchmark_results_io.h"
+#include "tests/benchmark/benchmark_runner.h"
+#include "tests/benchmark/dd_benchmark.h"
+#include "tests/benchmark/fd_benchmark.h"
+#include "tests/benchmark/ind_benchmark.h"
+#include "tests/benchmark/md_benchmark.h"
+#include "tests/benchmark/nar_benchmark.h"
 
 namespace po = boost::program_options;
 
diff --git a/src/tests/benchmark/md_benchmark.h b/src/tests/benchmark/md_benchmark.h
index 50e9bf55ba..32c1f55722 100644
--- a/src/tests/benchmark/md_benchmark.h
+++ b/src/tests/benchmark/md_benchmark.h
@@ -2,15 +2,15 @@
 
 #include <memory>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/md/decision_boundary.h"
-#include "algorithms/md/hymd/hymd.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
-#include "all_csv_configs.h"
-#include "benchmark_comparer.h"
-#include "benchmark_runner.h"
-#include "config/names.h"
-#include "config/thread_number/type.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/md/decision_boundary.h"
+#include "core/algorithms/md/hymd/hymd.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
+#include "core/config/names.h"
+#include "core/config/thread_number/type.h"
+#include "tests/benchmark/benchmark_comparer.h"
+#include "tests/benchmark/benchmark_runner.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace benchmark {
 
diff --git a/src/tests/benchmark/nar_benchmark.h b/src/tests/benchmark/nar_benchmark.h
index 658d2b6667..9664191a4f 100644
--- a/src/tests/benchmark/nar_benchmark.h
+++ b/src/tests/benchmark/nar_benchmark.h
@@ -2,11 +2,11 @@
 
 #include <cmath>
 
-#include "algorithms/nar/des/des.h"
-#include "all_csv_configs.h"
-#include "benchmark_comparer.h"
-#include "benchmark_runner.h"
-#include "config/names.h"
+#include "core/algorithms/nar/des/des.h"
+#include "core/config/names.h"
+#include "tests/benchmark/benchmark_comparer.h"
+#include "tests/benchmark/benchmark_runner.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace benchmark {
 
diff --git a/src/tests/common/all_csv_configs.cpp b/src/tests/common/all_csv_configs.cpp
index a607528901..1a4d720534 100644
--- a/src/tests/common/all_csv_configs.cpp
+++ b/src/tests/common/all_csv_configs.cpp
@@ -1,8 +1,8 @@
-#include "all_csv_configs.h"
+#include "tests/common/all_csv_configs.h"
 
 #include <string_view>
 
-#include "csv_config_util.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/common/all_csv_configs.h b/src/tests/common/all_csv_configs.h
index 1dd7b8c3d5..2724b87197 100644
--- a/src/tests/common/all_csv_configs.h
+++ b/src/tests/common/all_csv_configs.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "parser/csv_parser/csv_parser.h"
+#include "core/parser/csv_parser/csv_parser.h"
 
 namespace tests {
 extern CSVConfig const kAbalone;
diff --git a/src/tests/common/csv_config_util.h b/src/tests/common/csv_config_util.h
index 15598745ce..aaeb698067 100644
--- a/src/tests/common/csv_config_util.h
+++ b/src/tests/common/csv_config_util.h
@@ -3,8 +3,8 @@
 #include <filesystem>
 #include <vector>
 
-#include "config/tabular_data/input_table_type.h"
-#include "parser/csv_parser/csv_parser.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/parser/csv_parser/csv_parser.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/all_gfd_paths.cpp b/src/tests/unit/all_gfd_paths.cpp
index 5ab21b9f37..fc80ccdce9 100644
--- a/src/tests/unit/all_gfd_paths.cpp
+++ b/src/tests/unit/all_gfd_paths.cpp
@@ -1,6 +1,6 @@
-#include "all_gfd_paths.h"
+#include "tests/unit/all_gfd_paths.h"
 
-#include "csv_config_util.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/all_gfd_paths.h b/src/tests/unit/all_gfd_paths.h
index 298b9d3bbb..e201b85b5b 100644
--- a/src/tests/unit/all_gfd_paths.h
+++ b/src/tests/unit/all_gfd_paths.h
@@ -3,8 +3,8 @@
 #include <filesystem>
 #include <fstream>
 
-#include "algorithms/gfd/gfd.h"
-#include "parser/graph_parser/graph_parser.h"
+#include "core/algorithms/gfd/gfd.h"
+#include "core/parser/graph_parser/graph_parser.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/main.cpp b/src/tests/unit/main.cpp
index 2e4a9c691e..ca7df2c44c 100644
--- a/src/tests/unit/main.cpp
+++ b/src/tests/unit/main.cpp
@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 
-#include "util/logger.h"
+#include "core/util/logger.h"
 
 int main(int argc, char** argv) {
     util::logging::EnsureInitialized();
diff --git a/src/tests/unit/test_ac_algorithm.cpp b/src/tests/unit/test_ac_algorithm.cpp
index 53b5cc1ba9..ddf66b420b 100644
--- a/src/tests/unit/test_ac_algorithm.cpp
+++ b/src/tests/unit/test_ac_algorithm.cpp
@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/algebraic_constraints/ac_algorithm.h"
-#include "algorithms/algebraic_constraints/bin_operation_enum.h"
-#include "algorithms/algo_factory.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "types.h"
+#include "core/algorithms/algebraic_constraints/ac_algorithm.h"
+#include "core/algorithms/algebraic_constraints/bin_operation_enum.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/config/names.h"
+#include "core/model/types/types.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace {
 void AssertRanges(std::vector<model::Double>& expected_ranges,
diff --git a/src/tests/unit/test_apriori.cpp b/src/tests/unit/test_apriori.cpp
index 34987398cc..a64a0f0c4c 100644
--- a/src/tests/unit/test_apriori.cpp
+++ b/src/tests/unit/test_apriori.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/association_rules/apriori.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/association_rules/apriori.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_bitset.cpp b/src/tests/unit/test_bitset.cpp
index d1ec087931..8e655a3b05 100644
--- a/src/tests/unit/test_bitset.cpp
+++ b/src/tests/unit/test_bitset.cpp
@@ -7,7 +7,7 @@
 
 #include <gtest/gtest.h>
 
-#include "model/types/bitset.h"
+#include "core/model/types/bitset.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_cfd_algos.cpp b/src/tests/unit/test_cfd_algos.cpp
index 809ffe803e..7e9c2e9380 100644
--- a/src/tests/unit/test_cfd_algos.cpp
+++ b/src/tests/unit/test_cfd_algos.cpp
@@ -3,11 +3,11 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/cfd/enums.h"
-#include "algorithms/cfd/fd_first_algorithm.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/cfd/enums.h"
+#include "core/algorithms/cfd/fd_first_algorithm.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_cfd_relation_data.cpp b/src/tests/unit/test_cfd_relation_data.cpp
index c7ac7f75ac..bcaeea9c28 100644
--- a/src/tests/unit/test_cfd_relation_data.cpp
+++ b/src/tests/unit/test_cfd_relation_data.cpp
@@ -2,9 +2,9 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/cfd/model/cfd_relation_data.h"
-#include "all_csv_configs.h"
-#include "csv_config_util.h"
+#include "core/algorithms/cfd/model/cfd_relation_data.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_cfd_verifier.cpp b/src/tests/unit/test_cfd_verifier.cpp
index 74f93fa685..79f812dcd2 100644
--- a/src/tests/unit/test_cfd_verifier.cpp
+++ b/src/tests/unit/test_cfd_verifier.cpp
@@ -4,10 +4,10 @@
 
 #include <gtest/gtest.h>
 
-#include "algo_factory.h"
-#include "algorithms/cfd/cfd_verifier/cfd_verifier.h"
-#include "all_csv_configs.h"
-#include "config/names_and_descriptions.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/cfd/cfd_verifier/cfd_verifier.h"
+#include "core/config/names_and_descriptions.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_csv_parser.cpp b/src/tests/unit/test_csv_parser.cpp
index 8eb561cd6b..94542e5730 100644
--- a/src/tests/unit/test_csv_parser.cpp
+++ b/src/tests/unit/test_csv_parser.cpp
@@ -6,9 +6,9 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "all_csv_configs.h"
-#include "csv_config_util.h"
-#include "parser/csv_parser/csv_parser.h"
+#include "core/parser/csv_parser/csv_parser.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_data_stats.cpp b/src/tests/unit/test_data_stats.cpp
index fe5a8633df..6c5e778189 100644
--- a/src/tests/unit/test_data_stats.cpp
+++ b/src/tests/unit/test_data_stats.cpp
@@ -1,10 +1,10 @@
 #include <gmock/gmock.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/statistics/data_stats.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "util/logger.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/statistics/data_stats.h"
+#include "core/config/names.h"
+#include "core/util/logger.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 namespace mo = model;
diff --git a/src/tests/unit/test_dc_structures.cpp b/src/tests/unit/test_dc_structures.cpp
index fe22646cf8..823f1a0ccf 100644
--- a/src/tests/unit/test_dc_structures.cpp
+++ b/src/tests/unit/test_dc_structures.cpp
@@ -3,23 +3,23 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "all_csv_configs.h"
-#include "create_type.h"
-#include "csv_parser/csv_parser.h"
-#include "dc/FastADC/misc/misc.h"
-#include "dc/FastADC/model/denial_constraint.h"
-#include "dc/FastADC/model/operator.h"
-#include "dc/FastADC/model/pli_shard.h"
-#include "dc/FastADC/util/approximate_evidence_inverter.h"
-#include "dc/FastADC/util/clue_set_builder.h"
-#include "dc/FastADC/util/evidence_aux_structures_builder.h"
-#include "dc/FastADC/util/evidence_set_builder.h"
-#include "dc/FastADC/util/predicate_builder.h"
-#include "dc/FastADC/util/predicate_organizer.h"
-#include "int_type.h"
-#include "string_type.h"
-#include "table/column_layout_typed_relation_data.h"
-#include "test_dc_structures_correct_results.h"
+#include "core/algorithms/dc/FastADC/misc/misc.h"
+#include "core/algorithms/dc/FastADC/model/denial_constraint.h"
+#include "core/algorithms/dc/FastADC/model/operator.h"
+#include "core/algorithms/dc/FastADC/model/pli_shard.h"
+#include "core/algorithms/dc/FastADC/util/approximate_evidence_inverter.h"
+#include "core/algorithms/dc/FastADC/util/clue_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/evidence_aux_structures_builder.h"
+#include "core/algorithms/dc/FastADC/util/evidence_set_builder.h"
+#include "core/algorithms/dc/FastADC/util/predicate_builder.h"
+#include "core/algorithms/dc/FastADC/util/predicate_organizer.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "core/model/types/create_type.h"
+#include "core/model/types/int_type.h"
+#include "core/model/types/string_type.h"
+#include "core/parser/csv_parser/csv_parser.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/unit/test_dc_structures_correct_results.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_dc_structures_correct_results.h b/src/tests/unit/test_dc_structures_correct_results.h
index 8cec7a6884..5ba6d83ba3 100644
--- a/src/tests/unit/test_dc_structures_correct_results.h
+++ b/src/tests/unit/test_dc_structures_correct_results.h
@@ -6,8 +6,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include "dc/FastADC/model/predicate.h"
-#include "model/types/bitset.h"
+#include "core/algorithms/dc/FastADC/model/predicate.h"
+#include "core/model/types/bitset.h"
 
 std::vector<std::string> different_column_predicates_expected = {
         "t.A == s.A", "t.A != s.A", "t.A > s.A",  "t.A < s.A",  "t.A >= s.A", "t.A <= s.A",
diff --git a/src/tests/unit/test_dc_verifier.cpp b/src/tests/unit/test_dc_verifier.cpp
index 8e3169b47c..ffb5307f39 100644
--- a/src/tests/unit/test_dc_verifier.cpp
+++ b/src/tests/unit/test_dc_verifier.cpp
@@ -4,10 +4,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/dc/verifier/dc_verifier.h"
-#include "all_csv_configs.h"
-#include "config/names_and_descriptions.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/dc/verifier/dc_verifier.h"
+#include "core/config/names_and_descriptions.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_dd_verifier.cpp b/src/tests/unit/test_dd_verifier.cpp
index 536b0d29d1..3bb8d925f3 100644
--- a/src/tests/unit/test_dd_verifier.cpp
+++ b/src/tests/unit/test_dd_verifier.cpp
@@ -2,9 +2,9 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/dd/dd_verifier/dd_verifier.h"
-#include "all_csv_configs.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/dd/dd_verifier/dd_verifier.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 struct DDVerifyingParams {
diff --git a/src/tests/unit/test_des.cpp b/src/tests/unit/test_des.cpp
index e7bb4561e3..91c910790d 100644
--- a/src/tests/unit/test_des.cpp
+++ b/src/tests/unit/test_des.cpp
@@ -1,9 +1,9 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/nar/des/des.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/nar/des/des.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_double_compare.cpp b/src/tests/unit/test_double_compare.cpp
index 5d12c6223d..912162f8a0 100644
--- a/src/tests/unit/test_double_compare.cpp
+++ b/src/tests/unit/test_double_compare.cpp
@@ -1,7 +1,7 @@
 #include <boost/math/special_functions/next.hpp>
 #include <gtest/gtest.h>
 
-#include "types.h"
+#include "core/model/types/types.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_dynamic_fd_verifier.cpp b/src/tests/unit/test_dynamic_fd_verifier.cpp
index 168ef165a6..98941ca1c1 100644
--- a/src/tests/unit/test_dynamic_fd_verifier.cpp
+++ b/src/tests/unit/test_dynamic_fd_verifier.cpp
@@ -3,15 +3,15 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "all_csv_configs.h"
-#include "config/exceptions.h"
-#include "config/indices/type.h"
-#include "config/names.h"
-#include "csv_config_util.h"
-#include "fd/fd_verifier/dynamic_fd_verifier.h"
-#include "fd/fd_verifier/dynamic_stats_calculator.h"
-#include "model/types/builtin.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/fd_verifier/dynamic_fd_verifier.h"
+#include "core/algorithms/fd/fd_verifier/dynamic_stats_calculator.h"
+#include "core/config/exceptions.h"
+#include "core/config/indices/type.h"
+#include "core/config/names.h"
+#include "core/model/types/builtin.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace {
 using namespace algos::fd_verifier;
diff --git a/src/tests/unit/test_faida.cpp b/src/tests/unit/test_faida.cpp
index 46fba7886e..79d9f127bf 100644
--- a/src/tests/unit/test_faida.cpp
+++ b/src/tests/unit/test_faida.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/ind/faida/faida.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "test_ind_util.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/ind/faida/faida.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/unit/test_ind_util.h"
 
 namespace tests {
 namespace {
diff --git a/src/tests/unit/test_fastod.cpp b/src/tests/unit/test_fastod.cpp
index 94e88a73df..9d608a2044 100644
--- a/src/tests/unit/test_fastod.cpp
+++ b/src/tests/unit/test_fastod.cpp
@@ -3,12 +3,12 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/od/fastod/fastod.h"
-#include "algorithms/od/fastod/hashing/hashing.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "csv_config_util.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/od/fastod/fastod.h"
+#include "core/algorithms/od/fastod/hashing/hashing.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_fd_algorithm.cpp b/src/tests/unit/test_fd_algorithm.cpp
index 091cb1462f..ba468cee34 100644
--- a/src/tests/unit/test_fd_algorithm.cpp
+++ b/src/tests/unit/test_fd_algorithm.cpp
@@ -3,17 +3,17 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "algorithms/fd/depminer/depminer.h"
-#include "algorithms/fd/dfd/dfd.h"
-#include "algorithms/fd/fastfds/fastfds.h"
-#include "algorithms/fd/fdep/fdep.h"
-#include "algorithms/fd/fun/fun.h"
-#include "algorithms/fd/hyfd/hyfd.h"
-#include "algorithms/fd/pyro/pyro.h"
-#include "algorithms/fd/tane/pfdtane.h"
-#include "algorithms/fd/tane/tane.h"
-#include "model/table/relational_schema.h"
-#include "test_fd_util.h"
+#include "core/algorithms/fd/depminer/depminer.h"
+#include "core/algorithms/fd/dfd/dfd.h"
+#include "core/algorithms/fd/fastfds/fastfds.h"
+#include "core/algorithms/fd/fdep/fdep.h"
+#include "core/algorithms/fd/fun/fun.h"
+#include "core/algorithms/fd/hyfd/hyfd.h"
+#include "core/algorithms/fd/pyro/pyro.h"
+#include "core/algorithms/fd/tane/pfdtane.h"
+#include "core/algorithms/fd/tane/tane.h"
+#include "core/model/table/relational_schema.h"
+#include "tests/unit/test_fd_util.h"
 
 using std::string, std::vector;
 using ::testing::ContainerEq, ::testing::Eq;
diff --git a/src/tests/unit/test_fd_approximate.cpp b/src/tests/unit/test_fd_approximate.cpp
index be7b2a3030..b7c105b528 100644
--- a/src/tests/unit/test_fd_approximate.cpp
+++ b/src/tests/unit/test_fd_approximate.cpp
@@ -3,10 +3,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "algorithms/fd/eulerfd/eulerfd.h"
-#include "all_csv_configs.h"
-#include "test_fd_util.h"
-#include "util/bitset_utils.h"
+#include "core/algorithms/fd/eulerfd/eulerfd.h"
+#include "core/util/bitset_utils.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/unit/test_fd_util.h"
 
 using ::testing::ContainerEq, ::testing::Eq;
 
diff --git a/src/tests/unit/test_fd_mine.cpp b/src/tests/unit/test_fd_mine.cpp
index 5e32d5e994..3da1e3bbb4 100644
--- a/src/tests/unit/test_fd_mine.cpp
+++ b/src/tests/unit/test_fd_mine.cpp
@@ -4,16 +4,16 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/fd/fd_mine/fd_mine.h"
-#include "algorithms/fd/pyro/pyro.h"
-#include "algorithms/fd/tane/pfdtane.h"
-#include "algorithms/fd/tane/tane.h"
-#include "config/error/type.h"
-#include "config/names.h"
-#include "csv_config_util.h"
-#include "model/table/relational_schema.h"
-#include "test_fd_util.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/fd_mine/fd_mine.h"
+#include "core/algorithms/fd/pyro/pyro.h"
+#include "core/algorithms/fd/tane/pfdtane.h"
+#include "core/algorithms/fd/tane/tane.h"
+#include "core/config/error/type.h"
+#include "core/config/names.h"
+#include "core/model/table/relational_schema.h"
+#include "tests/common/csv_config_util.h"
+#include "tests/unit/test_fd_util.h"
 
 namespace tests {
 using ::testing::ContainerEq, ::testing::Eq;
diff --git a/src/tests/unit/test_fd_util.h b/src/tests/unit/test_fd_util.h
index 071d2739a2..09276795c5 100644
--- a/src/tests/unit/test_fd_util.h
+++ b/src/tests/unit/test_fd_util.h
@@ -2,12 +2,12 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/fd/fd_algorithm.h"
-#include "all_csv_configs.h"
-#include "config/error/type.h"
-#include "config/names.h"
-#include "csv_config_util.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/config/error/type.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 template <typename T>
diff --git a/src/tests/unit/test_fd_verifier.cpp b/src/tests/unit/test_fd_verifier.cpp
index d1cf8be30e..2a6d34d9ad 100644
--- a/src/tests/unit/test_fd_verifier.cpp
+++ b/src/tests/unit/test_fd_verifier.cpp
@@ -3,14 +3,14 @@
 
 #include <gtest/gtest.h>
 
-#include "algo_factory.h"
-#include "all_csv_configs.h"
-#include "builtin.h"
-#include "config/indices/type.h"
-#include "config/names.h"
-#include "csv_config_util.h"
-#include "fd/fd_verifier/fd_verifier.h"
-#include "fd/fd_verifier/stats_calculator.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/fd_verifier/fd_verifier.h"
+#include "core/algorithms/fd/fd_verifier/stats_calculator.h"
+#include "core/config/indices/type.h"
+#include "core/config/names.h"
+#include "core/model/types/builtin.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace {
 using namespace algos::fd_verifier;
diff --git a/src/tests/unit/test_gfd_miner.cpp b/src/tests/unit/test_gfd_miner.cpp
index a986660600..e1154cb0ea 100644
--- a/src/tests/unit/test_gfd_miner.cpp
+++ b/src/tests/unit/test_gfd_miner.cpp
@@ -4,10 +4,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/gfd/gfd_miner/gfd_miner.h"
-#include "all_gfd_paths.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/gfd/gfd_miner/gfd_miner.h"
+#include "core/config/names.h"
+#include "tests/unit/all_gfd_paths.h"
 
 namespace gfd {
 void PrintTo(model::Gfd const& gfd, std::ostream* os) {
diff --git a/src/tests/unit/test_gfd_validator.cpp b/src/tests/unit/test_gfd_validator.cpp
index 445fb3c37b..18e218d57a 100644
--- a/src/tests/unit/test_gfd_validator.cpp
+++ b/src/tests/unit/test_gfd_validator.cpp
@@ -1,10 +1,10 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/gfd/gfd_validator/gfd_validator.h"
-#include "all_gfd_paths.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/gfd/gfd_validator/gfd_validator.h"
+#include "core/config/names.h"
+#include "tests/unit/all_gfd_paths.h"
 
 using namespace algos;
 using algos::StdParamsMap;
diff --git a/src/tests/unit/test_hash_util.cpp b/src/tests/unit/test_hash_util.cpp
index 03cbf49ac1..5fbd0241cf 100644
--- a/src/tests/unit/test_hash_util.cpp
+++ b/src/tests/unit/test_hash_util.cpp
@@ -3,7 +3,7 @@
  *
  * Helper functions to calculate hash definition
  */
-#include "test_hash_util.h"
+#include "tests/unit/test_hash_util.h"
 
 #include <vector>
 
diff --git a/src/tests/unit/test_hymd.cpp b/src/tests/unit/test_hymd.cpp
index 4279bbd107..da538bb093 100644
--- a/src/tests/unit/test_hymd.cpp
+++ b/src/tests/unit/test_hymd.cpp
@@ -8,15 +8,15 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/md/decision_boundary.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
-#include "algorithms/md/hymd/utility/md_less.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "config/tabular_data/input_table_type.h"
-#include "model/index.h"
-#include "parser/csv_parser/csv_parser.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/md/decision_boundary.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
+#include "core/algorithms/md/hymd/utility/md_less.h"
+#include "core/config/names.h"
+#include "core/config/tabular_data/input_table_type.h"
+#include "core/model/index.h"
+#include "core/parser/csv_parser/csv_parser.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace {
 auto GetCardinality(std::vector<model::md::DecisionBoundary> const& lhs_bounds) {
diff --git a/src/tests/unit/test_hymd_metrics.cpp b/src/tests/unit/test_hymd_metrics.cpp
index cf38fc5f67..c8386a29c5 100644
--- a/src/tests/unit/test_hymd_metrics.cpp
+++ b/src/tests/unit/test_hymd_metrics.cpp
@@ -1,12 +1,12 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/md/hymd/preprocessing/column_matches/date_difference.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/jaccard.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/lcs.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/number_difference.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/date_difference.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/jaccard.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/lcs.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/monge_elkan.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/number_difference.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/smith_waterman_gotoh.h"
 
 using namespace algos::hymd::preprocessing::column_matches;
 
diff --git a/src/tests/unit/test_ind_algorithms.cpp b/src/tests/unit/test_ind_algorithms.cpp
index 3f07da9eed..d9a0a53720 100644
--- a/src/tests/unit/test_ind_algorithms.cpp
+++ b/src/tests/unit/test_ind_algorithms.cpp
@@ -1,16 +1,15 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "all_csv_configs.h"
-#include "config/equal_nulls/type.h"
-#include "config/max_arity/type.h"
-#include "config/names.h"
-#include "config/thread_number/type.h"
-#include "csv_config_util.h"
-#include "error/type.h"
-#include "max_arity/type.h"
-#include "test_hash_util.h"
-#include "test_ind_util.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/config/equal_nulls/type.h"
+#include "core/config/error/type.h"
+#include "core/config/max_arity/type.h"
+#include "core/config/names.h"
+#include "core/config/thread_number/type.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
+#include "tests/unit/test_hash_util.h"
+#include "tests/unit/test_ind_util.h"
 
 namespace tests {
 namespace {
diff --git a/src/tests/unit/test_ind_util.cpp b/src/tests/unit/test_ind_util.cpp
index f17f522897..7274829cce 100644
--- a/src/tests/unit/test_ind_util.cpp
+++ b/src/tests/unit/test_ind_util.cpp
@@ -1,12 +1,12 @@
-#include "test_ind_util.h"
+#include "tests/unit/test_ind_util.h"
 
 #include <algorithm>
 #include <sstream>
 
 #include <gtest/gtest.h>
 
-#include "all_csv_configs.h"
-#include "ind/ind_algorithm.h"
+#include "core/algorithms/ind/ind_algorithm.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_ind_util.h b/src/tests/unit/test_ind_util.h
index 306414e610..84b4c3f070 100644
--- a/src/tests/unit/test_ind_util.h
+++ b/src/tests/unit/test_ind_util.h
@@ -5,10 +5,10 @@
 #include <utility>
 #include <vector>
 
-#include "algorithms/ind/ind.h"
-#include "algorithms/ind/ind_algorithm.h"
-#include "csv_config_util.h"
-#include "model/table/table_index.h"
+#include "core/algorithms/ind/ind.h"
+#include "core/algorithms/ind/ind_algorithm.h"
+#include "core/model/table/table_index.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_ind_verifier.cpp b/src/tests/unit/test_ind_verifier.cpp
index c77e5f4258..12f9c0f781 100644
--- a/src/tests/unit/test_ind_verifier.cpp
+++ b/src/tests/unit/test_ind_verifier.cpp
@@ -2,12 +2,12 @@
 
 #include <gtest/gtest.h>
 
-#include "algo_factory.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "csv_config_util.h"
-#include "error/type.h"
-#include "ind/ind_verifier/ind_verifier.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/ind/ind_verifier/ind_verifier.h"
+#include "core/config/error/type.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_md_verification.cpp b/src/tests/unit/test_md_verification.cpp
index 694393ca9a..c513a67288 100644
--- a/src/tests/unit/test_md_verification.cpp
+++ b/src/tests/unit/test_md_verification.cpp
@@ -4,13 +4,13 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
-#include "algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
-#include "algorithms/md/md_verifier/highlights/highlights.h"
-#include "algorithms/md/md_verifier/md_verifier.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/column_match_impl.h"
+#include "core/algorithms/md/hymd/preprocessing/column_matches/levenshtein.h"
+#include "core/algorithms/md/md_verifier/highlights/highlights.h"
+#include "core/algorithms/md/md_verifier/md_verifier.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 using namespace config::names;
diff --git a/src/tests/unit/test_metric_verifier.cpp b/src/tests/unit/test_metric_verifier.cpp
index a99f4362d3..16d8e569a5 100644
--- a/src/tests/unit/test_metric_verifier.cpp
+++ b/src/tests/unit/test_metric_verifier.cpp
@@ -5,11 +5,11 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/metric/enums.h"
-#include "algorithms/metric/metric_verifier.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/metric/enums.h"
+#include "core/algorithms/metric/metric_verifier.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 namespace onam = config::names;
diff --git a/src/tests/unit/test_nd_verifier.cpp b/src/tests/unit/test_nd_verifier.cpp
index de9e2e3f87..95d5f6cc30 100644
--- a/src/tests/unit/test_nd_verifier.cpp
+++ b/src/tests/unit/test_nd_verifier.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/nd/nd.h"
-#include "algorithms/nd/nd_verifier/nd_verifier.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/nd/nd.h"
+#include "core/algorithms/nd/nd_verifier/nd_verifier.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 namespace onam = config::names;
diff --git a/src/tests/unit/test_numerictype_cast.cpp b/src/tests/unit/test_numerictype_cast.cpp
index 5f6d8c31cf..9a7c86277e 100644
--- a/src/tests/unit/test_numerictype_cast.cpp
+++ b/src/tests/unit/test_numerictype_cast.cpp
@@ -2,7 +2,7 @@
 
 #include <gtest/gtest.h>
 
-#include "types.h"
+#include "core/model/types/types.h"
 
 namespace tests {
 class NumericCast : public ::testing::Test {
diff --git a/src/tests/unit/test_order.cpp b/src/tests/unit/test_order.cpp
index 96ff513fd3..9a2bb0a5ba 100644
--- a/src/tests/unit/test_order.cpp
+++ b/src/tests/unit/test_order.cpp
@@ -5,11 +5,11 @@
 #include <boost/container_hash/hash.hpp>
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/od/order/order.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "csv_config_util.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/od/order/order.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_pfd_verifier.cpp b/src/tests/unit/test_pfd_verifier.cpp
index e1d26daf6f..e0033c5143 100644
--- a/src/tests/unit/test_pfd_verifier.cpp
+++ b/src/tests/unit/test_pfd_verifier.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/fd/pfd_verifier/pfd_verifier.h"
-#include "all_csv_configs.h"
-#include "config/indices/type.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/pfd_verifier/pfd_verifier.h"
+#include "core/config/indices/type.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 namespace onam = config::names;
diff --git a/src/tests/unit/test_pfdtane.cpp b/src/tests/unit/test_pfdtane.cpp
index 34b4cfc05d..0a815aed17 100644
--- a/src/tests/unit/test_pfdtane.cpp
+++ b/src/tests/unit/test_pfdtane.cpp
@@ -1,11 +1,11 @@
 #include <gtest/gtest.h>
 
-#include "algo_factory.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "fd/tane/pfdtane.h"
-#include "model/table/column_layout_relation_data.h"
-#include "parser/csv_parser/csv_parser.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/tane/pfdtane.h"
+#include "core/config/names.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/parser/csv_parser/csv_parser.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 namespace onam = config::names;
diff --git a/src/tests/unit/test_set_based_verifier.cpp b/src/tests/unit/test_set_based_verifier.cpp
index 58a4624424..899de61016 100644
--- a/src/tests/unit/test_set_based_verifier.cpp
+++ b/src/tests/unit/test_set_based_verifier.cpp
@@ -2,10 +2,10 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/od/fastod/model/removal_set.h"
-#include "algorithms/od/set_based_verifier/verifier.h"
-#include "all_csv_configs.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/od/fastod/model/removal_set.h"
+#include "core/algorithms/od/set_based_verifier/verifier.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_sfd.cpp b/src/tests/unit/test_sfd.cpp
index 0392b6bda8..46afc7452a 100644
--- a/src/tests/unit/test_sfd.cpp
+++ b/src/tests/unit/test_sfd.cpp
@@ -3,16 +3,16 @@
 
 #include <gtest/gtest.h>
 
-#include "algo_factory.h"
-#include "algorithms/fd/sfd/cords.h"
-#include "algorithms/fd/sfd/frequency_handler.h"
-#include "algorithms/fd/sfd/sample.h"
-#include "all_csv_configs.h"
-#include "config/equal_nulls/option.h"
-#include "config/max_lhs/type.h"
-#include "config/names.h"
-#include "csv_config_util.h"
-#include "model/table/column_layout_typed_relation_data.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/sfd/cords.h"
+#include "core/algorithms/fd/sfd/frequency_handler.h"
+#include "core/algorithms/fd/sfd/sample.h"
+#include "core/config/equal_nulls/option.h"
+#include "core/config/max_lhs/type.h"
+#include "core/config/names.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace {
 void AssertVectors(std::vector<Column> const& expected,
diff --git a/src/tests/unit/test_split.cpp b/src/tests/unit/test_split.cpp
index 46239c2a16..ea6ee92b44 100644
--- a/src/tests/unit/test_split.cpp
+++ b/src/tests/unit/test_split.cpp
@@ -5,10 +5,10 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "csv_config_util.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_tane_afd_measures.cpp b/src/tests/unit/test_tane_afd_measures.cpp
index 8baf14925c..73c2e2d3b5 100644
--- a/src/tests/unit/test_tane_afd_measures.cpp
+++ b/src/tests/unit/test_tane_afd_measures.cpp
@@ -3,14 +3,14 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "fd/tane/afd_measures.h"
-#include "fd/tane/enums.h"
-#include "fd/tane/tane.h"
-#include "model/table/column_layout_relation_data.h"
-#include "parser/csv_parser/csv_parser.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/fd/tane/afd_measures.h"
+#include "core/algorithms/fd/tane/enums.h"
+#include "core/algorithms/fd/tane/tane.h"
+#include "core/config/names.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/parser/csv_parser/csv_parser.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 namespace onam = config::names;
diff --git a/src/tests/unit/test_typed_column_data.cpp b/src/tests/unit/test_typed_column_data.cpp
index 85a6847db5..07b31cce27 100644
--- a/src/tests/unit/test_typed_column_data.cpp
+++ b/src/tests/unit/test_typed_column_data.cpp
@@ -2,10 +2,10 @@
 
 #include <gtest/gtest.h>
 
-#include "algorithms/fd/fd_algorithm.h"
-#include "all_csv_configs.h"
-#include "csv_config_util.h"
-#include "model/table/column_layout_typed_relation_data.h"
+#include "core/algorithms/fd/fd_algorithm.h"
+#include "core/model/table/column_layout_typed_relation_data.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_types.cpp b/src/tests/unit/test_types.cpp
index d11a79deb2..02c7e997c5 100644
--- a/src/tests/unit/test_types.cpp
+++ b/src/tests/unit/test_types.cpp
@@ -4,7 +4,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "types.h"
+#include "core/model/types/types.h"
 
 namespace tests {
 
diff --git a/src/tests/unit/test_ucc_algorithms.cpp b/src/tests/unit/test_ucc_algorithms.cpp
index 0259015f6b..23e193632d 100644
--- a/src/tests/unit/test_ucc_algorithms.cpp
+++ b/src/tests/unit/test_ucc_algorithms.cpp
@@ -6,15 +6,15 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/ucc/hyucc/hyucc.h"
-#include "algorithms/ucc/ucc.h"
-#include "algorithms/ucc/ucc_algorithm.h"
-#include "all_csv_configs.h"
-#include "config/names.h"
-#include "config/thread_number/type.h"
-#include "csv_config_util.h"
-#include "test_hash_util.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/ucc/hyucc/hyucc.h"
+#include "core/algorithms/ucc/ucc.h"
+#include "core/algorithms/ucc/ucc_algorithm.h"
+#include "core/config/names.h"
+#include "core/config/thread_number/type.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
+#include "tests/unit/test_hash_util.h"
 
 std::ostream& operator<<(std::ostream& os, Vertical const& v) {
     os << v.ToString();
diff --git a/src/tests/unit/test_ucc_verifier.cpp b/src/tests/unit/test_ucc_verifier.cpp
index 856dc2d298..ea9da6a572 100644
--- a/src/tests/unit/test_ucc_verifier.cpp
+++ b/src/tests/unit/test_ucc_verifier.cpp
@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "algorithms/algo_factory.h"
-#include "algorithms/ucc/ucc_verifier/ucc_verifier.h"
-#include "all_csv_configs.h"
-#include "config/indices/type.h"
-#include "config/names.h"
+#include "core/algorithms/algo_factory.h"
+#include "core/algorithms/ucc/ucc_verifier/ucc_verifier.h"
+#include "core/config/indices/type.h"
+#include "core/config/names.h"
+#include "tests/common/all_csv_configs.h"
 
 namespace tests {
 namespace onam = config::names;
diff --git a/src/tests/unit/test_util.cpp b/src/tests/unit/test_util.cpp
index 51654c0357..2c787ebe7d 100644
--- a/src/tests/unit/test_util.cpp
+++ b/src/tests/unit/test_util.cpp
@@ -4,13 +4,13 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include "all_csv_configs.h"
-#include "csv_config_util.h"
-#include "fd/pyrocommon/model/list_agree_set_sample.h"
-#include "levenshtein_distance.h"
-#include "model/table/agree_set_factory.h"
-#include "model/table/column_layout_relation_data.h"
-#include "model/table/identifier_set.h"
+#include "core/algorithms/fd/pyrocommon/model/list_agree_set_sample.h"
+#include "core/model/table/agree_set_factory.h"
+#include "core/model/table/column_layout_relation_data.h"
+#include "core/model/table/identifier_set.h"
+#include "core/util/levenshtein_distance.h"
+#include "tests/common/all_csv_configs.h"
+#include "tests/common/csv_config_util.h"
 
 namespace tests {