diff --git a/.gitignore b/.gitignore
index 95df8e6..ab9a33b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .vs
-pygame test/pygame test/saves/
+light_and_dark/light_and_dark/saves/
 **/__pycache__/
\ No newline at end of file
diff --git a/light_and_dark.slnx b/light_and_dark.slnx
new file mode 100644
index 0000000..c2e3f8d
--- /dev/null
+++ b/light_and_dark.slnx
@@ -0,0 +1,5 @@
+<Solution>
+  <Project Path="light_and_dark/light_and_dark.pyproj" Type="888888a0-9f3d-457c-b088-3a5042f75d52" Id="e4b51f4c-e0be-4f9e-8a8e-d814a78b30c5">
+    <Build Project="false" />
+  </Project>
+</Solution>
diff --git a/pygame test/Player_01.png b/light_and_dark/Player_01.png
similarity index 100%
rename from pygame test/Player_01.png
rename to light_and_dark/Player_01.png
diff --git a/pygame test/Player_01_idle1.png b/light_and_dark/Player_01_idle1.png
similarity index 100%
rename from pygame test/Player_01_idle1.png
rename to light_and_dark/Player_01_idle1.png
diff --git a/pygame test/Player_01_idle2.png b/light_and_dark/Player_01_idle2.png
similarity index 100%
rename from pygame test/Player_01_idle2.png
rename to light_and_dark/Player_01_idle2.png
diff --git a/pygame test/Player_02.png b/light_and_dark/Player_02.png
similarity index 100%
rename from pygame test/Player_02.png
rename to light_and_dark/Player_02.png
diff --git a/pygame test/README.md b/light_and_dark/README.md
similarity index 99%
rename from pygame test/README.md
rename to light_and_dark/README.md
index 3481400..a9cad94 100644
--- a/pygame test/README.md	
+++ b/light_and_dark/README.md
@@ -9,7 +9,7 @@ A 2D platformer built with **Pygame**. You switch between two forms — **Light*
 ## Running the game
 
 ```
-python pygame_test.py
+python main.py
 ```
 
 Requires Python 3.10+ and `pygame`. Game data (rooms, items, sets, enemies, drops) lives in `data/`. Rooms are edited with the included browser tool: `level_editor_v43.html`.
