diff --git a/src/source/GM3rdChangeUp.cpp b/src/source/GameMaps/GM3rdChangeUp.cpp
similarity index 100%
rename from src/source/GM3rdChangeUp.cpp
rename to src/source/GameMaps/GM3rdChangeUp.cpp
diff --git a/src/source/GM3rdChangeUp.h b/src/source/GameMaps/GM3rdChangeUp.h
similarity index 100%
rename from src/source/GM3rdChangeUp.h
rename to src/source/GameMaps/GM3rdChangeUp.h
diff --git a/src/source/GMAida.cpp b/src/source/GameMaps/GMAida.cpp
similarity index 100%
rename from src/source/GMAida.cpp
rename to src/source/GameMaps/GMAida.cpp
diff --git a/src/source/GMAida.h b/src/source/GameMaps/GMAida.h
similarity index 100%
rename from src/source/GMAida.h
rename to src/source/GameMaps/GMAida.h
diff --git a/src/source/GMBattleCastle.cpp b/src/source/GameMaps/GMBattleCastle.cpp
similarity index 100%
rename from src/source/GMBattleCastle.cpp
rename to src/source/GameMaps/GMBattleCastle.cpp
diff --git a/src/source/GMBattleCastle.h b/src/source/GameMaps/GMBattleCastle.h
similarity index 100%
rename from src/source/GMBattleCastle.h
rename to src/source/GameMaps/GMBattleCastle.h
diff --git a/src/source/GMCryingWolf2nd.cpp b/src/source/GameMaps/GMCryingWolf2nd.cpp
similarity index 100%
rename from src/source/GMCryingWolf2nd.cpp
rename to src/source/GameMaps/GMCryingWolf2nd.cpp
diff --git a/src/source/GMCryingWolf2nd.h b/src/source/GameMaps/GMCryingWolf2nd.h
similarity index 100%
rename from src/source/GMCryingWolf2nd.h
rename to src/source/GameMaps/GMCryingWolf2nd.h
diff --git a/src/source/GMCrywolf1st.cpp b/src/source/GameMaps/GMCrywolf1st.cpp
similarity index 100%
rename from src/source/GMCrywolf1st.cpp
rename to src/source/GameMaps/GMCrywolf1st.cpp
diff --git a/src/source/GMCrywolf1st.h b/src/source/GameMaps/GMCrywolf1st.h
similarity index 100%
rename from src/source/GMCrywolf1st.h
rename to src/source/GameMaps/GMCrywolf1st.h
diff --git a/src/source/GMDoppelGanger1.cpp b/src/source/GameMaps/GMDoppelGanger1.cpp
similarity index 100%
rename from src/source/GMDoppelGanger1.cpp
rename to src/source/GameMaps/GMDoppelGanger1.cpp
diff --git a/src/source/GMDoppelGanger1.h b/src/source/GameMaps/GMDoppelGanger1.h
similarity index 100%
rename from src/source/GMDoppelGanger1.h
rename to src/source/GameMaps/GMDoppelGanger1.h
diff --git a/src/source/GMDoppelGanger2.cpp b/src/source/GameMaps/GMDoppelGanger2.cpp
similarity index 100%
rename from src/source/GMDoppelGanger2.cpp
rename to src/source/GameMaps/GMDoppelGanger2.cpp
diff --git a/src/source/GMDoppelGanger2.h b/src/source/GameMaps/GMDoppelGanger2.h
similarity index 100%
rename from src/source/GMDoppelGanger2.h
rename to src/source/GameMaps/GMDoppelGanger2.h
diff --git a/src/source/GMDoppelGanger3.cpp b/src/source/GameMaps/GMDoppelGanger3.cpp
similarity index 100%
rename from src/source/GMDoppelGanger3.cpp
rename to src/source/GameMaps/GMDoppelGanger3.cpp
diff --git a/src/source/GMDoppelGanger3.h b/src/source/GameMaps/GMDoppelGanger3.h
similarity index 100%
rename from src/source/GMDoppelGanger3.h
rename to src/source/GameMaps/GMDoppelGanger3.h
diff --git a/src/source/GMDoppelGanger4.cpp b/src/source/GameMaps/GMDoppelGanger4.cpp
similarity index 100%
rename from src/source/GMDoppelGanger4.cpp
rename to src/source/GameMaps/GMDoppelGanger4.cpp
diff --git a/src/source/GMDoppelGanger4.h b/src/source/GameMaps/GMDoppelGanger4.h
similarity index 100%
rename from src/source/GMDoppelGanger4.h
rename to src/source/GameMaps/GMDoppelGanger4.h
diff --git a/src/source/GMDuelArena.cpp b/src/source/GameMaps/GMDuelArena.cpp
similarity index 100%
rename from src/source/GMDuelArena.cpp
rename to src/source/GameMaps/GMDuelArena.cpp
diff --git a/src/source/GMDuelArena.h b/src/source/GameMaps/GMDuelArena.h
similarity index 100%
rename from src/source/GMDuelArena.h
rename to src/source/GameMaps/GMDuelArena.h
diff --git a/src/source/GMEmpireGuardian1.cpp b/src/source/GameMaps/GMEmpireGuardian1.cpp
similarity index 100%
rename from src/source/GMEmpireGuardian1.cpp
rename to src/source/GameMaps/GMEmpireGuardian1.cpp
diff --git a/src/source/GMEmpireGuardian1.h b/src/source/GameMaps/GMEmpireGuardian1.h
similarity index 100%
rename from src/source/GMEmpireGuardian1.h
rename to src/source/GameMaps/GMEmpireGuardian1.h
diff --git a/src/source/GMEmpireGuardian2.cpp b/src/source/GameMaps/GMEmpireGuardian2.cpp
similarity index 100%
rename from src/source/GMEmpireGuardian2.cpp
rename to src/source/GameMaps/GMEmpireGuardian2.cpp
diff --git a/src/source/GMEmpireGuardian2.h b/src/source/GameMaps/GMEmpireGuardian2.h
similarity index 100%
rename from src/source/GMEmpireGuardian2.h
rename to src/source/GameMaps/GMEmpireGuardian2.h
diff --git a/src/source/GMEmpireGuardian3.cpp b/src/source/GameMaps/GMEmpireGuardian3.cpp
similarity index 100%
rename from src/source/GMEmpireGuardian3.cpp
rename to src/source/GameMaps/GMEmpireGuardian3.cpp
diff --git a/src/source/GMEmpireGuardian3.h b/src/source/GameMaps/GMEmpireGuardian3.h
similarity index 100%
rename from src/source/GMEmpireGuardian3.h
rename to src/source/GameMaps/GMEmpireGuardian3.h
diff --git a/src/source/GMEmpireGuardian4.cpp b/src/source/GameMaps/GMEmpireGuardian4.cpp
similarity index 100%
rename from src/source/GMEmpireGuardian4.cpp
rename to src/source/GameMaps/GMEmpireGuardian4.cpp
diff --git a/src/source/GMEmpireGuardian4.h b/src/source/GameMaps/GMEmpireGuardian4.h
similarity index 100%
rename from src/source/GMEmpireGuardian4.h
rename to src/source/GameMaps/GMEmpireGuardian4.h
diff --git a/src/source/GMGmArea.h b/src/source/GameMaps/GMGmArea.h
similarity index 100%
rename from src/source/GMGmArea.h
rename to src/source/GameMaps/GMGmArea.h
diff --git a/src/source/GMHellas.cpp b/src/source/GameMaps/GMHellas.cpp
similarity index 100%
rename from src/source/GMHellas.cpp
rename to src/source/GameMaps/GMHellas.cpp
diff --git a/src/source/GMHellas.h b/src/source/GameMaps/GMHellas.h
similarity index 100%
rename from src/source/GMHellas.h
rename to src/source/GameMaps/GMHellas.h
diff --git a/src/source/GMHuntingGround.cpp b/src/source/GameMaps/GMHuntingGround.cpp
similarity index 100%
rename from src/source/GMHuntingGround.cpp
rename to src/source/GameMaps/GMHuntingGround.cpp
diff --git a/src/source/GMHuntingGround.h b/src/source/GameMaps/GMHuntingGround.h
similarity index 100%
rename from src/source/GMHuntingGround.h
rename to src/source/GameMaps/GMHuntingGround.h
diff --git a/src/source/GMKarutan1.cpp b/src/source/GameMaps/GMKarutan1.cpp
similarity index 100%
rename from src/source/GMKarutan1.cpp
rename to src/source/GameMaps/GMKarutan1.cpp
diff --git a/src/source/GMKarutan1.h b/src/source/GameMaps/GMKarutan1.h
similarity index 100%
rename from src/source/GMKarutan1.h
rename to src/source/GameMaps/GMKarutan1.h
diff --git a/src/source/GMNewTown.cpp b/src/source/GameMaps/GMNewTown.cpp
similarity index 100%
rename from src/source/GMNewTown.cpp
rename to src/source/GameMaps/GMNewTown.cpp
diff --git a/src/source/GMNewTown.h b/src/source/GameMaps/GMNewTown.h
similarity index 100%
rename from src/source/GMNewTown.h
rename to src/source/GameMaps/GMNewTown.h
diff --git a/src/source/GMSantaTown.cpp b/src/source/GameMaps/GMSantaTown.cpp
similarity index 100%
rename from src/source/GMSantaTown.cpp
rename to src/source/GameMaps/GMSantaTown.cpp
diff --git a/src/source/GMSantaTown.h b/src/source/GameMaps/GMSantaTown.h
similarity index 100%
rename from src/source/GMSantaTown.h
rename to src/source/GameMaps/GMSantaTown.h
diff --git a/src/source/GMSwampOfQuiet.cpp b/src/source/GameMaps/GMSwampOfQuiet.cpp
similarity index 100%
rename from src/source/GMSwampOfQuiet.cpp
rename to src/source/GameMaps/GMSwampOfQuiet.cpp
diff --git a/src/source/GMSwampOfQuiet.h b/src/source/GameMaps/GMSwampOfQuiet.h
similarity index 100%
rename from src/source/GMSwampOfQuiet.h
rename to src/source/GameMaps/GMSwampOfQuiet.h
diff --git a/src/source/GMUnitedMarketPlace.cpp b/src/source/GameMaps/GMUnitedMarketPlace.cpp
similarity index 100%
rename from src/source/GMUnitedMarketPlace.cpp
rename to src/source/GameMaps/GMUnitedMarketPlace.cpp
diff --git a/src/source/GMUnitedMarketPlace.h b/src/source/GameMaps/GMUnitedMarketPlace.h
similarity index 100%
rename from src/source/GMUnitedMarketPlace.h
rename to src/source/GameMaps/GMUnitedMarketPlace.h
diff --git a/src/source/GM_kanturu_1st.cpp b/src/source/GameMaps/GM_Kanturu_1st.cpp
similarity index 100%
rename from src/source/GM_kanturu_1st.cpp
rename to src/source/GameMaps/GM_Kanturu_1st.cpp
diff --git a/src/source/GM_Kanturu_1st.h b/src/source/GameMaps/GM_Kanturu_1st.h
similarity index 100%
rename from src/source/GM_Kanturu_1st.h
rename to src/source/GameMaps/GM_Kanturu_1st.h
diff --git a/src/source/GM_Kanturu_2nd.cpp b/src/source/GameMaps/GM_Kanturu_2nd.cpp
similarity index 100%
rename from src/source/GM_Kanturu_2nd.cpp
rename to src/source/GameMaps/GM_Kanturu_2nd.cpp
diff --git a/src/source/GM_Kanturu_2nd.h b/src/source/GameMaps/GM_Kanturu_2nd.h
similarity index 100%
rename from src/source/GM_Kanturu_2nd.h
rename to src/source/GameMaps/GM_Kanturu_2nd.h
diff --git a/src/source/GM_Kanturu_3rd.cpp b/src/source/GameMaps/GM_Kanturu_3rd.cpp
similarity index 100%
rename from src/source/GM_Kanturu_3rd.cpp
rename to src/source/GameMaps/GM_Kanturu_3rd.cpp
diff --git a/src/source/GM_Kanturu_3rd.h b/src/source/GameMaps/GM_Kanturu_3rd.h
similarity index 100%
rename from src/source/GM_Kanturu_3rd.h
rename to src/source/GameMaps/GM_Kanturu_3rd.h
diff --git a/src/source/GM_PK_Field.cpp b/src/source/GameMaps/GM_PK_Field.cpp
similarity index 100%
rename from src/source/GM_PK_Field.cpp
rename to src/source/GameMaps/GM_PK_Field.cpp
diff --git a/src/source/GM_PK_Field.h b/src/source/GameMaps/GM_PK_Field.h
similarity index 100%
rename from src/source/GM_PK_Field.h
rename to src/source/GameMaps/GM_PK_Field.h
diff --git a/src/source/GM_Raklion.cpp b/src/source/GameMaps/GM_Raklion.cpp
similarity index 100%
rename from src/source/GM_Raklion.cpp
rename to src/source/GameMaps/GM_Raklion.cpp
diff --git a/src/source/GM_Raklion.h b/src/source/GameMaps/GM_Raklion.h
similarity index 100%
rename from src/source/GM_Raklion.h
rename to src/source/GameMaps/GM_Raklion.h
diff --git a/src/source/w_MapHeaders.h b/src/source/w_MapHeaders.h
index 4566044ce..fd4f72a4b 100644
--- a/src/source/w_MapHeaders.h
+++ b/src/source/w_MapHeaders.h
@@ -10,60 +10,60 @@ T& TheWorld(int type)
     return dynamic_cast<T&>(TheMapProcess().GetMap(type));
 }
 
