diff --git a/Patch/RenderEnvironmentPatches.cs b/Patch/Engine/RenderEnvironmentPatches.cs
similarity index 99%
rename from Patch/RenderEnvironmentPatches.cs
rename to Patch/Engine/RenderEnvironmentPatches.cs
index 9f91376..a317b0f 100644
--- a/Patch/RenderEnvironmentPatches.cs
+++ b/Patch/Engine/RenderEnvironmentPatches.cs
@@ -3,7 +3,7 @@ using ADOFAIRenderer.Core;
 using HarmonyLib;
 using UnityEngine;
 
-namespace ADOFAIRenderer.Patch
+namespace ADOFAIRenderer.Patch.Engine
 {
     public static class RenderEnvironmentPatches
     {
diff --git a/Patch/ClassPatch/EndscreenLanternsPatch.cs b/Patch/Game/EndscreenLanternsPatch.cs
similarity index 98%
rename from Patch/ClassPatch/EndscreenLanternsPatch.cs
rename to Patch/Game/EndscreenLanternsPatch.cs
index 2eed40f..bc72b8a 100644
--- a/Patch/ClassPatch/EndscreenLanternsPatch.cs
+++ b/Patch/Game/EndscreenLanternsPatch.cs
@@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis;
 using ADOFAIRenderer.Core;
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(EndscreenLanterns))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/ClassPatch/PersistencePatch.cs b/Patch/Game/PersistencePatch.cs
similarity index 92%
rename from Patch/ClassPatch/PersistencePatch.cs
rename to Patch/Game/PersistencePatch.cs
index 9c88ce9..aaee7e8 100644
--- a/Patch/ClassPatch/PersistencePatch.cs
+++ b/Patch/Game/PersistencePatch.cs
@@ -1,7 +1,7 @@
 using ADOFAIRenderer.Core;
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(Persistence), "skipIntroBehavior", MethodType.Getter)]
     public static class PersistencePatch
diff --git a/Patch/ClassPatch/scnEditorPatch.cs b/Patch/Game/scnEditorPatch.cs
similarity index 97%
rename from Patch/ClassPatch/scnEditorPatch.cs
rename to Patch/Game/scnEditorPatch.cs
index 5a229c3..bbc0e77 100644
--- a/Patch/ClassPatch/scnEditorPatch.cs
+++ b/Patch/Game/scnEditorPatch.cs
@@ -3,7 +3,7 @@ using HarmonyLib;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scnEditor))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/SetCustomFrameRatePatch.cs b/Patch/Game/scrCameraPatch.cs
similarity index 78%
rename from Patch/SetCustomFrameRatePatch.cs
rename to Patch/Game/scrCameraPatch.cs
index 311c897..3189c92 100644
--- a/Patch/SetCustomFrameRatePatch.cs
+++ b/Patch/Game/scrCameraPatch.cs
@@ -1,14 +1,14 @@
 using System.Diagnostics.CodeAnalysis;
 using HarmonyLib;
-using UnityEngine;
 
