diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c21d2d..6d382af 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -85,12 +85,12 @@ add_subdirectory(basic_room)
 add_subdirectory(simple_room)
 add_subdirectory(simple_rpc)
 add_subdirectory(simple_data_stream)
-add_subdirectory(logging_levels_basic_usage)
-add_subdirectory(logging_levels_custom_sinks)
-add_subdirectory(hello_livekit_sender)
-add_subdirectory(hello_livekit_receiver)
-add_subdirectory(simple_joystick_sender)
-add_subdirectory(simple_joystick_receiver)
-add_subdirectory(ping_pong_ping)
-add_subdirectory(ping_pong_pong)
+add_subdirectory(logging_levels/basic_usage logging_levels_basic_usage)
+add_subdirectory(logging_levels/custom_sinks logging_levels_custom_sinks)
+add_subdirectory(hello_livekit/sender hello_livekit_sender)
+add_subdirectory(hello_livekit/receiver hello_livekit_receiver)
+add_subdirectory(simple_joystick/sender simple_joystick_sender)
+add_subdirectory(simple_joystick/receiver simple_joystick_receiver)
+add_subdirectory(ping_pong/ping ping_pong_ping)
+add_subdirectory(ping_pong/pong ping_pong_pong)
 add_subdirectory(user_timestamped_video)