-#include "GMAida.h"
-#include "GMBattleCastle.h"
-#include "GMCryingWolf2nd.h"
-#include "GMCrywolf1st.h"
-#include "GMDoppelGanger1.h"
-#include "GMDoppelGanger2.h"
-#include "GMDoppelGanger3.h"
-#include "GMDoppelGanger4.h"
+#include "GameMaps/GMAida.h"
+#include "GameMaps/GMBattleCastle.h"
+#include "GameMaps/GMCryingWolf2nd.h"
+#include "GameMaps/GMCrywolf1st.h"
+#include "GameMaps/GMDoppelGanger1.h"
+#include "GameMaps/GMDoppelGanger2.h"
+#include "GameMaps/GMDoppelGanger3.h"
+#include "GameMaps/GMDoppelGanger4.h"
 
 #define g_DoppelGanger1 TheWorld<CGMDoppelGanger1>(WD_65DOPPLEGANGER1)
 #define g_DoppelGanger2 TheWorld<CGMDoppelGanger2>(WD_66DOPPLEGANGER2)
 #define g_DoppelGanger3 TheWorld<CGMDoppelGanger3>(WD_67DOPPLEGANGER3)
 #define g_DoppelGanger4 TheWorld<CGMDoppelGanger4>(WD_68DOPPLEGANGER4)
 
