diff --git a/src/core_test/CMakeLists.txt b/src/core_test/CMakeLists.txt
index d56b1fd..169e364 100644
--- a/src/core_test/CMakeLists.txt
+++ b/src/core_test/CMakeLists.txt
@@ -8,14 +8,10 @@ set(KLSK_TEST_DEPS klotski_c klotski_core
 
 # ------------------------------------------------------------------------------------ #
 
-include_directories(utility)
-
-# TODO: just pass compile for now
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../core/utils)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../core/raw_code)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../core/all_cases)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../core/short_code)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../core/common_code)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+# TODO: remove it
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/utility)
 
 # ------------------------------------------------------------------------------------ #
 
diff --git a/src/core_test/codec/common_code.cc b/src/core_test/codec/common_code.cc
index b3fefe6..0191e0a 100644
--- a/src/core_test/codec/common_code.cc
+++ b/src/core_test/codec/common_code.cc
@@ -1,12 +1,12 @@
 #include <algorithm>
+#include <gtest/gtest.h>
+#include <BS_thread_pool.hpp>
 
 #include "sample.h"
-#include "raw_code.h"
-#include "all_cases.h"
-#include "short_code.h"
-#include "common_code.h"
-#include "gtest/gtest.h"
-#include "BS_thread_pool.hpp"
+#include "raw_code/raw_code.h"
+#include "all_cases/all_cases.h"
+#include "short_code/short_code.h"
+#include "common_code/common_code.h"
 
 using klotski::codec::RawCode;
 using klotski::codec::ShortCode;
diff --git a/src/core_test/codec/mirror.cc b/src/core_test/codec/mirror.cc
index d7adc50..0f6fe70 100644
--- a/src/core_test/codec/mirror.cc
+++ b/src/core_test/codec/mirror.cc
@@ -1,8 +1,9 @@
-#include "raw_code.h"
-#include "all_cases.h"
-#include "common_code.h"
-#include "gtest/gtest.h"
-#include "BS_thread_pool.hpp"
+#include <gtest/gtest.h>
+#include <BS_thread_pool.hpp>
+
+#include "raw_code/raw_code.h"
+#include "all_cases/all_cases.h"
+#include "common_code/common_code.h"
 
 using klotski::codec::RawCode;
 using klotski::cases::AllCases;
diff --git a/src/core_test/codec/raw_code.cc b/src/core_test/codec/raw_code.cc
index 0b65db7..f533f96 100644
--- a/src/core_test/codec/raw_code.cc
+++ b/src/core_test/codec/raw_code.cc
@@ -1,10 +1,11 @@
-#include "common.h"
+#include <gtest/gtest.h>
+#include <BS_thread_pool.hpp>
+
 #include "sample.h"
-#include "raw_code.h"
-#include "all_cases.h"
-#include "common_code.h"
-#include "gtest/gtest.h"
-#include "BS_thread_pool.hpp"
+#include "utils/common.h"
+#include "raw_code/raw_code.h"
+#include "all_cases/all_cases.h"
+#include "common_code/common_code.h"
 
 using klotski::range_reverse;
 
diff --git a/src/core_test/codec/sample.h b/src/core_test/codec/sample.h
index 65294f2..03c94e5 100644
--- a/src/core_test/codec/sample.h
+++ b/src/core_test/codec/sample.h
@@ -2,7 +2,8 @@
 
 #include <string>
 #include <cstdint>
-#include "all_cases.h"
+
+#include "all_cases/all_cases.h"
 
 // ----------------------------------------------------------------------------------------- //
 
diff --git a/src/core_test/codec/short_code.cc b/src/core_test/codec/short_code.cc
index 845239f..4c6cf4c 100644
--- a/src/core_test/codec/short_code.cc
+++ b/src/core_test/codec/short_code.cc
@@ -1,12 +1,12 @@
 #include <algorithm>
+#include <gtest/gtest.h>
+#include <BS_thread_pool.hpp>
 
 #include "sample.h"
 #include "exposer.h"
-#include "all_cases.h"
-#include "short_code.h"
-#include "common_code.h"
-#include "gtest/gtest.h"
-#include "BS_thread_pool.hpp"
+#include "all_cases/all_cases.h"
+#include "short_code/short_code.h"
+#include "common_code/common_code.h"
 
 using klotski::cases::AllCases;
 using klotski::cases::BasicRanges;