diff --git a/Assets/Scripts/Controls/PlayerController.cs b/Assets/Scripts/Controls/PlayerController.cs
index 7396691..32fbe04 100644
--- a/Assets/Scripts/Controls/PlayerController.cs
+++ b/Assets/Scripts/Controls/PlayerController.cs
@@ -1,7 +1,5 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using Cyber.Entities;
+using UnityEngine;
+using Cyber.Entities.SyncBases;
 using Cyber.Console;
 using Cyber.Networking.Clientside;
 using Cyber.Networking;
diff --git a/Assets/Scripts/Entities/SyncBases.meta b/Assets/Scripts/Entities/SyncBases.meta
new file mode 100644
index 0000000..1abd7a5
--- /dev/null
+++ b/Assets/Scripts/Entities/SyncBases.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6c0d898c94c44574ea93823a5fdabf08
+folderAsset: yes
+timeCreated: 1494421269
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Entities/Character.cs b/Assets/Scripts/Entities/SyncBases/Character.cs
similarity index 99%
rename from Assets/Scripts/Entities/Character.cs
rename to Assets/Scripts/Entities/SyncBases/Character.cs
index 51f9e56..09c759d 100644
--- a/Assets/Scripts/Entities/Character.cs
+++ b/Assets/Scripts/Entities/SyncBases/Character.cs
@@ -3,7 +3,7 @@ using UnityEngine;
 using UnityEngine.Networking;
 using Cyber.Networking.Clientside;
 
-namespace Cyber.Entities {
+namespace Cyber.Entities.SyncBases {
     
     /// <summary>
     /// A syncable component that all characters have. Controls the character's subsystems.
diff --git a/Assets/Scripts/Entities/Character.cs.meta b/Assets/Scripts/Entities/SyncBases/Character.cs.meta
similarity index 100%
rename from Assets/Scripts/Entities/Character.cs.meta
rename to Assets/Scripts/Entities/SyncBases/Character.cs.meta
diff --git a/Assets/Scripts/Entities/SyncBase.cs b/Assets/Scripts/Entities/SyncBases/SyncBase.cs
similarity index 97%
rename from Assets/Scripts/Entities/SyncBase.cs
rename to Assets/Scripts/Entities/SyncBases/SyncBase.cs
index 3a7b875..b8f331e 100644
--- a/Assets/Scripts/Entities/SyncBase.cs
+++ b/Assets/Scripts/Entities/SyncBases/SyncBase.cs
@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.Networking;
 
-namespace Cyber.Entities {
+namespace Cyber.Entities.SyncBases {
     
     /// <summary>
     /// A base class for all syncable components. An instance of 
diff --git a/Assets/Scripts/Entities/SyncBase.cs.meta b/Assets/Scripts/Entities/SyncBases/SyncBase.cs.meta
similarity index 100%
rename from Assets/Scripts/Entities/SyncBase.cs.meta
rename to Assets/Scripts/Entities/SyncBases/SyncBase.cs.meta
diff --git a/Assets/Scripts/Entities/SyncDB.cs b/Assets/Scripts/Entities/SyncDB.cs
index 9eb2f6f..4debfed 100644
--- a/Assets/Scripts/Entities/SyncDB.cs
+++ b/Assets/Scripts/Entities/SyncDB.cs
@@ -2,6 +2,7 @@
 using System;
 using UnityEngine;
 using Cyber.Networking.Serverside;
+using Cyber.Entities.SyncBases;
 
 namespace Cyber.Entities {
     
diff --git a/Assets/Scripts/Networking/Clientside/CConnectedPlayer.cs b/Assets/Scripts/Networking/Clientside/CConnectedPlayer.cs
index 2d4a0dc..c8a3cd9 100644
--- a/Assets/Scripts/Networking/Clientside/CConnectedPlayer.cs
+++ b/Assets/Scripts/Networking/Clientside/CConnectedPlayer.cs
@@ -1,4 +1,4 @@
-using Cyber.Entities;
+using Cyber.Entities.SyncBases;
 
 namespace Cyber.Networking.Clientside {
 
diff --git a/Assets/Scripts/Networking/Clientside/Client.cs b/Assets/Scripts/Networking/Clientside/Client.cs
index 374a124..9d9bead 100644
--- a/Assets/Scripts/Networking/Clientside/Client.cs
+++ b/Assets/Scripts/Networking/Clientside/Client.cs
@@ -1,5 +1,6 @@
 using Cyber.Console;
 using Cyber.Entities;
+using Cyber.Entities.SyncBases;
 using Cyber.Networking.Messages;
 using System.Collections.Generic;
 using UnityEngine;
diff --git a/Assets/Scripts/Networking/Serverside/SConnectedPlayer.cs b/Assets/Scripts/Networking/Serverside/SConnectedPlayer.cs
index 25fa9b5..b4180e0 100644
--- a/Assets/Scripts/Networking/Serverside/SConnectedPlayer.cs
+++ b/Assets/Scripts/Networking/Serverside/SConnectedPlayer.cs
@@ -1,5 +1,4 @@
-
-using Cyber.Entities;
+using Cyber.Entities.SyncBases;
 
 namespace Cyber.Networking.Serverside {
 
diff --git a/Assets/Scripts/Networking/Serverside/Server.cs b/Assets/Scripts/Networking/Serverside/Server.cs
index 1d845c2..69a7d0d 100644
--- a/Assets/Scripts/Networking/Serverside/Server.cs
+++ b/Assets/Scripts/Networking/Serverside/Server.cs
@@ -1,5 +1,6 @@
 using Cyber.Console;
 using Cyber.Entities;
+using Cyber.Entities.SyncBases;
 using Cyber.Networking.Messages;
 using System.Collections.Generic;
 using UnityEngine;
diff --git a/Assets/Scripts/Networking/Serverside/Syncer.cs b/Assets/Scripts/Networking/Serverside/Syncer.cs
index 44eda17..99cddb0 100644
--- a/Assets/Scripts/Networking/Serverside/Syncer.cs
+++ b/Assets/Scripts/Networking/Serverside/Syncer.cs
@@ -1,5 +1,6 @@
 
 using Cyber.Entities;
+using Cyber.Entities.SyncBases;
 using Cyber.Networking.Messages;
 using System;
 using System.Collections.Generic;