-#include "GMDuelArena.h"
+#include "GameMaps/GMDuelArena.h"
 
 #define g_DuelArena TheWorld<CGMDuelArena>(WD_64DUELARENA)
 
-#include "GMEmpireGuardian1.h"
-#include "GMEmpireGuardian2.h"
-#include "GMEmpireGuardian3.h"
-#include "GMEmpireGuardian4.h"
+#include "GameMaps/GMEmpireGuardian1.h"
+#include "GameMaps/GMEmpireGuardian2.h"
+#include "GameMaps/GMEmpireGuardian3.h"
+#include "GameMaps/GMEmpireGuardian4.h"
 
 #define g_EmpireGuardian1 TheWorld<GMEmpireGuardian1>(WD_69EMPIREGUARDIAN1)
 #define g_EmpireGuardian2 TheWorld<GMEmpireGuardian2>(WD_70EMPIREGUARDIAN2)
 #define g_EmpireGuardian3 TheWorld<GMEmpireGuardian3>(WD_71EMPIREGUARDIAN3)
 #define g_EmpireGuardian4 TheWorld<GMEmpireGuardian4>(WD_72EMPIREGUARDIAN4)
 
-#include "GMGmArea.h"
-#include "GMHellas.h"
-#include "GMHuntingGround.h"
+#include "GameMaps/GMGmArea.h"
+#include "GameMaps/GMHellas.h"
+#include "GameMaps/GMHuntingGround.h"
 
 #ifdef ASG_ADD_MAP_KARUTAN
