diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41d6beb..bf9b52d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,10 +53,10 @@ FetchContent_MakeAvailable(benchmark)
 
 add_library(FastCast INTERFACE fastcast.hpp)
 
-add_executable(measure benchmark.cpp utilities.hpp)
+add_executable(measure benchmark/benchmark.cpp tests/utilities.hpp)
 target_link_libraries(measure PRIVATE benchmark::benchmark FastCast)
 
-add_executable(tests tests.cpp)
+add_executable(tests tests/tests.cpp)
 target_link_libraries(tests PRIVATE FastCast Boost::unit_test_framework)
 target_include_directories(tests PRIVATE ${Boost_INCLUDE_DIRS})
 
diff --git a/benchmark.cpp b/benchmark/benchmark.cpp
similarity index 98%
rename from benchmark.cpp
rename to benchmark/benchmark.cpp
index e3cc986..16b1b65 100644
--- a/benchmark.cpp
+++ b/benchmark/benchmark.cpp
@@ -2,8 +2,8 @@
 // Created by sayan on 10/4/25.
 //
 
-#include "fastcast.hpp"
-#include "utilities.hpp"
+#include "../fastcast.hpp"
+#include "../tests/utilities.hpp"
 #include <benchmark/benchmark.h>
 #include <thread>
 
diff --git a/tests.cpp b/tests/tests.cpp
similarity index 99%
rename from tests.cpp
rename to tests/tests.cpp
index 9e16823..067e1b0 100644
--- a/tests.cpp
+++ b/tests/tests.cpp
@@ -4,7 +4,7 @@
 
 // fastcast_test.cpp
 #define BOOST_TEST_MODULE FastCastTests
-#include "fastcast.hpp"
+#include "../fastcast.hpp"
 #include "utilities.hpp"
 #include <boost/test/included/unit_test.hpp>
 
diff --git a/utilities.hpp b/tests/utilities.hpp
similarity index 100%
rename from utilities.hpp
rename to tests/utilities.hpp