diff --git a/BigBaseV2/src/gui/main_window.cpp b/BigBaseV2/src/gui/windows/main.cpp
similarity index 100%
rename from BigBaseV2/src/gui/main_window.cpp
rename to BigBaseV2/src/gui/windows/main.cpp
diff --git a/BigBaseV2/src/gui/player_window.cpp b/BigBaseV2/src/gui/windows/player.cpp
similarity index 100%
rename from BigBaseV2/src/gui/player_window.cpp
rename to BigBaseV2/src/gui/windows/player.cpp
diff --git a/BigBaseV2/src/gui/top_bar.cpp b/BigBaseV2/src/gui/windows/top_bar.cpp
similarity index 86%
rename from BigBaseV2/src/gui/top_bar.cpp
rename to BigBaseV2/src/gui/windows/top_bar.cpp
index e7be92a3..bfaaaa7f 100644
--- a/BigBaseV2/src/gui/top_bar.cpp
+++ b/BigBaseV2/src/gui/windows/top_bar.cpp
@@ -16,11 +16,11 @@ namespace big
 			{
 				if (strlen(player_name) == 0)
 					QUEUE_JOB_BEGIN_CLAUSE(&)
-					{
-						player_name = (char*)PLAYER::GET_PLAYER_NAME(g_playerId);
-					}QUEUE_JOB_END_CLAUSE
+				{
+					player_name = (char*)PLAYER::GET_PLAYER_NAME(g_playerId);
+				}QUEUE_JOB_END_CLAUSE
 
-				ImGui::MenuItem("Logged in as:", NULL, false, false);
+					ImGui::MenuItem("Logged in as:", NULL, false, false);
 				ImGui::MenuItem(player_name, NULL, false, false);
 
 				if (ImGui::MenuItem("Am I lobby host?"))
@@ -68,7 +68,7 @@ namespace big
 				{
 					if (ImGui::MenuItem(sessions[i].descr))
 					{
-						QUEUE_JOB_BEGIN_CLAUSE(=)
+						QUEUE_JOB_BEGIN_CLAUSE(= )
 						{
 							features::functions::join_session_type(sessions[i]);
 						}QUEUE_JOB_END_CLAUSE
diff --git a/BigBaseV2/src/gui/user_sidebar.cpp b/BigBaseV2/src/gui/windows/user_sidebar.cpp
similarity index 100%
rename from BigBaseV2/src/gui/user_sidebar.cpp
rename to BigBaseV2/src/gui/windows/user_sidebar.cpp