diff --git a/Source/Luckyrobots/Private/LuckyRobotsPlayerController.cpp b/Source/Luckyrobots/Private/Controllers/LuckyRobotsPlayerController.cpp
similarity index 60%
rename from Source/Luckyrobots/Private/LuckyRobotsPlayerController.cpp
rename to Source/Luckyrobots/Private/Controllers/LuckyRobotsPlayerController.cpp
index 0519d757..95d5976c 100644
--- a/Source/Luckyrobots/Private/LuckyRobotsPlayerController.cpp
+++ b/Source/Luckyrobots/Private/Controllers/LuckyRobotsPlayerController.cpp
@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyRobotsPlayerController.h"
+#include "Controllers/LuckyRobotsPlayerController.h"
 
diff --git a/Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp b/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp
similarity index 98%
rename from Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp
rename to Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp
index 7eb55513..6e9769fc 100644
--- a/Source/Luckyrobots/Private/LuckyRobotsGameInstance.cpp
+++ b/Source/Luckyrobots/Private/Core/LuckyRobotsGameInstance.cpp
@@ -1,10 +1,10 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyRobotsGameInstance.h"
-#include "LuckyRobotsGameState.h"
+#include "Core/LuckyRobotsGameInstance.h"
+#include "GameModes/LuckyRobotsGameState.h"
 #include "Kismet/GameplayStatics.h"