diff --git a/pygame test/ROADMAP.md b/light_and_dark/ROADMAP.md
similarity index 100%
rename from pygame test/ROADMAP.md
rename to light_and_dark/ROADMAP.md
diff --git a/pygame test/data/config/animation.json b/light_and_dark/data/config/animation.json
similarity index 100%
rename from pygame test/data/config/animation.json
rename to light_and_dark/data/config/animation.json
diff --git a/pygame test/data/config/coin_drops.json b/light_and_dark/data/config/coin_drops.json
similarity index 100%
rename from pygame test/data/config/coin_drops.json
rename to light_and_dark/data/config/coin_drops.json
diff --git a/pygame test/data/config/colors.json b/light_and_dark/data/config/colors.json
similarity index 100%
rename from pygame test/data/config/colors.json
rename to light_and_dark/data/config/colors.json
diff --git a/pygame test/data/config/game_config.json b/light_and_dark/data/config/game_config.json
similarity index 100%
rename from pygame test/data/config/game_config.json
rename to light_and_dark/data/config/game_config.json
diff --git a/pygame test/data/config/npc.json b/light_and_dark/data/config/npc.json
similarity index 100%
rename from pygame test/data/config/npc.json
rename to light_and_dark/data/config/npc.json
diff --git a/pygame test/data/config/physics.json b/light_and_dark/data/config/physics.json
similarity index 100%
rename from pygame test/data/config/physics.json
rename to light_and_dark/data/config/physics.json
diff --git a/pygame test/data/config/ranged.json b/light_and_dark/data/config/ranged.json
similarity index 100%
rename from pygame test/data/config/ranged.json
rename to light_and_dark/data/config/ranged.json
diff --git a/pygame test/data/config/reward_room.json b/light_and_dark/data/config/reward_room.json
similarity index 70%
rename from pygame test/data/config/reward_room.json
rename to light_and_dark/data/config/reward_room.json
index 44c8c85..f7c4e4c 100644
--- a/pygame test/data/config/reward_room.json	
+++ b/light_and_dark/data/config/reward_room.json
@@ -1,5 +1,5 @@
 {
-  "room_id": "room_05.json",
+  "room_id": "room_reward_01.json",
   "chest_pos": [520, 330],
   "ability_pos": [820, 210],
   "chest_coins": [30, 30]
diff --git a/pygame test/data/config/ui_layout.json b/light_and_dark/data/config/ui_layout.json
similarity index 100%
rename from pygame test/data/config/ui_layout.json
rename to light_and_dark/data/config/ui_layout.json
diff --git a/pygame test/data/drops/enemy_drops.json b/light_and_dark/data/drops/enemy_drops.json
similarity index 100%
rename from pygame test/data/drops/enemy_drops.json
rename to light_and_dark/data/drops/enemy_drops.json
diff --git a/pygame test/data/enemies/enemy_types.json b/light_and_dark/data/enemies/enemy_types.json
similarity index 100%
rename from pygame test/data/enemies/enemy_types.json
rename to light_and_dark/data/enemies/enemy_types.json
diff --git a/pygame test/data/items/armor.json b/light_and_dark/data/items/armor.json
similarity index 100%
rename from pygame test/data/items/armor.json
rename to light_and_dark/data/items/armor.json
diff --git a/pygame test/data/items/necklaces.json b/light_and_dark/data/items/necklaces.json
similarity index 100%
rename from pygame test/data/items/necklaces.json
rename to light_and_dark/data/items/necklaces.json
diff --git a/pygame test/data/items/rarities.json b/light_and_dark/data/items/rarities.json
similarity index 100%
rename from pygame test/data/items/rarities.json
rename to light_and_dark/data/items/rarities.json
diff --git a/pygame test/data/items/sets.json b/light_and_dark/data/items/sets.json
similarity index 100%
rename from pygame test/data/items/sets.json
rename to light_and_dark/data/items/sets.json
diff --git a/pygame test/data/objects/objects.json b/light_and_dark/data/objects/objects.json
similarity index 100%
rename from pygame test/data/objects/objects.json
rename to light_and_dark/data/objects/objects.json
diff --git a/pygame test/data/sprites/abilities/Ranged_projectile.png b/light_and_dark/data/sprites/abilities/Ranged_projectile.png
similarity index 100%
rename from pygame test/data/sprites/abilities/Ranged_projectile.png
rename to light_and_dark/data/sprites/abilities/Ranged_projectile.png
diff --git a/pygame test/data/sprites/abilities/Tether_dark_ability.png b/light_and_dark/data/sprites/abilities/Tether_dark_ability.png
similarity index 100%
rename from pygame test/data/sprites/abilities/Tether_dark_ability.png
rename to light_and_dark/data/sprites/abilities/Tether_dark_ability.png
diff --git a/pygame test/data/sprites/abilities/Tether_dark_ability_edge.png b/light_and_dark/data/sprites/abilities/Tether_dark_ability_edge.png
similarity index 100%
rename from pygame test/data/sprites/abilities/Tether_dark_ability_edge.png
rename to light_and_dark/data/sprites/abilities/Tether_dark_ability_edge.png
diff --git a/pygame test/data/sprites/abilities/Tether_light_ability.png b/light_and_dark/data/sprites/abilities/Tether_light_ability.png
similarity index 100%
rename from pygame test/data/sprites/abilities/Tether_light_ability.png
rename to light_and_dark/data/sprites/abilities/Tether_light_ability.png
diff --git a/pygame test/data/sprites/abilities/Tether_light_ability_edge.png b/light_and_dark/data/sprites/abilities/Tether_light_ability_edge.png
similarity index 100%
rename from pygame test/data/sprites/abilities/Tether_light_ability_edge.png
rename to light_and_dark/data/sprites/abilities/Tether_light_ability_edge.png
diff --git a/pygame test/data/sprites/objects/lamp_1.png b/light_and_dark/data/sprites/objects/lamp_1.png
similarity index 100%
rename from pygame test/data/sprites/objects/lamp_1.png
rename to light_and_dark/data/sprites/objects/lamp_1.png
diff --git a/pygame test/data/sprites/tokens/Boss1_token.png b/light_and_dark/data/sprites/tokens/Boss1_token.png
similarity index 100%
rename from pygame test/data/sprites/tokens/Boss1_token.png
rename to light_and_dark/data/sprites/tokens/Boss1_token.png
diff --git a/pygame test/data/ui/icons/abilities/RealityBreak_dark.png b/light_and_dark/data/ui/icons/abilities/RealityBreak_dark.png
similarity index 100%
rename from pygame test/data/ui/icons/abilities/RealityBreak_dark.png
rename to light_and_dark/data/ui/icons/abilities/RealityBreak_dark.png
diff --git a/pygame test/data/ui/icons/abilities/RealityBreak_light.png b/light_and_dark/data/ui/icons/abilities/RealityBreak_light.png
similarity index 100%
rename from pygame test/data/ui/icons/abilities/RealityBreak_light.png
rename to light_and_dark/data/ui/icons/abilities/RealityBreak_light.png
diff --git a/pygame test/data/ui/icons/abilities/Shatterstep_dark.png b/light_and_dark/data/ui/icons/abilities/Shatterstep_dark.png
similarity index 100%
rename from pygame test/data/ui/icons/abilities/Shatterstep_dark.png
rename to light_and_dark/data/ui/icons/abilities/Shatterstep_dark.png
diff --git a/pygame test/data/ui/icons/abilities/Shatterstep_light.png b/light_and_dark/data/ui/icons/abilities/Shatterstep_light.png
similarity index 100%
rename from pygame test/data/ui/icons/abilities/Shatterstep_light.png
rename to light_and_dark/data/ui/icons/abilities/Shatterstep_light.png
diff --git a/pygame test/data/ui/icons/abilities/Tether_dark.png b/light_and_dark/data/ui/icons/abilities/Tether_dark.png
similarity index 100%
rename from pygame test/data/ui/icons/abilities/Tether_dark.png
rename to light_and_dark/data/ui/icons/abilities/Tether_dark.png
diff --git a/pygame test/data/ui/icons/abilities/Tether_light.png b/light_and_dark/data/ui/icons/abilities/Tether_light.png
similarity index 100%
rename from pygame test/data/ui/icons/abilities/Tether_light.png
rename to light_and_dark/data/ui/icons/abilities/Tether_light.png
diff --git a/pygame test/data/ui/icons/coins/coin_dark.png b/light_and_dark/data/ui/icons/coins/coin_dark.png
similarity index 100%
rename from pygame test/data/ui/icons/coins/coin_dark.png
rename to light_and_dark/data/ui/icons/coins/coin_dark.png
diff --git a/pygame test/data/ui/icons/coins/coin_light.png b/light_and_dark/data/ui/icons/coins/coin_light.png
similarity index 100%
rename from pygame test/data/ui/icons/coins/coin_light.png
rename to light_and_dark/data/ui/icons/coins/coin_light.png
diff --git a/pygame test/data/ui/icons/slots/chestplate.png b/light_and_dark/data/ui/icons/slots/chestplate.png
similarity index 100%
rename from pygame test/data/ui/icons/slots/chestplate.png
rename to light_and_dark/data/ui/icons/slots/chestplate.png
diff --git a/pygame test/data/ui/icons/slots/helmet.png b/light_and_dark/data/ui/icons/slots/helmet.png
similarity index 100%
rename from pygame test/data/ui/icons/slots/helmet.png
rename to light_and_dark/data/ui/icons/slots/helmet.png
diff --git a/pygame test/data/ui/icons/slots/necklace.png b/light_and_dark/data/ui/icons/slots/necklace.png
similarity index 100%
rename from pygame test/data/ui/icons/slots/necklace.png
rename to light_and_dark/data/ui/icons/slots/necklace.png
diff --git a/pygame test/data/ui/icons/slots/pants.png b/light_and_dark/data/ui/icons/slots/pants.png
similarity index 100%
rename from pygame test/data/ui/icons/slots/pants.png
rename to light_and_dark/data/ui/icons/slots/pants.png
diff --git a/pygame test/data/world/rooms/room_01.json b/light_and_dark/data/world/rooms/room_01.json
similarity index 100%
rename from pygame test/data/world/rooms/room_01.json
rename to light_and_dark/data/world/rooms/room_01.json
diff --git a/pygame test/data/world/rooms/room_02.json b/light_and_dark/data/world/rooms/room_02.json
similarity index 100%
rename from pygame test/data/world/rooms/room_02.json
rename to light_and_dark/data/world/rooms/room_02.json
diff --git a/pygame test/data/world/rooms/room_07.json b/light_and_dark/data/world/rooms/room_07.json
similarity index 100%
rename from pygame test/data/world/rooms/room_07.json
rename to light_and_dark/data/world/rooms/room_07.json
diff --git a/pygame test/data/world/rooms/room_boss_01.json b/light_and_dark/data/world/rooms/room_boss_01.json
similarity index 100%
rename from pygame test/data/world/rooms/room_boss_01.json
rename to light_and_dark/data/world/rooms/room_boss_01.json
diff --git a/pygame test/data/world/rooms/room_boss_refight_01.json b/light_and_dark/data/world/rooms/room_boss_refight_01.json
similarity index 100%
rename from pygame test/data/world/rooms/room_boss_refight_01.json
rename to light_and_dark/data/world/rooms/room_boss_refight_01.json
diff --git a/pygame test/data/world/rooms/room_reward_01.json b/light_and_dark/data/world/rooms/room_reward_01.json
similarity index 100%
rename from pygame test/data/world/rooms/room_reward_01.json
rename to light_and_dark/data/world/rooms/room_reward_01.json
diff --git a/pygame test/data/world/rooms/room_town_gloomreach.json b/light_and_dark/data/world/rooms/room_town_gloomreach.json
similarity index 100%
rename from pygame test/data/world/rooms/room_town_gloomreach.json
rename to light_and_dark/data/world/rooms/room_town_gloomreach.json
diff --git a/pygame test/level_editor_v43.html b/light_and_dark/level_editor_v43.html
similarity index 100%
rename from pygame test/level_editor_v43.html
rename to light_and_dark/level_editor_v43.html
diff --git a/pygame test/pygame test.pyproj b/light_and_dark/light_and_dark.pyproj
similarity index 89%
rename from pygame test/pygame test.pyproj
rename to light_and_dark/light_and_dark.pyproj
index 18b98ba..77001ac 100644
--- a/pygame test/pygame test.pyproj	
+++ b/light_and_dark/light_and_dark.pyproj
@@ -4,13 +4,13 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>e4b51f4c-e0be-4f9e-8a8e-d814a78b30c5</ProjectGuid>
     <ProjectHome>.</ProjectHome>
-    <StartupFile>pygame_test.py</StartupFile>
+    <StartupFile>main.py</StartupFile>
     <SearchPath>
     </SearchPath>
     <WorkingDirectory>.</WorkingDirectory>
     <OutputPath>.</OutputPath>
-    <Name>pygame test</Name>
-    <RootNamespace>pygame test</RootNamespace>
+    <Name>light_and_dark</Name>
+    <RootNamespace>light_and_dark</RootNamespace>
     <TestFramework>unittest</TestFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -22,7 +22,7 @@
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="pygame_test.py" />
+    <Compile Include="main.py" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
   <!-- Uncomment the CoreCompile target to enable the Build command in
diff --git a/pygame test/pygame_test.py b/light_and_dark/main.py
similarity index 99%
rename from pygame test/pygame_test.py
rename to light_and_dark/main.py
index 2b3134d..993bb1b 100644
--- a/pygame test/pygame_test.py	
+++ b/light_and_dark/main.py
@@ -38,7 +38,7 @@ LOOT_BOB_AMP = 3            # pixels
 LOOT_BOB_SPEED = 2.2        # radians/sec-ish feel
 
 # --- Reward room setup ---
-REWARD_ROOM_ID = "room_05.json"
+REWARD_ROOM_ID = "room_reward_01.json"
 REWARD_CHEST_POS = (520, 330)
 REWARD_ABILITY_POS = (820, 210)
 REWARD_CHEST_COINS = (30, 30)  # light, dark
diff --git a/pygame test/notes.txt b/light_and_dark/notes.txt
similarity index 100%
rename from pygame test/notes.txt
rename to light_and_dark/notes.txt
diff --git a/light_and_dark/saves/save 1.json b/light_and_dark/saves/save 1.json
new file mode 100644
index 0000000..1ceeb72
--- /dev/null
+++ b/light_and_dark/saves/save 1.json	
@@ -0,0 +1,28 @@
+{
+  "version": 1,
+  "saved_at": "2026-09-28T09:46:05",
+  "player": {
+    "room_id": "room_02.json",
+    "x": -45,
+    "y": 360,
+    "health": 10,
+    "charge": 100.0,
+    "shade": false,
+    "coins_light": 23,
+    "coins_dark": 2,
+    "has_ranged": false,
+    "reward_chest_opened": false,
+    "equipment": {}
+  },
+  "inventory": [],
+  "quests": {
+    "active": {},
+    "completed_one_time": [],
+    "tokens": 0
+  },
+  "boss_diary": {
+    "slotted": {}
+  },
+  "defeated_bosses": [],
+  "broken_doors": []
+}
\ No newline at end of file
diff --git a/pygame test.slnx b/pygame test.slnx
deleted file mode 100644
index 933ff8d..0000000
--- a/pygame test.slnx	
+++ /dev/null
@@ -1,5 +0,0 @@
-<Solution>
-  <Project Path="pygame test/pygame test.pyproj" Type="888888a0-9f3d-457c-b088-3a5042f75d52" Id="e4b51f4c-e0be-4f9e-8a8e-d814a78b30c5">
-    <Build Project="false" />
-  </Project>
-</Solution>
diff --git a/pygame test/__pycache__/pygame_test.cpython-312.pyc b/pygame test/__pycache__/pygame_test.cpython-312.pyc
deleted file mode 100644
index d4d36f8..0000000
Binary files a/pygame test/__pycache__/pygame_test.cpython-312.pyc and /dev/null differ