diff --git a/hello_livekit_receiver/CMakeLists.txt b/hello_livekit/receiver/CMakeLists.txt
similarity index 100%
rename from hello_livekit_receiver/CMakeLists.txt
rename to hello_livekit/receiver/CMakeLists.txt
diff --git a/hello_livekit_receiver/main.cpp b/hello_livekit/receiver/main.cpp
similarity index 100%
rename from hello_livekit_receiver/main.cpp
rename to hello_livekit/receiver/main.cpp
diff --git a/hello_livekit_sender/CMakeLists.txt b/hello_livekit/sender/CMakeLists.txt
similarity index 100%
rename from hello_livekit_sender/CMakeLists.txt
rename to hello_livekit/sender/CMakeLists.txt
diff --git a/hello_livekit_sender/main.cpp b/hello_livekit/sender/main.cpp
similarity index 100%
rename from hello_livekit_sender/main.cpp
rename to hello_livekit/sender/main.cpp
diff --git a/logging_levels_basic_usage/CMakeLists.txt b/logging_levels/basic_usage/CMakeLists.txt
similarity index 100%
rename from logging_levels_basic_usage/CMakeLists.txt
rename to logging_levels/basic_usage/CMakeLists.txt
diff --git a/logging_levels_basic_usage/main.cpp b/logging_levels/basic_usage/main.cpp
similarity index 100%
rename from logging_levels_basic_usage/main.cpp
rename to logging_levels/basic_usage/main.cpp
diff --git a/logging_levels_custom_sinks/CMakeLists.txt b/logging_levels/custom_sinks/CMakeLists.txt
similarity index 100%
rename from logging_levels_custom_sinks/CMakeLists.txt
rename to logging_levels/custom_sinks/CMakeLists.txt
diff --git a/logging_levels_custom_sinks/main.cpp b/logging_levels/custom_sinks/main.cpp
similarity index 100%
rename from logging_levels_custom_sinks/main.cpp
rename to logging_levels/custom_sinks/main.cpp
diff --git a/ping_pong_ping/CMakeLists.txt b/ping_pong/ping/CMakeLists.txt
similarity index 100%
rename from ping_pong_ping/CMakeLists.txt
rename to ping_pong/ping/CMakeLists.txt
diff --git a/ping_pong_ping/constants.h b/ping_pong/ping/constants.h
similarity index 100%
rename from ping_pong_ping/constants.h
rename to ping_pong/ping/constants.h
diff --git a/ping_pong_ping/json_converters.cpp b/ping_pong/ping/json_converters.cpp
similarity index 100%
rename from ping_pong_ping/json_converters.cpp
rename to ping_pong/ping/json_converters.cpp
diff --git a/ping_pong_ping/json_converters.h b/ping_pong/ping/json_converters.h
similarity index 100%
rename from ping_pong_ping/json_converters.h
rename to ping_pong/ping/json_converters.h
diff --git a/ping_pong_ping/main.cpp b/ping_pong/ping/main.cpp
similarity index 100%
rename from ping_pong_ping/main.cpp
rename to ping_pong/ping/main.cpp
diff --git a/ping_pong_ping/messages.h b/ping_pong/ping/messages.h
similarity index 100%
rename from ping_pong_ping/messages.h
rename to ping_pong/ping/messages.h
diff --git a/ping_pong_ping/utils.h b/ping_pong/ping/utils.h
similarity index 100%
rename from ping_pong_ping/utils.h
rename to ping_pong/ping/utils.h
diff --git a/ping_pong_pong/CMakeLists.txt b/ping_pong/pong/CMakeLists.txt
similarity index 100%
rename from ping_pong_pong/CMakeLists.txt
rename to ping_pong/pong/CMakeLists.txt
diff --git a/ping_pong_pong/constants.h b/ping_pong/pong/constants.h
similarity index 100%
rename from ping_pong_pong/constants.h
rename to ping_pong/pong/constants.h
diff --git a/ping_pong_pong/json_converters.cpp b/ping_pong/pong/json_converters.cpp
similarity index 100%
rename from ping_pong_pong/json_converters.cpp
rename to ping_pong/pong/json_converters.cpp
diff --git a/ping_pong_pong/json_converters.h b/ping_pong/pong/json_converters.h
similarity index 100%
rename from ping_pong_pong/json_converters.h
rename to ping_pong/pong/json_converters.h
diff --git a/ping_pong_pong/main.cpp b/ping_pong/pong/main.cpp
similarity index 100%
rename from ping_pong_pong/main.cpp
rename to ping_pong/pong/main.cpp
diff --git a/ping_pong_pong/messages.h b/ping_pong/pong/messages.h
similarity index 100%
rename from ping_pong_pong/messages.h
rename to ping_pong/pong/messages.h
diff --git a/ping_pong_pong/utils.h b/ping_pong/pong/utils.h
similarity index 100%
rename from ping_pong_pong/utils.h
rename to ping_pong/pong/utils.h
diff --git a/simple_joystick_receiver/CMakeLists.txt b/simple_joystick/receiver/CMakeLists.txt
similarity index 100%
rename from simple_joystick_receiver/CMakeLists.txt
rename to simple_joystick/receiver/CMakeLists.txt
diff --git a/simple_joystick_receiver/json_utils.cpp b/simple_joystick/receiver/json_utils.cpp
similarity index 100%
rename from simple_joystick_receiver/json_utils.cpp
rename to simple_joystick/receiver/json_utils.cpp
diff --git a/simple_joystick_receiver/json_utils.h b/simple_joystick/receiver/json_utils.h
similarity index 100%
rename from simple_joystick_receiver/json_utils.h
rename to simple_joystick/receiver/json_utils.h
diff --git a/simple_joystick_receiver/main.cpp b/simple_joystick/receiver/main.cpp
similarity index 100%
rename from simple_joystick_receiver/main.cpp
rename to simple_joystick/receiver/main.cpp
diff --git a/simple_joystick_receiver/utils.cpp b/simple_joystick/receiver/utils.cpp
similarity index 100%
rename from simple_joystick_receiver/utils.cpp
rename to simple_joystick/receiver/utils.cpp
diff --git a/simple_joystick_receiver/utils.h b/simple_joystick/receiver/utils.h
similarity index 100%
rename from simple_joystick_receiver/utils.h
rename to simple_joystick/receiver/utils.h
diff --git a/simple_joystick_sender/CMakeLists.txt b/simple_joystick/sender/CMakeLists.txt
similarity index 100%
rename from simple_joystick_sender/CMakeLists.txt
rename to simple_joystick/sender/CMakeLists.txt
diff --git a/simple_joystick_sender/json_utils.cpp b/simple_joystick/sender/json_utils.cpp
similarity index 100%
rename from simple_joystick_sender/json_utils.cpp
rename to simple_joystick/sender/json_utils.cpp
diff --git a/simple_joystick_sender/json_utils.h b/simple_joystick/sender/json_utils.h
similarity index 100%
rename from simple_joystick_sender/json_utils.h
rename to simple_joystick/sender/json_utils.h
diff --git a/simple_joystick_sender/main.cpp b/simple_joystick/sender/main.cpp
similarity index 100%
rename from simple_joystick_sender/main.cpp
rename to simple_joystick/sender/main.cpp
diff --git a/simple_joystick_sender/utils.cpp b/simple_joystick/sender/utils.cpp
similarity index 100%
rename from simple_joystick_sender/utils.cpp
rename to simple_joystick/sender/utils.cpp
diff --git a/simple_joystick_sender/utils.h b/simple_joystick/sender/utils.h
similarity index 100%
rename from simple_joystick_sender/utils.h
rename to simple_joystick/sender/utils.h