diff --git a/stardew-access/HarmonyPatches.cs b/stardew-access/HarmonyPatches.cs
index 5171631..659cb28 100644
--- a/stardew-access/HarmonyPatches.cs
+++ b/stardew-access/HarmonyPatches.cs
@@ -213,7 +213,7 @@ namespace stardew_access
             #region Chat Menu Patches
             harmony.Patch(
                     original: AccessTools.Method(typeof(ChatBox), nameof(ChatBox.update), new Type[] { typeof(GameTime) }),
-                    postfix: new HarmonyMethod(typeof(ChatMenuPatch), nameof(ChatMenuPatch.UpdatePatch))
+                    postfix: new HarmonyMethod(typeof(ChatBoxPatch), nameof(ChatBoxPatch.UpdatePatch))
                 );
             #endregion
 
diff --git a/stardew-access/Patches/ForgeMenuPatch.cs b/stardew-access/Patches/MenuWithInventoryPatches/ForgeMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/ForgeMenuPatch.cs
rename to stardew-access/Patches/MenuWithInventoryPatches/ForgeMenuPatch.cs
diff --git a/stardew-access/Patches/GeodeMenuPatch.cs b/stardew-access/Patches/MenuWithInventoryPatches/GeodeMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/GeodeMenuPatch.cs
rename to stardew-access/Patches/MenuWithInventoryPatches/GeodeMenuPatch.cs
diff --git a/stardew-access/Patches/ItemGrabMenuPatch.cs b/stardew-access/Patches/MenuWithInventoryPatches/ItemGrabMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/ItemGrabMenuPatch.cs
rename to stardew-access/Patches/MenuWithInventoryPatches/ItemGrabMenuPatch.cs
diff --git a/stardew-access/Patches/ShopMenuPatch.cs b/stardew-access/Patches/MenuWithInventoryPatches/ShopMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/ShopMenuPatch.cs
rename to stardew-access/Patches/MenuWithInventoryPatches/ShopMenuPatch.cs
diff --git a/stardew-access/Patches/TailoringMenuPatch.cs b/stardew-access/Patches/MenuWithInventoryPatches/TailoringMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/TailoringMenuPatch.cs
rename to stardew-access/Patches/MenuWithInventoryPatches/TailoringMenuPatch.cs
diff --git a/stardew-access/Patches/ChatMenuPatch.cs b/stardew-access/Patches/MiscPatches/ChatBoxPatch.cs
similarity index 98%
rename from stardew-access/Patches/ChatMenuPatch.cs
rename to stardew-access/Patches/MiscPatches/ChatBoxPatch.cs
index a0b521e..8ded908 100644
--- a/stardew-access/Patches/ChatMenuPatch.cs
+++ b/stardew-access/Patches/MiscPatches/ChatBoxPatch.cs
@@ -2,7 +2,7 @@
 
 namespace stardew_access.Patches
 {
-    internal class ChatMenuPatch
+    internal class ChatBoxPatch
     {
         private static int currentChatMessageIndex = 0;
         private static bool isChatRunning = false;
diff --git a/stardew-access/Patches/DialogueBoxPatch.cs b/stardew-access/Patches/MiscPatches/DialogueBoxPatch.cs
similarity index 100%
rename from stardew-access/Patches/DialogueBoxPatch.cs
rename to stardew-access/Patches/MiscPatches/DialogueBoxPatch.cs
diff --git a/stardew-access/Patches/Game1Patch.cs b/stardew-access/Patches/MiscPatches/Game1Patch.cs
similarity index 100%
rename from stardew-access/Patches/Game1Patch.cs
rename to stardew-access/Patches/MiscPatches/Game1Patch.cs
diff --git a/stardew-access/Patches/IClickableMenuPatch.cs b/stardew-access/Patches/MiscPatches/IClickableMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/IClickableMenuPatch.cs
rename to stardew-access/Patches/MiscPatches/IClickableMenuPatch.cs
diff --git a/stardew-access/Patches/InstanceGamePatch.cs b/stardew-access/Patches/MiscPatches/InstanceGamePatch.cs
similarity index 100%
rename from stardew-access/Patches/InstanceGamePatch.cs
rename to stardew-access/Patches/MiscPatches/InstanceGamePatch.cs
diff --git a/stardew-access/Patches/NPCPatch.cs b/stardew-access/Patches/MiscPatches/NPCPatch.cs
similarity index 100%
rename from stardew-access/Patches/NPCPatch.cs
rename to stardew-access/Patches/MiscPatches/NPCPatch.cs
diff --git a/stardew-access/Patches/TextBoxPatch.cs b/stardew-access/Patches/MiscPatches/TextBoxPatch.cs
similarity index 100%
rename from stardew-access/Patches/TextBoxPatch.cs
rename to stardew-access/Patches/MiscPatches/TextBoxPatch.cs
diff --git a/stardew-access/Patches/AnimalQueryMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/AnimalQueryMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/AnimalQueryMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/AnimalQueryMenuPatch.cs
diff --git a/stardew-access/Patches/CarpenterMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/CarpenterMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/CarpenterMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/CarpenterMenuPatch.cs
diff --git a/stardew-access/Patches/ChooseFromListMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/ChooseFromListMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/ChooseFromListMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/ChooseFromListMenuPatch.cs
diff --git a/stardew-access/Patches/ConfirmationDialogMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/ConfirmationDialogMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/ConfirmationDialogMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/ConfirmationDialogMenuPatch.cs
diff --git a/stardew-access/Patches/ItemListMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/ItemListMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/ItemListMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/ItemListMenuPatch.cs
diff --git a/stardew-access/Patches/LanguageSelectionMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/LanguageSelectionMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/LanguageSelectionMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/LanguageSelectionMenuPatch.cs
diff --git a/stardew-access/Patches/LetterViewerMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/LetterViewerMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/LetterViewerMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/LetterViewerMenuPatch.cs
diff --git a/stardew-access/Patches/LevelUpMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/LevelUpMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/LevelUpMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/LevelUpMenuPatch.cs
diff --git a/stardew-access/Patches/MineElevatorMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/MineElevatorMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/MineElevatorMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/MineElevatorMenuPatch.cs
diff --git a/stardew-access/Patches/NamingMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/NamingMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/NamingMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/NamingMenuPatch.cs
diff --git a/stardew-access/Patches/PondQuerMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/PondQuerMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/PondQuerMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/PondQuerMenuPatch.cs
diff --git a/stardew-access/Patches/PurchaseAnimalsMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/PurchaseAnimalsMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/PurchaseAnimalsMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/PurchaseAnimalsMenuPatch.cs
diff --git a/stardew-access/Patches/ShippingMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/ShippingMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/ShippingMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/ShippingMenuPatch.cs
diff --git a/stardew-access/Patches/TitleTextInputMenuPatch.cs b/stardew-access/Patches/OtherMenuPatches/TitleTextInputMenuPatch.cs
similarity index 100%
rename from stardew-access/Patches/TitleTextInputMenuPatch.cs
rename to stardew-access/Patches/OtherMenuPatches/TitleTextInputMenuPatch.cs