diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ca818f..6e70259 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,13 +5,13 @@ include (cmake/helper.cmake)
 
 enable_testing()
  
-add_subdirectory(maps/profile)
-add_subdirectory(vectors/profile)
-add_subdirectory(smart_ptr/profile)
-add_subdirectory(array/profile)
-add_subdirectory(string/custom)
+add_subdirectory(maps)
+add_subdirectory(vectors)
+add_subdirectory(smart_ptr)
+add_subdirectory(array)
+add_subdirectory(string)
 add_subdirectory(heap)
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  add_subdirectory(threads/profile) 
+  add_subdirectory(threads) 
 endif ()
diff --git a/array/CMakeLists.txt b/array/CMakeLists.txt
new file mode 100644
index 0000000..79ae563
--- /dev/null
+++ b/array/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(profile)
\ No newline at end of file
diff --git a/heap/CMakeLists.txt b/heap/CMakeLists.txt
index ce6bbb5..79ae563 100644
--- a/heap/CMakeLists.txt
+++ b/heap/CMakeLists.txt
@@ -1,3 +1 @@
-configure_target(system-heap system-heap.cpp)
-configure_target(custom-heap custom-heap.cpp)
-configure_target(memory-pool pool.cpp)
+add_subdirectory(profile)
\ No newline at end of file
diff --git a/heap/profile/CMakeLists.txt b/heap/profile/CMakeLists.txt
new file mode 100644
index 0000000..5ea3def
--- /dev/null
+++ b/heap/profile/CMakeLists.txt
@@ -0,0 +1,3 @@
+configure_target(system-heap system-heap.cpp)
+configure_target(custom-heap custom-heap.cpp)
+configure_target(memory-pool pool.cpp)
\ No newline at end of file
diff --git a/heap/custom-heap.cpp b/heap/profile/custom-heap.cpp
similarity index 100%
rename from heap/custom-heap.cpp
rename to heap/profile/custom-heap.cpp
diff --git a/heap/pool.cpp b/heap/profile/pool.cpp
similarity index 100%
rename from heap/pool.cpp
rename to heap/profile/pool.cpp
diff --git a/heap/portable.h b/heap/profile/portable.h
similarity index 100%
rename from heap/portable.h
rename to heap/profile/portable.h
diff --git a/heap/system-heap.cpp b/heap/profile/system-heap.cpp
similarity index 100%
rename from heap/system-heap.cpp
rename to heap/profile/system-heap.cpp
diff --git a/maps/CMakeLists.txt b/maps/CMakeLists.txt
new file mode 100644
index 0000000..79ae563
--- /dev/null
+++ b/maps/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(profile)
\ No newline at end of file
diff --git a/smart_ptr/CMakeLists.txt b/smart_ptr/CMakeLists.txt
new file mode 100644
index 0000000..79ae563
--- /dev/null
+++ b/smart_ptr/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(profile)
\ No newline at end of file
diff --git a/string/CMakeLists.txt b/string/CMakeLists.txt
new file mode 100644
index 0000000..65452a3
--- /dev/null
+++ b/string/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(custom)
\ No newline at end of file
diff --git a/threads/CMakeLists.txt b/threads/CMakeLists.txt
new file mode 100644
index 0000000..79ae563
--- /dev/null
+++ b/threads/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(profile)
\ No newline at end of file
diff --git a/vectors/CMakeLists.txt b/vectors/CMakeLists.txt
new file mode 100644
index 0000000..79ae563
--- /dev/null
+++ b/vectors/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(profile)
\ No newline at end of file