diff --git a/CMakeLists.txt b/CMakeLists.txt
index e018a5e..8b9a90d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
 message(STATUS "Module Path: ${CMAKE_MODULE_PATH}")
 message(STATUS "Prefix Path: ${CMAKE_PREFIX_PATH}")
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/modules)
 
 project(tcp_pubsub)
 
@@ -25,10 +25,10 @@ add_subdirectory(tcp_pubsub)
 
 add_subdirectory(thirdparty/recycle EXCLUDE_FROM_ALL)
 
-add_subdirectory(performance_publisher)
-add_subdirectory(performance_subscriber)
-add_subdirectory(hello_world_publisher)
-add_subdirectory(hello_world_subscriber)
+add_subdirectory(samples/performance_publisher)
+add_subdirectory(samples/performance_subscriber)
+add_subdirectory(samples/hello_world_publisher)
+add_subdirectory(samples/hello_world_subscriber)
 
 # add_subdirectory(ecal_to_tcp)
 # add_subdirectory(tcp_to_ecal)
diff --git a/ecal_to_tcp/CMakeLists.txt b/samples/ecal_to_tcp/CMakeLists.txt
similarity index 100%
rename from ecal_to_tcp/CMakeLists.txt
rename to samples/ecal_to_tcp/CMakeLists.txt
diff --git a/ecal_to_tcp/src/main.cpp b/samples/ecal_to_tcp/src/main.cpp
similarity index 100%
rename from ecal_to_tcp/src/main.cpp
rename to samples/ecal_to_tcp/src/main.cpp
diff --git a/hello_world_publisher/CMakeLists.txt b/samples/hello_world_publisher/CMakeLists.txt
similarity index 100%
rename from hello_world_publisher/CMakeLists.txt
rename to samples/hello_world_publisher/CMakeLists.txt
diff --git a/hello_world_publisher/src/main.cpp b/samples/hello_world_publisher/src/main.cpp
similarity index 100%
rename from hello_world_publisher/src/main.cpp
rename to samples/hello_world_publisher/src/main.cpp
diff --git a/hello_world_subscriber/CMakeLists.txt b/samples/hello_world_subscriber/CMakeLists.txt
similarity index 100%
rename from hello_world_subscriber/CMakeLists.txt
rename to samples/hello_world_subscriber/CMakeLists.txt
diff --git a/hello_world_subscriber/src/main.cpp b/samples/hello_world_subscriber/src/main.cpp
similarity index 100%
rename from hello_world_subscriber/src/main.cpp
rename to samples/hello_world_subscriber/src/main.cpp
diff --git a/performance_publisher/CMakeLists.txt b/samples/performance_publisher/CMakeLists.txt
similarity index 100%
rename from performance_publisher/CMakeLists.txt
rename to samples/performance_publisher/CMakeLists.txt
diff --git a/performance_publisher/src/main.cpp b/samples/performance_publisher/src/main.cpp
similarity index 100%
rename from performance_publisher/src/main.cpp
rename to samples/performance_publisher/src/main.cpp
diff --git a/performance_subscriber/CMakeLists.txt b/samples/performance_subscriber/CMakeLists.txt
similarity index 100%
rename from performance_subscriber/CMakeLists.txt
rename to samples/performance_subscriber/CMakeLists.txt
diff --git a/performance_subscriber/src/main.cpp b/samples/performance_subscriber/src/main.cpp
similarity index 100%
rename from performance_subscriber/src/main.cpp
rename to samples/performance_subscriber/src/main.cpp
diff --git a/tcp_to_ecal/CMakeLists.txt b/samples/tcp_to_ecal/CMakeLists.txt
similarity index 100%
rename from tcp_to_ecal/CMakeLists.txt
rename to samples/tcp_to_ecal/CMakeLists.txt
diff --git a/tcp_to_ecal/src/main.cpp b/samples/tcp_to_ecal/src/main.cpp
similarity index 100%
rename from tcp_to_ecal/src/main.cpp
rename to samples/tcp_to_ecal/src/main.cpp
diff --git a/tcp_pubsub/CMakeLists.txt b/tcp_pubsub/CMakeLists.txt
index a4e914c..6e9d0a0 100644
--- a/tcp_pubsub/CMakeLists.txt
+++ b/tcp_pubsub/CMakeLists.txt
@@ -131,7 +131,7 @@ install(
 include(CMakePackageConfigHelpers)
 
 configure_package_config_file(
-  "../cmake/tcp_pubsubConfig.cmake.in"
+  "cmake/tcp_pubsubConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/cmake/tcp_pubsubConfig.cmake"
   INSTALL_DESTINATION ${TCP_PUBSUB_INSTALL_CMAKE_DIR}
   PATH_VARS TCP_PUBSUB_INSTALL_CMAKE_DIR
diff --git a/cmake/tcp_pubsubConfig.cmake.in b/tcp_pubsub/cmake/tcp_pubsubConfig.cmake.in
similarity index 100%
rename from cmake/tcp_pubsubConfig.cmake.in
rename to tcp_pubsub/cmake/tcp_pubsubConfig.cmake.in
diff --git a/cmake/Findasio.cmake b/thirdparty/modules/Findasio.cmake
similarity index 92%
rename from cmake/Findasio.cmake
rename to thirdparty/modules/Findasio.cmake
index 045a569..5151a88 100644
--- a/cmake/Findasio.cmake
+++ b/thirdparty/modules/Findasio.cmake
@@ -1,7 +1,7 @@
 find_path(Asio_INCLUDE_DIR
   NAMES asio.hpp
   PATHS
-  ${CMAKE_CURRENT_LIST_DIR}/../thirdparty/asio/asio/include
+  ${CMAKE_CURRENT_LIST_DIR}/../asio/asio/include
   include
 )