diff --git a/QSB/Animation/AnimationSync.cs b/QSB/Animation/AnimationSync.cs
index 8e7fd568..736b8ba2 100644
--- a/QSB/Animation/AnimationSync.cs
+++ b/QSB/Animation/AnimationSync.cs
@@ -1,5 +1,6 @@
 using OWML.ModHelper.Events;
 using QSB.Events;
+using QSB.Player;
 using System;
 using System.Linq;
 using UnityEngine;
diff --git a/QSB/Animation/Events/AnimTriggerEvent.cs b/QSB/Animation/Events/AnimTriggerEvent.cs
index 573b8542..52ca352a 100644
--- a/QSB/Animation/Events/AnimTriggerEvent.cs
+++ b/QSB/Animation/Events/AnimTriggerEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Animation.Events
 {
diff --git a/QSB/Animation/PlayerSuitEvent.cs b/QSB/Animation/Events/PlayerSuitEvent.cs
similarity index 98%
rename from QSB/Animation/PlayerSuitEvent.cs
rename to QSB/Animation/Events/PlayerSuitEvent.cs
index e1f0f2ad..481a20b8 100644
--- a/QSB/Animation/PlayerSuitEvent.cs
+++ b/QSB/Animation/Events/PlayerSuitEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Animation
 {
diff --git a/QSB/ConversationSync/ConversationManager.cs b/QSB/ConversationSync/ConversationManager.cs
index 63ab2a72..08356180 100644
--- a/QSB/ConversationSync/ConversationManager.cs
+++ b/QSB/ConversationSync/ConversationManager.cs
@@ -1,6 +1,7 @@
 using OWML.Common;
 using OWML.ModHelper.Events;
 using QSB.Events;
+using QSB.Player;
 using QSB.Utility;
 using QSB.WorldSync;
 using System.Collections.Generic;
diff --git a/QSB/ConversationSync/ConversationPatches.cs b/QSB/ConversationSync/ConversationPatches.cs
index 6e7125b2..8b77d444 100644
--- a/QSB/ConversationSync/ConversationPatches.cs
+++ b/QSB/ConversationSync/ConversationPatches.cs
@@ -1,4 +1,5 @@
 using OWML.Common;
+using QSB.Player;
 using QSB.Utility;
 using QSB.WorldSync;
 using System.Collections.Generic;
diff --git a/QSB/ConversationSync/Events/ConversationEvent.cs b/QSB/ConversationSync/Events/ConversationEvent.cs
index 282f0f52..284f4253 100644
--- a/QSB/ConversationSync/Events/ConversationEvent.cs
+++ b/QSB/ConversationSync/Events/ConversationEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 using QSB.WorldSync;
 
 namespace QSB.ConversationSync.Events
diff --git a/QSB/ConversationSync/Events/ConversationStartEndEvent.cs b/QSB/ConversationSync/Events/ConversationStartEndEvent.cs
index a7552750..8743f77f 100644
--- a/QSB/ConversationSync/Events/ConversationStartEndEvent.cs
+++ b/QSB/ConversationSync/Events/ConversationStartEndEvent.cs
@@ -1,6 +1,7 @@
 using OWML.Common;
 using OWML.ModHelper.Events;
 using QSB.Events;
+using QSB.Player;
 using QSB.Utility;
 using QSB.WorldSync;
 using System.Linq;
diff --git a/QSB/DeathSync/Events/PlayerDeathEvent.cs b/QSB/DeathSync/Events/PlayerDeathEvent.cs
index 930e3235..8119caa5 100644
--- a/QSB/DeathSync/Events/PlayerDeathEvent.cs
+++ b/QSB/DeathSync/Events/PlayerDeathEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 using QSB.Utility;
 
 namespace QSB.DeathSync.Events
diff --git a/QSB/Events/PlayerState.cs b/QSB/Events/PlayerStateEvent.cs
similarity index 88%
rename from QSB/Events/PlayerState.cs
rename to QSB/Events/PlayerStateEvent.cs
index 0b9b9d35..692dede0 100644
--- a/QSB/Events/PlayerState.cs
+++ b/QSB/Events/PlayerStateEvent.cs
@@ -1,11 +1,13 @@
 using QSB.Messaging;
+using QSB.Player;
+using QSB.Player.Events;
 using UnityEngine.Networking;
 
 namespace QSB.Events
 {
-    public class PlayerState : NetworkBehaviour
+    public class PlayerStateEvent : NetworkBehaviour
     {
-        public static PlayerState LocalInstance { get; private set; }
+        public static PlayerStateEvent LocalInstance { get; private set; }
 
         private MessageHandler<PlayerStateMessage> _messageHandler;
 
diff --git a/QSB/Events/QSBEvent.cs b/QSB/Events/QSBEvent.cs
index b9c5e5aa..204bd2d1 100644
--- a/QSB/Events/QSBEvent.cs
+++ b/QSB/Events/QSBEvent.cs
@@ -1,4 +1,5 @@
 using QSB.Messaging;
+using QSB.Player;
 using QSB.TransformSync;
 using UnityEngine.Networking;
 
diff --git a/QSB/Events/QSBEventManager.cs b/QSB/Events/QSBEventManager.cs
index 03708e71..768786a4 100644
--- a/QSB/Events/QSBEventManager.cs
+++ b/QSB/Events/QSBEventManager.cs
@@ -7,6 +7,7 @@ using QSB.ElevatorSync.Events;
 using QSB.GeyserSync.Events;
 using QSB.Instruments.Events;
 using QSB.OrbSync.Events;
+using QSB.Player.Events;
 using QSB.TimeSync.Events;
 using QSB.Tools.Events;
 using QSB.TransformSync;
diff --git a/QSB/Instruments/Events/PlayInstrumentEvent.cs b/QSB/Instruments/Events/PlayInstrumentEvent.cs
index f99c76e7..07b579f9 100644
--- a/QSB/Instruments/Events/PlayInstrumentEvent.cs
+++ b/QSB/Instruments/Events/PlayInstrumentEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 using QSB.Utility;
 using System;
 
diff --git a/QSB/Instruments/InstrumentsManager.cs b/QSB/Instruments/InstrumentsManager.cs
index 9ef323fa..28bb451a 100644
--- a/QSB/Instruments/InstrumentsManager.cs
+++ b/QSB/Instruments/InstrumentsManager.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Instruments.QSBCamera;
+using QSB.Player;
 using UnityEngine;
 
 namespace QSB.Instruments
diff --git a/QSB/Events/PlayerJoinEvent.cs b/QSB/Player/Events/PlayerJoinEvent.cs
similarity index 96%
rename from QSB/Events/PlayerJoinEvent.cs
rename to QSB/Player/Events/PlayerJoinEvent.cs
index a3e343a2..42fa3251 100644
--- a/QSB/Events/PlayerJoinEvent.cs
+++ b/QSB/Player/Events/PlayerJoinEvent.cs
@@ -1,8 +1,9 @@
 using OWML.Common;
+using QSB.Events;
 using QSB.Messaging;
 using QSB.Utility;
 
-namespace QSB.Events
+namespace QSB.Player.Events
 {
     public class PlayerJoinEvent : QSBEvent<PlayerJoinMessage>
     {
diff --git a/QSB/Messaging/PlayerJoinMessage.cs b/QSB/Player/Events/PlayerJoinMessage.cs
similarity index 84%
rename from QSB/Messaging/PlayerJoinMessage.cs
rename to QSB/Player/Events/PlayerJoinMessage.cs
index 560f1706..97a1efa3 100644
--- a/QSB/Messaging/PlayerJoinMessage.cs
+++ b/QSB/Player/Events/PlayerJoinMessage.cs
@@ -1,6 +1,7 @@
-using UnityEngine.Networking;
+using QSB.Messaging;
+using UnityEngine.Networking;
 
-namespace QSB.Messaging
+namespace QSB.Player.Events
 {
     public class PlayerJoinMessage : PlayerMessage
     {
diff --git a/QSB/Events/PlayerLeaveEvent.cs b/QSB/Player/Events/PlayerLeaveEvent.cs
similarity index 96%
rename from QSB/Events/PlayerLeaveEvent.cs
rename to QSB/Player/Events/PlayerLeaveEvent.cs
index 61b6ffc7..0a61363e 100644
--- a/QSB/Events/PlayerLeaveEvent.cs
+++ b/QSB/Player/Events/PlayerLeaveEvent.cs
@@ -1,9 +1,10 @@
 using OWML.Common;
+using QSB.Events;
 using QSB.Messaging;
 using QSB.Utility;
 using System.Linq;
 
-namespace QSB.Events
+namespace QSB.Player.Events
 {
     public class PlayerLeaveEvent : QSBEvent<PlayerLeaveMessage>
     {
diff --git a/QSB/Messaging/PlayerLeaveMessage.cs b/QSB/Player/Events/PlayerLeaveMessage.cs
similarity index 89%
rename from QSB/Messaging/PlayerLeaveMessage.cs
rename to QSB/Player/Events/PlayerLeaveMessage.cs
index b5e93496..21670043 100644
--- a/QSB/Messaging/PlayerLeaveMessage.cs
+++ b/QSB/Player/Events/PlayerLeaveMessage.cs
@@ -1,8 +1,9 @@
-using System;
+using QSB.Messaging;
+using System;
 using System.Linq;
 using UnityEngine.Networking;
 
-namespace QSB.Messaging
+namespace QSB.Player.Events
 {
     public class PlayerLeaveMessage : PlayerMessage
     {
diff --git a/QSB/Events/PlayerReadyEvent.cs b/QSB/Player/Events/PlayerReadyEvent.cs
similarity index 94%
rename from QSB/Events/PlayerReadyEvent.cs
rename to QSB/Player/Events/PlayerReadyEvent.cs
index b307d4b6..63d4b274 100644
--- a/QSB/Events/PlayerReadyEvent.cs
+++ b/QSB/Player/Events/PlayerReadyEvent.cs
@@ -1,10 +1,11 @@
 using OWML.Common;
+using QSB.Events;
 using QSB.Messaging;
 using QSB.TransformSync;
 using QSB.Utility;
 using System.Linq;
 
-namespace QSB.Events
+namespace QSB.Player.Events
 {
     public class PlayerReadyEvent : QSBEvent<ToggleMessage>
     {
@@ -30,7 +31,7 @@ namespace QSB.Events
                 return;
             }
             QSBPlayerManager.GetPlayer(message.AboutId).IsReady = message.ToggleValue;
-            PlayerState.LocalInstance.Send();
+            PlayerStateEvent.LocalInstance.Send();
         }
 
         public override void OnReceiveRemote(ToggleMessage message)
diff --git a/QSB/Messaging/PlayerStateMessage.cs b/QSB/Player/Events/PlayerStateMessage.cs
similarity index 92%
rename from QSB/Messaging/PlayerStateMessage.cs
rename to QSB/Player/Events/PlayerStateMessage.cs
index 9b54fbbb..b881e4c1 100644
--- a/QSB/Messaging/PlayerStateMessage.cs
+++ b/QSB/Player/Events/PlayerStateMessage.cs
@@ -1,6 +1,7 @@
-using UnityEngine.Networking;
+using QSB.Messaging;
+using UnityEngine.Networking;
 
-namespace QSB.Messaging
+namespace QSB.Player.Events
 {
     public class PlayerStateMessage : PlayerMessage
     {
diff --git a/QSB/Events/PlayerStatesRequestEvent.cs b/QSB/Player/Events/PlayerStatesRequestEvent.cs
similarity index 90%
rename from QSB/Events/PlayerStatesRequestEvent.cs
rename to QSB/Player/Events/PlayerStatesRequestEvent.cs
index 13c5f7c6..5db26b82 100644
--- a/QSB/Events/PlayerStatesRequestEvent.cs
+++ b/QSB/Player/Events/PlayerStatesRequestEvent.cs
@@ -1,9 +1,10 @@
-using QSB.Messaging;
+using QSB.Events;
+using QSB.Messaging;
 using QSB.TransformSync;
 using QSB.Utility;
 using System.Linq;
 
-namespace QSB.Events
+namespace QSB.Player.Events
 {
     public class PlayerStatesRequestEvent : QSBEvent<PlayerMessage>
     {
@@ -23,7 +24,7 @@ namespace QSB.Events
         public override void OnServerReceive(PlayerMessage message)
         {
             DebugLog.DebugWrite($"[S] Get state request from {message.FromId}");
-            PlayerState.LocalInstance.Send();
+            PlayerStateEvent.LocalInstance.Send();
             foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
                 .Where(x => x != null && x.IsReady && x.ReferenceSector != null))
             {
diff --git a/QSB/PlayerInfo.cs b/QSB/Player/PlayerInfo.cs
similarity index 99%
rename from QSB/PlayerInfo.cs
rename to QSB/Player/PlayerInfo.cs
index 0a8780ad..e3ac12b0 100644
--- a/QSB/PlayerInfo.cs
+++ b/QSB/Player/PlayerInfo.cs
@@ -6,7 +6,7 @@ using QSB.Utility;
 using System.Linq;
 using UnityEngine;
 
-namespace QSB
+namespace QSB.Player
 {
     public class PlayerInfo
     {
diff --git a/QSB/PlayerSyncObject.cs b/QSB/Player/PlayerSyncObject.cs
similarity index 94%
rename from QSB/PlayerSyncObject.cs
rename to QSB/Player/PlayerSyncObject.cs
index dd896b31..923fbe85 100644
--- a/QSB/PlayerSyncObject.cs
+++ b/QSB/Player/PlayerSyncObject.cs
@@ -1,6 +1,6 @@
 using UnityEngine.Networking;
 
-namespace QSB
+namespace QSB.Player
 {
     public abstract class PlayerSyncObject : NetworkBehaviour
     {
diff --git a/QSB/QSBPlayerManager.cs b/QSB/Player/QSBPlayerManager.cs
similarity index 99%
rename from QSB/QSBPlayerManager.cs
rename to QSB/Player/QSBPlayerManager.cs
index 890e4c4d..cb2bff9c 100644
--- a/QSB/QSBPlayerManager.cs
+++ b/QSB/Player/QSBPlayerManager.cs
@@ -1,5 +1,6 @@
 using OWML.Common;
 using QSB.Messaging;
+using QSB.Player.Events;
 using QSB.TransformSync;
 using QSB.Utility;
 using System.Collections.Generic;
@@ -7,7 +8,7 @@ using System.Diagnostics;
 using System.Linq;
 using UnityEngine.Networking;
 
-namespace QSB
+namespace QSB.Player
 {
     public static class QSBPlayerManager
     {
diff --git a/QSB/State.cs b/QSB/Player/State.cs
similarity index 93%
rename from QSB/State.cs
rename to QSB/Player/State.cs
index 01fa5209..d0217277 100644
--- a/QSB/State.cs
+++ b/QSB/Player/State.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace QSB
+namespace QSB.Player
 {
     [Flags]
     public enum State
diff --git a/QSB/QSB.csproj b/QSB/QSB.csproj
index 94556aeb..ff7aa432 100644
--- a/QSB/QSB.csproj
+++ b/QSB/QSB.csproj
@@ -159,32 +159,32 @@
     <Compile Include="OrbSync\Events\OrbUserEvent.cs" />
     <Compile Include="OrbSync\QSBOrbSlot.cs" />
     <Compile Include="Patches\QSBPatchManager.cs" />
-    <Compile Include="PlayerSyncObject.cs" />
+    <Compile Include="Player\PlayerSyncObject.cs" />
     <Compile Include="QSBNetworkLobby.cs" />
     <Compile Include="Patches\QSBPatch.cs" />
     <Compile Include="Patches\QSBPatchTypes.cs" />
     <Compile Include="QSBSceneManager.cs" />
     <Compile Include="TimeSync\WakeUpPatches.cs" />
     <Compile Include="Tools\Events\PlayerFlashlightEvent.cs" />
-    <Compile Include="Events\PlayerJoinEvent.cs" />
-    <Compile Include="Events\PlayerLeaveEvent.cs" />
+    <Compile Include="Player\Events\PlayerJoinEvent.cs" />
+    <Compile Include="Player\Events\PlayerLeaveEvent.cs" />
     <Compile Include="Tools\Events\PlayerProbeEvent.cs" />
-    <Compile Include="Events\PlayerReadyEvent.cs" />
+    <Compile Include="Player\Events\PlayerReadyEvent.cs" />
     <Compile Include="TransformSync\NomaiOrbTransformSync.cs" />
     <Compile Include="TransformSync\PlayerSectorEvent.cs" />
-    <Compile Include="Events\PlayerStatesRequestEvent.cs" />
-    <Compile Include="Animation\PlayerSuitEvent.cs" />
+    <Compile Include="Player\Events\PlayerStatesRequestEvent.cs" />
+    <Compile Include="Animation\Events\PlayerSuitEvent.cs" />
     <Compile Include="TimeSync\Events\ServerTimeEvent.cs" />
     <Compile Include="GeyserSync\Events\GeyserEvent.cs" />
     <Compile Include="GeyserSync\GeyserManager.cs" />
     <Compile Include="GeyserSync\QSBGeyser.cs" />
     <Compile Include="DeathSync\Events\PlayerDeathMessage.cs" />
-    <Compile Include="Messaging\PlayerLeaveMessage.cs" />
+    <Compile Include="Player\Events\PlayerLeaveMessage.cs" />
     <Compile Include="Tools\Events\PlayerProbeLauncherEvent.cs" />
     <Compile Include="Tools\Events\PlayerSignalscopeEvent.cs" />
     <Compile Include="Tools\Events\PlayerTranslatorEvent.cs" />
     <Compile Include="Events\QSBEvent.cs" />
-    <Compile Include="Messaging\PlayerJoinMessage.cs" />
+    <Compile Include="Player\Events\PlayerJoinMessage.cs" />
     <Compile Include="Messaging\ToggleMessage.cs" />
     <Compile Include="TransformSync\QSBSector.cs" />
     <Compile Include="TransformSync\QSBSectorManager.cs" />
@@ -200,18 +200,18 @@
     <Compile Include="TransformSync\PlayerProbeSync.cs" />
     <Compile Include="Utility\DebugActions.cs" />
     <Compile Include="Events\QSBEventManager.cs" />
-    <Compile Include="Messaging\PlayerStateMessage.cs" />
-    <Compile Include="Events\PlayerState.cs" />
+    <Compile Include="Player\Events\PlayerStateMessage.cs" />
+    <Compile Include="Events\PlayerStateEvent.cs" />
     <Compile Include="DeathSync\Necronomicon.cs" />
     <Compile Include="Utility\DebugLog.cs" />
     <Compile Include="Messaging\PlayerMessage.cs" />
     <Compile Include="Messaging\MessageHandler.cs" />
     <Compile Include="Messaging\EventType.cs" />
-    <Compile Include="PlayerInfo.cs" />
-    <Compile Include="State.cs" />
+    <Compile Include="Player\PlayerInfo.cs" />
+    <Compile Include="Player\State.cs" />
     <Compile Include="DeathSync\PreventShipDestruction.cs" />
     <Compile Include="DeathSync\RespawnOnDeath.cs" />
-    <Compile Include="QSBPlayerManager.cs" />
+    <Compile Include="Player\QSBPlayerManager.cs" />
     <Compile Include="TransformSync\PlayerCameraSync.cs" />
     <Compile Include="Utility\FlagsHelper.cs" />
     <Compile Include="TransformSync\PlayerHUDMarker.cs" />
diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs
index d41250d2..0e37ac05 100644
--- a/QSB/QSBNetworkManager.cs
+++ b/QSB/QSBNetworkManager.cs
@@ -8,6 +8,7 @@ using QSB.Events;
 using QSB.GeyserSync;
 using QSB.OrbSync;
 using QSB.Patches;
+using QSB.Player;
 using QSB.TimeSync;
 using QSB.TransformSync;
 using QSB.Utility;
@@ -101,7 +102,7 @@ namespace QSB
             channels.Add(QosType.Reliable);
             channels.Add(QosType.Unreliable);
 
-            gameObject.AddComponent<Events.PlayerState>();
+            gameObject.AddComponent<Events.PlayerStateEvent>();
         }
 
         public override void OnStartServer()
diff --git a/QSB/Tools/Events/PlayerFlashlightEvent.cs b/QSB/Tools/Events/PlayerFlashlightEvent.cs
index 9cf57fa6..7a2051ad 100644
--- a/QSB/Tools/Events/PlayerFlashlightEvent.cs
+++ b/QSB/Tools/Events/PlayerFlashlightEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {
diff --git a/QSB/Tools/Events/PlayerProbeEvent.cs b/QSB/Tools/Events/PlayerProbeEvent.cs
index d88bc263..15bd61ee 100644
--- a/QSB/Tools/Events/PlayerProbeEvent.cs
+++ b/QSB/Tools/Events/PlayerProbeEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {
diff --git a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs b/QSB/Tools/Events/PlayerProbeLauncherEvent.cs
index 2d318fad..ef668eb4 100644
--- a/QSB/Tools/Events/PlayerProbeLauncherEvent.cs
+++ b/QSB/Tools/Events/PlayerProbeLauncherEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {
diff --git a/QSB/Tools/Events/PlayerSignalscopeEvent.cs b/QSB/Tools/Events/PlayerSignalscopeEvent.cs
index cc9ac372..9acc37b3 100644
--- a/QSB/Tools/Events/PlayerSignalscopeEvent.cs
+++ b/QSB/Tools/Events/PlayerSignalscopeEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {
diff --git a/QSB/Tools/Events/PlayerTranslatorEvent.cs b/QSB/Tools/Events/PlayerTranslatorEvent.cs
index daf0fbd2..5f517c36 100644
--- a/QSB/Tools/Events/PlayerTranslatorEvent.cs
+++ b/QSB/Tools/Events/PlayerTranslatorEvent.cs
@@ -1,5 +1,6 @@
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 
 namespace QSB.Tools.Events
 {
diff --git a/QSB/Tools/PlayerToolsManager.cs b/QSB/Tools/PlayerToolsManager.cs
index 503ba559..a0f8683a 100644
--- a/QSB/Tools/PlayerToolsManager.cs
+++ b/QSB/Tools/PlayerToolsManager.cs
@@ -1,4 +1,5 @@
 using OWML.ModHelper.Events;
+using QSB.Player;
 using QSB.Utility;
 using System.Linq;
 using UnityEngine;
diff --git a/QSB/TransformSync/PlayerCameraSync.cs b/QSB/TransformSync/PlayerCameraSync.cs
index b05f0868..000015af 100644
--- a/QSB/TransformSync/PlayerCameraSync.cs
+++ b/QSB/TransformSync/PlayerCameraSync.cs
@@ -1,4 +1,5 @@
 using QSB.Events;
+using QSB.Player;
 using QSB.Tools;
 using QSB.Utility;
 using UnityEngine;
diff --git a/QSB/TransformSync/PlayerHUDMarker.cs b/QSB/TransformSync/PlayerHUDMarker.cs
index 70561b87..0e1e228e 100644
--- a/QSB/TransformSync/PlayerHUDMarker.cs
+++ b/QSB/TransformSync/PlayerHUDMarker.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using QSB.Player;
+using UnityEngine;
 
 namespace QSB.TransformSync
 {
diff --git a/QSB/TransformSync/PlayerProbeSync.cs b/QSB/TransformSync/PlayerProbeSync.cs
index e3cf8a6b..739874ed 100644
--- a/QSB/TransformSync/PlayerProbeSync.cs
+++ b/QSB/TransformSync/PlayerProbeSync.cs
@@ -1,4 +1,5 @@
 using OWML.Common;
+using QSB.Player;
 using QSB.Tools;
 using QSB.Utility;
 using UnityEngine;
diff --git a/QSB/TransformSync/PlayerSectorEvent.cs b/QSB/TransformSync/PlayerSectorEvent.cs
index 3bfd683f..91a7b91b 100644
--- a/QSB/TransformSync/PlayerSectorEvent.cs
+++ b/QSB/TransformSync/PlayerSectorEvent.cs
@@ -1,6 +1,7 @@
 using OWML.Common;
 using QSB.Events;
 using QSB.Messaging;
+using QSB.Player;
 using QSB.Utility;
 using QSB.WorldSync;
 
diff --git a/QSB/TransformSync/PlayerTransformSync.cs b/QSB/TransformSync/PlayerTransformSync.cs
index ef618362..b07a5005 100644
--- a/QSB/TransformSync/PlayerTransformSync.cs
+++ b/QSB/TransformSync/PlayerTransformSync.cs
@@ -1,4 +1,5 @@
 using QSB.Animation;
+using QSB.Player;
 using UnityEngine;
 
 namespace QSB.TransformSync
diff --git a/QSB/TransformSync/SectorSync.cs b/QSB/TransformSync/SectorSync.cs
index 1be54147..a93d1e7b 100644
--- a/QSB/TransformSync/SectorSync.cs
+++ b/QSB/TransformSync/SectorSync.cs
@@ -1,4 +1,5 @@
 using QSB.Events;
+using QSB.Player;
 using System.Linq;
 using UnityEngine;
 
diff --git a/QSB/TransformSync/ShipTransformSync.cs b/QSB/TransformSync/ShipTransformSync.cs
index d7ba1936..ba4864f5 100644
--- a/QSB/TransformSync/ShipTransformSync.cs
+++ b/QSB/TransformSync/ShipTransformSync.cs
@@ -1,4 +1,5 @@
-using UnityEngine;
+using QSB.Player;
+using UnityEngine;
 
 namespace QSB.TransformSync
 {
diff --git a/QSB/TransformSync/TransformSync.cs b/QSB/TransformSync/TransformSync.cs
index ff506ebf..6dcccf49 100644
--- a/QSB/TransformSync/TransformSync.cs
+++ b/QSB/TransformSync/TransformSync.cs
@@ -1,4 +1,5 @@
 using OWML.Common;
+using QSB.Player;
 using QSB.Utility;
 using UnityEngine;