diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b53caf..f203ba0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,18 +21,7 @@ target_include_directories(mach_detours
         PRIVATE src
 )
 
-
-add_executable(mach_detours_sample
-        sample/main.c
-)
-target_link_libraries(mach_detours_sample
-        PRIVATE mach_detours
-)
-
-
 add_subdirectory(lib/catch2)
-add_executable(mach_detours_tests
-        tests/test.cpp)
-target_link_libraries(mach_detours_tests
-        PRIVATE Catch2::Catch2WithMain mach_detours
-)
+
+add_subdirectory(sample)
+add_subdirectory(tests)
diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt
new file mode 100644
index 0000000..88e2f30
--- /dev/null
+++ b/sample/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_executable(mach_detours_sample
+        main.c
+)
+target_link_libraries(mach_detours_sample
+        PRIVATE mach_detours
+)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..d216ff3
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_executable(mach_detours_tests
+        test.cpp)
+
+target_link_libraries(mach_detours_tests
+        PRIVATE Catch2::Catch2WithMain mach_detours
+)
\ No newline at end of file