diff --git a/MelonLoader/Patches/Modes/Harvest/GardenBagMenu_Patch.cs b/MelonLoader/Patches/Modes/Harvest/GardenBagMenu_Patch.cs
index 6a377e6..3f009bd 100644
--- a/MelonLoader/Patches/Modes/Harvest/GardenBagMenu_Patch.cs
+++ b/MelonLoader/Patches/Modes/Harvest/GardenBagMenu_Patch.cs
@@ -4,7 +4,7 @@ using Il2CppTMPro;
 using PvZ_Fusion_Translator.AssetStore;
 using UnityEngine;
 
-namespace PvZ_Fusion_Translator.Patches.GameObjects
+namespace PvZ_Fusion_Translator.Patches.Modes.Harvest
 {
     [HarmonyPatch(typeof(GardenBagMenu))]
     public static class GardenBagMenu_Patch
diff --git a/MelonLoader/Patches/Modes/Harvest/GardenCard_Patch.cs b/MelonLoader/Patches/Modes/Harvest/GardenCard_Patch.cs
index cb4e23d..d1baac8 100644
--- a/MelonLoader/Patches/Modes/Harvest/GardenCard_Patch.cs
+++ b/MelonLoader/Patches/Modes/Harvest/GardenCard_Patch.cs
@@ -2,7 +2,7 @@
 using Il2Cpp;
 using PvZ_Fusion_Translator.AssetStore;
 
-namespace PvZ_Fusion_Translator.Patches.GameObjects
+namespace PvZ_Fusion_Translator.Patches.Modes.Harvest
 {
     [HarmonyPatch(typeof(GardenCard))]
 	public static class GardenCard_Patch
diff --git a/MelonLoader/PvZ Fusion Translator [MelonLoader].csproj b/MelonLoader/PvZ Fusion Translator [MelonLoader].csproj
index c463798..3ccbe6a 100644
--- a/MelonLoader/PvZ Fusion Translator [MelonLoader].csproj	
+++ b/MelonLoader/PvZ Fusion Translator [MelonLoader].csproj	
@@ -400,13 +400,13 @@
 		<Compile Include="Log.cs" />
 		<Compile Include="ModFeatures.cs" />
 		<Compile Include="AssetStore\AudioStore.cs" />
-		<Compile Include="Patches\GameObjects\AbyssBuffMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AdvantureEvolutionMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AdvantureStarMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AdvantureMissionMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AdvantureHelpMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AdvantureMenu2_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AdvantureMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssBuffMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Starbound\AdvantureEvolutionMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Starbound\AdvantureStarMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Starbound\AdvantureMissionMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Starbound\AdvantureHelpMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Starbound\AdvantureMenu2_Patch.cs" />
+		<Compile Include="Patches\Modes\Starbound\AdvantureMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AlmanacZombieWindow_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AlmanacZombieMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\AlmanacPlantMenu_Patch.cs" />
@@ -423,73 +423,73 @@
 		<Compile Include="Patches\GameObjects\ButtonObjects\BackToIndex_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\UIBtn_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ExploreMakeMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AbyssSelectBuffWindow_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssSelectBuffWindow_Patch.cs" />
 		<Compile Include="Patches\GameObjects\SpriteRenderer_Patch.cs" />
 		<Compile Include="Patches\GameObjects\Board_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\MainMenu_Btn_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\TreasureMoney_Patch.cs" />
 		<Compile Include="Patches\GameObjects\PlantInfoWindow_Patch.cs" />
-		<Compile Include="Patches\GameObjects\GardenCard_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\GardenCard_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\UIProgress2_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\Jigsaw_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ExploreEnterWindow_Patch.cs" />
 		<Compile Include="Patches\GameObjects\PlayerShootingWindow_Patch.cs" />
 		<Compile Include="Patches\GameObjects\PlayerShootingMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\GardenBagMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\GardenBagMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ExploreMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\SeedLibrary_Patch.cs" />
-		<Compile Include="Patches\GameObjects\TreasureEquipmentMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\TreasureConfirmMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\TreasureEvacuateMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\TreasureUpgradeMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\TreasureStoreMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\TreasureWarehouseMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\TreasureMainMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\TreasureEquipmentMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\TreasureConfirmMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\TreasureEvacuateMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\TreasureUpgradeMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\TreasureStoreMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\TreasureWarehouseMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\TreasureMainMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ShootingSelectWindow_Patch.cs" />
 		<Compile Include="Patches\GameObjects\FruitNinjaSelectWindow_Patch.cs" />
 		<Compile Include="Patches\GameObjects\RogueCardWindow_Patch.cs" />
 		<Compile Include="Patches\GameObjects\CrisisZombieWindow_Patch.cs" />
 		<Compile Include="Patches\GameObjects\RogueStartMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AbyssBagMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AbyssCheckInBag_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AbyssStoreMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AbyssSettlementMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssBagMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssCheckInBag_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssStoreMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssSettlementMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\NormalBtn_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\UIButton_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\TrainingDummy_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\UltimateChomper_Patch.cs" />
 		<Compile Include="Patches\GameObjects\OtherMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\ButtonObjects\AbyssCheckSellMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\ButtonObjects\AbyssBuffButton_Patch.cs" />
-		<Compile Include="Patches\GameObjects\ButtonObjects\AbyssLevelEnter_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssCheckSellMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssBuffButton_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssLevelEnter_Patch.cs" />
 		<Compile Include="Patches\GameObjects\BaseMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\CustomLevelEnter_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ButtonObjects\SaveMenuBtn_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MainMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\MinorObjects\AbyssGoods_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssGoods_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\DY_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\LanternUmbrella_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\MagnetBox_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\MagnetInterface_Patch.cs" />
 		<Compile Include="Patches\GameObjects\MinorObjects\Money_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AbyssDevelopMenu_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AbyssMenu2_Patch.cs" />
-		<Compile Include="Patches\GameObjects\AbyssMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssDevelopMenu_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssMenu2_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssMenu_Patch.cs" />
 		<Compile Include="Patches\Modes\Odyssey\TravelBuffMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\TowerUpgradeMenu_Patch.cs" />
 		<Compile Include="Patches\GameObjects\TowerOption_Patch.cs" />
 		<Compile Include="Patches\Modes\Odyssey\TravelLookBuff_Patch.cs" />
 		<Compile Include="Patches\GameObjects\ShootingMenu_Patch.cs" />
 		<Compile Include="Patches\Modes\Odyssey\TravelLookMenu_Patch.cs" />
-		<Compile Include="Patches\Managers\AbyssBuffData_Patch.cs" />
-		<Compile Include="Patches\Managers\AbyssInfo_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssBuffData_Patch.cs" />
+		<Compile Include="Patches\Modes\Abyss\AbyssInfo_Patch.cs" />
 		<Compile Include="Patches\Managers\ChessManager_Patch.cs" />
 		<Compile Include="Patches\Managers\CustomLevelShower_Patch.cs" />
 		<Compile Include="Patches\Managers\Garden_Patch.cs" />
 		<Compile Include="Patches\Managers\DrawCardManager_Patch.cs" />
 		<Compile Include="Patches\Managers\CanvasUpUI_Patch.cs" />
 		<Compile Include="Patches\Modes\Odyssey\TravelMgr_Patch.cs" />
-		<Compile Include="Patches\Managers\TreasureManager_Patch.cs" />
+		<Compile Include="Patches\Modes\Harvest\TreasureManager_Patch.cs" />
 		<Compile Include="Patches\Managers\TowerManager_Patch.cs" />
 		<Compile Include="Patches\Managers\SaveMenu_Patch.cs" />
 		<Compile Include="Patches\Modes\Odyssey\TravelBuffOptionButton_Patch.cs" />