From dc43de0f183b7c40a6d22878c8e09e5604ca27b3 Mon Sep 17 00:00:00 2001
From: D1GQ <yourboylax@gmail.com>
Date: Thu, 19 Mar 2026 17:20:08 -0500
Subject: [PATCH] Organize handlers

---
 src/Modules/AntiCheat/BetterAntiCheat.cs                    | 1 +
 src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs         | 2 +-
 src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs    | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs       | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs        | 2 +-
 src/Modules/AntiCheat/RPCHandlers/Cheats/AUMChatHandler.cs  | 2 +-
 src/Modules/AntiCheat/RPCHandlers/Cheats/AUMHandler.cs      | 2 +-
 .../AntiCheat/RPCHandlers/Cheats/KillNetworkChatHandler.cs  | 2 +-
 .../AntiCheat/RPCHandlers/Cheats/KillNetworkHandler.cs      | 2 +-
 .../AntiCheat/RPCHandlers/Cheats/ModMenuCrewChatHandler.cs  | 2 +-
 .../AntiCheat/RPCHandlers/Cheats/ModMenuCrewHandler.cs      | 2 +-
 src/Modules/AntiCheat/RPCHandlers/Cheats/SickoHandler.cs    | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs     | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs      | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs     | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs       | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs    | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs      | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs     | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs    | 2 +-
 src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs       | 2 +-
 src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs     | 2 +-
 .../AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs        | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs    | 2 +-
 src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs    | 6 +++---
 .../AntiCheat/RPCHandlers/{ => Deprecated}/SetHatHandler.cs | 2 +-
 .../RPCHandlers/{ => Deprecated}/SetInfectedHandler.cs      | 2 +-
 .../RPCHandlers/{ => Deprecated}/SetNamePlateHandler.cs     | 2 +-
 .../AntiCheat/RPCHandlers/{ => Deprecated}/SetPetHandler.cs | 2 +-
 .../RPCHandlers/{ => Deprecated}/SetSkinHandler.cs          | 2 +-
 .../RPCHandlers/{ => Deprecated}/SetVisorHandler.cs         | 2 +-
 src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs       | 2 +-
 src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs          | 2 +-
 src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs        | 2 +-
 .../AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs        | 2 +-
 .../AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs       | 2 +-
 src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs    | 2 +-
 .../NetObjectHandlers/DeserializeNetObjectHandler.cs        | 2 +-
 .../NetObjectHandlers/DespawnNetObjectHandler.cs            | 2 +-
 .../{ => NetObjectHandlers}/UpdateSystemHandler.cs          | 2 +-
 src/Modules/AntiCheat/RPCHandlers/PetHandler.cs             | 2 +-
 src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs   | 2 +-
 src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs   | 2 +-
 .../AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs        | 2 +-
 src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs  | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs        | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs    | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs   | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs        | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs       | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs        | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs         | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs       | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs         | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs      | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs      | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs        | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs     | 2 +-
 src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs      | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs          | 2 +-
 src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs     | 2 +-
 src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs    | 2 +-
 src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs     | 2 +-
 src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs    | 2 +-
 src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs   | 2 +-
 src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs     | 2 +-
 src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs      | 2 +-
 src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs  | 2 +-
 71 files changed, 73 insertions(+), 72 deletions(-)
 rename src/Modules/AntiCheat/RPCHandlers/{ => Deprecated}/SetHatHandler.cs (73%)
 rename src/Modules/AntiCheat/RPCHandlers/{ => Deprecated}/SetInfectedHandler.cs (72%)
 rename src/Modules/AntiCheat/RPCHandlers/{ => Deprecated}/SetNamePlateHandler.cs (74%)
 rename src/Modules/AntiCheat/RPCHandlers/{ => Deprecated}/SetPetHandler.cs (73%)
 rename src/Modules/AntiCheat/RPCHandlers/{ => Deprecated}/SetSkinHandler.cs (73%)
 rename src/Modules/AntiCheat/RPCHandlers/{ => Deprecated}/SetVisorHandler.cs (73%)
 rename src/Modules/AntiCheat/RPCHandlers/{ => NetObjectHandlers}/UpdateSystemHandler.cs (99%)