-#include "GMKarutan1.h"
+#include "GameMaps/GMKarutan1.h"
 #define g_Karutan1 TheWorld<CGMKarutan1>(WD_80KARUTAN1)
 #endif // ASG_ADD_MAP_KARUTAN
 
-#include "GMNewTown.h"
+#include "GameMaps/GMNewTown.h"
 
-#include "GM_PK_Field.h"
+#include "GameMaps/GM_PK_Field.h"
 #define g_PKField TheWorld<CGM_PK_Field>(WD_63PK_FIELD)
 
-#include "GM_Raklion.h"
+#include "GameMaps/GM_Raklion.h"
 #define g_Raklion	TheWorld<SEASON4A::CGM_Raklion>(WD_57ICECITY)
 
-#include "GMSantaTown.h"
+#include "GameMaps/GMSantaTown.h"
 #define g_SantaTown TheWorld<CGMSantaTown>(WD_62SANTA_TOWN)
 
-#include "GMSwampOfQuiet.h"
+#include "GameMaps/GMSwampOfQuiet.h"
 
-#include "GMUnitedMarketPlace.h"
+#include "GameMaps/GMUnitedMarketPlace.h"
 #define g_UnitedMarketPlace TheWorld<GMUnitedMarketPlace>(WD_79UNITEDMARKETPLACE)
 
-#include "GM_Kanturu_1st.h"
-#include "GM_Kanturu_2nd.h"
-#include "GM_Kanturu_3rd.h"
-#include "GM3rdChangeUp.h"
\ No newline at end of file
+#include "GameMaps/GM_Kanturu_1st.h"
+#include "GameMaps/GM_Kanturu_2nd.h"
+#include "GameMaps/GM_Kanturu_3rd.h"
+#include "GameMaps/GM3rdChangeUp.h"