-namespace ADOFAIRenderer.Patch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrCamera), "SetCustomFrameRate")]
-    public class SetCustomFrameRatePatch
+    // ReSharper disable once InconsistentNaming
+    public class scrCameraPatch
     {
         [SuppressMessage("ReSharper", "InconsistentNaming")]
-        private static bool Prefix(scrCamera __instance, bool enable, float frame, ref MeshRenderer ___camQuadMesh, ref RenderTexture ___camRT)
+        private static bool Prefix(scrCamera __instance, bool enable, float frame)
         {
             // There is an issue that `mainTexture.Release` triggers even if `mainTexture` is `camRT`, so mod tries to fix it
             if (enable || __instance.enableCustomFPS != enable) return true;
diff --git a/Patch/ClassPatch/scrControllerPatch.cs b/Patch/Game/scrControllerPatch.cs
similarity index 96%
rename from Patch/ClassPatch/scrControllerPatch.cs
rename to Patch/Game/scrControllerPatch.cs
index d5680e7..4bee274 100644
--- a/Patch/ClassPatch/scrControllerPatch.cs
+++ b/Patch/Game/scrControllerPatch.cs
@@ -1,7 +1,7 @@
 using ADOFAIRenderer.Core;
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrController))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/ClassPatch/scrDecorationPatch.cs b/Patch/Game/scrDecorationPatch.cs
similarity index 96%
rename from Patch/ClassPatch/scrDecorationPatch.cs
rename to Patch/Game/scrDecorationPatch.cs
index b4866dd..b6b354e 100644
--- a/Patch/ClassPatch/scrDecorationPatch.cs
+++ b/Patch/Game/scrDecorationPatch.cs
@@ -1,6 +1,6 @@
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrDecoration))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/ShowHitTextPatch.cs b/Patch/Game/scrHitTextManagerPatch.cs
similarity index 70%
rename from Patch/ShowHitTextPatch.cs
rename to Patch/Game/scrHitTextManagerPatch.cs
index 632bbc3..6e9195b 100644
--- a/Patch/ShowHitTextPatch.cs
+++ b/Patch/Game/scrHitTextManagerPatch.cs
@@ -1,10 +1,11 @@
 using ADOFAIRenderer.Core;
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrHitTextManager), "ShowHitText")]
-    public class ShowHitTextPatch
+    // ReSharper disable once InconsistentNaming
+    public class scrHitTextManagerPatch
     {
         public static bool Prefix()
         {
diff --git a/Patch/ClassPatch/scrMistakesManagerPatch.cs b/Patch/Game/scrMistakesManagerPatch.cs
similarity index 90%
rename from Patch/ClassPatch/scrMistakesManagerPatch.cs
rename to Patch/Game/scrMistakesManagerPatch.cs
index e051268..9256b4d 100644
--- a/Patch/ClassPatch/scrMistakesManagerPatch.cs
+++ b/Patch/Game/scrMistakesManagerPatch.cs
@@ -1,7 +1,7 @@
 using ADOFAIRenderer.Core;
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrMistakesManager))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/ClassPatch/scrPlayerManagerPatch.cs b/Patch/Game/scrPlayerManagerPatch.cs
similarity index 93%
rename from Patch/ClassPatch/scrPlayerManagerPatch.cs
rename to Patch/Game/scrPlayerManagerPatch.cs
index 3ccb2e8..43644a8 100644
--- a/Patch/ClassPatch/scrPlayerManagerPatch.cs
+++ b/Patch/Game/scrPlayerManagerPatch.cs
@@ -1,7 +1,7 @@
 using ADOFAIRenderer.Core;
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrPlayerManager))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/ClassPatch/scrPortalParticlesPatch.cs b/Patch/Game/scrPortalParticlesPatch.cs
similarity index 94%
rename from Patch/ClassPatch/scrPortalParticlesPatch.cs
rename to Patch/Game/scrPortalParticlesPatch.cs
index 2e58f69..7c0a401 100644
--- a/Patch/ClassPatch/scrPortalParticlesPatch.cs
+++ b/Patch/Game/scrPortalParticlesPatch.cs
@@ -1,7 +1,7 @@
 using HarmonyLib;
 using UnityEngine;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrPortalParticles))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/ClassPatch/scrPressToStartPatch.cs b/Patch/Game/scrPressToStartPatch.cs
similarity index 92%
rename from Patch/ClassPatch/scrPressToStartPatch.cs
rename to Patch/Game/scrPressToStartPatch.cs
index 05a6396..9361adc 100644
--- a/Patch/ClassPatch/scrPressToStartPatch.cs
+++ b/Patch/Game/scrPressToStartPatch.cs
@@ -1,7 +1,7 @@
 using ADOFAIRenderer.Core;
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrPressToStart))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/ClassPatch/scrShowIfDebugPatch.cs b/Patch/Game/scrShowIfDebugPatch.cs
similarity index 96%
rename from Patch/ClassPatch/scrShowIfDebugPatch.cs
rename to Patch/Game/scrShowIfDebugPatch.cs
index a969727..8bde244 100644
--- a/Patch/ClassPatch/scrShowIfDebugPatch.cs
+++ b/Patch/Game/scrShowIfDebugPatch.cs
@@ -4,7 +4,7 @@ using HarmonyLib;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrShowIfDebug))]
     // ReSharper disable once InconsistentNaming
diff --git a/Patch/ClassPatch/scrUIControllerPatch.cs b/Patch/Game/scrUIControllerPatch.cs
similarity index 93%
rename from Patch/ClassPatch/scrUIControllerPatch.cs
rename to Patch/Game/scrUIControllerPatch.cs
index ffd6274..df2c6a1 100644
--- a/Patch/ClassPatch/scrUIControllerPatch.cs
+++ b/Patch/Game/scrUIControllerPatch.cs
@@ -1,7 +1,7 @@
 using ADOFAIRenderer.Core;
 using HarmonyLib;
 
-namespace ADOFAIRenderer.Patch.ClassPatch
+namespace ADOFAIRenderer.Patch.Game
 {
     [HarmonyPatch(typeof(scrUIController))]
     // ReSharper disable once InconsistentNaming