diff --git a/src/Modules/AntiCheat/BetterAntiCheat.cs b/src/Modules/AntiCheat/BetterAntiCheat.cs
index 1eafd1e..671fa0a 100644
--- a/src/Modules/AntiCheat/BetterAntiCheat.cs
+++ b/src/Modules/AntiCheat/BetterAntiCheat.cs
@@ -4,6 +4,7 @@ using BetterAmongUs.Data.Config;
 using BetterAmongUs.Enums;
 using BetterAmongUs.Helpers;
 using BetterAmongUs.Managers;
+using BetterAmongUs.Modules.AntiCheat.RPCHandlers.NetObjectHandlers;
 using BetterAmongUs.Modules.Support;
 using BetterAmongUs.Mono;
 using BetterAmongUs.Network;
diff --git a/src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs
index aaea97a..1bb25ea 100644
--- a/src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/AddVoteHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class AddVoteHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs b/src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs
index 5023f12..3628494 100644
--- a/src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/BootFromVentHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class BootFromVentHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs
index e744dd3..4fa1318 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CancelPetHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CancelPetHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs
index 6cbba7d..dce95a5 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CastVoteHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CastVoteHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/Cheats/AUMChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Cheats/AUMChatHandler.cs
index 5a1b4b9..9d691c2 100644
--- a/src/Modules/AntiCheat/RPCHandlers/Cheats/AUMChatHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Cheats/AUMChatHandler.cs
@@ -10,7 +10,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Cheats;
 
 [RegisterRPCHandler]
 internal sealed class AUMChatHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/Cheats/AUMHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Cheats/AUMHandler.cs
index 55e7c6b..b2d9767 100644
--- a/src/Modules/AntiCheat/RPCHandlers/Cheats/AUMHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Cheats/AUMHandler.cs
@@ -10,7 +10,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Cheats;
 
 [RegisterRPCHandler]
 internal sealed class AUMHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/Cheats/KillNetworkChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Cheats/KillNetworkChatHandler.cs
index 8cd31b9..111f467 100644
--- a/src/Modules/AntiCheat/RPCHandlers/Cheats/KillNetworkChatHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Cheats/KillNetworkChatHandler.cs
@@ -10,7 +10,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Cheats;
 
 [RegisterRPCHandler]
 internal sealed class KillNetworkChatHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/Cheats/KillNetworkHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Cheats/KillNetworkHandler.cs
index 4bb995b..3547292 100644
--- a/src/Modules/AntiCheat/RPCHandlers/Cheats/KillNetworkHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Cheats/KillNetworkHandler.cs
@@ -10,7 +10,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Cheats;
 
 [RegisterRPCHandler]
 internal sealed class KillNetworkHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/Cheats/ModMenuCrewChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Cheats/ModMenuCrewChatHandler.cs
index 8b36a0f..16e2a7b 100644
--- a/src/Modules/AntiCheat/RPCHandlers/Cheats/ModMenuCrewChatHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Cheats/ModMenuCrewChatHandler.cs
@@ -10,7 +10,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Cheats;
 
 [RegisterRPCHandler]
 internal sealed class ModMenuCrewChatHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/Cheats/ModMenuCrewHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Cheats/ModMenuCrewHandler.cs
index 92099da..675a874 100644
--- a/src/Modules/AntiCheat/RPCHandlers/Cheats/ModMenuCrewHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Cheats/ModMenuCrewHandler.cs
@@ -10,7 +10,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Cheats;
 
 [RegisterRPCHandler]
 internal sealed class ModMenuCrewHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/Cheats/SickoHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Cheats/SickoHandler.cs
index 9d55b43..2c0a052 100644
--- a/src/Modules/AntiCheat/RPCHandlers/Cheats/SickoHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Cheats/SickoHandler.cs
@@ -10,7 +10,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Cheats;
 
 [RegisterRPCHandler]
 internal sealed class SickoHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs
index b60a080..fd4fe34 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckAppearHandler.cs
@@ -3,7 +3,7 @@ using BetterAmongUs.Attributes;
 using BetterAmongUs.Helpers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckAppearHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs
index 339d67f..790a4b4 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckColorHandler.cs
@@ -1,7 +1,7 @@
 using BetterAmongUs.Attributes;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckColorHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs
index 7ce5c15..bbd846f 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckMurderHandler.cs
@@ -4,7 +4,7 @@ using Hazel;
 using InnerNet;
 using UnityEngine;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckMurderHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs
index a4e4417..ca63453 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckNameHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Managers;
 using BetterAmongUs.Mono;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckNameHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs
index 85facfe..2cdc3dc 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckProtectHandler.cs
@@ -5,7 +5,7 @@ using Hazel;
 using InnerNet;
 using UnityEngine;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckProtectHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs
index 7244e3d..5d57960 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckShapeshiftHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Helpers;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckShapeshiftHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs
index 585ae73..6fe7ae9 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckSporeHandler.cs
@@ -1,7 +1,7 @@
 using BetterAmongUs.Attributes;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckSporeHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs
index 7878f70..765b99e 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckVanishHandler.cs
@@ -3,7 +3,7 @@ using BetterAmongUs.Attributes;
 using BetterAmongUs.Helpers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckVanishHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs
index 569b6b7..2844c01 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CheckZiplineHandler.cs
@@ -1,7 +1,7 @@
 using BetterAmongUs.Attributes;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CheckZiplineHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs
index 45fa246..ce929cf 100644
--- a/src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/ClearVoteHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class ClearVoteHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs
index c970f26..d9303e2 100644
--- a/src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/ClimbLadderHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class ClimbLadderHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs
index ae54049..47328ac 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CloseDoorsOfTypeHandler.cs
@@ -3,7 +3,7 @@ using BetterAmongUs.Helpers;
 using BetterAmongUs.Managers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CloseDoorsOfTypeHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs
index b19e5c4..8f8faca 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CloseMeetingHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CloseMeetingHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs b/src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs
index 8de5680..a633e6a 100644
--- a/src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/CompleteTaskHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Managers;
 using BetterAmongUs.Mono;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class CompleteTaskHandler : RPCHandler
