diff --git a/Source/Game/CameraMovement.cs b/Source/Game/Camera/CameraMovement.cs
similarity index 100%
rename from Source/Game/CameraMovement.cs
rename to Source/Game/Camera/CameraMovement.cs
diff --git a/Source/Game/CameraRender.cs b/Source/Game/Camera/CameraRender.cs
similarity index 100%
rename from Source/Game/CameraRender.cs
rename to Source/Game/Camera/CameraRender.cs
diff --git a/Source/Game/CameraSpring.cs b/Source/Game/Camera/CameraSpring.cs
similarity index 100%
rename from Source/Game/CameraSpring.cs
rename to Source/Game/Camera/CameraSpring.cs
diff --git a/Source/Game/WeaponSway.cs b/Source/Game/Camera/WeaponSway.cs
similarity index 100%
rename from Source/Game/WeaponSway.cs
rename to Source/Game/Camera/WeaponSway.cs
diff --git a/Source/Game/Cabrito/CommonCommands.cs b/Source/Game/Console/CommonCommands.cs
similarity index 100%
rename from Source/Game/Cabrito/CommonCommands.cs
rename to Source/Game/Console/CommonCommands.cs
diff --git a/Source/Game/Cabrito/Console/Console.cs b/Source/Game/Console/Console.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/Console.cs
rename to Source/Game/Console/Console.cs
diff --git a/Source/Game/Cabrito/Console/ConsoleAttributes.cs b/Source/Game/Console/ConsoleAttributes.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/ConsoleAttributes.cs
rename to Source/Game/Console/ConsoleAttributes.cs
diff --git a/Source/Game/Cabrito/Console/ConsoleCommand.cs b/Source/Game/Console/ConsoleCommand.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/ConsoleCommand.cs
rename to Source/Game/Console/ConsoleCommand.cs
diff --git a/Source/Game/Cabrito/Console/ConsoleContentTextBox.cs b/Source/Game/Console/ConsoleContentTextBox.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/ConsoleContentTextBox.cs
rename to Source/Game/Console/ConsoleContentTextBox.cs
diff --git a/Source/Game/Cabrito/Console/ConsoleInputTextBox.cs b/Source/Game/Console/ConsoleInputTextBox.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/ConsoleInputTextBox.cs
rename to Source/Game/Console/ConsoleInputTextBox.cs
diff --git a/Source/Game/Cabrito/Console/ConsolePlugin.cs b/Source/Game/Console/ConsolePlugin.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/ConsolePlugin.cs
rename to Source/Game/Console/ConsolePlugin.cs
diff --git a/Source/Game/Cabrito/Console/ConsoleScript.cs b/Source/Game/Console/ConsoleScript.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/ConsoleScript.cs
rename to Source/Game/Console/ConsoleScript.cs
diff --git a/Source/Game/Cabrito/Console/ConsoleTextBoxBase.cs b/Source/Game/Console/ConsoleTextBoxBase.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/ConsoleTextBoxBase.cs
rename to Source/Game/Console/ConsoleTextBoxBase.cs
diff --git a/Source/Game/Cabrito/Console/ConsoleVariable.cs b/Source/Game/Console/ConsoleVariable.cs
similarity index 100%
rename from Source/Game/Cabrito/Console/ConsoleVariable.cs
rename to Source/Game/Console/ConsoleVariable.cs
diff --git a/Source/Game/Cabrito/EngineSubsystem.cs b/Source/Game/Console/EngineSubsystem.cs
similarity index 100%
rename from Source/Game/Cabrito/EngineSubsystem.cs
rename to Source/Game/Console/EngineSubsystem.cs
diff --git a/Source/Game/Cabrito/FpsScript.cs b/Source/Game/Hud/FpsScript.cs
similarity index 100%
rename from Source/Game/Cabrito/FpsScript.cs
rename to Source/Game/Hud/FpsScript.cs
diff --git a/Source/Game/BrushMaterialList.cs b/Source/Game/Level/BrushMaterialList.cs
similarity index 100%
rename from Source/Game/BrushMaterialList.cs
rename to Source/Game/Level/BrushMaterialList.cs
diff --git a/Source/Game/MapParser/MapParser.cs b/Source/Game/Level/MapParser.cs
similarity index 100%
rename from Source/Game/MapParser/MapParser.cs
rename to Source/Game/Level/MapParser.cs
diff --git a/Source/Game/Q3MapImporter.cs b/Source/Game/Level/Q3MapImporter.cs
similarity index 100%
rename from Source/Game/Q3MapImporter.cs
rename to Source/Game/Level/Q3MapImporter.cs
diff --git a/Source/Game/QuickHull.cs b/Source/Game/Level/QuickHull.cs
similarity index 100%
rename from Source/Game/QuickHull.cs
rename to Source/Game/Level/QuickHull.cs
diff --git a/Source/Game/QuickHull2.cs b/Source/Game/Level/QuickHull2.cs
similarity index 100%
rename from Source/Game/QuickHull2.cs
rename to Source/Game/Level/QuickHull2.cs
diff --git a/Source/Game/Networking/NetworkManager.cs b/Source/Game/Network/NetworkManager.cs
similarity index 100%
rename from Source/Game/Networking/NetworkManager.cs
rename to Source/Game/Network/NetworkManager.cs
diff --git a/Source/Game/Networking/NetworkManagerPlugin.cs b/Source/Game/Network/NetworkManagerPlugin.cs
similarity index 100%
rename from Source/Game/Networking/NetworkManagerPlugin.cs
rename to Source/Game/Network/NetworkManagerPlugin.cs
diff --git a/Source/Game/Networking/NetworkManager_Client.cs b/Source/Game/Network/NetworkManager_Client.cs
similarity index 100%
rename from Source/Game/Networking/NetworkManager_Client.cs
rename to Source/Game/Network/NetworkManager_Client.cs
diff --git a/Source/Game/Networking/NetworkManager_Server.cs b/Source/Game/Network/NetworkManager_Server.cs
similarity index 100%
rename from Source/Game/Networking/NetworkManager_Server.cs
rename to Source/Game/Network/NetworkManager_Server.cs
diff --git a/Source/Game/CustomCharacterController.cs b/Source/Game/Player/CustomCharacterController.cs
similarity index 100%
rename from Source/Game/CustomCharacterController.cs
rename to Source/Game/Player/CustomCharacterController.cs
diff --git a/Source/Game/InputManager.cs b/Source/Game/Player/InputManager.cs
similarity index 100%
rename from Source/Game/InputManager.cs
rename to Source/Game/Player/InputManager.cs
diff --git a/Source/Game/PlayerActor.cs b/Source/Game/Player/PlayerActor.cs
similarity index 100%
rename from Source/Game/PlayerActor.cs
rename to Source/Game/Player/PlayerActor.cs
diff --git a/Source/Game/PlayerInput.cs b/Source/Game/Player/PlayerInput.cs
similarity index 100%
rename from Source/Game/PlayerInput.cs
rename to Source/Game/Player/PlayerInput.cs
diff --git a/Source/Game/PlayerInputDemo.cs b/Source/Game/Player/PlayerInputDemo.cs
similarity index 100%
rename from Source/Game/PlayerInputDemo.cs
rename to Source/Game/Player/PlayerInputDemo.cs
diff --git a/Source/Game/PlayerInputLocal.cs b/Source/Game/Player/PlayerInputLocal.cs
similarity index 100%
rename from Source/Game/PlayerInputLocal.cs
rename to Source/Game/Player/PlayerInputLocal.cs
diff --git a/Source/Game/PlayerInputNetwork.cs b/Source/Game/Player/PlayerInputNetwork.cs
similarity index 100%
rename from Source/Game/PlayerInputNetwork.cs
rename to Source/Game/Player/PlayerInputNetwork.cs
diff --git a/Source/Game/PlayerMovement.cs b/Source/Game/Player/PlayerMovement.cs
similarity index 100%
rename from Source/Game/PlayerMovement.cs
rename to Source/Game/Player/PlayerMovement.cs
diff --git a/Source/Game/PlayerMovement_NK.cs b/Source/Game/Player/PlayerMovement_NK.cs
similarity index 100%
rename from Source/Game/PlayerMovement_NK.cs
rename to Source/Game/Player/PlayerMovement_NK.cs