diff --git a/QSB/MessageHandler.cs b/QSB/Messaging/MessageHandler.cs
similarity index 70%
rename from QSB/MessageHandler.cs
rename to QSB/Messaging/MessageHandler.cs
index 4ce89674..d90a09a3 100644
--- a/QSB/MessageHandler.cs
+++ b/QSB/Messaging/MessageHandler.cs
@@ -6,8 +6,8 @@ namespace QSB {
         protected abstract short type { get; }
 
         public MessageHandler () {
-            NetworkServer.RegisterHandler(SectorMessage.Type, OnServerReceiveMessage);
-            NetworkManager.singleton.client.RegisterHandler(SectorMessage.Type, OnClientReceiveMessage);
+            NetworkServer.RegisterHandler(MessageType.Sector, OnServerReceiveMessage);
+            NetworkManager.singleton.client.RegisterHandler(MessageType.Sector, OnClientReceiveMessage);
         }
 
         protected abstract void OnClientReceiveMessage (NetworkMessage netMsg);
diff --git a/QSB/MessageType.cs b/QSB/Messaging/MessageType.cs
similarity index 100%
rename from QSB/MessageType.cs
rename to QSB/Messaging/MessageType.cs
diff --git a/QSB/SectorMessage.cs b/QSB/Messaging/SectorMessage.cs
similarity index 100%
rename from QSB/SectorMessage.cs
rename to QSB/Messaging/SectorMessage.cs