@@ -16,8 +16,8 @@ internal sealed class CompleteTaskHandler : RPCHandler
         var taskId = reader.ReadPackedUInt32();
 
         if (sender.IsImpostorTeam() || !sender.Data.Tasks.AnyIl2Cpp(task => task.Id == taskId)
-            || sender.BetterData().AntiCheatInfo.LastTaskId == taskId || (sender.BetterData().AntiCheatInfo.LastTaskId != taskId
-            && sender.BetterData().AntiCheatInfo.TimeSinceLastTask < 1.25f))
+            || sender.BetterData().AntiCheatInfo.LastTaskId == taskId || sender.BetterData().AntiCheatInfo.LastTaskId != taskId
+            && sender.BetterData().AntiCheatInfo.TimeSinceLastTask < 1.25f)
         {
             if (BetterNotificationManager.NotifyCheat(sender, GetFormatActionText()))
             {
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetHatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetHatHandler.cs
similarity index 73%
rename from src/Modules/AntiCheat/RPCHandlers/SetHatHandler.cs
rename to src/Modules/AntiCheat/RPCHandlers/Deprecated/SetHatHandler.cs
index 74cd0f3..ae77c2e 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetHatHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetHatHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Deprecated;
 
 [RegisterRPCHandler]
 internal sealed class SetHatHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetInfectedHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetInfectedHandler.cs
similarity index 72%
rename from src/Modules/AntiCheat/RPCHandlers/SetInfectedHandler.cs
rename to src/Modules/AntiCheat/RPCHandlers/Deprecated/SetInfectedHandler.cs
index bac529c..beb44e7 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetInfectedHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetInfectedHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Deprecated;
 
 [RegisterRPCHandler]
 internal sealed class SetInfectedHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetNamePlateHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetNamePlateHandler.cs
similarity index 74%
rename from src/Modules/AntiCheat/RPCHandlers/SetNamePlateHandler.cs
rename to src/Modules/AntiCheat/RPCHandlers/Deprecated/SetNamePlateHandler.cs
index 141e92f..bd44248 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetNamePlateHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetNamePlateHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Deprecated;
 
 [RegisterRPCHandler]
 internal sealed class SetNamePlateHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetPetHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetPetHandler.cs
similarity index 73%
rename from src/Modules/AntiCheat/RPCHandlers/SetPetHandler.cs
rename to src/Modules/AntiCheat/RPCHandlers/Deprecated/SetPetHandler.cs
index 6c5a1e4..c670b33 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetPetHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetPetHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Deprecated;
 
 [RegisterRPCHandler]
 internal sealed class SetPetHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetSkinHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetSkinHandler.cs
similarity index 73%
rename from src/Modules/AntiCheat/RPCHandlers/SetSkinHandler.cs
rename to src/Modules/AntiCheat/RPCHandlers/Deprecated/SetSkinHandler.cs
index e0c9701..0c2d593 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetSkinHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetSkinHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Deprecated;
 
 [RegisterRPCHandler]
 internal sealed class SetSkinHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetVisorHandler.cs b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetVisorHandler.cs
similarity index 73%
rename from src/Modules/AntiCheat/RPCHandlers/SetVisorHandler.cs
rename to src/Modules/AntiCheat/RPCHandlers/Deprecated/SetVisorHandler.cs
index ce0ed3f..449a8fa 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetVisorHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/Deprecated/SetVisorHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.Deprecated;
 
 [RegisterRPCHandler]
 internal sealed class SetVisorHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs b/src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs
index 88bfb89..6b88d79 100644
--- a/src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/EnterVentHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Helpers;
 using BetterAmongUs.Managers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class EnterVentHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs
index 23336fa..1a7e755 100644
--- a/src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/ExiledHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class ExiledHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs
index e5f4a01..3c2c2ab 100644
--- a/src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/ExitVentHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Helpers;
 using BetterAmongUs.Managers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class ExitVentHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs
index 38bdf94..7d464f3 100644
--- a/src/Modules/AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/ExtendLobbyTimerHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class ExtendLobbyTimerHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs b/src/Modules/AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs
index 66ec64c..05d009e 100644
--- a/src/Modules/AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/LobbyTimeExpiringHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class LobbyTimeExpiringHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs b/src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs
index d6c2c3d..a5a0c03 100644
--- a/src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/MurderPlayerHandler.cs
@@ -6,7 +6,7 @@ using BetterAmongUs.Mono;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class MurderPlayerHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/DeserializeNetObjectHandler.cs b/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/DeserializeNetObjectHandler.cs
index 47d3356..46dadf2 100644
--- a/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/DeserializeNetObjectHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/DeserializeNetObjectHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Patches.Gameplay.UI;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.NetObjectHandlers;
 
 internal sealed class DeserializeNetObjectHandler : RPCHandler
 {
diff --git a/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/DespawnNetObjectHandler.cs b/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/DespawnNetObjectHandler.cs
index 9940973..af5aa57 100644
--- a/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/DespawnNetObjectHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/DespawnNetObjectHandler.cs
@@ -3,7 +3,7 @@ using BetterAmongUs.Managers;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.NetObjectHandlers;
 
 internal sealed class DespawnNetObjectHandler : RPCHandler
 {
diff --git a/src/Modules/AntiCheat/RPCHandlers/UpdateSystemHandler.cs b/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/UpdateSystemHandler.cs
similarity index 99%
rename from src/Modules/AntiCheat/RPCHandlers/UpdateSystemHandler.cs
rename to src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/UpdateSystemHandler.cs
index 00812a9..52e0b7e 100644
--- a/src/Modules/AntiCheat/RPCHandlers/UpdateSystemHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/NetObjectHandlers/UpdateSystemHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 using UnityEngine;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers.NetObjectHandlers;
 
 [RegisterRPCHandler]
 internal sealed class UpdateSystemHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/PetHandler.cs b/src/Modules/AntiCheat/RPCHandlers/PetHandler.cs
index 13ea927..9f363a8 100644
--- a/src/Modules/AntiCheat/RPCHandlers/PetHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/PetHandler.cs
@@ -2,7 +2,7 @@ using BetterAmongUs.Attributes;
 using BetterAmongUs.Managers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class PetHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs b/src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs
index 11aa629..7d097ea 100644
--- a/src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/PlayAnimationHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class PlayAnimationHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs
index 610e773..9a717d8 100644
--- a/src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/ProtectPlayerHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Helpers;
 using BetterAmongUs.Managers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class ProtectPlayerHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs b/src/Modules/AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs
index 77a1b64..c550bf3 100644
--- a/src/Modules/AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/RejectShapeshiftHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class RejectShapeshiftHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs
index 72dd2d8..b352f2e 100644
--- a/src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/ReportDeadBodyHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Managers;
 using BetterAmongUs.Patches.Gameplay.UI;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class ReportDeadBodyHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs
index 111e760..1df3011 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SendChatHandler.cs
@@ -6,7 +6,7 @@ using BetterAmongUs.Managers;
 using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SendChatHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs
index b7e9c79..ffd8fcd 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SendChatNoteHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SendChatNoteHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs
index 5a68dee..6bfaac0 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SendQuickChatHandler.cs
@@ -3,7 +3,7 @@ using BetterAmongUs.Helpers;
 using BetterAmongUs.Managers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SendQuickChatHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs
index 4bd3217..593c696 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetColorHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetColorHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs
index f7414f7..2f36032 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetHatStrHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetHatStrHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs
index e8e7344..2a22623 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetLevelHandler.cs
@@ -5,7 +5,7 @@ using BetterAmongUs.Mono;
 using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetLevelHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs
index 3ef1334..02ef262 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetNameHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Managers;
 using BetterAmongUs.Mono;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetNameHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs
index 72b1021..ddd74e8 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetNamePlateStrHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetNamePlateStrHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs
index 8bec620..4c49860 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetPetStrHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetPetStrHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs
index 99b43c7..17f2f08 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetRoleHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetRoleHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs
index a5ba680..d5cdaa2 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetScannerHandler.cs
@@ -1,7 +1,7 @@
 using BetterAmongUs.Attributes;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetScannerHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs
index 0ff6c98..d6ce4de 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetSkinStrHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetSkinStrHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs
index 56a9421..8219712 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetStartCounterHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetStartCounterHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs
index 123041e..597ffc0 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetTasksHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetTasksHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs
index f8ed391..22dffb1 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SetVisorStrHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SetVisorStrHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs b/src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs
index f491b85..bd16d22 100644
--- a/src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/ShapeshiftHandler.cs
@@ -5,7 +5,7 @@ using BetterAmongUs.Managers;
 using Hazel;
 using InnerNet;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class ShapeshiftHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs
index b157e4c..eb938af 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SnapToHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SnapToHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs b/src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs
index 0affab8..2de73eb 100644
--- a/src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/StartAppearHandler.cs
@@ -3,7 +3,7 @@ using BetterAmongUs.Helpers;
 using BetterAmongUs.Managers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class StartAppearHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs b/src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs
index c5b85f8..58c77d2 100644
--- a/src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/StartMeetingHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class StartMeetingHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs b/src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs
index 3067984..917d216 100644
--- a/src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/StartVanishHandler.cs
@@ -4,7 +4,7 @@ using BetterAmongUs.Helpers;
 using BetterAmongUs.Managers;
 using Hazel;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class StartVanishHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs b/src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs
index 8ce1d78..e091c26 100644
--- a/src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/SyncSettingsHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class SyncSettingsHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs b/src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs
index 4f3b7ad..b5ab965 100644
--- a/src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/TriggerSporesHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class TriggerSporesHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs b/src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs
index 8eeb34d..fb58403 100644
--- a/src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/UsePlatformHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class UsePlatformHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs b/src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs
index a91fbca..0c74159 100644
--- a/src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/UseZiplineHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class UseZiplineHandler : RPCHandler
diff --git a/src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs b/src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs
index 9bda126..b5157af 100644
--- a/src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs
+++ b/src/Modules/AntiCheat/RPCHandlers/VotingCompleteHandler.cs
@@ -1,6 +1,6 @@
 using BetterAmongUs.Attributes;
 
-namespace BetterAmongUs.Modules.AntiCheat;
+namespace BetterAmongUs.Modules.AntiCheat.RPCHandlers;
 
 [RegisterRPCHandler]
 internal sealed class VotingCompleteHandler : RPCHandler