diff --git a/assets/map/_states.map b/assets/map/ET.map
similarity index 100%
rename from assets/map/_states.map
rename to assets/map/ET.map
diff --git a/assets/map/states.map b/assets/map/test.map
similarity index 100%
rename from assets/map/states.map
rename to assets/map/test.map
diff --git a/engine/src/main.cpp b/engine/src/main.cpp
index e8a91aa..b31811c 100644
--- a/engine/src/main.cpp
+++ b/engine/src/main.cpp
@@ -44,7 +44,7 @@ int main(int argc, char **argv)
     Engine::assetManager->LoadDir(ee_assets::MATERIAL, "assets/materials");
 
     // Load assets
-    Engine::assetManager->LoadAsync(ee_assets::MAP_MESH, "assets/map/regions.map");
+    Engine::assetManager->LoadAsync(ee_assets::MAP_MESH, "assets/map/ET.map");
     Engine::assetManager->LoadAsync(ee_assets::SAVE, "assets/scenarios/empires.save");
 
     // Setup input manager TODO: builder
@@ -53,7 +53,7 @@ int main(int argc, char **argv)
     // Setup renderer TODO: builder
     Engine::renderer = reinterpret_cast<ee_engine::IRenderer*>(Allocate<ee_magnum::MagnumRenderer>(window));
 
-    ee_assets::AssetMapMesh &states = Engine::assetManager->FindOnce<ee_assets::AssetMapMesh>("assets/map/regions.map");
+    ee_assets::AssetMapMesh &states = Engine::assetManager->FindOnce<ee_assets::AssetMapMesh>("assets/map/ET.map");
     Engine::renderer->RegisterMapMesh(&states.content);
 
     //TODO: ShaderRefs builder from set of AssetMaterial
@@ -78,9 +78,9 @@ int main(int argc, char **argv)
 
     // Setup Client TODO: builder
     Engine::client = Allocate<Client>();
-    AssetHandle save = Engine::assetManager->Find("assets/scenarios/empires.save");
-    Engine::client->LoadSave(save);
-    Engine::client->Init();
+//    AssetHandle save = Engine::assetManager->Find("assets/scenarios/empires.save");
+//    Engine::client->LoadSave(save);
+//    Engine::client->Init();
     Engine::client->Start();
 
     // Game loop
diff --git a/sdk/map/_states.bmp b/sdk/map/maps/ET.map.bmp
similarity index 100%
rename from sdk/map/_states.bmp
rename to sdk/map/maps/ET.map.bmp
diff --git a/sdk/map/regions.bmp b/sdk/map/maps/regions.map.bmp
similarity index 100%
rename from sdk/map/regions.bmp
rename to sdk/map/maps/regions.map.bmp
diff --git a/sdk/map/states.bmp b/sdk/map/maps/test.map.bmp
similarity index 100%
rename from sdk/map/states.bmp
rename to sdk/map/maps/test.map.bmp
diff --git a/sdk/map/run.cmd b/sdk/map/run.cmd
index 21b3933..c33f181 100644
--- a/sdk/map/run.cmd
+++ b/sdk/map/run.cmd
@@ -1,2 +1,6 @@
 @echo off
-"%CD%/../../out/build/DEBUG/sdk/map/convert_map.exe" regions.bmp ../../assets/map/regions.map
\ No newline at end of file
+
+set ASSETS=../../assets
+set COMPILE=%CD%/../../out/build/DEBUG/sdk/map/convert_map.exe
+
+for %%F in (maps/*) do %COMPILE% "maps/%%~nF.bmp" "%ASSETS%/map/%%~nF" && echo "Compiled: %%~nF"