-#include "GameUserWidget.h"
+#include "UI/GameUserWidget.h"
 
 void ULuckyRobotsGameInstance::DoSendMessage(FString SendValue)
 {
diff --git a/Source/Luckyrobots/Private/LuckyRobotsFunctionLibrary.cpp b/Source/Luckyrobots/Private/FunctionLibraries/LuckyRobotsFunctionLibrary.cpp
similarity index 96%
rename from Source/Luckyrobots/Private/LuckyRobotsFunctionLibrary.cpp
rename to Source/Luckyrobots/Private/FunctionLibraries/LuckyRobotsFunctionLibrary.cpp
index 901f9a3f..491b9dd6 100644
--- a/Source/Luckyrobots/Private/LuckyRobotsFunctionLibrary.cpp
+++ b/Source/Luckyrobots/Private/FunctionLibraries/LuckyRobotsFunctionLibrary.cpp
@@ -1,11 +1,11 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyRobotsFunctionLibrary.h"
-#include "LuckyRobotsGameInstance.h"
+#include "FunctionLibraries/LuckyRobotsFunctionLibrary.h"
+#include "Core/LuckyRobotsGameInstance.h"
 #include "GameFramework/GameUserSettings.h"
 #include "Kismet/GameplayStatics.h"
-#include "SG_CaptureSetting.h"
+#include "Settings/SG_CaptureSetting.h"
 
 ULuckyRobotsGameInstance* ULuckyRobotsFunctionLibrary::GetLuckyRobotsGameInstance(const UObject* WorldContextObject)
 {
diff --git a/Source/Luckyrobots/Private/LuckyRobotsGameMode.cpp b/Source/Luckyrobots/Private/GameModes/LuckyRobotsGameMode.cpp
similarity index 87%
rename from Source/Luckyrobots/Private/LuckyRobotsGameMode.cpp
rename to Source/Luckyrobots/Private/GameModes/LuckyRobotsGameMode.cpp
index 6d7577a4..3c563237 100644
--- a/Source/Luckyrobots/Private/LuckyRobotsGameMode.cpp
+++ b/Source/Luckyrobots/Private/GameModes/LuckyRobotsGameMode.cpp
@@ -1,9 +1,9 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyRobotsGameMode.h"
-#include "LuckyRobotsGameInstance.h"
-#include "LuckyRobotsFunctionLibrary.h"
+#include "GameModes/LuckyRobotsGameMode.h"
+#include "Core/LuckyRobotsGameInstance.h"
+#include "FunctionLibraries/LuckyRobotsFunctionLibrary.h"
 
 void ALuckyRobotsGameMode::BeginPlay()
 {
diff --git a/Source/Luckyrobots/Private/LuckyRobotsGameState.cpp b/Source/Luckyrobots/Private/GameModes/LuckyRobotsGameState.cpp
similarity index 90%
rename from Source/Luckyrobots/Private/LuckyRobotsGameState.cpp
rename to Source/Luckyrobots/Private/GameModes/LuckyRobotsGameState.cpp
index bb4e6587..c72f2270 100644
--- a/Source/Luckyrobots/Private/LuckyRobotsGameState.cpp
+++ b/Source/Luckyrobots/Private/GameModes/LuckyRobotsGameState.cpp
@@ -1,10 +1,10 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LuckyRobotsGameState.h"
+#include "GameModes/LuckyRobotsGameState.h"
 #include "SocketIOClientComponent.h"
-#include "LuckyRobotsFunctionLibrary.h"
-#include "LuckyRobotsGameInstance.h"
+#include "FunctionLibraries/LuckyRobotsFunctionLibrary.h"
+#include "Core/LuckyRobotsGameInstance.h"
 
 ALuckyRobotsGameState::ALuckyRobotsGameState()
 {
diff --git a/Source/Luckyrobots/Private/LobbyGameMode.cpp b/Source/Luckyrobots/Private/Lobby/LobbyGameMode.cpp
similarity index 68%
rename from Source/Luckyrobots/Private/LobbyGameMode.cpp
rename to Source/Luckyrobots/Private/Lobby/LobbyGameMode.cpp
index c2942b1a..0f7abba0 100644
--- a/Source/Luckyrobots/Private/LobbyGameMode.cpp
+++ b/Source/Luckyrobots/Private/Lobby/LobbyGameMode.cpp
@@ -1,8 +1,8 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LobbyGameMode.h"
-#include "LuckyRobotsFunctionLibrary.h"
+#include "Lobby/LobbyGameMode.h"
+#include "FunctionLibraries/LuckyRobotsFunctionLibrary.h"
 
 void ALobbyGameMode::BeginPlay()
 {
diff --git a/Source/Luckyrobots/Private/LobbyPlayerController.cpp b/Source/Luckyrobots/Private/Lobby/LobbyPlayerController.cpp
similarity index 93%
rename from Source/Luckyrobots/Private/LobbyPlayerController.cpp
rename to Source/Luckyrobots/Private/Lobby/LobbyPlayerController.cpp
index 6aa12218..14f31e84 100644
--- a/Source/Luckyrobots/Private/LobbyPlayerController.cpp
+++ b/Source/Luckyrobots/Private/Lobby/LobbyPlayerController.cpp
@@ -1,7 +1,7 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "LobbyPlayerController.h"
+#include "Lobby/LobbyPlayerController.h"
 
 void ALobbyPlayerController::BeginPlay()
 {
diff --git a/Source/Luckyrobots/Private/MainScreenUserWidget.cpp b/Source/Luckyrobots/Private/Menus/MainScreenUserWidget.cpp
similarity index 96%
rename from Source/Luckyrobots/Private/MainScreenUserWidget.cpp
rename to Source/Luckyrobots/Private/Menus/MainScreenUserWidget.cpp
index c06c7dec..5259745c 100644
--- a/Source/Luckyrobots/Private/MainScreenUserWidget.cpp
+++ b/Source/Luckyrobots/Private/Menus/MainScreenUserWidget.cpp
@@ -1,10 +1,10 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "MainScreenUserWidget.h"
+#include "Menus/MainScreenUserWidget.h"
 #include "Engine/DataTable.h"
-#include "LuckyRobotsGameInstance.h"
-#include "LuckyRobotsFunctionLibrary.h"
+#include "Core/LuckyRobotsGameInstance.h"
+#include "FunctionLibraries/LuckyRobotsFunctionLibrary.h"
 
 void UMainScreenUserWidget::NativeConstruct()
 {
diff --git a/Source/Luckyrobots/Private/SG_CaptureSetting.cpp b/Source/Luckyrobots/Private/Settings/SG_CaptureSetting.cpp
similarity index 66%
rename from Source/Luckyrobots/Private/SG_CaptureSetting.cpp
rename to Source/Luckyrobots/Private/Settings/SG_CaptureSetting.cpp
index 64b88c56..6f33b329 100644
--- a/Source/Luckyrobots/Private/SG_CaptureSetting.cpp
+++ b/Source/Luckyrobots/Private/Settings/SG_CaptureSetting.cpp
@@ -1,4 +1,4 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "SG_CaptureSetting.h"
+#include "Settings/SG_CaptureSetting.h"
diff --git a/Source/Luckyrobots/Private/GameUserWidget.cpp b/Source/Luckyrobots/Private/UI/GameUserWidget.cpp
similarity index 73%
rename from Source/Luckyrobots/Private/GameUserWidget.cpp
rename to Source/Luckyrobots/Private/UI/GameUserWidget.cpp
index f73027f7..08f555a5 100644
--- a/Source/Luckyrobots/Private/GameUserWidget.cpp
+++ b/Source/Luckyrobots/Private/UI/GameUserWidget.cpp
@@ -1,9 +1,9 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "GameUserWidget.h"
-#include "LuckyRobotsFunctionLibrary.h"
-#include "LuckyRobotsGameInstance.h"
+#include "UI/GameUserWidget.h"
+#include "FunctionLibraries/LuckyRobotsFunctionLibrary.h"
+#include "Core/LuckyRobotsGameInstance.h"
 
 void UGameUserWidget::NativeConstruct()
 {
diff --git a/Source/Luckyrobots/Private/CaptureSettingsUserWidget.cpp b/Source/Luckyrobots/Private/UI/Settings/CaptureSettingsUserWidget.cpp
similarity index 61%
rename from Source/Luckyrobots/Private/CaptureSettingsUserWidget.cpp
rename to Source/Luckyrobots/Private/UI/Settings/CaptureSettingsUserWidget.cpp
index d0c258be..272118a8 100644
--- a/Source/Luckyrobots/Private/CaptureSettingsUserWidget.cpp
+++ b/Source/Luckyrobots/Private/UI/Settings/CaptureSettingsUserWidget.cpp
@@ -1,5 +1,5 @@
 // Fill out your copyright notice in the Description page of Project Settings.
 
 
-#include "CaptureSettingsUserWidget.h"
+#include "UI/Settings/CaptureSettingsUserWidget.h"
 
diff --git a/Source/Luckyrobots/Public/LuckyRobotsPlayerController.h b/Source/Luckyrobots/Public/Controllers/LuckyRobotsPlayerController.h
similarity index 100%
rename from Source/Luckyrobots/Public/LuckyRobotsPlayerController.h
rename to Source/Luckyrobots/Public/Controllers/LuckyRobotsPlayerController.h
diff --git a/Source/Luckyrobots/Public/LuckyRobotsGameInstance.h b/Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h
similarity index 100%
rename from Source/Luckyrobots/Public/LuckyRobotsGameInstance.h
rename to Source/Luckyrobots/Public/Core/LuckyRobotsGameInstance.h
diff --git a/Source/Luckyrobots/Public/LuckyRobotsFunctionLibrary.h b/Source/Luckyrobots/Public/FunctionLibraries/LuckyRobotsFunctionLibrary.h
similarity index 100%
rename from Source/Luckyrobots/Public/LuckyRobotsFunctionLibrary.h
rename to Source/Luckyrobots/Public/FunctionLibraries/LuckyRobotsFunctionLibrary.h
diff --git a/Source/Luckyrobots/Public/LuckyRobotsGameMode.h b/Source/Luckyrobots/Public/GameModes/LuckyRobotsGameMode.h
similarity index 100%
rename from Source/Luckyrobots/Public/LuckyRobotsGameMode.h
rename to Source/Luckyrobots/Public/GameModes/LuckyRobotsGameMode.h
diff --git a/Source/Luckyrobots/Public/LuckyRobotsGameState.h b/Source/Luckyrobots/Public/GameModes/LuckyRobotsGameState.h
similarity index 100%
rename from Source/Luckyrobots/Public/LuckyRobotsGameState.h
rename to Source/Luckyrobots/Public/GameModes/LuckyRobotsGameState.h
diff --git a/Source/Luckyrobots/Public/LobbyGameMode.h b/Source/Luckyrobots/Public/Lobby/LobbyGameMode.h
similarity index 100%
rename from Source/Luckyrobots/Public/LobbyGameMode.h
rename to Source/Luckyrobots/Public/Lobby/LobbyGameMode.h
diff --git a/Source/Luckyrobots/Public/LobbyPlayerController.h b/Source/Luckyrobots/Public/Lobby/LobbyPlayerController.h
similarity index 100%
rename from Source/Luckyrobots/Public/LobbyPlayerController.h
rename to Source/Luckyrobots/Public/Lobby/LobbyPlayerController.h
diff --git a/Source/Luckyrobots/Public/MainScreenUserWidget.h b/Source/Luckyrobots/Public/Menus/MainScreenUserWidget.h
similarity index 100%
rename from Source/Luckyrobots/Public/MainScreenUserWidget.h
rename to Source/Luckyrobots/Public/Menus/MainScreenUserWidget.h
diff --git a/Source/Luckyrobots/Public/SG_CaptureSetting.h b/Source/Luckyrobots/Public/Settings/SG_CaptureSetting.h
similarity index 100%
rename from Source/Luckyrobots/Public/SG_CaptureSetting.h
rename to Source/Luckyrobots/Public/Settings/SG_CaptureSetting.h
diff --git a/Source/Luckyrobots/Public/GameUserWidget.h b/Source/Luckyrobots/Public/UI/GameUserWidget.h
similarity index 100%
rename from Source/Luckyrobots/Public/GameUserWidget.h
rename to Source/Luckyrobots/Public/UI/GameUserWidget.h
diff --git a/Source/Luckyrobots/Public/CaptureSettingsUserWidget.h b/Source/Luckyrobots/Public/UI/Settings/CaptureSettingsUserWidget.h
similarity index 100%
rename from Source/Luckyrobots/Public/CaptureSettingsUserWidget.h
rename to Source/Luckyrobots/Public/UI/Settings/CaptureSettingsUserWidget.h