diff --git a/Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs b/Content.Client/AI/ClientAiDebugSystem.cs
similarity index 98%
rename from Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs
rename to Content.Client/AI/ClientAiDebugSystem.cs
index 1085267530..e60014f48f 100644
--- a/Content.Client/GameObjects/EntitySystems/AI/ClientAiDebugSystem.cs
+++ b/Content.Client/AI/ClientAiDebugSystem.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Content.Shared.AI;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
@@ -9,7 +9,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.EntitySystems.AI
+namespace Content.Client.AI
 {
 #if DEBUG
     public class ClientAiDebugSystem : EntitySystem
diff --git a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs b/Content.Client/AI/ClientPathfindingDebugSystem.cs
similarity index 99%
rename from Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
rename to Content.Client/AI/ClientPathfindingDebugSystem.cs
index 492407dfb7..805d66ca5b 100644
--- a/Content.Client/GameObjects/EntitySystems/AI/ClientPathfindingDebugSystem.cs
+++ b/Content.Client/AI/ClientPathfindingDebugSystem.cs
@@ -13,7 +13,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.EntitySystems.AI
+namespace Content.Client.AI
 {
 #if DEBUG
     public class ClientPathfindingDebugSystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEControllerBoundUserInterface.cs b/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Power/AME/AMEControllerBoundUserInterface.cs
rename to Content.Client/AME/UI/AMEControllerBoundUserInterface.cs
index a7b56e82ff..2f35cd924f 100644
--- a/Content.Client/GameObjects/Components/Power/AME/AMEControllerBoundUserInterface.cs
+++ b/Content.Client/AME/UI/AMEControllerBoundUserInterface.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
+using Content.Shared.Chemistry.Dispenser;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent;
+using static Content.Shared.AME.SharedAMEControllerComponent;
 
-namespace Content.Client.GameObjects.Components.Power.AME
+namespace Content.Client.AME.UI
 {
     [UsedImplicitly]
     public class AMEControllerBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs b/Content.Client/AME/UI/AMEWindow.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs
rename to Content.Client/AME/UI/AMEWindow.cs
index 48e2b69ac0..7bb1d3b434 100644
--- a/Content.Client/GameObjects/Components/Power/AME/AMEWindow.cs
+++ b/Content.Client/AME/UI/AMEWindow.cs
@@ -1,13 +1,13 @@
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent;
+using static Content.Shared.AME.SharedAMEControllerComponent;
 
-namespace Content.Client.GameObjects.Components.Power.AME
+namespace Content.Client.AME.UI
 {
     public class AMEWindow : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs b/Content.Client/AME/Visualizers/AMEControllerVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs
rename to Content.Client/AME/Visualizers/AMEControllerVisualizer.cs
index cda56f1084..99243fdb37 100644
--- a/Content.Client/GameObjects/Components/Power/AME/AMEControllerVisualizer.cs
+++ b/Content.Client/AME/Visualizers/AMEControllerVisualizer.cs
@@ -1,9 +1,9 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEControllerComponent;
+using static Content.Shared.AME.SharedAMEControllerComponent;
 
-namespace Content.Client.GameObjects.Components.Power.AME
+namespace Content.Client.AME.Visualizers
 {
     [UsedImplicitly]
     public class AMEControllerVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs b/Content.Client/AME/Visualizers/AMEVisualizer.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs
rename to Content.Client/AME/Visualizers/AMEVisualizer.cs
index 59b0cb0c28..eaf691cba0 100644
--- a/Content.Client/GameObjects/Components/Power/AME/AMEVisualizer.cs
+++ b/Content.Client/AME/Visualizers/AMEVisualizer.cs
@@ -1,9 +1,9 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Power.AME.SharedAMEShieldComponent;
+using static Content.Shared.AME.SharedAMEShieldComponent;
 
-namespace Content.Client.GameObjects.Components.Power.AME
+namespace Content.Client.AME.Visualizers
 {
     [UsedImplicitly]
     public class AMEVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs b/Content.Client/APC/ApcBoundUserInterface.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
rename to Content.Client/APC/ApcBoundUserInterface.cs
index 412deaa37d..567bb842b8 100644
--- a/Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs
+++ b/Content.Client/APC/ApcBoundUserInterface.cs
@@ -1,6 +1,6 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.GameObjects.Components.Power;
+using Content.Client.Stylesheets;
+using Content.Shared.APC;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -9,7 +9,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.APC
 {
     [UsedImplicitly]
     public class ApcBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs b/Content.Client/APC/ApcVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Power/ApcVisualizer.cs
rename to Content.Client/APC/ApcVisualizer.cs
index ce5144a611..a112f55b42 100644
--- a/Content.Client/GameObjects/Components/Power/ApcVisualizer.cs
+++ b/Content.Client/APC/ApcVisualizer.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.APC;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.APC
 {
     public class ApcVisualizer : AppearanceVisualizer
     {
diff --git a/Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs
rename to Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
index 9084895c5b..d8703ab376 100644
--- a/Content.Client/GameObjects/Components/Access/IdCardConsoleBoundUserInterface.cs
+++ b/Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
@@ -3,9 +3,9 @@ using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Access.SharedIdCardConsoleComponent;
+using static Content.Shared.Access.SharedIdCardConsoleComponent;
 
-namespace Content.Client.GameObjects.Components.Access
+namespace Content.Client.Access.UI
 {
     public class IdCardConsoleBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs b/Content.Client/Access/UI/IdCardConsoleWindow.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs
rename to Content.Client/Access/UI/IdCardConsoleWindow.cs
index defd81efe1..e9b5caff47 100644
--- a/Content.Client/GameObjects/Components/Access/IdCardConsoleWindow.cs
+++ b/Content.Client/Access/UI/IdCardConsoleWindow.cs
@@ -7,9 +7,9 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Access.SharedIdCardConsoleComponent;
+using static Content.Shared.Access.SharedIdCardConsoleComponent;
 
-namespace Content.Client.GameObjects.Components.Access
+namespace Content.Client.Access.UI
 {
     public class IdCardConsoleWindow : SS14Window
     {
diff --git a/Content.Client/GameObjects/EntitySystems/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs
similarity index 98%
rename from Content.Client/GameObjects/EntitySystems/ActionsSystem.cs
rename to Content.Client/Actions/ActionsSystem.cs
index 68f87ed77b..044d6099d1 100644
--- a/Content.Client/GameObjects/EntitySystems/ActionsSystem.cs
+++ b/Content.Client/Actions/ActionsSystem.cs
@@ -1,4 +1,5 @@
-using Content.Client.GameObjects.Components.Mobs;
+using Content.Client.Construction;
+using Content.Client.DragDrop;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.Player;
@@ -7,7 +8,7 @@ using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Actions
 {
     [UsedImplicitly]
     public class ActionsSystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/Mobs/Actions/ActionAssignment.cs b/Content.Client/Actions/Assignments/ActionAssignment.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Mobs/Actions/ActionAssignment.cs
rename to Content.Client/Actions/Assignments/ActionAssignment.cs
index f9793c19b4..91e1e7725c 100644
--- a/Content.Client/GameObjects/Components/Mobs/Actions/ActionAssignment.cs
+++ b/Content.Client/Actions/Assignments/ActionAssignment.cs
@@ -2,7 +2,7 @@
 using Content.Shared.Actions;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Mobs.Actions
+namespace Content.Client.Actions.Assignments
 {
     public struct ActionAssignment : IEquatable<ActionAssignment>
     {
diff --git a/Content.Client/GameObjects/Components/Mobs/Actions/ActionAssignments.cs b/Content.Client/Actions/Assignments/ActionAssignments.cs
similarity index 99%
rename from Content.Client/GameObjects/Components/Mobs/Actions/ActionAssignments.cs
rename to Content.Client/Actions/Assignments/ActionAssignments.cs
index 9afe2e27e6..4f9dd5143e 100644
--- a/Content.Client/GameObjects/Components/Mobs/Actions/ActionAssignments.cs
+++ b/Content.Client/Actions/Assignments/ActionAssignments.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Actions;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Actions.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Mobs.Actions
+namespace Content.Client.Actions.Assignments
 {
     /// <summary>
     /// Tracks and manages the hotbar assignments for actions.
diff --git a/Content.Client/GameObjects/Components/Mobs/ClientActionsComponent.cs b/Content.Client/Actions/ClientActionsComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Mobs/ClientActionsComponent.cs
rename to Content.Client/Actions/ClientActionsComponent.cs
index 6939080c66..7f1ccd4f8c 100644
--- a/Content.Client/GameObjects/Components/Mobs/ClientActionsComponent.cs
+++ b/Content.Client/Actions/ClientActionsComponent.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.HUD.Inventory;
-using Content.Client.GameObjects.Components.Items;
-using Content.Client.GameObjects.Components.Mobs.Actions;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.Controls;
-using Content.Shared.Actions;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Client.Actions.Assignments;
+using Content.Client.Actions.UI;
+using Content.Client.Hands;
+using Content.Client.Inventory;
+using Content.Client.Items.UI;
+using Content.Shared.Actions.Components;
+using Content.Shared.Actions.Prototypes;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -15,7 +15,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.Actions
 {
     /// <inheritdoc/>
     [RegisterComponent]
diff --git a/Content.Client/UserInterface/ActionAlertTooltip.cs b/Content.Client/Actions/UI/ActionAlertTooltip.cs
similarity index 97%
rename from Content.Client/UserInterface/ActionAlertTooltip.cs
rename to Content.Client/Actions/UI/ActionAlertTooltip.cs
index a411c81c3a..8ebb9c8642 100644
--- a/Content.Client/UserInterface/ActionAlertTooltip.cs
+++ b/Content.Client/Actions/UI/ActionAlertTooltip.cs
@@ -1,11 +1,11 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Actions.UI
 {
     /// <summary>
     /// Tooltip for actions or alerts because they are very similar.
diff --git a/Content.Client/UserInterface/ActionMenu.cs b/Content.Client/Actions/UI/ActionMenu.cs
similarity index 98%
rename from Content.Client/UserInterface/ActionMenu.cs
rename to Content.Client/Actions/UI/ActionMenu.cs
index 6ae2592b7a..ead0dad451 100644
--- a/Content.Client/UserInterface/ActionMenu.cs
+++ b/Content.Client/Actions/UI/ActionMenu.cs
@@ -4,12 +4,12 @@ using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.GameObjects.Components.Mobs.Actions;
-using Content.Client.UserInterface.Controls;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Actions.Assignments;
+using Content.Client.DragDrop;
+using Content.Client.HUD;
+using Content.Client.Stylesheets;
 using Content.Shared.Actions;
+using Content.Shared.Actions.Prototypes;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.Utility;
@@ -20,7 +20,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Timing;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Actions.UI
 {
     /// <summary>
     /// Action selection menu, allows filtering and searching over all possible
diff --git a/Content.Client/UserInterface/ActionMenuItem.cs b/Content.Client/Actions/UI/ActionMenuItem.cs
similarity index 95%
rename from Content.Client/UserInterface/ActionMenuItem.cs
rename to Content.Client/Actions/UI/ActionMenuItem.cs
index f3d6e7b365..32e42aa9ec 100644
--- a/Content.Client/UserInterface/ActionMenuItem.cs
+++ b/Content.Client/Actions/UI/ActionMenuItem.cs
@@ -1,11 +1,11 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.Actions;
+using Content.Client.Stylesheets;
+using Content.Shared.Actions.Prototypes;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.Utility;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Actions.UI
 {
     /// <summary>
     /// An individual action visible in the action menu.
diff --git a/Content.Client/UserInterface/Controls/ActionSlot.cs b/Content.Client/Actions/UI/ActionSlot.cs
similarity index 99%
rename from Content.Client/UserInterface/Controls/ActionSlot.cs
rename to Content.Client/Actions/UI/ActionSlot.cs
index 129f53cd3d..29b4b48b82 100644
--- a/Content.Client/UserInterface/Controls/ActionSlot.cs
+++ b/Content.Client/Actions/UI/ActionSlot.cs
@@ -1,8 +1,9 @@
 using System;
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Cooldown;
+using Content.Client.Stylesheets;
 using Content.Shared.Actions;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Actions.Components;
+using Content.Shared.Actions.Prototypes;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
@@ -16,7 +17,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client.UserInterface.Controls
+namespace Content.Client.Actions.UI
 {
     /// <summary>
     /// A slot in the action hotbar. Not extending BaseButton because
diff --git a/Content.Client/UserInterface/ActionsUI.cs b/Content.Client/Actions/UI/ActionsUI.cs
similarity index 98%
rename from Content.Client/UserInterface/ActionsUI.cs
rename to Content.Client/Actions/UI/ActionsUI.cs
index 308e6d79b0..07f07a4e2d 100644
--- a/Content.Client/UserInterface/ActionsUI.cs
+++ b/Content.Client/Actions/UI/ActionsUI.cs
@@ -1,10 +1,11 @@
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.GameObjects.Components.Mobs.Actions;
-using Content.Client.UserInterface.Controls;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Actions.Assignments;
+using Content.Client.DragDrop;
+using Content.Client.HUD;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
 using Content.Shared.Actions;
+using Content.Shared.Actions.Prototypes;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -17,7 +18,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Timing;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Actions.UI
 {
     /// <summary>
     ///     The action hotbar on the left side of the screen.
diff --git a/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs b/Content.Client/Administration/Managers/AdminMenuManager.cs
similarity index 96%
rename from Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs
rename to Content.Client/Administration/Managers/AdminMenuManager.cs
index 20b23f9fe3..198b413b7a 100644
--- a/Content.Client/UserInterface/AdminMenu/AdminMenuManager.cs
+++ b/Content.Client/Administration/Managers/AdminMenuManager.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
-using Content.Client.Administration;
-using Content.Shared.Administration.AdminMenu;
+using Content.Client.Administration.UI;
+using Content.Client.HUD;
+using Content.Shared.Administration.Menu;
 using Content.Shared.Input;
 using Robust.Client.Console;
 using Robust.Client.Input;
@@ -9,7 +10,7 @@ using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
-namespace Content.Client.UserInterface.AdminMenu
+namespace Content.Client.Administration.Managers
 {
     internal class AdminMenuManager : IAdminMenuManager
     {
diff --git a/Content.Client/Administration/ClientAdminManager.cs b/Content.Client/Administration/Managers/ClientAdminManager.cs
similarity index 96%
rename from Content.Client/Administration/ClientAdminManager.cs
rename to Content.Client/Administration/Managers/ClientAdminManager.cs
index 03f51039e7..f6955bef48 100644
--- a/Content.Client/Administration/ClientAdminManager.cs
+++ b/Content.Client/Administration/Managers/ClientAdminManager.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.Administration;
-using Content.Shared.Network.NetMessages;
 using Robust.Client.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Network;
 
-namespace Content.Client.Administration
+namespace Content.Client.Administration.Managers
 {
     public class ClientAdminManager : IClientAdminManager, IClientConGroupImplementation, IPostInjectInit
     {
diff --git a/Content.Client/Administration/IClientAdminManager.cs b/Content.Client/Administration/Managers/IClientAdminManager.cs
similarity index 97%
rename from Content.Client/Administration/IClientAdminManager.cs
rename to Content.Client/Administration/Managers/IClientAdminManager.cs
index 69f66757d3..46e3a01537 100644
--- a/Content.Client/Administration/IClientAdminManager.cs
+++ b/Content.Client/Administration/Managers/IClientAdminManager.cs
@@ -1,7 +1,7 @@
 using System;
 using Content.Shared.Administration;
 
-namespace Content.Client.Administration
+namespace Content.Client.Administration.Managers
 {
     /// <summary>
     ///     Manages server admin permissions for the local player.
diff --git a/Content.Client/UserInterface/AdminAddReagentUI.cs b/Content.Client/Administration/UI/AdminAddReagentUI.cs
similarity index 98%
rename from Content.Client/UserInterface/AdminAddReagentUI.cs
rename to Content.Client/Administration/UI/AdminAddReagentUI.cs
index e7d41b9ca9..e2c4fba355 100644
--- a/Content.Client/UserInterface/AdminAddReagentUI.cs
+++ b/Content.Client/Administration/UI/AdminAddReagentUI.cs
@@ -1,6 +1,6 @@
 using Content.Client.Eui;
 using Content.Shared.Administration;
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface.Controls;
@@ -9,7 +9,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Administration.UI
 {
     [UsedImplicitly]
     public sealed class AdminAddReagentEui : BaseEui
diff --git a/Content.Client/Administration/UI/AdminMenuWindow.xaml b/Content.Client/Administration/UI/AdminMenuWindow.xaml
new file mode 100644
index 0000000000..b60988b12f
--- /dev/null
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml
@@ -0,0 +1,19 @@
+<SS14Window
+    xmlns="https://spacestation14.io"
+    xmlns:adminMenu="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs;assembly=Content.Client"
+    xmlns:adminTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminTab"
+    xmlns:adminbusTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab"
+    xmlns:atmosTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab"
+    xmlns:adminTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
+    xmlns:adminbusTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
+    xmlns:atmosTab1="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
+    xmlns:tabs="clr-namespace:Content.Client.Administration.UI.Tabs">
+    <TabContainer Name="MasterTabContainer">
+        <adminTab1:AdminTab />
+        <adminbusTab1:AdminbusTab />
+        <atmosTab1:AtmosTab />
+        <tabs:RoundTab />
+        <tabs:ServerTab />
+        <tabs:PlayerTab Name="PlayerTabControl" />
+    </TabContainer>
+</SS14Window>
diff --git a/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.xaml.cs b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
similarity index 91%
rename from Content.Client/UserInterface/AdminMenu/AdminMenuWindow.xaml.cs
rename to Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
index ff34de6309..debef4c91e 100644
--- a/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
@@ -1,15 +1,15 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Client.UserInterface.AdminMenu.Tabs;
-using Content.Shared.Administration.AdminMenu;
+using Content.Client.Administration.UI.Tabs;
+using Content.Client.HUD;
+using Content.Shared.Administration.Menu;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface.AdminMenu
+namespace Content.Client.Administration.UI
 {
     [GenerateTypedNameReferences]
     public partial class AdminMenuWindow : SS14Window
diff --git a/Content.Client/UserInterface/AdminMenu/CustomControls/CommandButton.cs b/Content.Client/Administration/UI/CustomControls/CommandButton.cs
similarity index 93%
rename from Content.Client/UserInterface/AdminMenu/CustomControls/CommandButton.cs
rename to Content.Client/Administration/UI/CustomControls/CommandButton.cs
index 62ebfa6a8e..f728b8b6e2 100644
--- a/Content.Client/UserInterface/AdminMenu/CustomControls/CommandButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/CommandButton.cs
@@ -3,7 +3,7 @@ using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 
-namespace Content.Client.UserInterface.AdminMenu.CustomControls
+namespace Content.Client.Administration.UI.CustomControls
 {
     public class CommandButton : Button
     {
diff --git a/Content.Client/UserInterface/AdminMenu/CustomControls/PlayerListControl.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/CustomControls/PlayerListControl.xaml
rename to Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
similarity index 97%
rename from Content.Client/UserInterface/AdminMenu/CustomControls/PlayerListControl.xaml.cs
rename to Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
index fc27e313be..c582b234c0 100644
--- a/Content.Client/UserInterface/AdminMenu/CustomControls/PlayerListControl.xaml.cs
+++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 
-namespace Content.Client.UserInterface.AdminMenu.CustomControls
+namespace Content.Client.Administration.UI.CustomControls
 {
     [GenerateTypedNameReferences]
     public partial class PlayerListControl : VBoxContainer
diff --git a/Content.Client/UserInterface/AdminMenu/CustomControls/UICommandButton.cs b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
similarity index 89%
rename from Content.Client/UserInterface/AdminMenu/CustomControls/UICommandButton.cs
rename to Content.Client/Administration/UI/CustomControls/UICommandButton.cs
index 34ad95b9bd..dd38f32479 100644
--- a/Content.Client/UserInterface/AdminMenu/CustomControls/UICommandButton.cs
+++ b/Content.Client/Administration/UI/CustomControls/UICommandButton.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 
-namespace Content.Client.UserInterface.AdminMenu.CustomControls
+namespace Content.Client.Administration.UI.CustomControls
 {
     public class UICommandButton : CommandButton
     {
diff --git a/Content.Client/UserInterface/Permissions/PermissionsEui.cs b/Content.Client/Administration/UI/PermissionsEui.cs
similarity index 99%
rename from Content.Client/UserInterface/Permissions/PermissionsEui.cs
rename to Content.Client/Administration/UI/PermissionsEui.cs
index 1f979fec7a..291f6a6f1e 100644
--- a/Content.Client/UserInterface/Permissions/PermissionsEui.cs
+++ b/Content.Client/Administration/UI/PermissionsEui.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.Administration;
+using Content.Client.Administration.Managers;
 using Content.Client.Eui;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
@@ -15,7 +15,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using static Content.Shared.Administration.PermissionsEuiMsg;
 
-namespace Content.Client.UserInterface.Permissions
+namespace Content.Client.Administration.UI
 {
     [UsedImplicitly]
     public sealed class PermissionsEui : BaseEui
diff --git a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitEui.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs
similarity index 92%
rename from Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitEui.cs
rename to Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs
index 64b59f117a..2731aad170 100644
--- a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitEui.cs
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitEui.cs
@@ -1,9 +1,9 @@
 using Content.Client.Eui;
+using Content.Shared.Administration;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
-using Content.Shared.Administration;
 
-namespace Content.Client.UserInterface.AdminMenu.SetOutfit
+namespace Content.Client.Administration.UI.SetOutfit
 {
     [UsedImplicitly]
     public sealed class SetOutfitEui : BaseEui
diff --git a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml
rename to Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml.cs b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
similarity index 97%
rename from Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml.cs
rename to Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
index 0ddc345139..b39d0757a6 100644
--- a/Content.Client/UserInterface/AdminMenu/SetOutfit/SetOutfitMenu.xaml.cs
+++ b/Content.Client/Administration/UI/SetOutfit/SetOutfitMenu.xaml.cs
@@ -7,10 +7,9 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.UserInterface.AdminMenu.SetOutfit
+namespace Content.Client.Administration.UI.SetOutfit
 {
     [GenerateTypedNameReferences]
     public partial class SetOutfitMenu : SS14Window
diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
new file mode 100644
index 0000000000..a4b022ee27
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -0,0 +1,19 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:at="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminTab"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:adminTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
+    Margin="4"
+    MinSize="50 50">
+    <VBoxContainer>
+        <GridContainer Columns="4">
+            <customControls:UICommandButton Command="kick" Text="{Loc Kick}" WindowType="{x:Type adminTab:KickWindow}" />
+            <customControls:UICommandButton Command="ban" Text="{Loc Ban}" WindowType="{x:Type adminTab:BanWindow}" />
+            <customControls:CommandButton Command="aghost" Text="{Loc Admin Ghost}" />
+            <customControls:UICommandButton Command="tpto" Text="{Loc Teleport}" WindowType="{x:Type adminTab:TeleportWindow}" />
+            <customControls:CommandButton Command="permissions" Text="{Loc Permissions Panel}" />
+        </GridContainer>
+    </VBoxContainer>
+</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/AdminTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
similarity index 74%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/AdminTab.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
index 3bed8b059e..aa9fc7307c 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/AdminTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml.cs
@@ -2,7 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AdminTab
+namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     public partial class AdminTab : Control
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/BanWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/BanWindow.xaml
rename to Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/BanWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/BanWindow.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
index f7d3321de1..f45c3c3250 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/BanWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/BanWindow.xaml.cs
@@ -7,7 +7,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Utility;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AdminTab
+namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/KickWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
similarity index 77%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/KickWindow.xaml
rename to Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
index 6c880ef553..cf317b4570 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/KickWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml
@@ -1,6 +1,7 @@
 <SS14Window
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Kick}" MinSize="425 272">
     <VBoxContainer>
         <HBoxContainer>
@@ -8,7 +9,7 @@
             <Control MinWidth="50" />
             <LineEdit Name="ReasonLine" MinWidth="100" HorizontalExpand="True" />
         </HBoxContainer>
-        <cc:PlayerListControl Name="PlayerList" />
+        <customControls:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Kick}" />
     </VBoxContainer>
 </SS14Window>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/KickWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/KickWindow.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs
index 24f694c4fd..761be3d836 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/KickWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/KickWindow.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Utility;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AdminTab
+namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/TeleportWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
similarity index 66%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/TeleportWindow.xaml
rename to Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
index 892329c03d..55b58fa5e6 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/TeleportWindow.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml
@@ -1,9 +1,10 @@
 <SS14Window
     xmlns="https://spacestation14.io"
     xmlns:cc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
     Title="{Loc Teleport}" MinSize="425 230">
     <VBoxContainer>
-        <cc:PlayerListControl Name="PlayerList" />
+        <customControls:PlayerListControl Name="PlayerList" />
         <Button Name="SubmitButton" Text="{Loc Teleport}" />
     </VBoxContainer>
 </SS14Window>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/TeleportWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
similarity index 91%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/TeleportWindow.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
index f38398e813..5c8c5fc43b 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/TeleportWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/TeleportWindow.xaml.cs
@@ -1,15 +1,13 @@
 #nullable enable
 using JetBrains.Annotations;
-using NFluidsynth;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
-using Robust.Client.Player;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AdminTab
+namespace Content.Client.Administration.UI.Tabs.AdminTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
diff --git a/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
new file mode 100644
index 0000000000..5f97a32289
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml
@@ -0,0 +1,16 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:abt="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:adminbusTab="clr-namespace:Content.Client.Administration.UI.Tabs.AdminbusTab"
+    Margin="4"
+    MinSize="50 50">
+    <GridContainer
+        Columns="4">
+        <customControls:CommandButton Name="SpawnEntitiesButton" Text="{Loc Spawn Entities}" />
+        <customControls:CommandButton Name="SpawnTilesButton" Text="{Loc Spawn Tiles} " />
+        <customControls:UICommandButton Command="events" Text="{Loc Station Events}" WindowType="{x:Type adminbusTab:StationEventsWindow}" />
+    </GridContainer>
+</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/AdminbusTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/AdminbusTab.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
index b91579ed0c..20d22ceb0e 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/AdminbusTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/AdminbusTab.xaml.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using Content.Client.Administration.Managers;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Placement;
 using Robust.Client.ResourceManagement;
@@ -9,7 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab
+namespace Content.Client.Administration.UI.Tabs.AdminbusTab
 {
     [GenerateTypedNameReferences]
     public partial class AdminbusTab : Control
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/StationEventsWindow.xaml b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/StationEventsWindow.xaml
rename to Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/StationEventsWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
index e716d2616a..4d55547086 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AdminbusTab/StationEventsWindow.xaml.cs
@@ -1,7 +1,7 @@
 #nullable enable
-using System.Linq;
 using System.Collections.Generic;
-using Content.Client.StationEvents;
+using System.Linq;
+using Content.Client.StationEvents.Managers;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
@@ -10,7 +10,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab
+namespace Content.Client.Administration.UI.Tabs.AdminbusTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddAtmosWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddAtmosWindow.xaml
rename to Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddAtmosWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
similarity index 95%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
index 316c6dbe59..6867a1bc8f 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddAtmosWindow.xaml.cs
@@ -10,7 +10,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab
+namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddGasWindow.xaml
rename to Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
similarity index 97%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddGasWindow.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
index 19648eae89..4587b419d3 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AddGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AddGasWindow.xaml.cs
@@ -13,7 +13,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab
+namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
diff --git a/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
new file mode 100644
index 0000000000..034947bb2c
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml
@@ -0,0 +1,17 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:at="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    xmlns:atmosTab="clr-namespace:Content.Client.Administration.UI.Tabs.AtmosTab"
+    Margin="4"
+    MinSize="50 50">
+    <GridContainer Columns="4">
+        <customControls:UICommandButton Text="{Loc Add Atmos}" Command="addatmos" WindowType="{x:Type atmosTab:AddAtmosWindow}" />
+        <customControls:UICommandButton Text="{Loc Add Gas}" Command="addgas" WindowType="{x:Type atmosTab:AddGasWindow}" />
+        <customControls:UICommandButton Text="{Loc Fill Gas}" Command="fillgas" WindowType="{x:Type atmosTab:FillGasWindow}" />
+        <customControls:UICommandButton Text="{Loc Set Temperature}" Command="settemp"
+                             WindowType="{x:Type atmosTab:SetTemperatureWindow}" />
+    </GridContainer>
+</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AtmosTab.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
similarity index 63%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AtmosTab.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
index 4a81056e9c..a27a42c07e 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AtmosTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/AtmosTab.xaml.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab
+namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     public partial class AtmosTab : Control
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/FillGasWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/FillGasWindow.xaml
rename to Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/FillGasWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
similarity index 97%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/FillGasWindow.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
index 769d8ee12b..0acd97e52b 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/FillGasWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/FillGasWindow.xaml.cs
@@ -13,7 +13,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab
+namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/SetTemperatureWindow.xaml b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/SetTemperatureWindow.xaml
rename to Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
similarity index 96%
rename from Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
rename to Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
index 1d2377079f..234dde6a84 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/AtmosTab/SetTemperatureWindow.xaml.cs
@@ -10,7 +10,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab
+namespace Content.Client.Administration.UI.Tabs.AtmosTab
 {
     [GenerateTypedNameReferences]
     [UsedImplicitly]
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/PlayerTab.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml
similarity index 100%
rename from Content.Client/UserInterface/AdminMenu/Tabs/PlayerTab.xaml
rename to Content.Client/Administration/UI/Tabs/PlayerTab.xaml
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
similarity index 98%
rename from Content.Client/UserInterface/AdminMenu/Tabs/PlayerTab.xaml.cs
rename to Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
index 26094288fa..020f64ade0 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab.xaml.cs
@@ -1,7 +1,7 @@
 #nullable enable
 
 using System.Collections.Generic;
-using Content.Shared.Administration.AdminMenu;
+using Content.Shared.Administration.Menu;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -11,7 +11,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs
+namespace Content.Client.Administration.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public partial class PlayerTab : Control
diff --git a/Content.Client/Administration/UI/Tabs/RoundTab.xaml b/Content.Client/Administration/UI/Tabs/RoundTab.xaml
new file mode 100644
index 0000000000..7a3cdae0b1
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml
@@ -0,0 +1,13 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    Margin="4"
+    MinSize="50 50">
+    <GridContainer
+        Columns="4">
+        <customControls:CommandButton Command="startround" Text="{Loc Start Round}" />
+        <customControls:CommandButton Command="endround" Text="{Loc End Round}" />
+        <customControls:CommandButton Command="restartround" Text="{Loc Restart Round}" />
+    </GridContainer>
+</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/RoundTab.xaml.cs b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
similarity index 65%
rename from Content.Client/UserInterface/AdminMenu/Tabs/RoundTab.xaml.cs
rename to Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
index cc47b33c65..bfe1dfe3af 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/RoundTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/RoundTab.xaml.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs
+namespace Content.Client.Administration.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public partial class RoundTab : Control
diff --git a/Content.Client/Administration/UI/Tabs/ServerTab.xaml b/Content.Client/Administration/UI/Tabs/ServerTab.xaml
new file mode 100644
index 0000000000..25a2636da7
--- /dev/null
+++ b/Content.Client/Administration/UI/Tabs/ServerTab.xaml
@@ -0,0 +1,12 @@
+<Control
+    xmlns="https://spacestation14.io"
+    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
+    xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
+    Margin="4"
+    MinSize="50 50">
+    <GridContainer
+        Columns="4" >
+        <customControls:CommandButton Command="restart" Text="{Loc Reboot}"></customControls:CommandButton>
+        <customControls:CommandButton Command="shutdown" Text="{Loc Shutdown}"></customControls:CommandButton>
+    </GridContainer>
+</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/ServerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
similarity index 65%
rename from Content.Client/UserInterface/AdminMenu/Tabs/ServerTab.xaml.cs
rename to Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
index 9e2a3be0e3..fbb52bf7b0 100644
--- a/Content.Client/UserInterface/AdminMenu/Tabs/ServerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/ServerTab.xaml.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.UserInterface.AdminMenu.Tabs
+namespace Content.Client.Administration.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public partial class ServerTab : Control
diff --git a/Content.Client/GameObjects/Components/Mobs/ClientAlertsComponent.cs b/Content.Client/Alerts/ClientAlertsComponent.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Mobs/ClientAlertsComponent.cs
rename to Content.Client/Alerts/ClientAlertsComponent.cs
index 16f4f914ad..13df9dca61 100644
--- a/Content.Client/GameObjects/Components/Mobs/ClientAlertsComponent.cs
+++ b/Content.Client/Alerts/ClientAlertsComponent.cs
@@ -1,9 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.Controls;
+using Content.Client.Alerts.UI;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -15,7 +13,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.ViewVariables;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.Alerts
 {
     /// <inheritdoc/>
     [RegisterComponent]
diff --git a/Content.Client/UserInterface/Controls/AlertControl.cs b/Content.Client/Alerts/UI/AlertControl.cs
similarity index 97%
rename from Content.Client/UserInterface/Controls/AlertControl.cs
rename to Content.Client/Alerts/UI/AlertControl.cs
index a7a7e3b92e..4f84a1567b 100644
--- a/Content.Client/UserInterface/Controls/AlertControl.cs
+++ b/Content.Client/Alerts/UI/AlertControl.cs
@@ -1,4 +1,6 @@
 using System;
+using Content.Client.Actions.UI;
+using Content.Client.Cooldown;
 using Content.Shared.Alert;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -6,7 +8,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.UserInterface.Controls
+namespace Content.Client.Alerts.UI
 {
     public class AlertControl : BaseButton
     {
diff --git a/Content.Client/UserInterface/AlertsUI.cs b/Content.Client/Alerts/UI/AlertsUI.cs
similarity index 94%
rename from Content.Client/UserInterface/AlertsUI.cs
rename to Content.Client/Alerts/UI/AlertsUI.cs
index 9fe6398f4e..f5064438ee 100644
--- a/Content.Client/UserInterface/AlertsUI.cs
+++ b/Content.Client/Alerts/UI/AlertsUI.cs
@@ -1,12 +1,11 @@
-using Content.Client.Chat;
-using Content.Client.Interfaces.Chat;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Chat.Managers;
+using Content.Client.Chat.UI;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Alerts.UI
 {
     /// <summary>
     ///     The status effects display on the right side of the screen.
diff --git a/Content.Client/GameObjects/Components/AnimationsTestComponent.cs b/Content.Client/Animations/AnimationsTestComponent.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/AnimationsTestComponent.cs
rename to Content.Client/Animations/AnimationsTestComponent.cs
index 492fec6ad4..bc58ae26d1 100644
--- a/Content.Client/GameObjects/Components/AnimationsTestComponent.cs
+++ b/Content.Client/Animations/AnimationsTestComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Animations
 {
     [RegisterComponent]
     public sealed class AnimationsTestComponent : Component
diff --git a/Content.Client/Arcade/BlockGameMenu.cs b/Content.Client/Arcade/BlockGameMenu.cs
index 86982c5985..47e0c80a2e 100644
--- a/Content.Client/Arcade/BlockGameMenu.cs
+++ b/Content.Client/Arcade/BlockGameMenu.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Content.Client.GameObjects.Components.Arcade;
-using Content.Client.Utility;
+using Content.Client.Arcade.UI;
+using Content.Client.Resources;
 using Content.Shared.Arcade;
 using Content.Shared.Input;
 using Robust.Client.Graphics;
diff --git a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
index 058fcee145..fb7517ed68 100644
--- a/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
+++ b/Content.Client/Arcade/SpaceVillainArcadeMenu.cs
@@ -1,5 +1,5 @@
-using Content.Client.GameObjects.Components.Arcade;
-using Content.Shared.GameObjects.Components.Arcade;
+using Content.Client.Arcade.UI;
+using Content.Shared.Arcade;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
diff --git a/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs
rename to Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
index 68e795eda8..ca5b24b518 100644
--- a/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs
+++ b/Content.Client/Arcade/UI/BlockGameBoundUserInterface.cs
@@ -1,9 +1,8 @@
-using Content.Client.Arcade;
-using Content.Shared.Arcade;
+using Content.Shared.Arcade;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Arcade
+namespace Content.Client.Arcade.UI
 {
     public class BlockGameBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/Components/Arcade/SpaceVillainArcadeBoundUserInterface.cs b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
similarity index 86%
rename from Content.Client/GameObjects/Components/Arcade/SpaceVillainArcadeBoundUserInterface.cs
rename to Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
index 41475f45b2..442b148c10 100644
--- a/Content.Client/GameObjects/Components/Arcade/SpaceVillainArcadeBoundUserInterface.cs
+++ b/Content.Client/Arcade/UI/SpaceVillainArcadeBoundUserInterface.cs
@@ -1,10 +1,9 @@
-using Content.Client.Arcade;
-using Robust.Client.GameObjects;
+using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Arcade.SharedSpaceVillainArcadeComponent;
+using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent;
 
-namespace Content.Client.GameObjects.Components.Arcade
+namespace Content.Client.Arcade.UI
 {
     public class SpaceVillainArcadeBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/EntitySystems/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
similarity index 97%
rename from Content.Client/GameObjects/EntitySystems/BackgroundAudioSystem.cs
rename to Content.Client/Audio/BackgroundAudioSystem.cs
index 80b826bb10..c426ffec08 100644
--- a/Content.Client/GameObjects/EntitySystems/BackgroundAudioSystem.cs
+++ b/Content.Client/Audio/BackgroundAudioSystem.cs
@@ -1,20 +1,21 @@
 #nullable enable
-using Content.Client.Interfaces;
+using Content.Client.GameTicking.Managers;
+using Content.Client.Lobby;
+using Content.Client.Viewport;
+using Content.Shared;
 using Content.Shared.Audio;
 using JetBrains.Annotations;
-using Content.Shared;
+using Robust.Client;
+using Robust.Client.State;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Client;
-using Robust.Client.State;
-using Content.Client.State;
-using Robust.Shared.Player;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Audio
 {
     [UsedImplicitly]
     public class BackgroundAudioSystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/Body/BodyComponent.cs b/Content.Client/Body/Components/BodyComponent.cs
similarity index 70%
rename from Content.Client/GameObjects/Components/Body/BodyComponent.cs
rename to Content.Client/Body/Components/BodyComponent.cs
index 9e60d8262e..5ddaac9e0a 100644
--- a/Content.Client/GameObjects/Components/Body/BodyComponent.cs
+++ b/Content.Client/Body/Components/BodyComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Body
+namespace Content.Client.Body.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IBody))]
diff --git a/Content.Client/GameObjects/Components/Body/Part/BodyPartComponent.cs b/Content.Client/Body/Components/BodyPartComponent.cs
similarity index 67%
rename from Content.Client/GameObjects/Components/Body/Part/BodyPartComponent.cs
rename to Content.Client/Body/Components/BodyPartComponent.cs
index 718e70c669..2b797c64ed 100644
--- a/Content.Client/GameObjects/Components/Body/Part/BodyPartComponent.cs
+++ b/Content.Client/Body/Components/BodyPartComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Body.Part
+namespace Content.Client.Body.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedBodyPartComponent))]
diff --git a/Content.Client/GameObjects/Components/Body/Mechanism/MechanismComponent.cs b/Content.Client/Body/Components/MechanismComponent.cs
similarity index 64%
rename from Content.Client/GameObjects/Components/Body/Mechanism/MechanismComponent.cs
rename to Content.Client/Body/Components/MechanismComponent.cs
index 72f7e114d8..f5d1b50404 100644
--- a/Content.Client/GameObjects/Components/Body/Mechanism/MechanismComponent.cs
+++ b/Content.Client/Body/Components/MechanismComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Body.Mechanism;
+using Content.Shared.Body.Mechanism;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Body.Mechanism
+namespace Content.Client.Body.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedMechanismComponent))]
diff --git a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs b/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs
rename to Content.Client/Body/UI/BodyScannerBoundUserInterface.cs
index 178a9d727a..ba85e6691c 100644
--- a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerBoundUserInterface.cs
+++ b/Content.Client/Body/UI/BodyScannerBoundUserInterface.cs
@@ -1,11 +1,11 @@
 using System;
-using Content.Shared.GameObjects.Components.Body.Scanner;
+using Content.Shared.Body.Scanner;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Body.Scanner
+namespace Content.Client.Body.UI
 {
     [UsedImplicitly]
     public class BodyScannerBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs b/Content.Client/Body/UI/BodyScannerDisplay.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs
rename to Content.Client/Body/UI/BodyScannerDisplay.cs
index 119d31d21b..947014f3b4 100644
--- a/Content.Client/GameObjects/Components/Body/Scanner/BodyScannerDisplay.cs
+++ b/Content.Client/Body/UI/BodyScannerDisplay.cs
@@ -1,8 +1,8 @@
 using System.Linq;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
+using Content.Shared.Damage.Components;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
@@ -10,7 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using static Robust.Client.UserInterface.Controls.ItemList;
 
-namespace Content.Client.GameObjects.Components.Body.Scanner
+namespace Content.Client.Body.UI
 {
     public sealed class BodyScannerDisplay : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs b/Content.Client/Body/UI/SurgeryBoundUserInterface.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs
rename to Content.Client/Body/UI/SurgeryBoundUserInterface.cs
index 46ed53c954..7f5a004b9b 100644
--- a/Content.Client/GameObjects/Components/Body/Surgery/SurgeryBoundUserInterface.cs
+++ b/Content.Client/Body/UI/SurgeryBoundUserInterface.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Body.Surgery;
+using Content.Shared.Body.Surgery;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Body.Surgery
+namespace Content.Client.Body.UI
 {
     // TODO BODY Make window close if target or surgery tool gets too far away from user.
 
diff --git a/Content.Client/GameObjects/Components/Body/Surgery/SurgeryWindow.cs b/Content.Client/Body/UI/SurgeryWindow.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Body/Surgery/SurgeryWindow.cs
rename to Content.Client/Body/UI/SurgeryWindow.cs
index 4940e0463f..8cd15d7c46 100644
--- a/Content.Client/GameObjects/Components/Body/Surgery/SurgeryWindow.cs
+++ b/Content.Client/Body/UI/SurgeryWindow.cs
@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Body.Surgery
+namespace Content.Client.Body.UI
 {
     public class SurgeryWindow : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs b/Content.Client/Botany/PlantHolderVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs
rename to Content.Client/Botany/PlantHolderVisualizer.cs
index 4b6f5dd70f..485d225ed2 100644
--- a/Content.Client/GameObjects/Components/Botany/PlantHolderVisualizer.cs
+++ b/Content.Client/Botany/PlantHolderVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Botany;
+using Content.Shared.Botany;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
-namespace Content.Client.GameObjects.Components.Botany
+namespace Content.Client.Botany
 {
     [UsedImplicitly]
     public class PlantHolderVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Client/Buckle/BuckleComponent.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs
rename to Content.Client/Buckle/BuckleComponent.cs
index e8d5cc9877..542fb4e3ef 100644
--- a/Content.Client/GameObjects/Components/Buckle/BuckleComponent.cs
+++ b/Content.Client/Buckle/BuckleComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Buckle;
+using Content.Shared.Buckle.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Buckle
+namespace Content.Client.Buckle
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedBuckleComponent))]
diff --git a/Content.Client/Buckle/BuckleSystem.cs b/Content.Client/Buckle/BuckleSystem.cs
new file mode 100644
index 0000000000..e558ab70af
--- /dev/null
+++ b/Content.Client/Buckle/BuckleSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Buckle;
+
+namespace Content.Client.Buckle
+{
+    internal sealed class BuckleSystem : SharedBuckleSystem
+    {
+
+    }
+}
diff --git a/Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs b/Content.Client/Buckle/BuckleVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs
rename to Content.Client/Buckle/BuckleVisualizer.cs
index adfc5369d0..7d748cca5f 100644
--- a/Content.Client/GameObjects/Components/Buckle/BuckleVisualizer.cs
+++ b/Content.Client/Buckle/BuckleVisualizer.cs
@@ -1,13 +1,12 @@
 using System;
-using Content.Shared.GameObjects.Components.Buckle;
-using Content.Shared.GameObjects.Components.Strap;
+using Content.Shared.Buckle.Components;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Buckle
+namespace Content.Client.Buckle
 {
     [UsedImplicitly]
     public class BuckleVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Strap/StrapComponent.cs b/Content.Client/Buckle/Strap/StrapComponent.cs
similarity index 64%
rename from Content.Client/GameObjects/Components/Strap/StrapComponent.cs
rename to Content.Client/Buckle/Strap/StrapComponent.cs
index 6e25fa61fe..5bfa5520a0 100644
--- a/Content.Client/GameObjects/Components/Strap/StrapComponent.cs
+++ b/Content.Client/Buckle/Strap/StrapComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Strap;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Buckle.Components;
+using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Strap
+namespace Content.Client.Buckle.Strap
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedStrapComponent))]
diff --git a/Content.Client/GameObjects/Components/ItemCabinetVisualizer.cs b/Content.Client/Cabinet/ItemCabinetVisualizer.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/ItemCabinetVisualizer.cs
rename to Content.Client/Cabinet/ItemCabinetVisualizer.cs
index 3044e5e908..b095c62731 100644
--- a/Content.Client/GameObjects/Components/ItemCabinetVisualizer.cs
+++ b/Content.Client/Cabinet/ItemCabinetVisualizer.cs
@@ -1,10 +1,9 @@
-using System.ComponentModel.DataAnnotations;
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Cabinet;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Cabinet
 {
     [UsedImplicitly]
     public class ItemCabinetVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs b/Content.Client/Camera/CameraRecoilComponent.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
rename to Content.Client/Camera/CameraRecoilComponent.cs
index c01df83129..016c9122b8 100644
--- a/Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
+++ b/Content.Client/Camera/CameraRecoilComponent.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Camera;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
@@ -7,7 +7,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.Camera
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedCameraRecoilComponent))]
diff --git a/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs b/Content.Client/Camera/CameraRecoilSystem.cs
similarity index 82%
rename from Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs
rename to Content.Client/Camera/CameraRecoilSystem.cs
index 606a438f5e..e84a0ee78a 100644
--- a/Content.Client/GameObjects/EntitySystems/CameraRecoilSystem.cs
+++ b/Content.Client/Camera/CameraRecoilSystem.cs
@@ -1,8 +1,7 @@
-using Content.Client.GameObjects.Components.Mobs;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Camera
 {
     [UsedImplicitly]
     public sealed class CameraRecoilSystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs b/Content.Client/Cargo/CargoConsoleBoundUserInterface.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs
rename to Content.Client/Cargo/CargoConsoleBoundUserInterface.cs
index f875091bb4..4e85b9fe3a 100644
--- a/Content.Client/GameObjects/Components/Cargo/CargoConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/CargoConsoleBoundUserInterface.cs
@@ -1,14 +1,14 @@
-using System;
-using Content.Client.UserInterface.Cargo;
-using Content.Shared.GameObjects.Components.Cargo;
-using Content.Shared.Prototypes.Cargo;
+using Content.Client.Cargo.Components;
+using Content.Client.Cargo.UI;
+using Content.Shared.Cargo;
+using Content.Shared.Cargo.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Cargo.SharedCargoConsoleComponent;
+using static Content.Shared.Cargo.Components.SharedCargoConsoleComponent;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.GameObjects.Components.Cargo
+namespace Content.Client.Cargo
 {
     public class CargoConsoleBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs b/Content.Client/Cargo/Components/CargoOrderDatabaseComponent.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs
rename to Content.Client/Cargo/Components/CargoOrderDatabaseComponent.cs
index d0f8963deb..f99c6dc46d 100644
--- a/Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs
+++ b/Content.Client/Cargo/Components/CargoOrderDatabaseComponent.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Cargo;
-using Content.Shared.Prototypes.Cargo;
+using Content.Shared.Cargo;
+using Content.Shared.Cargo.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Cargo
+namespace Content.Client.Cargo.Components
 {
     [RegisterComponent]
     public class CargoOrderDatabaseComponent : SharedCargoOrderDatabaseComponent
diff --git a/Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs b/Content.Client/Cargo/Components/GalacticMarketComponent.cs
similarity index 87%
rename from Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs
rename to Content.Client/Cargo/Components/GalacticMarketComponent.cs
index 0f3293af4e..27bb68b298 100644
--- a/Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs
+++ b/Content.Client/Cargo/Components/GalacticMarketComponent.cs
@@ -1,11 +1,11 @@
 using System;
-using Content.Shared.GameObjects.Components.Cargo;
-using Content.Shared.Prototypes.Cargo;
+using Content.Shared.Cargo;
+using Content.Shared.Cargo.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.GameObjects.Components.Cargo
+namespace Content.Client.Cargo.Components
 {
     [RegisterComponent]
     public class GalacticMarketComponent : SharedGalacticMarketComponent
diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.cs
similarity index 98%
rename from Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs
rename to Content.Client/Cargo/UI/CargoConsoleMenu.cs
index be51f5c8a7..33889b129a 100644
--- a/Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.Cargo;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.Prototypes.Cargo;
+using Content.Client.Stylesheets;
+using Content.Shared.Cargo;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -12,7 +11,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.UserInterface.Cargo
+namespace Content.Client.Cargo.UI
 {
     public class CargoConsoleMenu : SS14Window
     {
diff --git a/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
similarity index 97%
rename from Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs
rename to Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
index 20bf033b8b..f98bab6d6a 100644
--- a/Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleOrderMenu.cs
@@ -4,7 +4,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Client.UserInterface.Cargo
+namespace Content.Client.Cargo.UI
 {
     class CargoConsoleOrderMenu : SS14Window
     {
diff --git a/Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs b/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
similarity index 90%
rename from Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs
rename to Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
index 26ce03c35f..bc7ce49b70 100644
--- a/Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs
+++ b/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
@@ -1,10 +1,9 @@
-using Content.Client.GameObjects.Components.Cargo;
-using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Client.UserInterface.Cargo
+namespace Content.Client.Cargo.UI
 {
     public class GalacticBankSelectionMenu : SS14Window
     {
diff --git a/Content.Client/Changelog/ChangelogButton.cs b/Content.Client/Changelog/ChangelogButton.cs
index d5d0a3526b..9178708ef1 100644
--- a/Content.Client/Changelog/ChangelogButton.cs
+++ b/Content.Client/Changelog/ChangelogButton.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml
index 047b4ce809..cd76429379 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -1,7 +1,7 @@
 <changelog:ChangelogWindow xmlns="https://spacestation14.io"
                            xmlns:cui="clr-namespace:Content.Client.UserInterface"
-                           xmlns:cuic="clr-namespace:Content.Client.UserInterface.Controls"
                            xmlns:changelog="clr-namespace:Content.Client.Changelog"
+                           xmlns:ui="clr-namespace:Content.Client.HUD.UI"
                            MinSize="500 400" MouseFilter="Stop">
     <PanelContainer StyleClasses="AngleRect" />
     <VBoxContainer>
@@ -11,7 +11,7 @@
             <TextureButton Margin="0 0 8 0" Name="CloseButton" StyleClasses="windowCloseButton"
                            VerticalAlignment="Center" />
         </HBoxContainer>
-        <cuic:HighDivider />
+        <ui:HighDivider />
 
         <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
             <VBoxContainer Name="ChangelogBody" />
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index dce9dca690..f5e4360f1c 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs b/Content.Client/CharacterAppearance/HumanoidAppearanceComponent.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs
rename to Content.Client/CharacterAppearance/HumanoidAppearanceComponent.cs
index 7c67aa3650..8245cb344d 100644
--- a/Content.Client/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs
+++ b/Content.Client/CharacterAppearance/HumanoidAppearanceComponent.cs
@@ -1,16 +1,15 @@
-using Content.Client.GameObjects.Components.ActionBlocking;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.Preferences;
-using Content.Shared.Preferences.Appearance;
+using Content.Client.Cuffs.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using Content.Shared.CharacterAppearance;
+using Content.Shared.CharacterAppearance.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.CharacterAppearance
 {
     [RegisterComponent]
     public sealed class HumanoidAppearanceComponent : SharedHumanoidAppearanceComponent, IBodyPartAdded, IBodyPartRemoved
diff --git a/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs
rename to Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
index 3dd39e460b..1fbdebd375 100644
--- a/Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs
+++ b/Content.Client/CharacterAppearance/MagicMirrorBoundUserInterface.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.Preferences.Appearance;
+using Content.Client.Stylesheets;
+using Content.Shared.CharacterAppearance;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
@@ -12,9 +12,9 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using static Content.Shared.GameObjects.Components.SharedMagicMirrorComponent;
+using static Content.Shared.CharacterAppearance.Components.SharedMagicMirrorComponent;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.CharacterAppearance
 {
     [UsedImplicitly]
     public class MagicMirrorBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs
rename to Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
index 3ae0720475..89bb8d1b96 100644
--- a/Content.Client/GameObjects/Components/Actor/CharacterInfoComponent.cs
+++ b/Content.Client/CharacterInfo/Components/CharacterInfoComponent.cs
@@ -1,7 +1,7 @@
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.GameObjects.Components.Actor;
+using Content.Client.CharacterInterface;
+using Content.Client.HUD.UI;
+using Content.Client.Stylesheets;
+using Content.Shared.CharacterInfo;
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -14,7 +14,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 
-namespace Content.Client.GameObjects.Components.Actor
+namespace Content.Client.CharacterInfo.Components
 {
     [RegisterComponent]
     public sealed class CharacterInfoComponent : SharedCharacterInfoComponent, ICharacterUI
diff --git a/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs b/Content.Client/CharacterInfo/Components/ICharacterUI.cs
similarity index 86%
rename from Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs
rename to Content.Client/CharacterInfo/Components/ICharacterUI.cs
index 80968a7c07..f71f1b0ca4 100644
--- a/Content.Client/GameObjects/Components/Mobs/ICharacterUI.cs
+++ b/Content.Client/CharacterInfo/Components/ICharacterUI.cs
@@ -1,7 +1,7 @@
-using Content.Client.GameObjects.Components.Actor;
+using Content.Client.CharacterInterface;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.CharacterInfo.Components
 {
     /// <summary>
     /// An interface which is gathered to assemble the character window from multiple components
diff --git a/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs b/Content.Client/CharacterInfo/ProgressTextureRect.cs
similarity index 84%
rename from Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs
rename to Content.Client/CharacterInfo/ProgressTextureRect.cs
index 42dc00a236..57e75bc27d 100644
--- a/Content.Client/GameObjects/Components/Actor/ProgressTextureRect.cs
+++ b/Content.Client/CharacterInfo/ProgressTextureRect.cs
@@ -1,10 +1,10 @@
 using System;
-using Content.Client.GameObjects.EntitySystems.DoAfter;
+using Content.Client.DoAfter.UI;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Actor
+namespace Content.Client.CharacterInfo
 {
     public class ProgressTextureRect : TextureRect
     {
diff --git a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
rename to Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
index ce07d10ae1..9e304defb2 100644
--- a/Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
+++ b/Content.Client/CharacterInterface/CharacterInterfaceComponent.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.UserInterface;
+using Content.Client.CharacterInfo.Components;
+using Content.Client.HUD;
 using Content.Shared.Input;
 using Robust.Client.GameObjects;
 using Robust.Client.Input;
@@ -10,14 +10,14 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GameObjects.Components.Actor
+namespace Content.Client.CharacterInterface
 {
     /// <summary>
     /// A semi-abstract component which gets added to entities upon attachment and collects all character
     /// user interfaces into a single window and keybind for the user
     /// </summary>
     [RegisterComponent]
-    public class CharacterInterface : Component
+    public class CharacterInterfaceComponent : Component
     {
         [Dependency] private readonly IGameHud _gameHud = default!;
 
diff --git a/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs b/Content.Client/CharacterInterface/CharacterInterfaceSystem.cs
similarity index 91%
rename from Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs
rename to Content.Client/CharacterInterface/CharacterInterfaceSystem.cs
index e55ad1fcea..f188120aa5 100644
--- a/Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs
+++ b/Content.Client/CharacterInterface/CharacterInterfaceSystem.cs
@@ -1,5 +1,4 @@
-using Content.Client.GameObjects.Components.Actor;
-using Content.Client.UserInterface;
+using Content.Client.HUD;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.Player;
@@ -8,7 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.CharacterInterface
 {
     [UsedImplicitly]
     public sealed class CharacterInterfaceSystem : EntitySystem
@@ -35,7 +34,7 @@ namespace Content.Client.GameObjects.EntitySystems
         private void HandleOpenCharacterMenu()
         {
             if (_playerManager.LocalPlayer?.ControlledEntity == null
-                || !_playerManager.LocalPlayer.ControlledEntity.TryGetComponent(out CharacterInterface? characterInterface))
+                || !_playerManager.LocalPlayer.ControlledEntity.TryGetComponent(out CharacterInterfaceComponent? characterInterface))
             {
                 return;
             }
diff --git a/Content.Client/Utility/ChatHelper.cs b/Content.Client/Chat/ChatHelper.cs
similarity index 94%
rename from Content.Client/Utility/ChatHelper.cs
rename to Content.Client/Chat/ChatHelper.cs
index 459bf0c2f6..076a6995cf 100644
--- a/Content.Client/Utility/ChatHelper.cs
+++ b/Content.Client/Chat/ChatHelper.cs
@@ -1,7 +1,7 @@
 using Content.Shared.Chat;
 using Robust.Shared.Maths;
 
-namespace Content.Client.Utility
+namespace Content.Client.Chat
 {
     public class ChatHelper
     {
diff --git a/Content.Client/Chat/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
similarity index 99%
rename from Content.Client/Chat/ChatManager.cs
rename to Content.Client/Chat/Managers/ChatManager.cs
index a161db96e1..1a60027cc0 100644
--- a/Content.Client/Chat/ChatManager.cs
+++ b/Content.Client/Chat/Managers/ChatManager.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.Administration;
-using Content.Client.GameObjects.Components.Observer;
-using Content.Client.Interfaces.Chat;
-using Content.Client.Utility;
+using Content.Client.Administration.Managers;
+using Content.Client.Chat.UI;
+using Content.Client.Ghost;
 using Content.Shared.Administration;
 using Content.Shared.Chat;
 using Robust.Client.Console;
@@ -20,7 +19,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Chat
+namespace Content.Client.Chat.Managers
 {
     internal sealed class ChatManager : IChatManager, IPostInjectInit
     {
diff --git a/Content.Client/Interfaces/Chat/IChatManager.cs b/Content.Client/Chat/Managers/IChatManager.cs
similarity index 91%
rename from Content.Client/Interfaces/Chat/IChatManager.cs
rename to Content.Client/Chat/Managers/IChatManager.cs
index f52151c92a..64367365f2 100644
--- a/Content.Client/Interfaces/Chat/IChatManager.cs
+++ b/Content.Client/Chat/Managers/IChatManager.cs
@@ -1,9 +1,9 @@
 using System;
-using Content.Client.Chat;
+using Content.Client.Chat.UI;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Timing;
 
-namespace Content.Client.Interfaces.Chat
+namespace Content.Client.Chat.Managers
 {
     public interface IChatManager
     {
diff --git a/Content.Client/Chat/ChatBox.cs b/Content.Client/Chat/UI/ChatBox.cs
similarity index 99%
rename from Content.Client/Chat/ChatBox.cs
rename to Content.Client/Chat/UI/ChatBox.cs
index 2bf877d901..08a6ffaf2f 100644
--- a/Content.Client/Chat/ChatBox.cs
+++ b/Content.Client/Chat/UI/ChatBox.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Immutable;
 using System.Linq;
-using Content.Client.State;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Alerts.UI;
+using Content.Client.Chat.Managers;
+using Content.Client.Lobby;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
 using Content.Shared.Chat;
 using Content.Shared.Input;
 using Robust.Client.Graphics;
@@ -20,7 +20,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Chat
+namespace Content.Client.Chat.UI
 {
     public class ChatBox : Control
     {
diff --git a/Content.Client/Chat/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs
similarity index 98%
rename from Content.Client/Chat/SpeechBubble.cs
rename to Content.Client/Chat/UI/SpeechBubble.cs
index 56dbc5da7f..ef57ad96c3 100644
--- a/Content.Client/Chat/SpeechBubble.cs
+++ b/Content.Client/Chat/UI/SpeechBubble.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Client.Interfaces.Chat;
+using Content.Client.Chat.Managers;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -7,7 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.Chat
+namespace Content.Client.Chat.UI
 {
     public abstract class SpeechBubble : Control
     {
diff --git a/Content.Client/Chemistry/ChemicalReactionSystem.cs b/Content.Client/Chemistry/ChemicalReactionSystem.cs
new file mode 100644
index 0000000000..71f3817792
--- /dev/null
+++ b/Content.Client/Chemistry/ChemicalReactionSystem.cs
@@ -0,0 +1,9 @@
+using Content.Shared.Chemistry.Reaction;
+
+namespace Content.Client.Chemistry
+{
+    public class ChemicalReactionSystem : SharedChemicalReactionSystem
+    {
+
+    }
+}
diff --git a/Content.Client/GameObjects/Components/Chemistry/HyposprayComponent.cs b/Content.Client/Chemistry/Components/HyposprayComponent.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Chemistry/HyposprayComponent.cs
rename to Content.Client/Chemistry/Components/HyposprayComponent.cs
index c9a9aeb984..90d830ffa6 100644
--- a/Content.Client/GameObjects/Components/Chemistry/HyposprayComponent.cs
+++ b/Content.Client/Chemistry/Components/HyposprayComponent.cs
@@ -1,7 +1,8 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Client.Items.Components;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
@@ -9,7 +10,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.Chemistry.Components
 {
     [RegisterComponent]
     public sealed class HyposprayComponent : SharedHyposprayComponent, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs b/Content.Client/Chemistry/Components/InjectorComponent.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs
rename to Content.Client/Chemistry/Components/InjectorComponent.cs
index c3e037f167..8e6244caf0 100644
--- a/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs
+++ b/Content.Client/Chemistry/Components/InjectorComponent.cs
@@ -1,7 +1,8 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Client.Items.Components;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
@@ -9,7 +10,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.Chemistry.Components
 {
     /// <summary>
     /// Client behavior for injectors & syringes. Used for item status on injectors
diff --git a/Content.Client/GameObjects/Components/Chemistry/SolutionContainerComponent.cs b/Content.Client/Chemistry/Components/SolutionContainerComponent.cs
similarity index 66%
rename from Content.Client/GameObjects/Components/Chemistry/SolutionContainerComponent.cs
rename to Content.Client/Chemistry/Components/SolutionContainerComponent.cs
index d635cb3c78..98ecdfee9a 100644
--- a/Content.Client/GameObjects/Components/Chemistry/SolutionContainerComponent.cs
+++ b/Content.Client/Chemistry/Components/SolutionContainerComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.Chemistry.Solution.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.Chemistry.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedSolutionContainerComponent))]
diff --git a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs
rename to Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
index fa8e504b06..b3a0297ae8 100644
--- a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterBoundUserInterface.cs
@@ -1,11 +1,11 @@
-using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
+using Content.Shared.Chemistry.Dispenser;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent;
+using static Content.Shared.Chemistry.Components.SharedChemMasterComponent;
 
-namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
+namespace Content.Client.Chemistry.UI
 {
     /// <summary>
     /// Initializes a <see cref="ChemMasterWindow"/> and updates it when new server messages are received.
diff --git a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs b/Content.Client/Chemistry/UI/ChemMasterWindow.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs
rename to Content.Client/Chemistry/UI/ChemMasterWindow.cs
index 43b2ccbb0e..da84103c29 100644
--- a/Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs
+++ b/Content.Client/Chemistry/UI/ChemMasterWindow.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
+using Content.Client.Stylesheets;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -12,10 +12,10 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent;
+using static Content.Shared.Chemistry.Components.SharedChemMasterComponent;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
+namespace Content.Client.Chemistry.UI
 {
     /// <summary>
     /// Client-side UI used to control a <see cref="SharedChemMasterComponent"/>
diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs
rename to Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
index 6f6b70b04e..5036adfe30 100644
--- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserBoundUserInterface.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
+using Content.Shared.Chemistry.Dispenser;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;
+using static Content.Shared.Chemistry.Dispenser.SharedReagentDispenserComponent;
 
-namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
+namespace Content.Client.Chemistry.UI
 {
     /// <summary>
     /// Initializes a <see cref="ReagentDispenserWindow"/> and updates it when new server messages are received.
diff --git a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs
rename to Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
index df33c06a5d..ede41c8ec8 100644
--- a/Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs
+++ b/Content.Client/Chemistry/UI/ReagentDispenserWindow.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
+using Content.Client.Stylesheets;
+using Content.Shared.Chemistry.Dispenser;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -11,9 +11,9 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;
+using static Content.Shared.Chemistry.Dispenser.SharedReagentDispenserComponent;
 
-namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
+namespace Content.Client.Chemistry.UI
 {
     /// <summary>
     /// Client-side UI used to control a <see cref="SharedReagentDispenserComponent"/>
diff --git a/Content.Client/GameObjects/Components/Chemistry/FoamVisualizer.cs b/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/Chemistry/FoamVisualizer.cs
rename to Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
index 662a55f629..fcf756af77 100644
--- a/Content.Client/GameObjects/Components/Chemistry/FoamVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/FoamVisualizer.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.Foam;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
@@ -7,7 +7,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.Chemistry.Visualizers
 {
     [UsedImplicitly]
     public class FoamVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/GameObjects/Components/Chemistry/SmokeVisualizer.cs b/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
similarity index 83%
rename from Content.Client/GameObjects/Components/Chemistry/SmokeVisualizer.cs
rename to Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
index a39b8494f4..bfc386948b 100644
--- a/Content.Client/GameObjects/Components/Chemistry/SmokeVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/SmokeVisualizer.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.Smoking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.Chemistry.Visualizers
 {
     [UsedImplicitly]
     public class SmokeVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs
rename to Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs
index 1e9430a699..dfb9d4cfb3 100644
--- a/Content.Client/GameObjects/Components/Chemistry/SolutionContainerVisualizer.cs
+++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualizer.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.Chemistry.Solution.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.Chemistry.Visualizers
 {
     [UsedImplicitly]
     public class SolutionContainerVisualizer : AppearanceVisualizer
diff --git a/Content.Client/ClickMapManager.cs b/Content.Client/Clickable/ClickMapManager.cs
similarity index 99%
rename from Content.Client/ClickMapManager.cs
rename to Content.Client/Clickable/ClickMapManager.cs
index 0e4d68e9ab..497a8a7493 100644
--- a/Content.Client/ClickMapManager.cs
+++ b/Content.Client/Clickable/ClickMapManager.cs
@@ -10,7 +10,7 @@ using Robust.Shared.ViewVariables;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace Content.Client
+namespace Content.Client.Clickable
 {
     internal class ClickMapManager : IClickMapManager, IPostInjectInit
     {
diff --git a/Content.Client/GameObjects/Components/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs
similarity index 99%
rename from Content.Client/GameObjects/Components/ClickableComponent.cs
rename to Content.Client/Clickable/ClickableComponent.cs
index a1f104b989..2037602bf1 100644
--- a/Content.Client/GameObjects/Components/ClickableComponent.cs
+++ b/Content.Client/Clickable/ClickableComponent.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Clickable
 {
     [RegisterComponent]
     public sealed class ClickableComponent : Component
diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs b/Content.Client/Cloning/CloningPodVisualizer.cs
similarity index 80%
rename from Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs
rename to Content.Client/Cloning/CloningPodVisualizer.cs
index 4db0cc6836..6a16cbe281 100644
--- a/Content.Client/GameObjects/Components/CloningPod/CloningPodVisualizer.cs
+++ b/Content.Client/Cloning/CloningPodVisualizer.cs
@@ -1,10 +1,10 @@
 using System;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
-using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent.CloningPodStatus;
+using static Content.Shared.Cloning.SharedCloningPodComponent;
+using static Content.Shared.Cloning.SharedCloningPodComponent.CloningPodStatus;
 
-namespace Content.Client.GameObjects.Components.CloningPod
+namespace Content.Client.Cloning
 {
     [UsedImplicitly]
     public class CloningPodVisualizer : AppearanceVisualizer
@@ -24,7 +24,7 @@ namespace Content.Client.GameObjects.Components.CloningPod
             //TODO: Find a use for GORE POD
             switch (status)
             {
-                case Cloning: return "pod_1";
+                case CloningPodStatus.Cloning: return "pod_1";
                 case NoMind: return "pod_e";
                 case Gore: return "pod_g";
                 case Idle: return "pod_0";
diff --git a/Content.Client/GameObjects/Components/MagbootsComponent.cs b/Content.Client/Cloning/MagbootsComponent.cs
similarity index 82%
rename from Content.Client/GameObjects/Components/MagbootsComponent.cs
rename to Content.Client/Cloning/MagbootsComponent.cs
index afbaeb62ad..dce398cf52 100644
--- a/Content.Client/GameObjects/Components/MagbootsComponent.cs
+++ b/Content.Client/Cloning/MagbootsComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Clothing;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Cloning
 {
     [RegisterComponent]
     public sealed class MagbootsComponent : SharedMagbootsComponent
diff --git a/Content.Client/GameObjects/Components/Observer/AcceptCloningEui.cs b/Content.Client/Cloning/UI/AcceptCloningEui.cs
similarity index 88%
rename from Content.Client/GameObjects/Components/Observer/AcceptCloningEui.cs
rename to Content.Client/Cloning/UI/AcceptCloningEui.cs
index a566abda0e..41626579db 100644
--- a/Content.Client/GameObjects/Components/Observer/AcceptCloningEui.cs
+++ b/Content.Client/Cloning/UI/AcceptCloningEui.cs
@@ -1,8 +1,8 @@
 using Content.Client.Eui;
-using Content.Shared.GameObjects.Components.Observer;
+using Content.Shared.Cloning;
 using JetBrains.Annotations;
 
-namespace Content.Client.GameObjects.Components.Observer
+namespace Content.Client.Cloning.UI
 {
     [UsedImplicitly]
     public class AcceptCloningEui : BaseEui
diff --git a/Content.Client/GameObjects/Components/Observer/AcceptCloningWindow.cs b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Observer/AcceptCloningWindow.cs
rename to Content.Client/Cloning/UI/AcceptCloningWindow.cs
index ebea63ae7f..40204566a9 100644
--- a/Content.Client/GameObjects/Components/Observer/AcceptCloningWindow.cs
+++ b/Content.Client/Cloning/UI/AcceptCloningWindow.cs
@@ -3,7 +3,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 
-namespace Content.Client.GameObjects.Components.Observer
+namespace Content.Client.Cloning.UI
 {
     public sealed class AcceptCloningWindow : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs b/Content.Client/Cloning/UI/CloningPodBoundUserInterface.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs
rename to Content.Client/Cloning/UI/CloningPodBoundUserInterface.cs
index f0ad47c23b..e28f40d203 100644
--- a/Content.Client/GameObjects/Components/CloningPod/CloningPodBoundUserInterface.cs
+++ b/Content.Client/Cloning/UI/CloningPodBoundUserInterface.cs
@@ -2,9 +2,9 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
+using static Content.Shared.Cloning.SharedCloningPodComponent;
 
-namespace Content.Client.GameObjects.Components.CloningPod
+namespace Content.Client.Cloning.UI
 {
     [UsedImplicitly]
     public class CloningPodBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/CloningPod/CloningPodWindow.cs b/Content.Client/Cloning/UI/CloningPodWindow.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/CloningPod/CloningPodWindow.cs
rename to Content.Client/Cloning/UI/CloningPodWindow.cs
index 066c5bc25a..88535ee606 100644
--- a/Content.Client/GameObjects/Components/CloningPod/CloningPodWindow.cs
+++ b/Content.Client/Cloning/UI/CloningPodWindow.cs
@@ -1,16 +1,16 @@
 using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Diagnostics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using Robust.Shared.IoC;
 using Robust.Shared.Timing;
-using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
+using static Content.Shared.Cloning.SharedCloningPodComponent;
 
-namespace Content.Client.GameObjects.Components.CloningPod
+namespace Content.Client.Cloning.UI
 {
     public sealed class CloningPodWindow : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs b/Content.Client/Clothing/ClothingComponent.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
rename to Content.Client/Clothing/ClothingComponent.cs
index bb08aa0808..e9c53322c9 100644
--- a/Content.Client/GameObjects/Components/Clothing/ClothingComponent.cs
+++ b/Content.Client/Clothing/ClothingComponent.cs
@@ -1,10 +1,10 @@
 #nullable enable
-using Content.Client.GameObjects.Components.HUD.Inventory;
-using Content.Client.GameObjects.Components.Items;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Storage;
+using Content.Client.Inventory;
+using Content.Client.Items.Components;
+using Content.Shared.Clothing;
+using Content.Shared.Inventory;
+using Content.Shared.Item;
+using Content.Shared.NetIDs;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Containers;
@@ -13,7 +13,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Clothing
+namespace Content.Client.Clothing
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedItemComponent))]
diff --git a/Content.Client/Graphics/Overlays/ColoredScreenBorderOverlay.cs b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
similarity index 94%
rename from Content.Client/Graphics/Overlays/ColoredScreenBorderOverlay.cs
rename to Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
index e7c28fb1c2..4fc1d7a908 100644
--- a/Content.Client/Graphics/Overlays/ColoredScreenBorderOverlay.cs
+++ b/Content.Client/CombatMode/ColoredScreenBorderOverlay.cs
@@ -4,9 +4,8 @@ using Robust.Shared.Enums;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using System;
 
-namespace Content.Client.Graphics.Overlays
+namespace Content.Client.CombatMode
 {
     public class ColoredScreenBorderOverlay : Overlay
     {
diff --git a/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs b/Content.Client/CombatMode/CombatModeComponent.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
rename to Content.Client/CombatMode/CombatModeComponent.cs
index 927c94594d..9ef65829e9 100644
--- a/Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
+++ b/Content.Client/CombatMode/CombatModeComponent.cs
@@ -1,11 +1,12 @@
-using Content.Client.UserInterface;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Client.HUD;
+using Content.Shared.CombatMode;
+using Content.Shared.Targeting;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.CombatMode
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedCombatModeComponent))]
diff --git a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Client/CombatMode/CombatModeSystem.cs
similarity index 76%
rename from Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
rename to Content.Client/CombatMode/CombatModeSystem.cs
index ea36ea018e..f50c62d0db 100644
--- a/Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
+++ b/Content.Client/CombatMode/CombatModeSystem.cs
@@ -1,18 +1,13 @@
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.UserInterface;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystemMessages;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Input;
+using Content.Client.HUD;
+using Content.Shared.CombatMode;
+using Content.Shared.Targeting;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
-using Robust.Shared.Players;
-using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.CombatMode
 {
     [UsedImplicitly]
     public sealed class CombatModeSystem : SharedCombatModeSystem
diff --git a/Content.Client/Commands/CreditsCommand.cs b/Content.Client/Commands/CreditsCommand.cs
index f3fa57e85e..417f9c3eb4 100644
--- a/Content.Client/Commands/CreditsCommand.cs
+++ b/Content.Client/Commands/CreditsCommand.cs
@@ -1,3 +1,4 @@
+using Content.Client.Credits;
 using Content.Client.UserInterface;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
diff --git a/Content.Client/Commands/DebugAiCommand.cs b/Content.Client/Commands/DebugAiCommand.cs
index f8a2de1152..da453d3059 100644
--- a/Content.Client/Commands/DebugAiCommand.cs
+++ b/Content.Client/Commands/DebugAiCommand.cs
@@ -1,4 +1,4 @@
-using Content.Client.GameObjects.EntitySystems.AI;
+using Content.Client.AI;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
diff --git a/Content.Client/Commands/DebugCommands.cs b/Content.Client/Commands/DebugCommands.cs
index 1f94d59228..091d6532f5 100644
--- a/Content.Client/Commands/DebugCommands.cs
+++ b/Content.Client/Commands/DebugCommands.cs
@@ -3,14 +3,16 @@
 using System;
 using Content.Client.GameObjects.Components;
 using Content.Client.GameObjects.EntitySystems;
-using Content.Client.Interfaces;
+using Content.Client.Markers;
+using Content.Client.Notifications.Managers;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.SubFloor;
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using DrawDepth = Content.Shared.GameObjects.DrawDepth;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
 namespace Content.Client.Commands
 {
diff --git a/Content.Client/Commands/DebugPathfindingCommand.cs b/Content.Client/Commands/DebugPathfindingCommand.cs
index 8e6f623833..6484edd716 100644
--- a/Content.Client/Commands/DebugPathfindingCommand.cs
+++ b/Content.Client/Commands/DebugPathfindingCommand.cs
@@ -1,4 +1,4 @@
-using Content.Client.GameObjects.EntitySystems.AI;
+using Content.Client.AI;
 using JetBrains.Annotations;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
@@ -58,7 +58,7 @@ namespace Content.Client.Commands
                         debugSystem.ToggleTooltip(PathfindingDebugMode.Regions);
                         anyAction = true;
                         break;
-                    
+
                     default:
                         continue;
                 }
diff --git a/Content.Client/Commands/GroupingContextMenuCommand.cs b/Content.Client/Commands/GroupingContextMenuCommand.cs
index 8489543a37..9e9ee961e4 100644
--- a/Content.Client/Commands/GroupingContextMenuCommand.cs
+++ b/Content.Client/Commands/GroupingContextMenuCommand.cs
@@ -4,7 +4,7 @@ using Content.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
-using ContextMenuView = Content.Client.UserInterface.ContextMenu.ContextMenuView;
+using ContextMenuView = Content.Client.ContextMenu.UI.ContextMenuView;
 
 namespace Content.Client.Commands
 {
diff --git a/Content.Client/Commands/HideMechanismsCommand.cs b/Content.Client/Commands/HideMechanismsCommand.cs
index d0bec6b29d..523f1ac4e7 100644
--- a/Content.Client/Commands/HideMechanismsCommand.cs
+++ b/Content.Client/Commands/HideMechanismsCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.Components.Body.Mechanism;
+using Content.Shared.Body.Mechanism;
 using Robust.Client.Console;
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
diff --git a/Content.Client/Commands/ShowMechanismsCommand.cs b/Content.Client/Commands/ShowMechanismsCommand.cs
index f1762079c1..fc28270e9a 100644
--- a/Content.Client/Commands/ShowMechanismsCommand.cs
+++ b/Content.Client/Commands/ShowMechanismsCommand.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.Components.Body.Mechanism;
+using Content.Shared.Body.Mechanism;
 using Robust.Client.Console;
 using Robust.Client.GameObjects;
 using Robust.Shared.Console;
diff --git a/Content.Client/Commands/ToggleHealthOverlayCommand.cs b/Content.Client/Commands/ToggleHealthOverlayCommand.cs
index 361d158c56..a2c2a55b8b 100644
--- a/Content.Client/Commands/ToggleHealthOverlayCommand.cs
+++ b/Content.Client/Commands/ToggleHealthOverlayCommand.cs
@@ -1,4 +1,4 @@
-using Content.Client.GameObjects.EntitySystems.HealthOverlay;
+using Content.Client.HealthOverlay;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs
rename to Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
index 0a80bef65a..fa7411aeb9 100644
--- a/Content.Client/GameObjects/Components/Command/CommunicationsConsoleBoundUserInterface.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
@@ -1,13 +1,12 @@
 using System;
-using Content.Client.Command;
-using Content.Shared.GameObjects.Components.Command;
+using Content.Shared.Communications;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Command
+namespace Content.Client.Communications.UI
 {
     public class CommunicationsConsoleBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/Command/CommunicationsConsoleMenu.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
similarity index 97%
rename from Content.Client/Command/CommunicationsConsoleMenu.cs
rename to Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
index dd60ac285f..56d8497104 100644
--- a/Content.Client/Command/CommunicationsConsoleMenu.cs
+++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.cs
@@ -1,5 +1,4 @@
 using System.Threading;
-using Content.Client.GameObjects.Components.Command;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -8,7 +7,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Client.Command
+namespace Content.Client.Communications.UI
 {
     public class CommunicationsConsoleMenu : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/ComputerVisualizer.cs b/Content.Client/Computer/ComputerVisualizer.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/ComputerVisualizer.cs
rename to Content.Client/Computer/ComputerVisualizer.cs
index d542b4822c..51485abdc4 100644
--- a/Content.Client/GameObjects/Components/ComputerVisualizer.cs
+++ b/Content.Client/Computer/ComputerVisualizer.cs
@@ -1,12 +1,10 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Computer;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Computer
 {
     [UsedImplicitly]
     public sealed class ComputerVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Configuration/ConfigurationBoundUserInterface.cs b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Configuration/ConfigurationBoundUserInterface.cs
rename to Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
index 58760b27bf..bc4bd2e5ad 100644
--- a/Content.Client/GameObjects/Components/Configuration/ConfigurationBoundUserInterface.cs
+++ b/Content.Client/Configurable/UI/ConfigurationBoundUserInterface.cs
@@ -2,9 +2,9 @@
 using System.Text.RegularExpressions;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.SharedConfigurationComponent;
+using static Content.Shared.Configurable.SharedConfigurationComponent;
 
-namespace Content.Client.GameObjects.Components.Configuration
+namespace Content.Client.Configurable.UI
 {
     public class ConfigurationBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/Components/Configuration/ConfigurationMenu.cs b/Content.Client/Configurable/UI/ConfigurationMenu.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Configuration/ConfigurationMenu.cs
rename to Content.Client/Configurable/UI/ConfigurationMenu.cs
index 74f811074d..ea0c717b3d 100644
--- a/Content.Client/GameObjects/Components/Configuration/ConfigurationMenu.cs
+++ b/Content.Client/Configurable/UI/ConfigurationMenu.cs
@@ -4,10 +4,10 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using static Content.Shared.GameObjects.Components.SharedConfigurationComponent;
+using static Content.Shared.Configurable.SharedConfigurationComponent;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.GameObjects.Components.Configuration
+namespace Content.Client.Configurable.UI
 {
     public class ConfigurationMenu : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Construction/ConstructionGhostComponent.cs b/Content.Client/Construction/ConstructionGhostComponent.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Construction/ConstructionGhostComponent.cs
rename to Content.Client/Construction/ConstructionGhostComponent.cs
index 10bd810bfb..523abd49d1 100644
--- a/Content.Client/GameObjects/Components/Construction/ConstructionGhostComponent.cs
+++ b/Content.Client/Construction/ConstructionGhostComponent.cs
@@ -1,5 +1,5 @@
-using Content.Shared.Construction;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Construction.Prototypes;
+using Content.Shared.Examine;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
@@ -7,7 +7,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Construction
+namespace Content.Client.Construction
 {
     [RegisterComponent]
     public class ConstructionGhostComponent : Component, IExamine
diff --git a/Content.Client/Construction/ConstructionPlacementHijack.cs b/Content.Client/Construction/ConstructionPlacementHijack.cs
index 3c8a8b96cf..153b307672 100644
--- a/Content.Client/Construction/ConstructionPlacementHijack.cs
+++ b/Content.Client/Construction/ConstructionPlacementHijack.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.Construction;
 using Content.Client.GameObjects.EntitySystems;
 using Content.Shared.Construction;
+using Content.Shared.Construction.Prototypes;
 using Robust.Client.Graphics;
 using Robust.Client.Placement;
 using Robust.Client.Utility;
diff --git a/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs
similarity index 97%
rename from Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs
rename to Content.Client/Construction/ConstructionSystem.cs
index d681396f45..6dfb70317a 100644
--- a/Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs
+++ b/Content.Client/Construction/ConstructionSystem.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.Construction;
 using Content.Shared.Construction;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Construction.Prototypes;
 using Content.Shared.Input;
-using Content.Shared.Utility;
+using Content.Shared.Interaction.Helpers;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
@@ -17,7 +16,7 @@ using Robust.Shared.Maths;
 
 #nullable enable
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Construction
 {
     /// <summary>
     /// The client-side implementation of the construction system, which is used for constructing entities in game.
diff --git a/Content.Client/GameObjects/Components/Construction/MachineFrameVisualizer.cs b/Content.Client/Construction/MachineFrameVisualizer.cs
similarity index 81%
rename from Content.Client/GameObjects/Components/Construction/MachineFrameVisualizer.cs
rename to Content.Client/Construction/MachineFrameVisualizer.cs
index ca78c9d66f..ddd6f7147a 100644
--- a/Content.Client/GameObjects/Components/Construction/MachineFrameVisualizer.cs
+++ b/Content.Client/Construction/MachineFrameVisualizer.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Construction;
+using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Construction
+namespace Content.Client.Construction
 {
     [UsedImplicitly]
     public class MachineFrameVisualizer : AppearanceVisualizer
diff --git a/Content.Client/Construction/ConstructionMenu.xaml b/Content.Client/Construction/UI/ConstructionMenu.xaml
similarity index 100%
rename from Content.Client/Construction/ConstructionMenu.xaml
rename to Content.Client/Construction/UI/ConstructionMenu.xaml
diff --git a/Content.Client/Construction/ConstructionMenu.xaml.cs b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
similarity index 99%
rename from Content.Client/Construction/ConstructionMenu.xaml.cs
rename to Content.Client/Construction/UI/ConstructionMenu.xaml.cs
index 0d3922adfc..baad99cf68 100644
--- a/Content.Client/Construction/ConstructionMenu.xaml.cs
+++ b/Content.Client/Construction/UI/ConstructionMenu.xaml.cs
@@ -9,7 +9,7 @@ using Robust.Shared.Localization;
 
 #nullable enable
 
-namespace Content.Client.Construction
+namespace Content.Client.Construction.UI
 {
     /// <summary>
     /// This is the interface for a UI View of the construction window. The point of it is to abstract away the actual
diff --git a/Content.Client/Construction/ConstructionMenuPresenter.cs b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
similarity index 98%
rename from Content.Client/Construction/ConstructionMenuPresenter.cs
rename to Content.Client/Construction/UI/ConstructionMenuPresenter.cs
index 2ee0069caa..344fa4755a 100644
--- a/Content.Client/Construction/ConstructionMenuPresenter.cs
+++ b/Content.Client/Construction/UI/ConstructionMenuPresenter.cs
@@ -2,11 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Client.UserInterface;
-using Content.Client.Utility;
-using Content.Shared.Construction;
-using Content.Shared.GameObjects.Components.Interactable;
+using Content.Client.HUD;
+using Content.Client.Resources;
+using Content.Shared.Construction.Prototypes;
+using Content.Shared.Construction.Steps;
+using Content.Shared.Tool;
 using Robust.Client.Graphics;
 using Robust.Client.Placement;
 using Robust.Client.ResourceManagement;
@@ -18,7 +18,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.Construction
+namespace Content.Client.Construction.UI
 {
     /// <summary>
     /// This class presents the Construction/Crafting UI to the client, linking the <see cref="ConstructionSystem" /> with the
diff --git a/Content.Client/Content.Client.csproj b/Content.Client/Content.Client.csproj
index 45520c5a3a..183e06394f 100644
--- a/Content.Client/Content.Client.csproj
+++ b/Content.Client/Content.Client.csproj
@@ -23,17 +23,6 @@
     <ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
     <ProjectReference Include="..\Content.Shared\Content.Shared.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UserInterface\OptionsMenu.Graphics.cs">
-      <DependentUpon>OptionsMenu.cs</DependentUpon>
-    </Compile>
-    <Compile Update="UserInterface\OptionsMenu.KeyRebind.cs">
-      <DependentUpon>OptionsMenu.cs</DependentUpon>
-    </Compile>
-    <Compile Update="UserInterface\OptionsMenu.Audio.cs">
-      <DependentUpon>OptionsMenu.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
 
   <Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
   <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
diff --git a/Content.Client/UserInterface/ContextMenu/ContextMenuElement.cs b/Content.Client/ContextMenu/UI/ContextMenuElement.cs
similarity index 97%
rename from Content.Client/UserInterface/ContextMenu/ContextMenuElement.cs
rename to Content.Client/ContextMenu/UI/ContextMenuElement.cs
index aa7928faf4..540aa07679 100644
--- a/Content.Client/UserInterface/ContextMenu/ContextMenuElement.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuElement.cs
@@ -2,9 +2,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.GameObjects.Components;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Interactable.Components;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -16,7 +16,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Vector2 = Robust.Shared.Maths.Vector2;
 
-namespace Content.Client.UserInterface.ContextMenu
+namespace Content.Client.ContextMenu.UI
 {
     public abstract class ContextMenuElement : Control
     {
diff --git a/Content.Client/GameObjects/EntitySystems/ContextMenuPresenter.cs b/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs
similarity index 97%
rename from Content.Client/GameObjects/EntitySystems/ContextMenuPresenter.cs
rename to Content.Client/ContextMenu/UI/ContextMenuPresenter.cs
index 11d4063f4f..e76b8f215c 100644
--- a/Content.Client/GameObjects/EntitySystems/ContextMenuPresenter.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuPresenter.cs
@@ -2,13 +2,14 @@
 using System;
 using System.Linq;
 using System.Threading;
-using Content.Client.State;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.ContextMenu;
-using Content.Client.Utility;
+using Content.Client.Examine;
+using Content.Client.Interactable;
+using Content.Client.Items.Managers;
+using Content.Client.Verbs;
+using Content.Client.Viewport;
 using Content.Shared;
-using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Input;
+using Content.Shared.Verbs;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -23,8 +24,9 @@ using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 using Timer = Robust.Shared.Timing.Timer;
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.ContextMenu.UI
 {
     public class ContextMenuPresenter : IDisposable
     {
@@ -183,7 +185,7 @@ namespace Content.Client.GameObjects.EntitySystems
             e.OutlineComponent?.OnMouseEnter(localPlayer.InRangeUnobstructed(entity, ignoreInsideBlocker: true), renderScale);
             if (e.SpriteComp != null)
             {
-                e.SpriteComp.DrawDepth = (int) Shared.GameObjects.DrawDepth.HighlightedItems;
+                e.SpriteComp.DrawDepth = (int) DrawDepth.HighlightedItems;
             }
             e.DrawOutline = true;
         }
diff --git a/Content.Client/UserInterface/ContextMenu/ContextMenuView.cs b/Content.Client/ContextMenu/UI/ContextMenuView.cs
similarity index 99%
rename from Content.Client/UserInterface/ContextMenu/ContextMenuView.cs
rename to Content.Client/ContextMenu/UI/ContextMenuView.cs
index bdf837dbaf..cef321f5b1 100644
--- a/Content.Client/UserInterface/ContextMenu/ContextMenuView.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuView.cs
@@ -8,7 +8,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface.ContextMenu
+namespace Content.Client.ContextMenu.UI
 {
     public interface IContextMenuView : IDisposable
     {
diff --git a/Content.Client/UserInterface/ContextMenu/ContextMenuViewGrouping.cs b/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs
similarity index 98%
rename from Content.Client/UserInterface/ContextMenu/ContextMenuViewGrouping.cs
rename to Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs
index 1a2c2add44..84797f8467 100644
--- a/Content.Client/UserInterface/ContextMenu/ContextMenuViewGrouping.cs
+++ b/Content.Client/ContextMenu/UI/ContextMenuViewGrouping.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.UserInterface.ContextMenu
+namespace Content.Client.ContextMenu.UI
 {
     public partial class ContextMenuView
     {
diff --git a/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs b/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs
rename to Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs
index c660da39e9..aabad00639 100644
--- a/Content.Client/GameObjects/Components/Conveyor/ConveyorVisualizer.cs
+++ b/Content.Client/Conveyor/Visualizers/ConveyorVisualizer.cs
@@ -1,11 +1,11 @@
 using System;
-using Content.Shared.GameObjects.Components.Conveyor;
+using Content.Shared.Conveyor;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Conveyor
+namespace Content.Client.Conveyor.Visualizers
 {
     [UsedImplicitly]
     public class ConveyorVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Conveyor/TwoWayLeverVisualizer.cs b/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Conveyor/TwoWayLeverVisualizer.cs
rename to Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs
index 8b589ee881..1f2742d4ec 100644
--- a/Content.Client/GameObjects/Components/Conveyor/TwoWayLeverVisualizer.cs
+++ b/Content.Client/Conveyor/Visualizers/TwoWayLeverVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.MachineLinking;
+using Content.Shared.MachineLinking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Conveyor
+namespace Content.Client.Conveyor.Visualizers
 {
     [UsedImplicitly]
     public class TwoWayLeverVisualizer : AppearanceVisualizer
diff --git a/Content.Client/UserInterface/CooldownGraphic.cs b/Content.Client/Cooldown/CooldownGraphic.cs
similarity index 97%
rename from Content.Client/UserInterface/CooldownGraphic.cs
rename to Content.Client/Cooldown/CooldownGraphic.cs
index 34c570070a..44a89a826e 100644
--- a/Content.Client/UserInterface/CooldownGraphic.cs
+++ b/Content.Client/Cooldown/CooldownGraphic.cs
@@ -5,7 +5,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Cooldown
 {
 
     public class CooldownGraphic : Control
diff --git a/Content.Client/GameObjects/Components/Crayon/CrayonComponent.cs b/Content.Client/Crayon/CrayonComponent.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Crayon/CrayonComponent.cs
rename to Content.Client/Crayon/CrayonComponent.cs
index dbc091e0e9..ac62e8f227 100644
--- a/Content.Client/GameObjects/Components/Crayon/CrayonComponent.cs
+++ b/Content.Client/Crayon/CrayonComponent.cs
@@ -1,15 +1,15 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components;
+using Content.Client.Items.Components;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.Crayon;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Crayon
+namespace Content.Client.Crayon
 {
     [RegisterComponent]
     public class CrayonComponent : SharedCrayonComponent, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Crayon/CrayonDecalVisualizer.cs b/Content.Client/Crayon/CrayonDecalVisualizer.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Crayon/CrayonDecalVisualizer.cs
rename to Content.Client/Crayon/CrayonDecalVisualizer.cs
index ae48115e74..bfeac8b9f6 100644
--- a/Content.Client/GameObjects/Components/Crayon/CrayonDecalVisualizer.cs
+++ b/Content.Client/Crayon/CrayonDecalVisualizer.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Crayon;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Crayon
+namespace Content.Client.Crayon
 {
     [UsedImplicitly]
     public class CrayonDecalVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs
rename to Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
index 3f7170a82f..e6fcf8273c 100644
--- a/Content.Client/GameObjects/Components/Crayon/CrayonBoundUserInterface.cs
+++ b/Content.Client/Crayon/UI/CrayonBoundUserInterface.cs
@@ -1,11 +1,11 @@
 using System.Linq;
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Crayon;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.GameObjects.Components.Crayon
+namespace Content.Client.Crayon.UI
 {
     public class CrayonBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/Components/Crayon/CrayonWindow.cs b/Content.Client/Crayon/UI/CrayonWindow.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Crayon/CrayonWindow.cs
rename to Content.Client/Crayon/UI/CrayonWindow.cs
index abf6b806d8..e63be1ede8 100644
--- a/Content.Client/GameObjects/Components/Crayon/CrayonWindow.cs
+++ b/Content.Client/Crayon/UI/CrayonWindow.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.GameObjects.Components;
+using Content.Client.Stylesheets;
+using Content.Shared.Crayon;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -10,7 +10,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.GameObjects.Components.Crayon
+namespace Content.Client.Crayon.UI
 {
     public class CrayonWindow : SS14Window
     {
diff --git a/Content.Client/UserInterface/CreditsWindow.cs b/Content.Client/Credits/CreditsWindow.cs
similarity index 98%
rename from Content.Client/UserInterface/CreditsWindow.cs
rename to Content.Client/Credits/CreditsWindow.cs
index 7b53ef0796..ab4541a931 100644
--- a/Content.Client/UserInterface/CreditsWindow.cs
+++ b/Content.Client/Credits/CreditsWindow.cs
@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Links;
+using Content.Client.Stylesheets;
 using Content.Shared;
 using Robust.Client.Credits;
 using Robust.Client.ResourceManagement;
@@ -15,7 +16,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Credits
 {
     public sealed class CreditsWindow : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs b/Content.Client/Cuffs/Components/CuffableComponent.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs
rename to Content.Client/Cuffs/Components/CuffableComponent.cs
index ee9360a037..df292084f6 100644
--- a/Content.Client/GameObjects/Components/ActionBlocking/CuffableComponent.cs
+++ b/Content.Client/Cuffs/Components/CuffableComponent.cs
@@ -1,12 +1,12 @@
-using Content.Shared.GameObjects.Components.ActionBlocking;
-using Content.Shared.Preferences.Appearance;
+using Content.Shared.CharacterAppearance;
+using Content.Shared.Cuffs.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.ActionBlocking
+namespace Content.Client.Cuffs.Components
 {
     [RegisterComponent]
     public class CuffableComponent : SharedCuffableComponent
diff --git a/Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs b/Content.Client/Cuffs/Components/HandcuffComponent.cs
similarity index 86%
rename from Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
rename to Content.Client/Cuffs/Components/HandcuffComponent.cs
index f96335ffc3..9be4196aea 100644
--- a/Content.Client/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
+++ b/Content.Client/Cuffs/Components/HandcuffComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.ActionBlocking;
+using Content.Shared.Cuffs.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.ActionBlocking
+namespace Content.Client.Cuffs.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedHandcuffComponent))]
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs b/Content.Client/Disposal/Components/DisposalMailingUnitComponent.cs
similarity index 66%
rename from Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs
rename to Content.Client/Disposal/Components/DisposalMailingUnitComponent.cs
index ec798a9834..f182f57cbc 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs
+++ b/Content.Client/Disposal/Components/DisposalMailingUnitComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Disposal;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Disposal.Components;
+using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedDisposalMailingUnitComponent))]
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitComponent.cs b/Content.Client/Disposal/Components/DisposalUnitComponent.cs
similarity index 65%
rename from Content.Client/GameObjects/Components/Disposal/DisposalUnitComponent.cs
rename to Content.Client/Disposal/Components/DisposalUnitComponent.cs
index 0db42a7ff1..b843febbca 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitComponent.cs
+++ b/Content.Client/Disposal/Components/DisposalUnitComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Disposal;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Disposal.Components;
+using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedDisposalUnitComponent))]
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalMailingUnitBoundUserInterface.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitBoundUserInterface.cs
rename to Content.Client/Disposal/UI/DisposalMailingUnitBoundUserInterface.cs
index c250bd010c..84cd3e7185 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitBoundUserInterface.cs
+++ b/Content.Client/Disposal/UI/DisposalMailingUnitBoundUserInterface.cs
@@ -2,9 +2,9 @@
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalMailingUnitComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalMailingUnitComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.UI
 {
     /// <summary>
     /// Initializes a <see cref="DisposalMailingUnitWindow"/> and updates it when new server messages are received.
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs b/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs
rename to Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
index 56afa3db32..0602d78b29 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalMailingUnitWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalMailingUnitWindow.cs
@@ -1,14 +1,14 @@
-using Content.Shared.GameObjects.Components.Disposal;
+using System.Collections.Generic;
+using Content.Shared.Disposal.Components;
+using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using System.Collections.Generic;
-using Robust.Client.Graphics;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalMailingUnitComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalMailingUnitComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.UI
 {
     /// <summary>
     /// Client-side UI used to control a <see cref="SharedDisposalMailingUnitComponent"/>
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs
rename to Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
index 6738859638..b6e87c6a40 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalRouterBoundUserInterface.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterBoundUserInterface.cs
@@ -1,9 +1,9 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalRouterComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.UI
 {
     /// <summary>
     /// Initializes a <see cref="DisposalRouterWindow"/> and updates it when new server messages are received.
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalRouterWindow.cs b/Content.Client/Disposal/UI/DisposalRouterWindow.cs
similarity index 87%
rename from Content.Client/GameObjects/Components/Disposal/DisposalRouterWindow.cs
rename to Content.Client/Disposal/UI/DisposalRouterWindow.cs
index 12ff2cc134..674b47b509 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalRouterWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalRouterWindow.cs
@@ -1,12 +1,11 @@
-using Content.Shared.GameObjects.Components.Disposal;
+using Content.Shared.Disposal.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalRouterComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.UI
 {
     /// <summary>
     /// Client-side UI used to control a <see cref="SharedDisposalRouterComponent"/>
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs
rename to Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
index a17c96eafc..be7b78918d 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerBoundUserInterface.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerBoundUserInterface.cs
@@ -1,9 +1,9 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalTaggerComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.UI
 {
     /// <summary>
     /// Initializes a <see cref="DisposalTaggerWindow"/> and updates it when new server messages are received.
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerWindow.cs b/Content.Client/Disposal/UI/DisposalTaggerWindow.cs
similarity index 87%
rename from Content.Client/GameObjects/Components/Disposal/DisposalTaggerWindow.cs
rename to Content.Client/Disposal/UI/DisposalTaggerWindow.cs
index 0802b16df1..0dd12081e9 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalTaggerWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalTaggerWindow.cs
@@ -1,12 +1,11 @@
-using Content.Shared.GameObjects.Components.Disposal;
+using Content.Shared.Disposal.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalTaggerComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.UI
 {
     /// <summary>
     /// Client-side UI used to control a <see cref="SharedDisposalTaggerComponent"/>
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs b/Content.Client/Disposal/UI/DisposalUnitBoundUserInterface.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs
rename to Content.Client/Disposal/UI/DisposalUnitBoundUserInterface.cs
index ff44d4497b..500ee7874c 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs
+++ b/Content.Client/Disposal/UI/DisposalUnitBoundUserInterface.cs
@@ -1,9 +1,9 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalUnitComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.UI
 {
     /// <summary>
     /// Initializes a <see cref="DisposalUnitWindow"/> and updates it when new server messages are received.
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs b/Content.Client/Disposal/UI/DisposalUnitWindow.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs
rename to Content.Client/Disposal/UI/DisposalUnitWindow.cs
index e78cc5a1af..a1bdd0d211 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs
+++ b/Content.Client/Disposal/UI/DisposalUnitWindow.cs
@@ -1,5 +1,5 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.GameObjects.Components.Disposal;
+using Content.Client.Stylesheets;
+using Content.Shared.Disposal.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -7,9 +7,9 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalUnitComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.UI
 {
     /// <summary>
     /// Client-side UI used to control a <see cref="SharedDisposalUnitComponent"/>
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs
rename to Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
index 42b45f06fa..ecd176750c 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalUnitVisualizer.cs
+++ b/Content.Client/Disposal/Visualizers/DisposalUnitVisualizer.cs
@@ -5,9 +5,9 @@ using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalUnitComponent;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.Visualizers
 {
     [UsedImplicitly]
     public class DisposalUnitVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs b/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs
rename to Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
index 17ff4aad4a..202129f7b8 100644
--- a/Content.Client/GameObjects/Components/Disposal/DisposalVisualizer.cs
+++ b/Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
@@ -1,12 +1,12 @@
 using System;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Disposal;
+using Content.Shared.Disposal.Components;
+using Content.Shared.SubFloor;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Disposal
+namespace Content.Client.Disposal.Visualizers
 {
     [UsedImplicitly]
     public class DisposalVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/DoAfterComponent.cs b/Content.Client/DoAfter/DoAfterComponent.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/DoAfterComponent.cs
rename to Content.Client/DoAfter/DoAfterComponent.cs
index 9006e8850b..1f17eed1ce 100644
--- a/Content.Client/GameObjects/Components/DoAfterComponent.cs
+++ b/Content.Client/DoAfter/DoAfterComponent.cs
@@ -1,16 +1,14 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.GameObjects.EntitySystems.DoAfter;
-using Content.Shared.GameObjects.Components;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
+using Content.Client.DoAfter.UI;
+using Content.Shared.DoAfter;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.DoAfter
 {
     [RegisterComponent]
     public sealed class DoAfterComponent : SharedDoAfterComponent
diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs b/Content.Client/DoAfter/DoAfterSystem.cs
similarity index 97%
rename from Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
rename to Content.Client/DoAfter/DoAfterSystem.cs
index 56654dcaf7..4cb7684163 100644
--- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
+++ b/Content.Client/DoAfter/DoAfterSystem.cs
@@ -1,6 +1,5 @@
 using System.Linq;
-using Content.Client.GameObjects.Components;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -8,7 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.EntitySystems.DoAfter
+namespace Content.Client.DoAfter
 {
     /// <summary>
     /// Handles events that need to happen after a certain amount of time where the event could be cancelled by factors
diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs b/Content.Client/DoAfter/UI/DoAfterBar.cs
similarity index 98%
rename from Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs
rename to Content.Client/DoAfter/UI/DoAfterBar.cs
index 74946ec6b4..fb47a17048 100644
--- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterBar.cs
+++ b/Content.Client/DoAfter/UI/DoAfterBar.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.EntitySystems.DoAfter
+namespace Content.Client.DoAfter.UI
 {
     public sealed class DoAfterBar : Control
     {
diff --git a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterGui.cs b/Content.Client/DoAfter/UI/DoAfterGui.cs
similarity index 97%
rename from Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterGui.cs
rename to Content.Client/DoAfter/UI/DoAfterGui.cs
index 6990470eca..1a2c91b952 100644
--- a/Content.Client/GameObjects/EntitySystems/DoAfter/DoAfterGui.cs
+++ b/Content.Client/DoAfter/UI/DoAfterGui.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components;
+using Content.Client.IoC;
+using Content.Client.Resources;
+using Content.Shared.DoAfter;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -13,7 +13,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client.GameObjects.EntitySystems.DoAfter
+namespace Content.Client.DoAfter.UI
 {
     public sealed class DoAfterGui : VBoxContainer
     {
diff --git a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs b/Content.Client/Doors/AirlockVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs
rename to Content.Client/Doors/AirlockVisualizer.cs
index 4c7836179f..4f6832b7b6 100644
--- a/Content.Client/GameObjects/Components/Doors/AirlockVisualizer.cs
+++ b/Content.Client/Doors/AirlockVisualizer.cs
@@ -1,7 +1,7 @@
 using System;
-using Content.Client.GameObjects.Components.Wires;
+using Content.Client.Wires;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Doors;
+using Content.Shared.Doors;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
@@ -9,7 +9,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Doors
+namespace Content.Client.Doors
 {
     [UsedImplicitly]
     public class AirlockVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/GameObjects/Components/Doors/ClientDoorComponent.cs b/Content.Client/Doors/ClientDoorComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Doors/ClientDoorComponent.cs
rename to Content.Client/Doors/ClientDoorComponent.cs
index e79894deda..aecc1c1762 100644
--- a/Content.Client/GameObjects/Components/Doors/ClientDoorComponent.cs
+++ b/Content.Client/Doors/ClientDoorComponent.cs
@@ -1,9 +1,9 @@
 using System;
-using Content.Shared.GameObjects.Components.Doors;
+using Content.Shared.Doors;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Doors
+namespace Content.Client.Doors
 {
     /// <summary>
     /// Bare-bones client-side door component; used to stop door-based mispredicts.
diff --git a/Content.Client/GameObjects/EntitySystems/DoorSystem.cs b/Content.Client/Doors/DoorSystem.cs
similarity index 88%
rename from Content.Client/GameObjects/EntitySystems/DoorSystem.cs
rename to Content.Client/Doors/DoorSystem.cs
index fc6c8f0f7d..e9dfceab69 100644
--- a/Content.Client/GameObjects/EntitySystems/DoorSystem.cs
+++ b/Content.Client/Doors/DoorSystem.cs
@@ -1,11 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.Doors;
-using Content.Shared.GameObjects.Components.Doors;
-using Content.Shared.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects;
+using Content.Shared.Doors;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Doors
 {
     /// <summary>
     /// Used by the client to "predict" when doors will change how collideable they are as part of their opening / closing.
diff --git a/Content.Client/Utility/DragDropHelper.cs b/Content.Client/DragDrop/DragDropHelper.cs
similarity index 99%
rename from Content.Client/Utility/DragDropHelper.cs
rename to Content.Client/DragDrop/DragDropHelper.cs
index 917bfb8335..0502c17c02 100644
--- a/Content.Client/Utility/DragDropHelper.cs
+++ b/Content.Client/DragDrop/DragDropHelper.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Client.Utility
+namespace Content.Client.DragDrop
 {
     /// <summary>
     /// Helper for implementing drag and drop interactions.
diff --git a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs b/Content.Client/DragDrop/DragDropSystem.cs
similarity index 97%
rename from Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
rename to Content.Client/DragDrop/DragDropSystem.cs
index 51466146d3..1fa5f83ca7 100644
--- a/Content.Client/GameObjects/EntitySystems/DragDropSystem.cs
+++ b/Content.Client/DragDrop/DragDropSystem.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using Content.Client.State;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.EntitySystemMessages;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Client.Viewport;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -21,9 +20,9 @@ using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using DrawDepth = Content.Shared.GameObjects.DrawDepth;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.DragDrop
 {
     /// <summary>
     /// Handles clientside drag and drop logic
diff --git a/Content.Client/EntryPoint.cs b/Content.Client/EntryPoint/EntryPoint.cs
similarity index 87%
rename from Content.Client/EntryPoint.cs
rename to Content.Client/EntryPoint/EntryPoint.cs
index b1261ffbe4..95499045a9 100644
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint/EntryPoint.cs
@@ -1,33 +1,43 @@
 using System;
-using Content.Client.Administration;
+using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
+using Content.Client.CharacterInterface;
+using Content.Client.Chat.Managers;
+using Content.Client.EscapeMenu;
 using Content.Client.Eui;
-using Content.Client.GameObjects.Components.Actor;
-using Content.Client.Graphics.Overlays;
+using Content.Client.Flash;
+using Content.Client.GameTicking.Managers;
+using Content.Client.HUD;
 using Content.Client.Input;
-using Content.Client.Interfaces;
-using Content.Client.Interfaces.Chat;
-using Content.Client.Interfaces.Parallax;
+using Content.Client.IoC;
+using Content.Client.Launcher;
+using Content.Client.MainMenu;
+using Content.Client.MobState.Overlays;
+using Content.Client.Notifications.Managers;
 using Content.Client.Parallax;
+using Content.Client.Parallax.Managers;
+using Content.Client.Preferences;
 using Content.Client.Sandbox;
-using Content.Client.State;
+using Content.Client.Screenshot;
+using Content.Client.Singularity;
 using Content.Client.StationEvents;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.AdminMenu;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.StationEvents.Managers;
+using Content.Client.Stylesheets;
+using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Actions;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Cargo;
-using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
-using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
-using Content.Shared.GameObjects.Components.Gravity;
-using Content.Shared.GameObjects.Components.Markers;
-using Content.Shared.GameObjects.Components.Power.AME;
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.GameObjects.Components.VendingMachines;
-using Content.Shared.Kitchen;
+using Content.Shared.AME;
+using Content.Shared.Cargo.Components;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Dispenser;
+using Content.Shared.Gravity;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Lathe;
+using Content.Shared.Markers;
+using Content.Shared.Research.Components;
+using Content.Shared.VendingMachines;
+using Content.Shared.Wires;
 using Robust.Client;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -41,7 +51,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Client
+namespace Content.Client.EntryPoint
 {
     public class EntryPoint : GameClient
     {
@@ -133,7 +143,7 @@ namespace Content.Client
         /// </summary>
         public static void AttachPlayerToEntity(EntityAttachedEventArgs eventArgs)
         {
-            eventArgs.NewEntity.AddComponent<CharacterInterface>();
+            eventArgs.NewEntity.AddComponent<CharacterInterfaceComponent>();
         }
 
         /// <summary>
@@ -143,7 +153,7 @@ namespace Content.Client
         {
             if (!eventArgs.OldEntity.Deleted)
             {
-                eventArgs.OldEntity.RemoveComponent<CharacterInterface>();
+                eventArgs.OldEntity.RemoveComponent<CharacterInterfaceComponent>();
             }
         }
 
diff --git a/Content.Client/IgnoredComponents.cs b/Content.Client/EntryPoint/IgnoredComponents.cs
similarity index 99%
rename from Content.Client/IgnoredComponents.cs
rename to Content.Client/EntryPoint/IgnoredComponents.cs
index 51e76489c9..d1ef41aad7 100644
--- a/Content.Client/IgnoredComponents.cs
+++ b/Content.Client/EntryPoint/IgnoredComponents.cs
@@ -1,5 +1,5 @@
 // ReSharper disable ArrangeTrailingCommaInMultilineLists
-namespace Content.Client
+namespace Content.Client.EntryPoint
 {
     public static class IgnoredComponents
     {
diff --git a/Content.Client/EscapeMenuOwner.cs b/Content.Client/EscapeMenu/EscapeMenuOwner.cs
similarity index 92%
rename from Content.Client/EscapeMenuOwner.cs
rename to Content.Client/EscapeMenu/EscapeMenuOwner.cs
index 18dee675c8..106150e407 100644
--- a/Content.Client/EscapeMenuOwner.cs
+++ b/Content.Client/EscapeMenu/EscapeMenuOwner.cs
@@ -1,5 +1,5 @@
-using Content.Client.State;
-using Content.Client.UserInterface;
+using Content.Client.HUD;
+using Content.Client.Viewport;
 using Robust.Client.Console;
 using Robust.Client.Input;
 using Robust.Client.State;
@@ -7,7 +7,7 @@ using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 
-namespace Content.Client
+namespace Content.Client.EscapeMenu
 {
     internal sealed class EscapeMenuOwner : IEscapeMenuOwner
     {
@@ -16,7 +16,7 @@ namespace Content.Client
         [Dependency] private readonly IStateManager _stateManager = default!;
         [Dependency] private readonly IGameHud _gameHud = default!;
 
-        private EscapeMenu? _escapeMenu;
+        private UI.EscapeMenu? _escapeMenu;
 
         public void Initialize()
         {
@@ -30,7 +30,7 @@ namespace Content.Client
             if (obj.NewState is GameScreenBase)
             {
                 // Switched TO GameScreen.
-                _escapeMenu = new EscapeMenu(_consoleHost);
+                _escapeMenu = new UI.EscapeMenu(_consoleHost);
 
                 _escapeMenu.OnClose += () => _gameHud.EscapeButtonDown = false;
 
diff --git a/Content.Client/UserInterface/EscapeMenu.xaml b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
similarity index 86%
rename from Content.Client/UserInterface/EscapeMenu.xaml
rename to Content.Client/EscapeMenu/UI/EscapeMenu.xaml
index 3d1c832eee..2707629137 100644
--- a/Content.Client/UserInterface/EscapeMenu.xaml
+++ b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml
@@ -1,12 +1,13 @@
 <SS14Window xmlns="https://spacestation14.io"
             xmlns:voting="clr-namespace:Content.Client.Voting"
             xmlns:changelog="clr-namespace:Content.Client.Changelog"
+            xmlns:ui="clr-namespace:Content.Client.Voting.UI"
             Title="{Loc 'ui-escape-title'}"
             Resizable="False">
 
     <VBoxContainer SeparationOverride="4" CustomMinimumSize="150 160">
         <changelog:ChangelogButton />
-        <voting:VoteCallMenuButton />
+        <ui:VoteCallMenuButton />
         <Button Name="OptionsButton" Text="{Loc 'ui-escape-options'}" />
         <Button Name="DisconnectButton" Text="{Loc 'ui-escape-disconnect'}" />
         <Button Name="QuitButton" Text="{Loc 'ui-escape-quit'}" />
diff --git a/Content.Client/UserInterface/EscapeMenu.xaml.cs b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
similarity index 97%
rename from Content.Client/UserInterface/EscapeMenu.xaml.cs
rename to Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
index 3d21a5bb60..0190a1ccee 100644
--- a/Content.Client/UserInterface/EscapeMenu.xaml.cs
+++ b/Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
@@ -4,7 +4,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.EscapeMenu.UI
 {
     [GenerateTypedNameReferences]
     internal partial class EscapeMenu : SS14Window
diff --git a/Content.Client/UserInterface/OptionsMenu.Audio.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs
similarity index 98%
rename from Content.Client/UserInterface/OptionsMenu.Audio.cs
rename to Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs
index de80cd25ec..e867757c2a 100644
--- a/Content.Client/UserInterface/OptionsMenu.Audio.cs
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.Audio.cs
@@ -1,4 +1,5 @@
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.HUD.UI;
+using Content.Client.Stylesheets;
 using Content.Shared;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
@@ -8,7 +9,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.EscapeMenu.UI
 {
     public sealed partial class OptionsMenu
     {
diff --git a/Content.Client/UserInterface/OptionsMenu.Graphics.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs
similarity index 99%
rename from Content.Client/UserInterface/OptionsMenu.Graphics.cs
rename to Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs
index bffdee6bee..6727ce9c23 100644
--- a/Content.Client/UserInterface/OptionsMenu.Graphics.cs
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.Graphics.cs
@@ -1,5 +1,6 @@
+using Content.Client.HUD.UI;
 using Content.Shared;
-using Content.Shared.Prototypes.HUD;
+using Content.Shared.HUD;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -9,7 +10,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.EscapeMenu.UI
 {
     public sealed partial class OptionsMenu
     {
diff --git a/Content.Client/UserInterface/OptionsMenu.KeyRebind.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs
similarity index 99%
rename from Content.Client/UserInterface/OptionsMenu.KeyRebind.cs
rename to Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs
index ab3a2b2bd0..ffde940423 100644
--- a/Content.Client/UserInterface/OptionsMenu.KeyRebind.cs
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.KeyRebind.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.HUD.UI;
+using Content.Client.Stylesheets;
 using Content.Shared.Input;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
@@ -12,7 +13,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.EscapeMenu.UI
 {
     public sealed partial class OptionsMenu
     {
diff --git a/Content.Client/UserInterface/OptionsMenu.cs b/Content.Client/EscapeMenu/UI/OptionsMenu.cs
similarity index 96%
rename from Content.Client/UserInterface/OptionsMenu.cs
rename to Content.Client/EscapeMenu/UI/OptionsMenu.cs
index 161faadbb0..5203494fc2 100644
--- a/Content.Client/UserInterface/OptionsMenu.cs
+++ b/Content.Client/EscapeMenu/UI/OptionsMenu.cs
@@ -4,10 +4,9 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.EscapeMenu.UI
 {
     public sealed partial class OptionsMenu : SS14Window
     {
diff --git a/Content.Client/Eui/BaseEui.cs b/Content.Client/Eui/BaseEui.cs
index 8d23378cc3..7f86ded7e4 100644
--- a/Content.Client/Eui/BaseEui.cs
+++ b/Content.Client/Eui/BaseEui.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Eui;
-using Content.Shared.Network.NetMessages;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
diff --git a/Content.Client/Eui/EuiManager.cs b/Content.Client/Eui/EuiManager.cs
index 8ba649a9c3..b52571e9a1 100644
--- a/Content.Client/Eui/EuiManager.cs
+++ b/Content.Client/Eui/EuiManager.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.Network.NetMessages;
+using Content.Shared.Eui;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Reflection;
diff --git a/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs b/Content.Client/Examine/ExamineSystem.cs
similarity index 97%
rename from Content.Client/GameObjects/EntitySystems/ExamineSystem.cs
rename to Content.Client/Examine/ExamineSystem.cs
index 2e4981466e..5302afc651 100644
--- a/Content.Client/GameObjects/EntitySystems/ExamineSystem.cs
+++ b/Content.Client/Examine/ExamineSystem.cs
@@ -1,8 +1,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Shared.GameObjects.EntitySystemMessages;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
@@ -17,7 +16,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Utility;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Examine
 {
     [UsedImplicitly]
     internal sealed class ExamineSystem : ExamineSystemShared
diff --git a/Content.Client/GlobalVerbs/ExamineVerb.cs b/Content.Client/Examine/ExamineVerb.cs
similarity index 85%
rename from Content.Client/GlobalVerbs/ExamineVerb.cs
rename to Content.Client/Examine/ExamineVerb.cs
index c7dc3b92c7..3d91d2cb31 100644
--- a/Content.Client/GlobalVerbs/ExamineVerb.cs
+++ b/Content.Client/Examine/ExamineVerb.cs
@@ -1,9 +1,8 @@
-using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Client.GlobalVerbs
+namespace Content.Client.Examine
 {
     [GlobalVerb]
     public class ExamineVerb : GlobalVerb
diff --git a/Content.Client/GameObjects/Components/Explosion/ClusterFlashVisualizer.cs b/Content.Client/Explosion/ClusterFlashVisualizer.cs
similarity index 87%
rename from Content.Client/GameObjects/Components/Explosion/ClusterFlashVisualizer.cs
rename to Content.Client/Explosion/ClusterFlashVisualizer.cs
index 42bf052cb4..25e5fe00e3 100644
--- a/Content.Client/GameObjects/Components/Explosion/ClusterFlashVisualizer.cs
+++ b/Content.Client/Explosion/ClusterFlashVisualizer.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Explosion;
+using Content.Shared.Explosion;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Explosion
+namespace Content.Client.Explosion
 {
     [UsedImplicitly]
     // ReSharper disable once InconsistentNaming
diff --git a/Content.Client/Graphics/Overlays/FlashOverlay.cs b/Content.Client/Flash/FlashOverlay.cs
similarity index 92%
rename from Content.Client/Graphics/Overlays/FlashOverlay.cs
rename to Content.Client/Flash/FlashOverlay.cs
index 89c8383294..87d78730d5 100644
--- a/Content.Client/Graphics/Overlays/FlashOverlay.cs
+++ b/Content.Client/Flash/FlashOverlay.cs
@@ -1,4 +1,4 @@
-using Content.Client.State;
+using Content.Client.Viewport;
 using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Shared.Enums;
@@ -6,10 +6,9 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace Content.Client.Graphics.Overlays
+namespace Content.Client.Flash
 {
     public class FlashOverlay : Overlay
     {
@@ -36,7 +35,7 @@ namespace Content.Client.Graphics.Overlays
             {
                 state.Viewport.Viewport.Screenshot(image =>
                 {
-                    var rgba32Image = image.CloneAs<Rgba32>(Configuration.Default);
+                    var rgba32Image = image.CloneAs<Rgba32>(SixLabors.ImageSharp.Configuration.Default);
                     _screenshotTexture = _displayManager.LoadTextureFromImage(rgba32Image);
                 });
             }
diff --git a/Content.Client/GameObjects/Components/Weapons/FlashableComponent.cs b/Content.Client/Flash/FlashableComponent.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Weapons/FlashableComponent.cs
rename to Content.Client/Flash/FlashableComponent.cs
index 93f35dc7e3..50b0d2a1e3 100644
--- a/Content.Client/GameObjects/Components/Weapons/FlashableComponent.cs
+++ b/Content.Client/Flash/FlashableComponent.cs
@@ -1,15 +1,13 @@
 #nullable enable
 using System;
-using Content.Client.Graphics.Overlays;
-using Content.Shared.GameObjects.Components.Weapons;
+using Content.Shared.Flash;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
-using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.Components.Weapons
+namespace Content.Client.Flash
 {
     [RegisterComponent]
     public sealed class FlashableComponent : SharedFlashableComponent
diff --git a/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs b/Content.Client/Fluids/SprayVisualizer.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs
rename to Content.Client/Fluids/SprayVisualizer.cs
index 30ef0922b3..db89a5fa5e 100644
--- a/Content.Client/GameObjects/Components/Fluids/SprayVisualizer.cs
+++ b/Content.Client/Fluids/SprayVisualizer.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Fluids;
+using Content.Shared.Fluids;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Fluids
+namespace Content.Client.Fluids
 {
     [UsedImplicitly]
     public class SprayVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
index 4f35a487d2..41720a8408 100644
--- a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
+++ b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
@@ -1,5 +1,6 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Items.Components;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
 using Content.Shared.GameObjects.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs
index 059520cc39..15adc5890a 100644
--- a/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs
+++ b/Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs
@@ -1,6 +1,6 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.Utility;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Shared.Temperature;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs b/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs
index 96217df375..b7387ddbc0 100644
--- a/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs
+++ b/Content.Client/GameObjects/Components/Atmos/VaporVisualizer.cs
@@ -1,5 +1,6 @@
 using System;
 using Content.Shared.GameObjects.Components;
+using Content.Shared.Vapor;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/GameObjects/Components/Mobs/State/CriticalMobState.cs b/Content.Client/GameObjects/Components/Mobs/State/CriticalMobState.cs
deleted file mode 100644
index e468de5d43..0000000000
--- a/Content.Client/GameObjects/Components/Mobs/State/CriticalMobState.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Content.Shared.GameObjects.Components.Mobs.State;
-
-namespace Content.Client.GameObjects.Components.Mobs.State
-{
-    public class CriticalMobState : SharedCriticalMobState
-    {
-    }
-}
diff --git a/Content.Client/GameObjects/EntitySystems/BuckleSystem.cs b/Content.Client/GameObjects/EntitySystems/BuckleSystem.cs
deleted file mode 100644
index 9175333750..0000000000
--- a/Content.Client/GameObjects/EntitySystems/BuckleSystem.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.GameObjects.EntitySystems;
-
-namespace Content.Client.GameObjects.EntitySystems
-{
-    internal sealed class BuckleSystem : SharedBuckleSystem
-    {
-
-    }
-}
diff --git a/Content.Client/GameObjects/EntitySystems/ChemicalReactionSystem.cs b/Content.Client/GameObjects/EntitySystems/ChemicalReactionSystem.cs
deleted file mode 100644
index f58526eec0..0000000000
--- a/Content.Client/GameObjects/EntitySystems/ChemicalReactionSystem.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Content.Shared.GameObjects.EntitySystems;
-
-namespace Content.Client.GameObjects.EntitySystems.NewFolder
-{
-    public class ChemicalReactionSystem : SharedChemicalReactionSystem
-    {
-
-    }
-}
diff --git a/Content.Client/GameTicking/ClientGameTicker.cs b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
similarity index 96%
rename from Content.Client/GameTicking/ClientGameTicker.cs
rename to Content.Client/GameTicking/Managers/ClientGameTicker.cs
index 369b72d3dd..1881b6ed1d 100644
--- a/Content.Client/GameTicking/ClientGameTicker.cs
+++ b/Content.Client/GameTicking/Managers/ClientGameTicker.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.Interfaces;
-using Content.Client.State;
-using Content.Client.UserInterface;
+using Content.Client.Lobby;
+using Content.Client.RoundEnd;
+using Content.Client.Viewport;
 using Content.Shared.GameTicking;
-using Content.Shared.Network.NetMessages;
+using Content.Shared.GameWindow;
 using Robust.Client.Graphics;
 using Robust.Client.State;
 using Robust.Shared.IoC;
@@ -12,7 +12,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameTicking
+namespace Content.Client.GameTicking.Managers
 {
     public class ClientGameTicker : SharedGameTicker, IClientGameTicker
     {
diff --git a/Content.Client/Interfaces/IClientGameTicker.cs b/Content.Client/GameTicking/Managers/IClientGameTicker.cs
similarity index 94%
rename from Content.Client/Interfaces/IClientGameTicker.cs
rename to Content.Client/GameTicking/Managers/IClientGameTicker.cs
index 59ceb4c10b..774ae6225c 100644
--- a/Content.Client/Interfaces/IClientGameTicker.cs
+++ b/Content.Client/GameTicking/Managers/IClientGameTicker.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Robust.Shared.Network;
 using static Content.Shared.GameTicking.SharedGameTicker;
 
-namespace Content.Client.Interfaces
+namespace Content.Client.GameTicking.Managers
 {
     public interface IClientGameTicker
     {
diff --git a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs b/Content.Client/Ghost/GhostComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Observer/GhostComponent.cs
rename to Content.Client/Ghost/GhostComponent.cs
index c57b248b37..efeea64923 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostComponent.cs
+++ b/Content.Client/Ghost/GhostComponent.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Content.Client.Interfaces.Chat;
-using Content.Client.UserInterface;
-using Content.Shared.GameObjects.Components.Observer;
+using Content.Client.Chat.Managers;
+using Content.Client.HUD;
+using Content.Shared.Ghost;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.GameObjects;
@@ -10,7 +10,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Observer
+namespace Content.Client.Ghost
 {
     [RegisterComponent]
     public class GhostComponent : SharedGhostComponent
diff --git a/Content.Client/UserInterface/GhostGui.cs b/Content.Client/Ghost/GhostGui.cs
similarity index 96%
rename from Content.Client/UserInterface/GhostGui.cs
rename to Content.Client/Ghost/GhostGui.cs
index c3480bfc27..cf0badffb9 100644
--- a/Content.Client/UserInterface/GhostGui.cs
+++ b/Content.Client/Ghost/GhostGui.cs
@@ -1,14 +1,12 @@
 #nullable enable
-using Content.Client.GameObjects.Components.Observer;
 using Robust.Client.Console;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
-using Vector2 = Robust.Shared.Maths.Vector2;
 using Robust.Shared.Localization;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Ghost
 {
     public class GhostGui : Control
     {
diff --git a/Content.Client/UserInterface/GhostRoleWindow.cs b/Content.Client/Ghost/Roles/UI/GhostRoleWindow.cs
similarity index 83%
rename from Content.Client/UserInterface/GhostRoleWindow.cs
rename to Content.Client/Ghost/Roles/UI/GhostRoleWindow.cs
index 4cf956bb87..ada3534dd5 100644
--- a/Content.Client/UserInterface/GhostRoleWindow.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRoleWindow.cs
@@ -1,6 +1,6 @@
 using Robust.Client.UserInterface.CustomControls;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Ghost.Roles.UI
 {
     public class GhostRoleWindow : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
similarity index 100%
rename from Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml
rename to Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml.cs b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
similarity index 74%
rename from Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml.cs
rename to Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
index 2f3d1b0b2c..6f3d255158 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEntry.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
@@ -1,11 +1,10 @@
 using System;
-using Content.Shared.GameObjects.Components.Observer;
-using Content.Shared.GameObjects.Components.Observer.GhostRoles;
+using Content.Shared.Ghost.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.GameObjects.Components.Observer.GhostRoles
+namespace Content.Client.Ghost.Roles.UI
 {
     [GenerateTypedNameReferences]
     public partial class GhostRolesEntry : VBoxContainer
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEui.cs b/Content.Client/Ghost/Roles/UI/GhostRolesEui.cs
similarity index 86%
rename from Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEui.cs
rename to Content.Client/Ghost/Roles/UI/GhostRolesEui.cs
index 39b09dfb6c..cd07bbda08 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesEui.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesEui.cs
@@ -1,10 +1,9 @@
 using Content.Client.Eui;
 using Content.Shared.Eui;
-using Content.Shared.GameObjects.Components.Observer;
-using Content.Shared.GameObjects.Components.Observer.GhostRoles;
+using Content.Shared.Ghost.Roles;
 using JetBrains.Annotations;
 
-namespace Content.Client.GameObjects.Components.Observer.GhostRoles
+namespace Content.Client.Ghost.Roles.UI
 {
     [UsedImplicitly]
     public class GhostRolesEui : BaseEui
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
similarity index 100%
rename from Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml
rename to Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml.cs b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
similarity index 79%
rename from Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml.cs
rename to Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
index f45e7b61ef..e582d3873a 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostRoles/GhostRolesWindow.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
@@ -1,10 +1,9 @@
 using System;
-using Content.Shared.GameObjects.Components.Observer.GhostRoles;
+using Content.Shared.Ghost.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Observer.GhostRoles
+namespace Content.Client.Ghost.Roles.UI
 {
     [GenerateTypedNameReferences]
     public partial class GhostRolesWindow : SS14Window
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEui.cs b/Content.Client/Ghost/Roles/UI/MakeGhostRoleEui.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEui.cs
rename to Content.Client/Ghost/Roles/UI/MakeGhostRoleEui.cs
index 68714e4835..63e79b0c5c 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEui.cs
+++ b/Content.Client/Ghost/Roles/UI/MakeGhostRoleEui.cs
@@ -1,6 +1,6 @@
 using Content.Client.Eui;
 using Content.Shared.Eui;
-using Content.Shared.GameObjects.Components.Observer.GhostRoles;
+using Content.Shared.Ghost.Roles;
 using JetBrains.Annotations;
 using Robust.Client.Console;
 using Robust.Client.Player;
@@ -8,7 +8,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Utility;
 
-namespace Content.Client.GameObjects.Components.Observer.GhostRoles
+namespace Content.Client.Ghost.Roles.UI
 {
     [UsedImplicitly]
     public class MakeGhostRoleEui : BaseEui
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
similarity index 100%
rename from Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml
rename to Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
diff --git a/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml.cs b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml.cs
rename to Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
index 1140b7cb66..f7ce045357 100644
--- a/Content.Client/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
@@ -5,7 +5,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.GameObjects;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.GameObjects.Components.Observer.GhostRoles
+namespace Content.Client.Ghost.Roles.UI
 {
     [GenerateTypedNameReferences]
     public partial class MakeGhostRoleWindow : SS14Window
diff --git a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs b/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs
rename to Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
index d9f9f5e636..cd51dd7696 100644
--- a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs
+++ b/Content.Client/Gravity/GravityGeneratorBoundUserInterface.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.Components.Gravity;
+using Content.Shared.Gravity;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
@@ -8,7 +8,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Gravity
+namespace Content.Client.Gravity
 {
     [UsedImplicitly]
     public class GravityGeneratorBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs b/Content.Client/Gravity/GravityGeneratorVisualizer.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs
rename to Content.Client/Gravity/GravityGeneratorVisualizer.cs
index b22fb039c0..ef43265d0c 100644
--- a/Content.Client/GameObjects/Components/Gravity/GravityGeneratorVisualizer.cs
+++ b/Content.Client/Gravity/GravityGeneratorVisualizer.cs
@@ -1,16 +1,14 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Gravity;
-using Robust.Client.GameObjects;
-using Robust.Shared.Utility;
 using System;
 using System.Collections.Generic;
+using Content.Shared.Gravity;
 using JetBrains.Annotations;
+using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components.Gravity
+namespace Content.Client.Gravity
 {
     [UsedImplicitly]
     public class GravityGeneratorVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/UserInterface/GameHud.cs b/Content.Client/HUD/GameHud.cs
similarity index 99%
rename from Content.Client/UserInterface/GameHud.cs
rename to Content.Client/HUD/GameHud.cs
index f377747cfb..da1887bbc8 100644
--- a/Content.Client/UserInterface/GameHud.cs
+++ b/Content.Client/HUD/GameHud.cs
@@ -1,12 +1,15 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.HUD.UI;
+using Content.Client.Info;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Client.Targeting;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.HUD;
 using Content.Shared.Input;
-using Content.Shared.Prototypes.HUD;
+using Content.Shared.Targeting;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.ResourceManagement;
@@ -24,7 +27,7 @@ using static Robust.Client.Input.Keyboard.Key;
 using Control = Robust.Client.UserInterface.Control;
 using LC = Robust.Client.UserInterface.Controls.LayoutContainer;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.HUD
 {
     /// <summary>
     ///     Responsible for laying out the default game HUD.
diff --git a/Content.Client/UserInterface/Controls/HighDivider.cs b/Content.Client/HUD/UI/HighDivider.cs
similarity index 74%
rename from Content.Client/UserInterface/Controls/HighDivider.cs
rename to Content.Client/HUD/UI/HighDivider.cs
index 29bdaabaee..96b6df3524 100644
--- a/Content.Client/UserInterface/Controls/HighDivider.cs
+++ b/Content.Client/HUD/UI/HighDivider.cs
@@ -1,8 +1,8 @@
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.UserInterface.Controls
+namespace Content.Client.HUD.UI
 {
     public sealed class HighDivider : Control
     {
diff --git a/Content.Client/UserInterface/MainViewport.cs b/Content.Client/HUD/UI/MainViewport.cs
similarity index 98%
rename from Content.Client/UserInterface/MainViewport.cs
rename to Content.Client/HUD/UI/MainViewport.cs
index 39870dd6e6..098458efef 100644
--- a/Content.Client/UserInterface/MainViewport.cs
+++ b/Content.Client/HUD/UI/MainViewport.cs
@@ -1,11 +1,11 @@
-using System;
+using Content.Client.Viewport;
 using Content.Shared;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.HUD.UI
 {
     /// <summary>
     ///     Wrapper for <see cref="ScalingViewport"/> that listens to configuration variables.
diff --git a/Content.Client/UserInterface/NanoHeading.cs b/Content.Client/HUD/UI/NanoHeading.cs
similarity index 85%
rename from Content.Client/UserInterface/NanoHeading.cs
rename to Content.Client/HUD/UI/NanoHeading.cs
index 636f265879..fa47f20739 100644
--- a/Content.Client/UserInterface/NanoHeading.cs
+++ b/Content.Client/HUD/UI/NanoHeading.cs
@@ -1,8 +1,7 @@
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.HUD.UI
 {
     public class NanoHeading : Container
     {
diff --git a/Content.Client/UserInterface/Placeholder.cs b/Content.Client/HUD/UI/Placeholder.cs
similarity index 94%
rename from Content.Client/UserInterface/Placeholder.cs
rename to Content.Client/HUD/UI/Placeholder.cs
index cff69edcc6..e23a131d9e 100644
--- a/Content.Client/UserInterface/Placeholder.cs
+++ b/Content.Client/HUD/UI/Placeholder.cs
@@ -1,6 +1,6 @@
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.HUD.UI
 {
     public sealed class Placeholder : PanelContainer
     {
diff --git a/Content.Client/UserInterface/StripeBack.cs b/Content.Client/HUD/UI/StripeBack.cs
similarity index 98%
rename from Content.Client/UserInterface/StripeBack.cs
rename to Content.Client/HUD/UI/StripeBack.cs
index c049176cfa..6e967b2a99 100644
--- a/Content.Client/UserInterface/StripeBack.cs
+++ b/Content.Client/HUD/UI/StripeBack.cs
@@ -2,7 +2,7 @@ using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.HUD.UI
 {
     public class StripeBack : Container
     {
diff --git a/Content.Client/UserInterface/TopNotification.cs b/Content.Client/HUD/UI/TopNotification.cs
similarity index 71%
rename from Content.Client/UserInterface/TopNotification.cs
rename to Content.Client/HUD/UI/TopNotification.cs
index 51d85cc970..0fc421f3ce 100644
--- a/Content.Client/UserInterface/TopNotification.cs
+++ b/Content.Client/HUD/UI/TopNotification.cs
@@ -1,6 +1,6 @@
 using Robust.Client.UserInterface;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.HUD.UI
 {
     public class TopNotification : Control
     {
diff --git a/Content.Client/UserInterface/HandButton.cs b/Content.Client/Hands/HandButton.cs
similarity index 92%
rename from Content.Client/UserInterface/HandButton.cs
rename to Content.Client/Hands/HandButton.cs
index 1664741b1b..8bd7c65d51 100644
--- a/Content.Client/UserInterface/HandButton.cs
+++ b/Content.Client/Hands/HandButton.cs
@@ -1,8 +1,9 @@
-using Content.Shared.GameObjects.Components.Items;
+using Content.Client.Items.UI;
+using Content.Shared.Hands.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Hands
 {
     public class HandButton : ItemSlotButton
     {
diff --git a/Content.Client/GameObjects/Components/Items/HandsComponent.cs b/Content.Client/Hands/HandsComponent.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Items/HandsComponent.cs
rename to Content.Client/Hands/HandsComponent.cs
index 44c46abfcb..f8f1ba0f64 100644
--- a/Content.Client/GameObjects/Components/Items/HandsComponent.cs
+++ b/Content.Client/Hands/HandsComponent.cs
@@ -2,9 +2,9 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Client.Animations;
-using Content.Client.UserInterface;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Storage;
+using Content.Client.HUD;
+using Content.Shared.Hands.Components;
+using Content.Shared.Item;
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.GameObjects;
@@ -13,7 +13,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Items
+namespace Content.Client.Hands
 {
     [RegisterComponent]
     [ComponentReference(typeof(ISharedHandsComponent))]
@@ -185,7 +185,7 @@ namespace Content.Client.GameObjects.Components.Items
 
                 _sprite.LayerSetColor($"hand-{name}", color);
                 _sprite.LayerSetVisible($"hand-{name}", true);
-                _sprite.LayerSetState($"hand-{name}", state, rsi);  
+                _sprite.LayerSetState($"hand-{name}", state, rsi);
             }
         }
 
diff --git a/Content.Client/UserInterface/HandsGui.cs b/Content.Client/Hands/HandsGui.cs
similarity index 97%
rename from Content.Client/UserInterface/HandsGui.cs
rename to Content.Client/Hands/HandsGui.cs
index 7c3e991a59..9bdb225499 100644
--- a/Content.Client/UserInterface/HandsGui.cs
+++ b/Content.Client/Hands/HandsGui.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Client.GameObjects.Components.Items;
-using Content.Client.Utility;
+using Content.Client.HUD;
+using Content.Client.Items.Managers;
+using Content.Client.Items.UI;
+using Content.Client.Resources;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Items;
+using Content.Shared.Hands.Components;
 using Content.Shared.Input;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -16,7 +18,7 @@ using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Hands
 {
     public class HandsGui : Control
     {
diff --git a/Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlaySystem.cs b/Content.Client/HealthOverlay/HealthOverlaySystem.cs
similarity index 94%
rename from Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlaySystem.cs
rename to Content.Client/HealthOverlay/HealthOverlaySystem.cs
index ff113fac88..5f1c6eec53 100644
--- a/Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlaySystem.cs
+++ b/Content.Client/HealthOverlay/HealthOverlaySystem.cs
@@ -1,15 +1,16 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Client.HealthOverlay.UI;
+using Content.Shared.Damage.Components;
 using Content.Shared.GameTicking;
+using Content.Shared.MobState;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GameObjects.EntitySystems.HealthOverlay
+namespace Content.Client.HealthOverlay
 {
     [UsedImplicitly]
     public class HealthOverlaySystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlayBar.cs b/Content.Client/HealthOverlay/UI/HealthOverlayBar.cs
similarity index 94%
rename from Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlayBar.cs
rename to Content.Client/HealthOverlay/UI/HealthOverlayBar.cs
index 3e06cf9ca4..869bf3433b 100644
--- a/Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlayBar.cs
+++ b/Content.Client/HealthOverlay/UI/HealthOverlayBar.cs
@@ -4,7 +4,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.GameObjects.EntitySystems.HealthOverlay
+namespace Content.Client.HealthOverlay.UI
 {
     public class HealthOverlayBar : Control
     {
diff --git a/Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlayGui.cs b/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
similarity index 95%
rename from Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlayGui.cs
rename to Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
index da35fc2e3d..8d1d546f48 100644
--- a/Content.Client/GameObjects/EntitySystems/HealthOverlay/HealthOverlayGui.cs
+++ b/Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
@@ -1,17 +1,17 @@
 #nullable enable
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Client.IoC;
+using Content.Client.Resources;
+using Content.Shared.Damage.Components;
+using Content.Shared.MobState;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.EntitySystems.HealthOverlay
+namespace Content.Client.HealthOverlay.UI
 {
     public class HealthOverlayGui : VBoxContainer
     {
diff --git a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs b/Content.Client/IconSmoothing/IconSmoothComponent.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
rename to Content.Client/IconSmoothing/IconSmoothComponent.cs
index 15baab69dc..da9db8ca08 100644
--- a/Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
+++ b/Content.Client/IconSmoothing/IconSmoothComponent.cs
@@ -1,18 +1,16 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.GameObjects.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Map;
 using Robust.Shared.Log;
+using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
 using static Robust.Client.GameObjects.SpriteComponent;
 
-namespace Content.Client.GameObjects.Components.IconSmoothing
+namespace Content.Client.IconSmoothing
 {
     // TODO: Potential improvements:
     //  Defer updating of these.
diff --git a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs b/Content.Client/IconSmoothing/IconSmoothSystem.cs
similarity index 97%
rename from Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs
rename to Content.Client/IconSmoothing/IconSmoothSystem.cs
index fbccdb6212..dc0ed68ac9 100644
--- a/Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs
+++ b/Content.Client/IconSmoothing/IconSmoothSystem.cs
@@ -1,14 +1,11 @@
 using System.Collections.Generic;
-using System.Linq;
-using Content.Client.GameObjects.Components.IconSmoothing;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Utility;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.IconSmoothing
 {
     /// <summary>
     ///     Entity system implementing the logic for <see cref="IconSmoothComponent"/>
diff --git a/Content.Client/UserInterface/InfoWindow.cs b/Content.Client/Info/InfoWindow.cs
similarity index 95%
rename from Content.Client/UserInterface/InfoWindow.cs
rename to Content.Client/Info/InfoWindow.cs
index 819c31989d..9dd8b48d90 100644
--- a/Content.Client/UserInterface/InfoWindow.cs
+++ b/Content.Client/Info/InfoWindow.cs
@@ -2,22 +2,18 @@
 
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared;
-using Robust.Client.Credits;
+using Content.Client.EscapeMenu.UI;
+using Content.Client.Stylesheets;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Info
 {
     public sealed class InfoWindow : SS14Window
     {
diff --git a/Content.Client/UserInterface/ServerInfo.cs b/Content.Client/Info/ServerInfo.cs
similarity index 95%
rename from Content.Client/UserInterface/ServerInfo.cs
rename to Content.Client/Info/ServerInfo.cs
index 81eb7f5da5..ddea0ba642 100644
--- a/Content.Client/UserInterface/ServerInfo.cs
+++ b/Content.Client/Info/ServerInfo.cs
@@ -1,11 +1,13 @@
 using Content.Client.Changelog;
+using Content.Client.Credits;
+using Content.Client.Links;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Info
 {
     public class ServerInfo : VBoxContainer
     {
diff --git a/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs b/Content.Client/Instruments/InstrumentComponent.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs
rename to Content.Client/Instruments/InstrumentComponent.cs
index bfbef85d58..edbc456736 100644
--- a/Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs
+++ b/Content.Client/Instruments/InstrumentComponent.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Instruments;
+using Content.Shared.Instruments;
 using Content.Shared.Physics;
 using Robust.Client.Audio.Midi;
 using Robust.Shared.Audio.Midi;
@@ -10,11 +9,11 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
-using Robust.Shared.Timing;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Instruments
+namespace Content.Client.Instruments
 {
 
     [RegisterComponent]
diff --git a/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs b/Content.Client/Instruments/InstrumentSystem.cs
similarity index 93%
rename from Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs
rename to Content.Client/Instruments/InstrumentSystem.cs
index 407176392d..6225b15617 100644
--- a/Content.Client/GameObjects/EntitySystems/InstrumentSystem.cs
+++ b/Content.Client/Instruments/InstrumentSystem.cs
@@ -1,4 +1,3 @@
-using Content.Client.GameObjects.Components.Instruments;
 using Content.Shared;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
@@ -6,7 +5,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Instruments
 {
     [UsedImplicitly]
     public class InstrumentSystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/Instruments/InstrumentBoundUserInterface.cs b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Instruments/InstrumentBoundUserInterface.cs
rename to Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
index 2246810c84..67bafc8e43 100644
--- a/Content.Client/GameObjects/Components/Instruments/InstrumentBoundUserInterface.cs
+++ b/Content.Client/Instruments/UI/InstrumentBoundUserInterface.cs
@@ -1,8 +1,7 @@
-using Content.Client.Instruments;
 using Robust.Client.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Instruments
+namespace Content.Client.Instruments.UI
 {
     public class InstrumentBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/Instruments/InstrumentMenu.xaml b/Content.Client/Instruments/UI/InstrumentMenu.xaml
similarity index 100%
rename from Content.Client/Instruments/InstrumentMenu.xaml
rename to Content.Client/Instruments/UI/InstrumentMenu.xaml
diff --git a/Content.Client/Instruments/InstrumentMenu.xaml.cs b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
similarity index 93%
rename from Content.Client/Instruments/InstrumentMenu.xaml.cs
rename to Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
index 8ddcdeacd1..7950a83cbe 100644
--- a/Content.Client/Instruments/InstrumentMenu.xaml.cs
+++ b/Content.Client/Instruments/UI/InstrumentMenu.xaml.cs
@@ -1,27 +1,21 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Content.Client.GameObjects.Components.Instruments;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Interactable;
 using Robust.Client.Audio.Midi;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Containers;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 using Range = Robust.Client.UserInterface.Controls.Range;
 
-namespace Content.Client.Instruments
+namespace Content.Client.Instruments.UI
 {
     [GenerateTypedNameReferences]
     public partial class InstrumentMenu : SS14Window
@@ -169,14 +163,14 @@ namespace Content.Client.Instruments
             // Do not seek while still grabbing.
             if (PlaybackSlider.Grabbed || _owner.Instrument == null) return;
 
-            _owner.Instrument.PlayerTick = (int)Math.Ceiling(PlaybackSlider.Value);
+            _owner.Instrument.PlayerTick = (int)Math.Ceiling((double) PlaybackSlider.Value);
         }
 
         private void PlaybackSliderKeyUp(GUIBoundKeyEventArgs args)
         {
             if (args.Function != EngineKeyFunctions.UIClick || _owner.Instrument == null) return;
 
-            _owner.Instrument.PlayerTick = (int)Math.Ceiling(PlaybackSlider.Value);
+            _owner.Instrument.PlayerTick = (int)Math.Ceiling((double) PlaybackSlider.Value);
         }
 
         protected override void FrameUpdate(FrameEventArgs args)
diff --git a/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/InteractionOutlineComponent.cs
rename to Content.Client/Interactable/Components/InteractionOutlineComponent.cs
index fc944474ef..da3da6a773 100644
--- a/Content.Client/GameObjects/Components/InteractionOutlineComponent.cs
+++ b/Content.Client/Interactable/Components/InteractionOutlineComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Interactable.Components
 {
     [RegisterComponent]
     public class InteractionOutlineComponent : Component
diff --git a/Content.Client/Utility/UnobstructedExtensions.cs b/Content.Client/Interactable/UnobstructedExtensions.cs
similarity index 95%
rename from Content.Client/Utility/UnobstructedExtensions.cs
rename to Content.Client/Interactable/UnobstructedExtensions.cs
index b918682501..aa3ad83bdf 100644
--- a/Content.Client/Utility/UnobstructedExtensions.cs
+++ b/Content.Client/Interactable/UnobstructedExtensions.cs
@@ -1,13 +1,13 @@
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Interaction;
 using Content.Shared.Physics;
 using Robust.Client.Player;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem;
+using static Content.Shared.Interaction.SharedInteractionSystem;
 
-namespace Content.Client.Utility
+namespace Content.Client.Interactable
 {
     public static class UnobstructedExtensions
     {
diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs b/Content.Client/Inventory/ClientInventoryComponent.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
rename to Content.Client/Inventory/ClientInventoryComponent.cs
index 84f43e203a..7ac3a7135c 100644
--- a/Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
+++ b/Content.Client/Inventory/ClientInventoryComponent.cs
@@ -1,20 +1,20 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Client.GameObjects.Components.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
-using Content.Shared.Preferences.Appearance;
+using Content.Client.Clothing;
+using Content.Shared.CharacterAppearance;
+using Content.Shared.EffectBlocker;
+using Content.Shared.Inventory;
+using Content.Shared.Movement.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
-using static Content.Shared.GameObjects.Components.Inventory.SharedInventoryComponent.ClientInventoryMessage;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.SharedInventoryComponent.ClientInventoryMessage;
 
-namespace Content.Client.GameObjects.Components.HUD.Inventory
+namespace Content.Client.Inventory
 {
     /// <summary>
     /// A character UI which shows items the user has equipped within his inventory
diff --git a/Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs
similarity index 84%
rename from Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs
rename to Content.Client/Inventory/ClientInventorySystem.cs
index d79d0f6d1f..587614bc09 100644
--- a/Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs
+++ b/Content.Client/Inventory/ClientInventorySystem.cs
@@ -1,14 +1,12 @@
-using Content.Client.GameObjects.Components.HUD.Inventory;
-using Content.Client.UserInterface;
+using Content.Client.HUD;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.Player;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Inventory
 {
     [UsedImplicitly]
     public sealed class ClientInventorySystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs b/Content.Client/Inventory/HumanInventoryInterfaceController.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs
rename to Content.Client/Inventory/HumanInventoryInterfaceController.cs
index a64bdbfffd..9cc3466577 100644
--- a/Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs
+++ b/Content.Client/Inventory/HumanInventoryInterfaceController.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using Content.Client.UserInterface;
-using Content.Client.Utility;
+using Content.Client.HUD;
+using Content.Client.Items.Managers;
+using Content.Client.Items.UI;
 using Content.Shared;
-using Content.Shared.Prototypes.HUD;
 using JetBrains.Annotations;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -14,12 +13,11 @@ using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Client.GameObjects.Components.HUD.Inventory
+namespace Content.Client.Inventory
 {
     // Dynamically instantiated by ClientInventoryComponent.
     [UsedImplicitly]
diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs b/Content.Client/Inventory/InventoryInterfaceController.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs
rename to Content.Client/Inventory/InventoryInterfaceController.cs
index 4f43b997bc..6aea2f466c 100644
--- a/Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs
+++ b/Content.Client/Inventory/InventoryInterfaceController.cs
@@ -1,15 +1,16 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.UserInterface;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Client.HUD;
+using Content.Client.Items.UI;
 using Content.Shared.Input;
+using Content.Shared.Inventory;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GameObjects.Components.HUD.Inventory
+namespace Content.Client.Inventory
 {
     public abstract class InventoryInterfaceController : IDisposable
     {
diff --git a/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs b/Content.Client/Inventory/StrippableBoundUserInterface.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs
rename to Content.Client/Inventory/StrippableBoundUserInterface.cs
index 8179307890..bfc5a89af5 100644
--- a/Content.Client/GameObjects/Components/HUD/Inventory/StrippableBoundUserInterface.cs
+++ b/Content.Client/Inventory/StrippableBoundUserInterface.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
-using Content.Client.UserInterface;
-using Content.Shared.GameObjects.Components.GUI;
+using Content.Client.Strip;
+using Content.Shared.Strip.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Client.GameObjects.Components.HUD.Inventory
+namespace Content.Client.Inventory
 {
     [UsedImplicitly]
     public class StrippableBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
similarity index 75%
rename from Content.Client/ClientContentIoC.cs
rename to Content.Client/IoC/ClientContentIoC.cs
index 9c72a54940..fbf7a149af 100644
--- a/Content.Client/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -1,25 +1,29 @@
-using Content.Client.Administration;
+using Content.Client.Administration.Managers;
 using Content.Client.Changelog;
-using Content.Client.Chat;
+using Content.Client.Chat.Managers;
+using Content.Client.Clickable;
+using Content.Client.EscapeMenu;
 using Content.Client.Eui;
-using Content.Client.GameTicking;
-using Content.Client.Interfaces;
-using Content.Client.Interfaces.Chat;
-using Content.Client.Interfaces.Parallax;
-using Content.Client.Parallax;
+using Content.Client.GameTicking.Managers;
+using Content.Client.HUD;
+using Content.Client.Items.Managers;
+using Content.Client.Module;
+using Content.Client.Notifications.Managers;
+using Content.Client.Parallax.Managers;
+using Content.Client.Preferences;
 using Content.Client.Sandbox;
-using Content.Client.StationEvents;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.AdminMenu;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Screenshot;
+using Content.Client.StationEvents.Managers;
+using Content.Client.Stylesheets;
+using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Actions;
-using Content.Shared.Interfaces;
 using Content.Shared.Alert;
+using Content.Shared.Module;
+using Content.Shared.Notification;
 using Robust.Shared.IoC;
 
-namespace Content.Client
+namespace Content.Client.IoC
 {
     internal static class ClientContentIoC
     {
diff --git a/Content.Client/ClientModuleTestingCallbacks.cs b/Content.Client/IoC/ClientModuleTestingCallbacks.cs
similarity index 86%
rename from Content.Client/ClientModuleTestingCallbacks.cs
rename to Content.Client/IoC/ClientModuleTestingCallbacks.cs
index 528f0d056b..a24b89bf1f 100644
--- a/Content.Client/ClientModuleTestingCallbacks.cs
+++ b/Content.Client/IoC/ClientModuleTestingCallbacks.cs
@@ -1,7 +1,7 @@
 using System;
 using Content.Shared;
 
-namespace Content.Client
+namespace Content.Client.IoC
 {
     public sealed class ClientModuleTestingCallbacks : SharedModuleTestingCallbacks
     {
diff --git a/Content.Client/StaticIoC.cs b/Content.Client/IoC/StaticIoC.cs
similarity index 87%
rename from Content.Client/StaticIoC.cs
rename to Content.Client/IoC/StaticIoC.cs
index 71c9ed7429..9cbe8053e3 100644
--- a/Content.Client/StaticIoC.cs
+++ b/Content.Client/IoC/StaticIoC.cs
@@ -1,7 +1,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Shared.IoC;
 
-namespace Content.Client
+namespace Content.Client.IoC
 {
     public static class StaticIoC
     {
diff --git a/Content.Client/GameObjects/Components/IItemStatus.cs b/Content.Client/Items/Components/IItemStatus.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/IItemStatus.cs
rename to Content.Client/Items/Components/IItemStatus.cs
index a83e1be2fb..80ab748aa1 100644
--- a/Content.Client/GameObjects/Components/IItemStatus.cs
+++ b/Content.Client/Items/Components/IItemStatus.cs
@@ -1,6 +1,6 @@
 using Robust.Client.UserInterface;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Items.Components
 {
     /// <summary>
     ///     Allows a component to provide status tooltips next to the hands interface.
diff --git a/Content.Client/GameObjects/Components/Items/ItemComponent.cs b/Content.Client/Items/Components/ItemComponent.cs
similarity index 85%
rename from Content.Client/GameObjects/Components/Items/ItemComponent.cs
rename to Content.Client/Items/Components/ItemComponent.cs
index fc1835f255..9b497e9bbd 100644
--- a/Content.Client/GameObjects/Components/Items/ItemComponent.cs
+++ b/Content.Client/Items/Components/ItemComponent.cs
@@ -1,9 +1,10 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Storage;
+using Content.Client.Hands;
+using Content.Shared.Item;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Items
+namespace Content.Client.Items.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedItemComponent))]
diff --git a/Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs b/Content.Client/Items/Components/ItemStatusComponent.cs
similarity index 76%
rename from Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs
rename to Content.Client/Items/Components/ItemStatusComponent.cs
index 0a21bd8e43..a5aecc2bc0 100644
--- a/Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs
+++ b/Content.Client/Items/Components/ItemStatusComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Items
+namespace Content.Client.Items.Components
 {
     [RegisterComponent]
     public class ItemStatusComponent : Component
diff --git a/Content.Client/UserInterface/IItemSlotManager.cs b/Content.Client/Items/Managers/IItemSlotManager.cs
similarity index 77%
rename from Content.Client/UserInterface/IItemSlotManager.cs
rename to Content.Client/Items/Managers/IItemSlotManager.cs
index 62495a50d1..127eedc1b4 100644
--- a/Content.Client/UserInterface/IItemSlotManager.cs
+++ b/Content.Client/Items/Managers/IItemSlotManager.cs
@@ -1,7 +1,8 @@
-using Robust.Client.UserInterface;
+using Content.Client.Items.UI;
+using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Items.Managers
 {
     public interface IItemSlotManager
     {
diff --git a/Content.Client/UserInterface/ItemSlotManager.cs b/Content.Client/Items/Managers/ItemSlotManager.cs
similarity index 96%
rename from Content.Client/UserInterface/ItemSlotManager.cs
rename to Content.Client/Items/Managers/ItemSlotManager.cs
index 382195c0f8..8bbcaacc8a 100644
--- a/Content.Client/UserInterface/ItemSlotManager.cs
+++ b/Content.Client/Items/Managers/ItemSlotManager.cs
@@ -1,6 +1,8 @@
-using Content.Client.GameObjects.Components.Storage;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Items;
+using Content.Client.Examine;
+using Content.Client.Items.UI;
+using Content.Client.Storage;
+using Content.Client.Verbs;
+using Content.Shared.Cooldown;
 using Content.Shared.Input;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -14,7 +16,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Items.Managers
 {
     public class ItemSlotManager : IItemSlotManager
     {
diff --git a/Content.Client/UserInterface/ItemSlotButton.cs b/Content.Client/Items/UI/ItemSlotButton.cs
similarity index 97%
rename from Content.Client/UserInterface/ItemSlotButton.cs
rename to Content.Client/Items/UI/ItemSlotButton.cs
index 44ba70b89d..8ffbdc5cf8 100644
--- a/Content.Client/UserInterface/ItemSlotButton.cs
+++ b/Content.Client/Items/UI/ItemSlotButton.cs
@@ -1,12 +1,13 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Cooldown;
+using Content.Client.Stylesheets;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Items.UI
 {
     public class ItemSlotButton : Control
     {
diff --git a/Content.Client/UserInterface/ItemStatusPanel.cs b/Content.Client/Items/UI/ItemStatusPanel.cs
similarity index 95%
rename from Content.Client/UserInterface/ItemStatusPanel.cs
rename to Content.Client/Items/UI/ItemStatusPanel.cs
index 722e211a3e..6162c59e51 100644
--- a/Content.Client/UserInterface/ItemStatusPanel.cs
+++ b/Content.Client/Items/UI/ItemStatusPanel.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components.Items;
+using Content.Client.Items.Components;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Shared.Hands.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -11,9 +11,9 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using static Content.Client.StaticIoC;
+using static Content.Client.IoC.StaticIoC;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Items.UI
 {
     public class ItemStatusPanel : Control
     {
diff --git a/Content.Client/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs b/Content.Client/Kitchen/KitchenSpikeComponent.cs
similarity index 66%
rename from Content.Client/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs
rename to Content.Client/Kitchen/KitchenSpikeComponent.cs
index fa838358ac..0c7acf3137 100644
--- a/Content.Client/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs
+++ b/Content.Client/Kitchen/KitchenSpikeComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Kitchen;
+using Content.Shared.DragDrop;
+using Content.Shared.Kitchen.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Kitchen
+namespace Content.Client.Kitchen
 {
     [RegisterComponent]
     internal sealed class KitchenSpikeComponent : SharedKitchenSpikeComponent
diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
rename to Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
index a95db5e44b..b1ad64b5f1 100644
--- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/MicrowaveBoundUserInterface.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.Chemistry;
-using Content.Shared.Kitchen;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Kitchen.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -15,7 +16,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.GameObjects.Components.Kitchen
+namespace Content.Client.Kitchen.UI
 {
     [UsedImplicitly]
     public class MicrowaveBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs
rename to Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
index b4d034618d..b7af649c7b 100644
--- a/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderBoundUserInterface.cs
+++ b/Content.Client/Kitchen/UI/ReagentGrinderBoundUserInterface.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Content.Shared.Chemistry;
-using Content.Shared.Kitchen;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Kitchen.Components;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -10,9 +10,9 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using static Content.Shared.Chemistry.Solution;
+using static Content.Shared.Chemistry.Solution.Solution;
 
-namespace Content.Client.GameObjects.Components.Kitchen
+namespace Content.Client.Kitchen.UI
 {
     public class ReagentGrinderBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs b/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs
rename to Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
index a862a5eea5..d82f37f32f 100644
--- a/Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs
+++ b/Content.Client/Kitchen/Visualizers/MicrowaveVisualizer.cs
@@ -1,13 +1,13 @@
-using Content.Client.GameObjects.Components.Sound;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.GameObjects.Components.Sound;
-using Content.Shared.Kitchen;
+using Content.Client.Sound;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Power;
+using Content.Shared.Sound;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Log;
 
-namespace Content.Client.GameObjects.Components.Kitchen
+namespace Content.Client.Kitchen.Visualizers
 {
     [UsedImplicitly]
     public sealed class MicrowaveVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderVisualizer.cs b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
similarity index 80%
rename from Content.Client/GameObjects/Components/Kitchen/ReagentGrinderVisualizer.cs
rename to Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
index a41d74f18b..5160d88ae4 100644
--- a/Content.Client/GameObjects/Components/Kitchen/ReagentGrinderVisualizer.cs
+++ b/Content.Client/Kitchen/Visualizers/ReagentGrinderVisualizer.cs
@@ -1,7 +1,7 @@
 using Robust.Client.GameObjects;
-using static Content.Shared.Kitchen.SharedReagentGrinderComponent;
+using static Content.Shared.Kitchen.Components.SharedReagentGrinderComponent;
 
-namespace Content.Client.GameObjects.Components.Kitchen
+namespace Content.Client.Kitchen.Visualizers
 {
     public class ReagentGrinderVisualizer : AppearanceVisualizer
     {
diff --git a/Content.Client/UserInterface/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
similarity index 98%
rename from Content.Client/UserInterface/LateJoinGui.cs
rename to Content.Client/LateJoin/LateJoinGui.cs
index 77009b2b66..f8e028c2e0 100644
--- a/Content.Client/UserInterface/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.Interfaces;
+using Content.Client.GameTicking.Managers;
 using Content.Shared.Roles;
 using Robust.Client.Console;
 using Robust.Client.Graphics;
@@ -16,7 +16,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.LateJoin
 {
     public sealed class LateJoinGui : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Research/LatheDatabaseComponent.cs b/Content.Client/Lathe/Components/LatheDatabaseComponent.cs
similarity index 85%
rename from Content.Client/GameObjects/Components/Research/LatheDatabaseComponent.cs
rename to Content.Client/Lathe/Components/LatheDatabaseComponent.cs
index 465fb9b6a8..c2f38f909f 100644
--- a/Content.Client/GameObjects/Components/Research/LatheDatabaseComponent.cs
+++ b/Content.Client/Lathe/Components/LatheDatabaseComponent.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Shared.Lathe;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.GameObjects.Components.Research
+namespace Content.Client.Lathe.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
diff --git a/Content.Client/GameObjects/Components/Research/MaterialStorageComponent.cs b/Content.Client/Lathe/Components/MaterialStorageComponent.cs
similarity index 86%
rename from Content.Client/GameObjects/Components/Research/MaterialStorageComponent.cs
rename to Content.Client/Lathe/Components/MaterialStorageComponent.cs
index bb609ed6f0..156cbceaf5 100644
--- a/Content.Client/GameObjects/Components/Research/MaterialStorageComponent.cs
+++ b/Content.Client/Lathe/Components/MaterialStorageComponent.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Research;
+using Content.Shared.Lathe;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Research
+namespace Content.Client.Lathe.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedMaterialStorageComponent))]
diff --git a/Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs b/Content.Client/Lathe/Components/ProtolatheDatabaseComponent.cs
similarity index 88%
rename from Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs
rename to Content.Client/Lathe/Components/ProtolatheDatabaseComponent.cs
index dd42799c70..d37ee37c2e 100644
--- a/Content.Client/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs
+++ b/Content.Client/Lathe/Components/ProtolatheDatabaseComponent.cs
@@ -1,11 +1,11 @@
 using System;
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Shared.Lathe;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.GameObjects.Components.Research
+namespace Content.Client.Lathe.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
diff --git a/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs
rename to Content.Client/Lathe/UI/LatheBoundUserInterface.cs
index 4b8e2d7c71..54b21e13d3 100644
--- a/Content.Client/GameObjects/Components/Research/LatheBoundUserInterface.cs
+++ b/Content.Client/Lathe/UI/LatheBoundUserInterface.cs
@@ -1,15 +1,15 @@
 using System.Collections.Generic;
-using Content.Client.Research;
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Client.Lathe.Components;
+using Content.Shared.Lathe;
+using Content.Shared.Research.Prototypes;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Research.SharedLatheComponent;
+using static Content.Shared.Lathe.SharedLatheComponent;
 
-namespace Content.Client.GameObjects.Components.Research
+namespace Content.Client.Lathe.UI
 {
     public class LatheBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/Research/LatheMenu.cs b/Content.Client/Lathe/UI/LatheMenu.cs
similarity index 98%
rename from Content.Client/Research/LatheMenu.cs
rename to Content.Client/Lathe/UI/LatheMenu.cs
index c299bba910..38bde6c6ca 100644
--- a/Content.Client/Research/LatheMenu.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.Research;
+using Content.Client.Lathe.Components;
 using Content.Shared.Materials;
-using Content.Shared.Research;
+using Content.Shared.Research.Prototypes;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -9,7 +9,7 @@ using Robust.Client.Utility;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.Research
+namespace Content.Client.Lathe.UI
 {
     public class LatheMenu : SS14Window
     {
diff --git a/Content.Client/Research/LatheQueueMenu.cs b/Content.Client/Lathe/UI/LatheQueueMenu.cs
similarity index 96%
rename from Content.Client/Research/LatheQueueMenu.cs
rename to Content.Client/Lathe/UI/LatheQueueMenu.cs
index 1d065faa1d..135f72fb2a 100644
--- a/Content.Client/Research/LatheQueueMenu.cs
+++ b/Content.Client/Lathe/UI/LatheQueueMenu.cs
@@ -1,5 +1,4 @@
-using Content.Client.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Shared.Research.Prototypes;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -7,7 +6,7 @@ using Robust.Client.Utility;
 using Robust.Shared.Localization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.Research
+namespace Content.Client.Lathe.UI
 {
     public class LatheQueueMenu : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs b/Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs
rename to Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs
index 36e4af586d..a9ba95597a 100644
--- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs
+++ b/Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs
@@ -1,12 +1,12 @@
 using System;
-using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.Lathe;
+using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.Lathe.Visualizers
 {
     [UsedImplicitly]
     public class AutolatheVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs b/Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs
rename to Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs
index 838ef3a89f..ef75bf1683 100644
--- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs
+++ b/Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs
@@ -1,12 +1,12 @@
 using System;
-using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.Lathe;
+using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.Lathe.Visualizers
 {
     [UsedImplicitly]
     public class ProtolatheVisualizer : AppearanceVisualizer
diff --git a/Content.Client/State/LauncherConnecting.cs b/Content.Client/Launcher/LauncherConnecting.cs
similarity index 97%
rename from Content.Client/State/LauncherConnecting.cs
rename to Content.Client/Launcher/LauncherConnecting.cs
index 877f3ce6d6..ff80d1f1c3 100644
--- a/Content.Client/State/LauncherConnecting.cs
+++ b/Content.Client/Launcher/LauncherConnecting.cs
@@ -1,11 +1,10 @@
 using System;
-using Content.Client.UserInterface;
 using Robust.Client;
 using Robust.Client.UserInterface;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
-namespace Content.Client.State
+namespace Content.Client.Launcher
 {
     public class LauncherConnecting : Robust.Client.State.State
     {
diff --git a/Content.Client/UserInterface/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
similarity index 94%
rename from Content.Client/UserInterface/LauncherConnectingGui.xaml
rename to Content.Client/Launcher/LauncherConnectingGui.xaml
index e141d8e391..5d0b18a7ce 100644
--- a/Content.Client/UserInterface/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -1,9 +1,10 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         xmlns:cui="clr-namespace:Content.Client.UserInterface.Controls"
          xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-         xmlns:cuic="clr-namespace:Content.Client.UserInterface">
-    <cuic:ParallaxControl />
+         xmlns:cuic="clr-namespace:Content.Client.UserInterface"
+         xmlns:parallax="clr-namespace:Content.Client.Parallax"
+         xmlns:ui="clr-namespace:Content.Client.HUD.UI">
+    <parallax:ParallaxControl />
     <Control HorizontalAlignment="Center" VerticalAlignment="Center">
         <PanelContainer StyleClasses="AngleRect" />
         <VBoxContainer MinSize="300 200">
@@ -13,7 +14,7 @@
                 <Button Name="ExitButton" Text="{Loc 'connecting-exit'}"
                         HorizontalAlignment="Right" HorizontalExpand="True" />
             </HBoxContainer>
-            <cui:HighDivider />
+            <ui:HighDivider />
             <VBoxContainer VerticalExpand="True" Margin="4 4 4 0">
                 <Control VerticalExpand="True" Margin="0 0 0 8">
                     <VBoxContainer Name="ConnectingStatus">
diff --git a/Content.Client/UserInterface/LauncherConnectingGui.xaml.cs b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
similarity index 94%
rename from Content.Client/UserInterface/LauncherConnectingGui.xaml.cs
rename to Content.Client/Launcher/LauncherConnectingGui.xaml.cs
index 05c79ddb2e..f679c73e2d 100644
--- a/Content.Client/UserInterface/LauncherConnectingGui.xaml.cs
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml.cs
@@ -1,5 +1,4 @@
-using Content.Client.State;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -8,7 +7,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Network;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Launcher
 {
     [GenerateTypedNameReferences]
     public sealed partial class LauncherConnectingGui : Control
diff --git a/Content.Client/GameObjects/Components/EmergencyLightComponent.cs b/Content.Client/Light/Components/EmergencyLightComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/EmergencyLightComponent.cs
rename to Content.Client/Light/Components/EmergencyLightComponent.cs
index 3fbf846264..2ae15fd32e 100644
--- a/Content.Client/GameObjects/Components/EmergencyLightComponent.cs
+++ b/Content.Client/Light/Components/EmergencyLightComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Light.Components
 {
     [RegisterComponent]
     public class EmergencyLightComponent : Component
diff --git a/Content.Client/GameObjects/Components/Interactable/ExpendableLightComponent.cs b/Content.Client/Light/Components/ExpendableLightComponent.cs
similarity index 72%
rename from Content.Client/GameObjects/Components/Interactable/ExpendableLightComponent.cs
rename to Content.Client/Light/Components/ExpendableLightComponent.cs
index 5fbf3af3e4..5531379084 100644
--- a/Content.Client/GameObjects/Components/Interactable/ExpendableLightComponent.cs
+++ b/Content.Client/Light/Components/ExpendableLightComponent.cs
@@ -1,8 +1,7 @@
-
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Light.Component;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Interactable
+namespace Content.Client.Light.Components
 {
     /// <summary>
     ///     Component that represents a handheld expendable light which can be activated and eventually dies over time.
@@ -10,6 +9,6 @@ namespace Content.Client.GameObjects.Components.Interactable
     [RegisterComponent]
     public class ExpendableLightComponent : SharedExpendableLightComponent
     {
-       
+
     }
 }
diff --git a/Content.Client/GameObjects/Components/HandheldLightComponent.cs b/Content.Client/Light/Components/HandheldLightComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/HandheldLightComponent.cs
rename to Content.Client/Light/Components/HandheldLightComponent.cs
index b001a37430..707d5f8bb4 100644
--- a/Content.Client/GameObjects/Components/HandheldLightComponent.cs
+++ b/Content.Client/Light/Components/HandheldLightComponent.cs
@@ -1,4 +1,5 @@
-using Content.Shared.GameObjects.Components;
+using Content.Client.Items.Components;
+using Content.Shared.Light.Component;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -7,7 +8,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Light.Components
 {
     [RegisterComponent]
     public sealed class HandheldLightComponent : SharedHandheldLightComponent, IItemStatus
diff --git a/Content.Client/GameObjects/Components/LightBehaviourComponent.cs b/Content.Client/Light/Components/LightBehaviourComponent.cs
similarity index 99%
rename from Content.Client/GameObjects/Components/LightBehaviourComponent.cs
rename to Content.Client/Light/Components/LightBehaviourComponent.cs
index dbaeb323a7..4d6c33c1a8 100644
--- a/Content.Client/GameObjects/Components/LightBehaviourComponent.cs
+++ b/Content.Client/Light/Components/LightBehaviourComponent.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Light.Component;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
@@ -15,7 +15,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Light.Components
 {
     #region LIGHT_BEHAVIOURS
     /// <summary>
diff --git a/Content.Client/GameObjects/Components/LanternVisualizer.cs b/Content.Client/Light/LanternVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/LanternVisualizer.cs
rename to Content.Client/Light/LanternVisualizer.cs
index 42d2b65642..418802956d 100644
--- a/Content.Client/GameObjects/Components/LanternVisualizer.cs
+++ b/Content.Client/Light/LanternVisualizer.cs
@@ -5,7 +5,7 @@ using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Light
 {
     [UsedImplicitly]
     public class LanternVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/ExpendableLightVisualizer.cs b/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/ExpendableLightVisualizer.cs
rename to Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
index 2ac0f1ad99..3a21d11b1a 100644
--- a/Content.Client/GameObjects/Components/ExpendableLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/ExpendableLightVisualizer.cs
@@ -1,9 +1,9 @@
-
-using Content.Shared.GameObjects.Components;
+using Content.Client.Light.Components;
+using Content.Shared.Light.Component;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Light.Visualizers
 {
     [UsedImplicitly]
     public class ExpendableLightVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/FlashLightVisualizer.cs b/Content.Client/Light/Visualizers/FlashLightVisualizer.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/FlashLightVisualizer.cs
rename to Content.Client/Light/Visualizers/FlashLightVisualizer.cs
index 28e3397d52..15b15ccc67 100644
--- a/Content.Client/GameObjects/Components/FlashLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/FlashLightVisualizer.cs
@@ -1,12 +1,12 @@
 using System;
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Light.Component;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Light.Visualizers
 {
     [UsedImplicitly]
     public class FlashLightVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightVisualizer.cs b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightVisualizer.cs
rename to Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
index 2262a4ecfa..582f758899 100644
--- a/Content.Client/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightVisualizer.cs
+++ b/Content.Client/Light/Visualizers/PoweredLightVisualizer.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
+using Content.Shared.Light;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
@@ -11,7 +11,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
+namespace Content.Client.Light.Visualizers
 {
     [UsedImplicitly]
     public class PoweredLightVisualizer : AppearanceVisualizer
diff --git a/Content.Client/UILinks.cs b/Content.Client/Links/UILinks.cs
similarity index 93%
rename from Content.Client/UILinks.cs
rename to Content.Client/Links/UILinks.cs
index 59bceabb99..cc85980b0b 100644
--- a/Content.Client/UILinks.cs
+++ b/Content.Client/Links/UILinks.cs
@@ -1,4 +1,4 @@
-namespace Content.Client
+namespace Content.Client.Links
 {
     public static class UILinks
     {
diff --git a/Content.Client/State/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
similarity index 97%
rename from Content.Client/State/LobbyState.cs
rename to Content.Client/Lobby/LobbyState.cs
index d6635e1984..dcebd4a6fc 100644
--- a/Content.Client/State/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -1,8 +1,13 @@
 using System;
 using System.Linq;
-using Content.Client.Interfaces;
-using Content.Client.Interfaces.Chat;
-using Content.Client.UserInterface;
+using Content.Client.Chat.Managers;
+using Content.Client.EscapeMenu.UI;
+using Content.Client.GameTicking.Managers;
+using Content.Client.LateJoin;
+using Content.Client.Lobby.UI;
+using Content.Client.Preferences;
+using Content.Client.Preferences.UI;
+using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Chat;
 using Content.Shared.Input;
@@ -22,7 +27,7 @@ using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.GameTicking.SharedGameTicker;
 
-namespace Content.Client.State
+namespace Content.Client.Lobby
 {
     public class LobbyState : Robust.Client.State.State
     {
diff --git a/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
similarity index 95%
rename from Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs
rename to Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
index ae2f3b9079..73dc21fde9 100644
--- a/Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
@@ -1,7 +1,8 @@
 using System.Linq;
-using Content.Client.GameObjects.Components.HUD.Inventory;
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.Interfaces;
+using Content.Client.CharacterAppearance;
+using Content.Client.HUD.UI;
+using Content.Client.Inventory;
+using Content.Client.Preferences;
 using Content.Shared.GameTicking;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
@@ -14,9 +15,9 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Lobby.UI
 {
     public class LobbyCharacterPreviewPanel : Control
     {
diff --git a/Content.Client/UserInterface/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
similarity index 83%
rename from Content.Client/UserInterface/LobbyGui.xaml
rename to Content.Client/Lobby/UI/LobbyGui.xaml
index 484f71bbce..044efe17a1 100644
--- a/Content.Client/UserInterface/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -1,15 +1,21 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-         xmlns:style="clr-namespace:Content.Client.UserInterface.Stylesheets"
          xmlns:cui="clr-namespace:Content.Client.UserInterface"
          xmlns:chat="clr-namespace:Content.Client.Chat"
          xmlns:maths="clr-namespace:Robust.Shared.Maths;assembly=Robust.Shared.Maths"
-         xmlns:voting="clr-namespace:Content.Client.Voting">
+         xmlns:voting="clr-namespace:Content.Client.Voting"
+         xmlns:parallax="clr-namespace:Content.Client.Parallax"
+         xmlns:ui="clr-namespace:Content.Client.Voting.UI"
+         xmlns:style="clr-namespace:Content.Client.Stylesheets"
+         xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
+         xmlns:ui2="clr-namespace:Content.Client.Chat.UI"
+         xmlns:ui3="clr-namespace:Content.Client.Lobby.UI"
+         xmlns:info="clr-namespace:Content.Client.Info">
 
     <Control>
         <!-- Parallax background -->
-        <cui:ParallaxControl />
+        <parallax:ParallaxControl />
 
         <!-- One day I'll code a Margin property for controls. -->
         <MarginContainer MarginBottomOverride="20" MarginLeftOverride="20" MarginRightOverride="20"
@@ -22,7 +28,7 @@
                         <Label StyleClasses="LabelHeadingBigger" VAlign="Center" Text="{Loc 'Lobby'}" />
                     </MarginContainer>
                     <Label Name="CServerName" StyleClasses="LabelHeadingBigger" VAlign="Center" />
-                    <voting:VoteCallMenuButton Name="CCallVoteButton" StyleClasses="ButtonBig" />
+                    <ui:VoteCallMenuButton Name="CCallVoteButton" StyleClasses="ButtonBig" />
                     <Button Name="COptionsButton" StyleClasses="ButtonBig" Text="{Loc 'Options'}" />
                     <Button Name="CLeaveButton" StyleClasses="ButtonBig" Text="{Loc 'Leave'}" />
                 </HBoxContainer>
@@ -37,7 +43,7 @@
                 <HBoxContainer VerticalExpand="True">
                     <!-- Left panel -->
                     <VBoxContainer Name="CLeftPanelContainer" HorizontalExpand="True">
-                        <cui:StripeBack>
+                        <ui1:StripeBack>
                             <MarginContainer MarginLeftOverride="3" MarginRightOverride="3" MarginBottomOverride="3"
                                              MarginTopOverride="3">
                                 <HBoxContainer SeparationOverride="6">
@@ -49,11 +55,11 @@
                                             StyleClasses="ButtonBig" />
                                 </HBoxContainer>
                             </MarginContainer>
-                        </cui:StripeBack>
+                        </ui1:StripeBack>
                         <MarginContainer VerticalExpand="True" MarginLeftOverride="3" MarginRightOverride="3"
                                          MarginBottomOverride="3"
                                          MarginTopOverride="3">
-                            <chat:ChatBox Name="CChat" />
+                            <ui2:ChatBox Name="CChat" />
                         </MarginContainer>
                     </VBoxContainer>
                     <!-- Gold line -->
@@ -66,20 +72,20 @@
                     <Control HorizontalExpand="True">
                         <VBoxContainer>
                             <!-- Player list -->
-                            <cui:NanoHeading Text="{Loc 'Online Players'}" />
+                            <ui1:NanoHeading Text="{Loc 'Online Players'}" />
                             <MarginContainer VerticalExpand="True"
                                              MarginRightOverride="3" MarginLeftOverride="3"
                                              MarginBottomOverride="3" MarginTopOverride="3">
-                                <cui:LobbyPlayerList Name="COnlinePlayerList"
+                                <ui3:LobbyPlayerList Name="COnlinePlayerList"
                                                      HorizontalExpand="True"
                                                      VerticalExpand="True" />
                             </MarginContainer>
                             <!-- Server info -->
-                            <cui:NanoHeading Text="{Loc 'Server Info'}" />
+                            <ui1:NanoHeading Text="{Loc 'Server Info'}" />
                             <MarginContainer VerticalExpand="True"
                                              MarginRightOverride="3" MarginLeftOverride="3"
                                              MarginBottomOverride="2" MarginTopOverride="3">
-                                <cui:ServerInfo Name="CServerInfo" />
+                                <info:ServerInfo Name="CServerInfo" />
                             </MarginContainer>
                         </VBoxContainer>
                         <MarginContainer SizeFlagsHorizontal="ShrinkEnd" MarginTopOverride="8" MarginRightOverride="8">
diff --git a/Content.Client/UserInterface/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
similarity index 96%
rename from Content.Client/UserInterface/LobbyGui.xaml.cs
rename to Content.Client/Lobby/UI/LobbyGui.xaml.cs
index 028f997253..a4bea076ff 100644
--- a/Content.Client/UserInterface/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -1,5 +1,6 @@
-using Content.Client.Chat;
-using Content.Client.Interfaces;
+using Content.Client.Chat.UI;
+using Content.Client.Info;
+using Content.Client.Preferences;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
@@ -8,7 +9,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Lobby.UI
 {
     [GenerateTypedNameReferences]
     internal sealed partial class LobbyGui : Control
diff --git a/Content.Client/GameObjects/Components/MachineLinking/SignalSwitchVisualizer.cs b/Content.Client/MachineLinking/SignalSwitchVisualizer.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/MachineLinking/SignalSwitchVisualizer.cs
rename to Content.Client/MachineLinking/SignalSwitchVisualizer.cs
index 4dbc9ed83a..fee7370451 100644
--- a/Content.Client/GameObjects/Components/MachineLinking/SignalSwitchVisualizer.cs
+++ b/Content.Client/MachineLinking/SignalSwitchVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.MachineLinking;
+using Content.Shared.MachineLinking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.MachineLinking
+namespace Content.Client.MachineLinking
 {
     [UsedImplicitly]
     public class SignalSwitchVisualizer : AppearanceVisualizer
diff --git a/Content.Client/State/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
similarity index 99%
rename from Content.Client/State/MainMenu.cs
rename to Content.Client/MainMenu/MainMenu.cs
index ea4af74ac3..5cf51e54ba 100644
--- a/Content.Client/State/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -1,7 +1,8 @@
 using System;
 using System.Text.RegularExpressions;
 using Content.Client.Changelog;
-using Content.Client.UserInterface;
+using Content.Client.EscapeMenu.UI;
+using Content.Client.Parallax;
 using Robust.Client;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -15,7 +16,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using UsernameHelpers = Robust.Shared.AuthLib.UsernameHelpers;
 
-namespace Content.Client.State
+namespace Content.Client.MainMenu
 {
     /// <summary>
     ///     Main menu screen that is the first screen to be displayed when the game starts.
diff --git a/Content.Client/GameObjects/Components/Markers/MarkerComponent.cs b/Content.Client/Markers/MarkerComponent.cs
similarity index 85%
rename from Content.Client/GameObjects/Components/Markers/MarkerComponent.cs
rename to Content.Client/Markers/MarkerComponent.cs
index 9ad1922129..ff75539928 100644
--- a/Content.Client/GameObjects/Components/Markers/MarkerComponent.cs
+++ b/Content.Client/Markers/MarkerComponent.cs
@@ -1,8 +1,7 @@
-using Content.Client.GameObjects.EntitySystems;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Markers
+namespace Content.Client.Markers
 {
     [RegisterComponent]
     public sealed class MarkerComponent : Component
diff --git a/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs b/Content.Client/Markers/MarkerSystem.cs
similarity index 85%
rename from Content.Client/GameObjects/EntitySystems/MarkerSystem.cs
rename to Content.Client/Markers/MarkerSystem.cs
index ea57233c86..32e9fdddf3 100644
--- a/Content.Client/GameObjects/EntitySystems/MarkerSystem.cs
+++ b/Content.Client/Markers/MarkerSystem.cs
@@ -1,7 +1,6 @@
-using Content.Client.GameObjects.Components.Markers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Markers
 {
     public sealed class MarkerSystem : EntitySystem
     {
diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerComponent.cs b/Content.Client/MedicalScanner/MedicalScannerComponent.cs
similarity index 64%
rename from Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerComponent.cs
rename to Content.Client/MedicalScanner/MedicalScannerComponent.cs
index 1063a37cdf..86f55c32d4 100644
--- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerComponent.cs
+++ b/Content.Client/MedicalScanner/MedicalScannerComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Medical;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.MedicalScanner;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.MedicalScanner
+namespace Content.Client.MedicalScanner
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedMedicalScannerComponent))]
diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs b/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
similarity index 88%
rename from Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs
rename to Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
index 8291858ac0..fd86dcceec 100644
--- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerVisualizer.cs
+++ b/Content.Client/MedicalScanner/MedicalScannerVisualizer.cs
@@ -1,10 +1,10 @@
 using System;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent;
-using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent.MedicalScannerStatus;
+using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
+using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent.MedicalScannerStatus;
 
-namespace Content.Client.GameObjects.Components.MedicalScanner
+namespace Content.Client.MedicalScanner
 {
     [UsedImplicitly]
     public class MedicalScannerVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerBoundUserInterface.cs b/Content.Client/MedicalScanner/UI/MedicalScannerBoundUserInterface.cs
similarity index 88%
rename from Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerBoundUserInterface.cs
rename to Content.Client/MedicalScanner/UI/MedicalScannerBoundUserInterface.cs
index e8b2a8fe09..be5427899f 100644
--- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerBoundUserInterface.cs
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerBoundUserInterface.cs
@@ -1,9 +1,9 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent;
+using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
 
-namespace Content.Client.GameObjects.Components.MedicalScanner
+namespace Content.Client.MedicalScanner.UI
 {
     [UsedImplicitly]
     public class MedicalScannerBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs
rename to Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
index 5d32cdf72c..de5fbaa967 100644
--- a/Content.Client/GameObjects/Components/MedicalScanner/MedicalScannerWindow.cs
+++ b/Content.Client/MedicalScanner/UI/MedicalScannerWindow.cs
@@ -5,10 +5,9 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using static Content.Shared.GameObjects.Components.Medical.SharedMedicalScannerComponent;
+using static Content.Shared.MedicalScanner.SharedMedicalScannerComponent;
 
-namespace Content.Client.GameObjects.Components.MedicalScanner
+namespace Content.Client.MedicalScanner.UI
 {
     public class MedicalScannerWindow : SS14Window
     {
diff --git a/Content.Client/Utility/RichTextLabelExt.cs b/Content.Client/Message/RichTextLabelExt.cs
similarity index 89%
rename from Content.Client/Utility/RichTextLabelExt.cs
rename to Content.Client/Message/RichTextLabelExt.cs
index 15b9944af8..df2c61e306 100644
--- a/Content.Client/Utility/RichTextLabelExt.cs
+++ b/Content.Client/Message/RichTextLabelExt.cs
@@ -1,7 +1,7 @@
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Utility
+namespace Content.Client.Message
 {
     public static class RichTextLabelExt
     {
diff --git a/Content.Client/GameObjects/Components/Mining/AsteroidRockVisualizer.cs b/Content.Client/Mining/AsteroidRockVisualizer.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/Mining/AsteroidRockVisualizer.cs
rename to Content.Client/Mining/AsteroidRockVisualizer.cs
index 7eeec49a68..1c30d6126c 100644
--- a/Content.Client/GameObjects/Components/Mining/AsteroidRockVisualizer.cs
+++ b/Content.Client/Mining/AsteroidRockVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Mining;
+using Content.Shared.Mining;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Mining
+namespace Content.Client.Mining
 {
     [UsedImplicitly]
     public class AsteroidRockVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs b/Content.Client/MobState/DamageStateVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs
rename to Content.Client/MobState/DamageStateVisualizer.cs
index 4ffe84623a..2e25961141 100644
--- a/Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs
+++ b/Content.Client/MobState/DamageStateVisualizer.cs
@@ -1,15 +1,13 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.DrawDepth;
+using Content.Shared.MobState;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.MobState
 {
     [UsedImplicitly]
     public sealed class DamageStateVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/GameObjects/Components/Mobs/State/MobStateComponent.cs b/Content.Client/MobState/MobStateComponent.cs
similarity index 67%
rename from Content.Client/GameObjects/Components/Mobs/State/MobStateComponent.cs
rename to Content.Client/MobState/MobStateComponent.cs
index 0f56a0a1cd..caa215c0c1 100644
--- a/Content.Client/GameObjects/Components/Mobs/State/MobStateComponent.cs
+++ b/Content.Client/MobState/MobStateComponent.cs
@@ -1,7 +1,8 @@
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
+using Content.Shared.MobState.State;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Mobs.State
+namespace Content.Client.MobState
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedMobStateComponent))]
diff --git a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs b/Content.Client/MobState/Overlays/CircleMaskOverlay.cs
similarity index 96%
rename from Content.Client/Graphics/Overlays/CircleMaskOverlay.cs
rename to Content.Client/MobState/Overlays/CircleMaskOverlay.cs
index 0060230f23..d468f5f170 100644
--- a/Content.Client/Graphics/Overlays/CircleMaskOverlay.cs
+++ b/Content.Client/MobState/Overlays/CircleMaskOverlay.cs
@@ -5,7 +5,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.Graphics.Overlays
+namespace Content.Client.MobState.Overlays
 {
     public class CircleMaskOverlay : Overlay
     {
diff --git a/Content.Client/Graphics/Overlays/CritOverlay.cs b/Content.Client/MobState/Overlays/CritOverlay.cs
similarity index 95%
rename from Content.Client/Graphics/Overlays/CritOverlay.cs
rename to Content.Client/MobState/Overlays/CritOverlay.cs
index efccb878fe..576d501e43 100644
--- a/Content.Client/Graphics/Overlays/CritOverlay.cs
+++ b/Content.Client/MobState/Overlays/CritOverlay.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Shared.Enums;
@@ -6,7 +6,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.Graphics.Overlays
+namespace Content.Client.MobState.Overlays
 {
     public class CritOverlay : Overlay
     {
diff --git a/Content.Client/MobState/States/CriticalMobState.cs b/Content.Client/MobState/States/CriticalMobState.cs
new file mode 100644
index 0000000000..c39e8f5be1
--- /dev/null
+++ b/Content.Client/MobState/States/CriticalMobState.cs
@@ -0,0 +1,8 @@
+using Content.Shared.MobState.State;
+
+namespace Content.Client.MobState.States
+{
+    public class CriticalMobState : SharedCriticalMobState
+    {
+    }
+}
diff --git a/Content.Client/GameObjects/Components/Mobs/State/DeadMobState.cs b/Content.Client/MobState/States/DeadMobState.cs
similarity index 81%
rename from Content.Client/GameObjects/Components/Mobs/State/DeadMobState.cs
rename to Content.Client/MobState/States/DeadMobState.cs
index 434a466a2a..3001f5be7b 100644
--- a/Content.Client/GameObjects/Components/Mobs/State/DeadMobState.cs
+++ b/Content.Client/MobState/States/DeadMobState.cs
@@ -1,10 +1,10 @@
-using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Client.Standing;
+using Content.Shared.MobState;
+using Content.Shared.MobState.State;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Mobs.State
+namespace Content.Client.MobState.States
 {
     public class DeadMobState : SharedDeadMobState
     {
diff --git a/Content.Client/GameObjects/Components/Mobs/State/NormalMobState.cs b/Content.Client/MobState/States/NormalMobState.cs
similarity index 72%
rename from Content.Client/GameObjects/Components/Mobs/State/NormalMobState.cs
rename to Content.Client/MobState/States/NormalMobState.cs
index c433a0eb96..19f55075c4 100644
--- a/Content.Client/GameObjects/Components/Mobs/State/NormalMobState.cs
+++ b/Content.Client/MobState/States/NormalMobState.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
+using Content.Shared.MobState.State;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Mobs.State
+namespace Content.Client.MobState.States
 {
     public class NormalMobState : SharedNormalMobState
     {
diff --git a/Content.Client/Utility/ClientModuleManager.cs b/Content.Client/Module/ClientModuleManager.cs
similarity index 84%
rename from Content.Client/Utility/ClientModuleManager.cs
rename to Content.Client/Module/ClientModuleManager.cs
index 75d51debe6..d3b61387f9 100644
--- a/Content.Client/Utility/ClientModuleManager.cs
+++ b/Content.Client/Module/ClientModuleManager.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Interfaces;
+using Content.Shared.Module;
 
-namespace Content.Client.Utility
+namespace Content.Client.Module
 {
     /// <summary>
     /// Client implementation of IModuleManager.
diff --git a/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs b/Content.Client/Morgue/Visualizers/BodyBagVisualizer.cs
similarity index 86%
rename from Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs
rename to Content.Client/Morgue/Visualizers/BodyBagVisualizer.cs
index 591a0c3874..0a632fb282 100644
--- a/Content.Client/GameObjects/Components/Morgue/BodyBagVisualizer.cs
+++ b/Content.Client/Morgue/Visualizers/BodyBagVisualizer.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Morgue;
+using Content.Shared.Morgue;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Morgue
+namespace Content.Client.Morgue.Visualizers
 {
     [UsedImplicitly]
     public sealed class BodyBagVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs b/Content.Client/Morgue/Visualizers/CrematoriumVisualizer.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs
rename to Content.Client/Morgue/Visualizers/CrematoriumVisualizer.cs
index 3fb7198a1c..48824e4a07 100644
--- a/Content.Client/GameObjects/Components/Morgue/CrematoriumVisualizer.cs
+++ b/Content.Client/Morgue/Visualizers/CrematoriumVisualizer.cs
@@ -1,11 +1,9 @@
-using Content.Shared.GameObjects.Components.Morgue;
+using Content.Shared.Morgue;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components.Morgue
+namespace Content.Client.Morgue.Visualizers
 {
     [UsedImplicitly]
     public sealed class CrematoriumVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs b/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs
rename to Content.Client/Morgue/Visualizers/MorgueVisualizer.cs
index bf49fa44b0..c1d5801780 100644
--- a/Content.Client/GameObjects/Components/Morgue/MorgueVisualizer.cs
+++ b/Content.Client/Morgue/Visualizers/MorgueVisualizer.cs
@@ -1,12 +1,9 @@
 #nullable enable
-using System.Runtime.CompilerServices;
-using Content.Shared.GameObjects.Components.Morgue;
+using Content.Shared.Morgue;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components.Storage
+namespace Content.Client.Morgue.Visualizers
 {
     public sealed class MorgueVisualizer : AppearanceVisualizer
     {
diff --git a/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs b/Content.Client/Movement/Components/ClimbableComponent.cs
similarity index 80%
rename from Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs
rename to Content.Client/Movement/Components/ClimbableComponent.cs
index 9cd08c1a52..fb74d4fb9b 100644
--- a/Content.Client/GameObjects/Components/Movement/ClimbableComponent.cs
+++ b/Content.Client/Movement/Components/ClimbableComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Climbing;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Movement
+namespace Content.Client.Movement.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IClimbable))]
diff --git a/Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs b/Content.Client/Movement/Components/ClimbingComponent.cs
similarity index 84%
rename from Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs
rename to Content.Client/Movement/Components/ClimbingComponent.cs
index bd745c04a9..849cc147a7 100644
--- a/Content.Client/GameObjects/Components/Movement/ClimbingComponent.cs
+++ b/Content.Client/Movement/Components/ClimbingComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Climbing;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Movement
+namespace Content.Client.Movement.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedClimbingComponent))]
diff --git a/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs b/Content.Client/Movement/Visualizers/HandTeleporterVisualizer.cs
similarity index 81%
rename from Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs
rename to Content.Client/Movement/Visualizers/HandTeleporterVisualizer.cs
index fc5d4849e8..597029a37e 100644
--- a/Content.Client/GameObjects/Components/Movement/HandTeleporterVisualizer.cs
+++ b/Content.Client/Movement/Visualizers/HandTeleporterVisualizer.cs
@@ -1,11 +1,9 @@
 using System;
-using Content.Client.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Portal;
+using Content.Shared.Portal.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Movement
+namespace Content.Client.Movement.Visualizers
 {
     [UsedImplicitly]
     public class HandTeleporterVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs b/Content.Client/Movement/Visualizers/PortalVisualizer.cs
similarity index 93%
rename from Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs
rename to Content.Client/Movement/Visualizers/PortalVisualizer.cs
index eec1bfe51f..4ab0bf605b 100644
--- a/Content.Client/GameObjects/Components/Movement/PortalVisualizer.cs
+++ b/Content.Client/Movement/Visualizers/PortalVisualizer.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Portal;
+using Content.Shared.Portal.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Movement
+namespace Content.Client.Movement.Visualizers
 {
     [UsedImplicitly]
     public class PortalVisualizer : AppearanceVisualizer
diff --git a/Content.Client/ClientNotifyManager.cs b/Content.Client/Notifications/Managers/ClientNotifyManager.cs
similarity index 98%
rename from Content.Client/ClientNotifyManager.cs
rename to Content.Client/Notifications/Managers/ClientNotifyManager.cs
index 544c8a38c8..a8fd79dd4d 100644
--- a/Content.Client/ClientNotifyManager.cs
+++ b/Content.Client/Notifications/Managers/ClientNotifyManager.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Content.Client.Interfaces;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Content.Shared;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -16,7 +15,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Client
+namespace Content.Client.Notifications.Managers
 {
     public class ClientNotifyManager : SharedNotifyManager, IClientNotifyManager
     {
diff --git a/Content.Client/Interfaces/IClientNotifyManager.cs b/Content.Client/Notifications/Managers/IClientNotifyManager.cs
similarity index 79%
rename from Content.Client/Interfaces/IClientNotifyManager.cs
rename to Content.Client/Notifications/Managers/IClientNotifyManager.cs
index b7dbaf36d0..b4baab491c 100644
--- a/Content.Client/Interfaces/IClientNotifyManager.cs
+++ b/Content.Client/Notifications/Managers/IClientNotifyManager.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Interfaces;
+using Content.Shared.Notification;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
-namespace Content.Client.Interfaces
+namespace Content.Client.Notifications.Managers
 {
     public interface IClientNotifyManager : ISharedNotifyManager
     {
diff --git a/Content.Client/GameObjects/Components/Nutrition/HungerComponent.cs b/Content.Client/Nutrition/Components/HungerComponent.cs
similarity index 82%
rename from Content.Client/GameObjects/Components/Nutrition/HungerComponent.cs
rename to Content.Client/Nutrition/Components/HungerComponent.cs
index f972160b50..58af57803c 100644
--- a/Content.Client/GameObjects/Components/Nutrition/HungerComponent.cs
+++ b/Content.Client/Nutrition/Components/HungerComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Shared.Movement.Components;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Nutrition
+namespace Content.Client.Nutrition.Components
 {
     [RegisterComponent]
     public class HungerComponent : SharedHungerComponent
diff --git a/Content.Client/GameObjects/Components/Nutrition/ThirstComponent.cs b/Content.Client/Nutrition/Components/ThirstComponent.cs
similarity index 82%
rename from Content.Client/GameObjects/Components/Nutrition/ThirstComponent.cs
rename to Content.Client/Nutrition/Components/ThirstComponent.cs
index eb30b7e287..4394ef6517 100644
--- a/Content.Client/GameObjects/Components/Nutrition/ThirstComponent.cs
+++ b/Content.Client/Nutrition/Components/ThirstComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Shared.Movement.Components;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Nutrition
+namespace Content.Client.Nutrition.Components
 {
     [RegisterComponent]
     public class ThirstComponent : SharedThirstComponent
diff --git a/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs b/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs
rename to Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
index 7425dd6c3f..3c509b110f 100644
--- a/Content.Client/GameObjects/Components/Nutrition/CreamPiedVisualizer.cs
+++ b/Content.Client/Nutrition/Visualizers/CreamPiedVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Shared.Nutrition.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Nutrition
+namespace Content.Client.Nutrition.Visualizers
 {
     [UsedImplicitly]
     public class CreamPiedVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs b/Content.Client/Nutrition/Visualizers/DrinkFoodContainerVisualizer2D.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs
rename to Content.Client/Nutrition/Visualizers/DrinkFoodContainerVisualizer2D.cs
index a33ea6c4cd..5117ebe5e2 100644
--- a/Content.Client/GameObjects/Components/Nutrition/DrinkFoodContainerVisualizer2D.cs
+++ b/Content.Client/Nutrition/Visualizers/DrinkFoodContainerVisualizer2D.cs
@@ -1,11 +1,11 @@
 using System;
-using Content.Shared.GameObjects.Components.Nutrition;
-using Content.Shared.Utility;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Rounding;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Nutrition
+namespace Content.Client.Nutrition.Visualizers
 {
     [UsedImplicitly]
     public sealed class FoodContainerVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs b/Content.Client/PDA/PDABoundUserInterface.cs
similarity index 99%
rename from Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs
rename to Content.Client/PDA/PDABoundUserInterface.cs
index b1ede0a33f..e1016d1d32 100644
--- a/Content.Client/GameObjects/Components/PDA/PDABoundUserInterface.cs
+++ b/Content.Client/PDA/PDABoundUserInterface.cs
@@ -1,7 +1,7 @@
 using System;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components.PDA;
+using Content.Client.Examine;
+using Content.Client.Message;
+using Content.Shared.PDA;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -15,7 +15,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.GameObjects.Components.PDA
+namespace Content.Client.PDA
 {
     [UsedImplicitly]
     public class PDABoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/PDA/PDAComponent.cs b/Content.Client/PDA/PDAComponent.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/PDA/PDAComponent.cs
rename to Content.Client/PDA/PDAComponent.cs
index 01e925f0e4..b9e0c206dc 100644
--- a/Content.Client/GameObjects/Components/PDA/PDAComponent.cs
+++ b/Content.Client/PDA/PDAComponent.cs
@@ -1,11 +1,11 @@
-using Content.Shared.GameObjects.Components.PDA;
+using Content.Shared.PDA;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
 using Robust.Shared.Player;
 using Robust.Shared.Players;
 
-namespace Content.Client.GameObjects.Components.PDA
+namespace Content.Client.PDA
 {
     [RegisterComponent]
     public class PDAComponent : SharedPDAComponent
diff --git a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs b/Content.Client/PDA/PDAVisualizer.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs
rename to Content.Client/PDA/PDAVisualizer.cs
index d83cfdddb8..36d4c403f3 100644
--- a/Content.Client/GameObjects/Components/PDA/PDAVisualizer.cs
+++ b/Content.Client/PDA/PDAVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.PDA;
+using Content.Shared.PDA;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.PDA
+namespace Content.Client.PDA
 {
     [UsedImplicitly]
     // ReSharper disable once InconsistentNaming
diff --git a/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs
rename to Content.Client/Paper/UI/PaperBoundUserInterface.cs
index ab27bc65eb..d3c9542733 100644
--- a/Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs
+++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs
@@ -2,9 +2,9 @@ using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.SharedPaperComponent;
+using static Content.Shared.Paper.SharedPaperComponent;
 
-namespace Content.Client.GameObjects.Components.Paper
+namespace Content.Client.Paper.UI
 {
     [UsedImplicitly]
     public class PaperBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/Paper/PaperWindow.cs b/Content.Client/Paper/UI/PaperWindow.cs
similarity index 88%
rename from Content.Client/GameObjects/Components/Paper/PaperWindow.cs
rename to Content.Client/Paper/UI/PaperWindow.cs
index f4e3905e4f..6a0c01c083 100644
--- a/Content.Client/GameObjects/Components/Paper/PaperWindow.cs
+++ b/Content.Client/Paper/UI/PaperWindow.cs
@@ -1,10 +1,9 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Paper;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 
-namespace Content.Client.GameObjects.Components.Paper
+namespace Content.Client.Paper.UI
 {
     public class PaperWindow : SS14Window
     {
diff --git a/Content.Client/Interfaces/Parallax/IParallaxManager.cs b/Content.Client/Parallax/Managers/IParallaxManager.cs
similarity index 82%
rename from Content.Client/Interfaces/Parallax/IParallaxManager.cs
rename to Content.Client/Parallax/Managers/IParallaxManager.cs
index d47af0677d..6a2aaf192e 100644
--- a/Content.Client/Interfaces/Parallax/IParallaxManager.cs
+++ b/Content.Client/Parallax/Managers/IParallaxManager.cs
@@ -1,7 +1,7 @@
 using System;
 using Robust.Client.Graphics;
 
-namespace Content.Client.Interfaces.Parallax
+namespace Content.Client.Parallax.Managers
 {
     public interface IParallaxManager
     {
diff --git a/Content.Client/Parallax/ParallaxManager.cs b/Content.Client/Parallax/Managers/ParallaxManager.cs
similarity index 98%
rename from Content.Client/Parallax/ParallaxManager.cs
rename to Content.Client/Parallax/Managers/ParallaxManager.cs
index a84ec87675..24fbe71d05 100644
--- a/Content.Client/Parallax/ParallaxManager.cs
+++ b/Content.Client/Parallax/Managers/ParallaxManager.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Content.Client.Interfaces.Parallax;
 using Content.Shared;
 using Nett;
 using Robust.Client.Graphics;
@@ -15,7 +14,7 @@ using Robust.Shared.Utility;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace Content.Client.Parallax
+namespace Content.Client.Parallax.Managers
 {
     internal sealed class ParallaxManager : IParallaxManager
     {
diff --git a/Content.Client/UserInterface/ParallaxControl.cs b/Content.Client/Parallax/ParallaxControl.cs
similarity index 94%
rename from Content.Client/UserInterface/ParallaxControl.cs
rename to Content.Client/Parallax/ParallaxControl.cs
index a93ade5c04..b02cb661af 100644
--- a/Content.Client/UserInterface/ParallaxControl.cs
+++ b/Content.Client/Parallax/ParallaxControl.cs
@@ -1,4 +1,4 @@
-using Content.Client.Interfaces.Parallax;
+using Content.Client.Parallax.Managers;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Shared.IoC;
@@ -6,7 +6,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Parallax
 {
     /// <summary>
     ///     Renders the parallax background as a UI control.
diff --git a/Content.Client/Parallax/ParallaxOverlay.cs b/Content.Client/Parallax/ParallaxOverlay.cs
index 5feedc4409..db3c84e924 100644
--- a/Content.Client/Parallax/ParallaxOverlay.cs
+++ b/Content.Client/Parallax/ParallaxOverlay.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Client.Interfaces.Parallax;
+using Content.Client.Parallax.Managers;
 using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;
diff --git a/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs
rename to Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
index ee2cbbc589..3d5fa2c935 100644
--- a/Content.Client/GameObjects/Components/ParticleAcceleratorPartVisualizer.cs
+++ b/Content.Client/ParticleAccelerator/ParticleAcceleratorPartVisualizer.cs
@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Singularity.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.ParticleAccelerator
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorBoundUserInterface.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
similarity index 92%
rename from Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorBoundUserInterface.cs
rename to Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
index b1dd582314..e4df220529 100644
--- a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorBoundUserInterface.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorBoundUserInterface.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Singularity.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.UserInterface.ParticleAccelerator
+namespace Content.Client.ParticleAccelerator.UI
 {
     public class ParticleAcceleratorBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
similarity index 99%
rename from Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs
rename to Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
index b55c2101be..3cbdf4b2ef 100644
--- a/Content.Client/UserInterface/ParticleAccelerator/ParticleAcceleratorControlMenu.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
@@ -1,7 +1,8 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components;
+using Content.Client.HUD.UI;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Shared.Singularity.Components;
 using Robust.Client.Animations;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -15,7 +16,7 @@ using Robust.Shared.Noise;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Client.UserInterface.ParticleAccelerator
+namespace Content.Client.ParticleAccelerator.UI
 {
     public sealed class ParticleAcceleratorControlMenu : BaseWindow
     {
diff --git a/Content.Client/Physics/Controllers/MoverController.cs b/Content.Client/Physics/Controllers/MoverController.cs
index 797b34f1ac..e7fef24c90 100644
--- a/Content.Client/Physics/Controllers/MoverController.cs
+++ b/Content.Client/Physics/Controllers/MoverController.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Movement.Components;
 using Content.Shared.Physics.Controllers;
 using Robust.Client.Player;
 using Robust.Shared.GameObjects;
diff --git a/Content.Client/GameObjects/Components/PlaceableSurfaceComponent.cs b/Content.Client/Placeable/PlaceableSurfaceComponent.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/PlaceableSurfaceComponent.cs
rename to Content.Client/Placeable/PlaceableSurfaceComponent.cs
index ab47a4a048..11776ba072 100644
--- a/Content.Client/GameObjects/Components/PlaceableSurfaceComponent.cs
+++ b/Content.Client/Placeable/PlaceableSurfaceComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Placeable;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Placeable
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedPlaceableSurfaceComponent))]
diff --git a/Content.Client/GameObjects/Components/Pointing/PointingArrowComponent.cs b/Content.Client/Pointing/Components/PointingArrowComponent.cs
similarity index 71%
rename from Content.Client/GameObjects/Components/Pointing/PointingArrowComponent.cs
rename to Content.Client/Pointing/Components/PointingArrowComponent.cs
index 92ac28a48a..4be2892b38 100644
--- a/Content.Client/GameObjects/Components/Pointing/PointingArrowComponent.cs
+++ b/Content.Client/Pointing/Components/PointingArrowComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Pointing;
+using Content.Shared.Pointing.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using DrawDepth = Content.Shared.GameObjects.DrawDepth;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
-namespace Content.Client.GameObjects.Components.Pointing
+namespace Content.Client.Pointing.Components
 {
     [RegisterComponent]
     public class PointingArrowComponent : SharedPointingArrowComponent
diff --git a/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs b/Content.Client/Pointing/Components/RoguePointingArrowComponent.cs
similarity index 71%
rename from Content.Client/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs
rename to Content.Client/Pointing/Components/RoguePointingArrowComponent.cs
index 19ab52f197..976505c7ad 100644
--- a/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs
+++ b/Content.Client/Pointing/Components/RoguePointingArrowComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Pointing;
+using Content.Shared.Pointing.Components;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using DrawDepth = Content.Shared.GameObjects.DrawDepth;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
-namespace Content.Client.GameObjects.Components.Pointing
+namespace Content.Client.Pointing.Components
 {
     [RegisterComponent]
     public class RoguePointingArrowComponent : SharedRoguePointingArrowComponent
diff --git a/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs b/Content.Client/Pointing/RoguePointingArrowVisualizer.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs
rename to Content.Client/Pointing/RoguePointingArrowVisualizer.cs
index b326240ea1..9ef6f55775 100644
--- a/Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs
+++ b/Content.Client/Pointing/RoguePointingArrowVisualizer.cs
@@ -1,12 +1,12 @@
 using System;
-using Content.Shared.GameObjects.Components.Pointing;
+using Content.Shared.Pointing.Components;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Pointing
+namespace Content.Client.Pointing
 {
     [UsedImplicitly]
     public class RoguePointingArrowVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Portal/PortalComponent.cs b/Content.Client/Portal/PortalComponent.cs
similarity index 54%
rename from Content.Client/GameObjects/Components/Portal/PortalComponent.cs
rename to Content.Client/Portal/PortalComponent.cs
index 1dfa71e8e0..7ef2899c32 100644
--- a/Content.Client/GameObjects/Components/Portal/PortalComponent.cs
+++ b/Content.Client/Portal/PortalComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Portal;
+using Content.Shared.Portal.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Portal
+namespace Content.Client.Portal
 {
     [RegisterComponent]
     public class PortalComponent : SharedPortalComponent
diff --git a/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs b/Content.Client/Power/PowerDeviceVisualizer.cs
similarity index 85%
rename from Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs
rename to Content.Client/Power/PowerDeviceVisualizer.cs
index 99d3dcaab0..44dd5ac8b8 100644
--- a/Content.Client/GameObjects/Components/Power/PowerDeviceVisualizer.cs
+++ b/Content.Client/Power/PowerDeviceVisualizer.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.Power
 {
     [UsedImplicitly]
     public class PowerDeviceVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs b/Content.Client/PowerCell/PowerCellVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs
rename to Content.Client/PowerCell/PowerCellVisualizer.cs
index ffbcd1fadb..29052155f8 100644
--- a/Content.Client/GameObjects/Components/Power/PowerCellVisualizer.cs
+++ b/Content.Client/PowerCell/PowerCellVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.PowerCell;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.PowerCell
 {
     [UsedImplicitly]
     public class PowerCellVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs b/Content.Client/PowerCell/PowerChargerVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs
rename to Content.Client/PowerCell/PowerChargerVisualizer.cs
index 8a3fe972dc..a6bd92a4e1 100644
--- a/Content.Client/GameObjects/Components/Power/PowerChargerVisualizer.cs
+++ b/Content.Client/PowerCell/PowerChargerVisualizer.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.Power;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.PowerCell
 {
     [UsedImplicitly]
     public class PowerChargerVisualizer : AppearanceVisualizer
diff --git a/Content.Client/ClientPreferencesManager.cs b/Content.Client/Preferences/ClientPreferencesManager.cs
similarity index 97%
rename from Content.Client/ClientPreferencesManager.cs
rename to Content.Client/Preferences/ClientPreferencesManager.cs
index 0a0530ddd0..d62b95d5c2 100644
--- a/Content.Client/ClientPreferencesManager.cs
+++ b/Content.Client/Preferences/ClientPreferencesManager.cs
@@ -1,14 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.Interfaces;
-using Content.Shared.Network.NetMessages;
 using Content.Shared.Preferences;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 
-namespace Content.Client
+namespace Content.Client.Preferences
 {
     /// <summary>
     ///     Receives <see cref="PlayerPreferences" /> and <see cref="GameSettings" /> from the server during the initial
diff --git a/Content.Client/Interfaces/IClientPreferencesManager.cs b/Content.Client/Preferences/IClientPreferencesManager.cs
similarity index 94%
rename from Content.Client/Interfaces/IClientPreferencesManager.cs
rename to Content.Client/Preferences/IClientPreferencesManager.cs
index 8fd6b75b17..e55d6b600c 100644
--- a/Content.Client/Interfaces/IClientPreferencesManager.cs
+++ b/Content.Client/Preferences/IClientPreferencesManager.cs
@@ -1,7 +1,7 @@
 using System;
 using Content.Shared.Preferences;
 
-namespace Content.Client.Interfaces
+namespace Content.Client.Preferences
 {
     public interface IClientPreferencesManager
     {
diff --git a/Content.Client/UserInterface/CharacterSetupGui.cs b/Content.Client/Preferences/UI/CharacterSetupGui.cs
similarity index 97%
rename from Content.Client/UserInterface/CharacterSetupGui.cs
rename to Content.Client/Preferences/UI/CharacterSetupGui.cs
index fcd7acd97d..eec408ffd0 100644
--- a/Content.Client/UserInterface/CharacterSetupGui.cs
+++ b/Content.Client/Preferences/UI/CharacterSetupGui.cs
@@ -1,8 +1,9 @@
 using System.Linq;
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.Interfaces;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.CharacterAppearance;
+using Content.Client.Lobby.UI;
+using Content.Client.Parallax;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Client.GameObjects;
@@ -17,7 +18,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Preferences.UI
 {
     public class CharacterSetupGui : Control
     {
diff --git a/Content.Client/UserInterface/HumanoidProfileEditor.Random.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs
similarity index 86%
rename from Content.Client/UserInterface/HumanoidProfileEditor.Random.cs
rename to Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs
index 87a7883a57..26e22b0e93 100644
--- a/Content.Client/UserInterface/HumanoidProfileEditor.Random.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs
@@ -1,10 +1,11 @@
+using Content.Shared.CharacterAppearance;
+using Content.Shared.Dataset;
 using Content.Shared.Preferences;
-using Content.Shared.Prototypes;
-using Content.Shared.Utility;
+using Content.Shared.Random.Helpers;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Preferences.UI
 {
     public partial class HumanoidProfileEditor
     {
diff --git a/Content.Client/UserInterface/HumanoidProfileEditor.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.cs
similarity index 99%
rename from Content.Client/UserInterface/HumanoidProfileEditor.cs
rename to Content.Client/Preferences/UI/HumanoidProfileEditor.cs
index 2626b963f7..19ec48f190 100644
--- a/Content.Client/UserInterface/HumanoidProfileEditor.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.cs
@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.GameObjects.Components;
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.Interfaces;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.CharacterAppearance;
+using Content.Client.Lobby.UI;
+using Content.Client.Stylesheets;
+using Content.Shared.CharacterAppearance;
 using Content.Shared.GameTicking;
 using Content.Shared.Preferences;
-using Content.Shared.Preferences.Appearance;
 using Content.Shared.Roles;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -24,7 +23,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Preferences.UI
 {
     public partial class HumanoidProfileEditor : Control
     {
diff --git a/Content.Client/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Client/Projectiles/ProjectileComponent.cs
similarity index 81%
rename from Content.Client/GameObjects/Components/Projectiles/ProjectileComponent.cs
rename to Content.Client/Projectiles/ProjectileComponent.cs
index 934a49f13b..784faab5aa 100644
--- a/Content.Client/GameObjects/Components/Projectiles/ProjectileComponent.cs
+++ b/Content.Client/Projectiles/ProjectileComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Projectiles;
+using Content.Shared.Projectiles;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Projectiles
+namespace Content.Client.Projectiles
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedProjectileComponent))]
diff --git a/Content.Client/GameObjects/Components/Pulling/PullableComponent.cs b/Content.Client/Pulling/PullableComponent.cs
similarity index 63%
rename from Content.Client/GameObjects/Components/Pulling/PullableComponent.cs
rename to Content.Client/Pulling/PullableComponent.cs
index 43f3049fc8..ff39f07cc8 100644
--- a/Content.Client/GameObjects/Components/Pulling/PullableComponent.cs
+++ b/Content.Client/Pulling/PullableComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Pulling;
+using Content.Shared.Pulling.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Pulling
+namespace Content.Client.Pulling
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedPullableComponent))]
diff --git a/Content.Client/GameObjects/EntitySystems/PullingSystem.cs b/Content.Client/Pulling/PullingSystem.cs
similarity index 77%
rename from Content.Client/GameObjects/EntitySystems/PullingSystem.cs
rename to Content.Client/Pulling/PullingSystem.cs
index 40064daf22..feeb73ad61 100644
--- a/Content.Client/GameObjects/EntitySystems/PullingSystem.cs
+++ b/Content.Client/Pulling/PullingSystem.cs
@@ -1,10 +1,8 @@
-using Content.Client.GameObjects.Components.Pulling;
-using Content.Shared.GameObjects.EntitySystemMessages.Pulling;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Pulling;
 using JetBrains.Annotations;
 using Robust.Client.Physics;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Pulling
 {
     [UsedImplicitly]
     public class PullingSystem : SharedPullingSystem
diff --git a/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs b/Content.Client/Recycling/RecyclerVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs
rename to Content.Client/Recycling/RecyclerVisualizer.cs
index 64dd202504..f831372b4c 100644
--- a/Content.Client/GameObjects/Components/Recycling/RecyclerVisualizer.cs
+++ b/Content.Client/Recycling/RecyclerVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Recycling;
+using Content.Shared.Recycling;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Recycling
+namespace Content.Client.Recycling
 {
     [UsedImplicitly]
     public class RecyclerVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Research/TechnologyDatabaseComponent.cs b/Content.Client/Research/TechnologyDatabaseComponent.cs
similarity index 87%
rename from Content.Client/GameObjects/Components/Research/TechnologyDatabaseComponent.cs
rename to Content.Client/Research/TechnologyDatabaseComponent.cs
index 152ffedd7a..00b3034846 100644
--- a/Content.Client/GameObjects/Components/Research/TechnologyDatabaseComponent.cs
+++ b/Content.Client/Research/TechnologyDatabaseComponent.cs
@@ -1,11 +1,11 @@
 using System;
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Shared.Research.Components;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.GameObjects.Components.Research
+namespace Content.Client.Research
 {
     [RegisterComponent]
     public class TechnologyDatabaseComponent : SharedTechnologyDatabaseComponent
diff --git a/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs
rename to Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
index 4b021ce686..e44e9f6708 100644
--- a/Content.Client/GameObjects/Components/Research/ResearchClientBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchClientBoundUserInterface.cs
@@ -1,8 +1,8 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Research.SharedResearchClientComponent;
+using static Content.Shared.Research.Components.SharedResearchClientComponent;
 
-namespace Content.Client.GameObjects.Components.Research
+namespace Content.Client.Research.UI
 {
     public class ResearchClientBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs
rename to Content.Client/Research/UI/ResearchClientServerSelectionMenu.cs
index 3b00b70510..ca88ecddab 100644
--- a/Content.Client/GameObjects/Components/Research/ResearchClientServerSelectionMenu.cs
+++ b/Content.Client/Research/UI/ResearchClientServerSelectionMenu.cs
@@ -2,9 +2,8 @@
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Research
+namespace Content.Client.Research.UI
 {
     public class ResearchClientServerSelectionMenu : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs
rename to Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
index 56ac64a206..0fcd499e40 100644
--- a/Content.Client/GameObjects/Components/Research/ResearchConsoleBoundUserInterface.cs
+++ b/Content.Client/Research/UI/ResearchConsoleBoundUserInterface.cs
@@ -1,11 +1,10 @@
-using Content.Client.Research;
-using Content.Shared.Research;
+using Content.Shared.Research.Prototypes;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Research.SharedResearchConsoleComponent;
+using static Content.Shared.Research.Components.SharedResearchConsoleComponent;
 
-namespace Content.Client.GameObjects.Components.Research
+namespace Content.Client.Research.UI
 {
     [UsedImplicitly]
     public class ResearchConsoleBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/Research/ResearchConsoleMenu.cs b/Content.Client/Research/UI/ResearchConsoleMenu.cs
similarity index 98%
rename from Content.Client/Research/ResearchConsoleMenu.cs
rename to Content.Client/Research/UI/ResearchConsoleMenu.cs
index e4a479b502..1f9e64e954 100644
--- a/Content.Client/Research/ResearchConsoleMenu.cs
+++ b/Content.Client/Research/UI/ResearchConsoleMenu.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Shared.Research.Prototypes;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
@@ -9,7 +8,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.Research
+namespace Content.Client.Research.UI
 {
     public class ResearchConsoleMenu : SS14Window
     {
diff --git a/Content.Client/Utility/ResourceCacheExtensions.cs b/Content.Client/Resources/ResourceCacheExtensions.cs
similarity index 96%
rename from Content.Client/Utility/ResourceCacheExtensions.cs
rename to Content.Client/Resources/ResourceCacheExtensions.cs
index e1b9a704ef..3f381216f1 100644
--- a/Content.Client/Utility/ResourceCacheExtensions.cs
+++ b/Content.Client/Resources/ResourceCacheExtensions.cs
@@ -3,7 +3,7 @@ using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Utility
+namespace Content.Client.Resources
 {
     [PublicAPI]
     public static class ResourceCacheExtensions
diff --git a/Content.Client/GameObjects/Components/Rotatable/RotatableComponent.cs b/Content.Client/Rotatable/RotatableComponent.cs
similarity index 65%
rename from Content.Client/GameObjects/Components/Rotatable/RotatableComponent.cs
rename to Content.Client/Rotatable/RotatableComponent.cs
index 462d360709..2e46278b35 100644
--- a/Content.Client/GameObjects/Components/Rotatable/RotatableComponent.cs
+++ b/Content.Client/Rotatable/RotatableComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Rotatable;
+using Content.Shared.Rotatable;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Rotatable
+namespace Content.Client.Rotatable
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedRotatableComponent))]
diff --git a/Content.Client/GameObjects/Components/Rotation/RotationVisualizer.cs b/Content.Client/Rotation/RotationVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Rotation/RotationVisualizer.cs
rename to Content.Client/Rotation/RotationVisualizer.cs
index e835d83cb7..5e99489efa 100644
--- a/Content.Client/GameObjects/Components/Rotation/RotationVisualizer.cs
+++ b/Content.Client/Rotation/RotationVisualizer.cs
@@ -1,12 +1,12 @@
 using System;
-using Content.Shared.GameObjects.Components.Rotation;
+using Content.Shared.Rotation;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Animations;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Rotation
+namespace Content.Client.Rotation
 {
     [UsedImplicitly]
     public class RotationVisualizer : AppearanceVisualizer
diff --git a/Content.Client/UserInterface/RoundEndSummaryWindow.cs b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
similarity index 98%
rename from Content.Client/UserInterface/RoundEndSummaryWindow.cs
rename to Content.Client/RoundEnd/RoundEndSummaryWindow.cs
index 06d90285ff..92ef60745c 100644
--- a/Content.Client/UserInterface/RoundEndSummaryWindow.cs
+++ b/Content.Client/RoundEnd/RoundEndSummaryWindow.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.Utility;
+using Content.Client.Message;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using static Content.Shared.GameTicking.SharedGameTicker;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.RoundEnd
 {
     public sealed class RoundEndSummaryWindow : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs b/Content.Client/SMES/SmesVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Power/SmesVisualizer.cs
rename to Content.Client/SMES/SmesVisualizer.cs
index 85d30e3d15..0937cfb3ad 100644
--- a/Content.Client/GameObjects/Components/Power/SmesVisualizer.cs
+++ b/Content.Client/SMES/SmesVisualizer.cs
@@ -1,9 +1,10 @@
-using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.Power;
+using Content.Shared.SMES;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.SMES
 {
     [UsedImplicitly]
     public class SmesVisualizer : AppearanceVisualizer
diff --git a/Content.Client/Sandbox/SandboxManager.cs b/Content.Client/Sandbox/SandboxManager.cs
index 3341345d0d..1ac730025f 100644
--- a/Content.Client/Sandbox/SandboxManager.cs
+++ b/Content.Client/Sandbox/SandboxManager.cs
@@ -1,9 +1,12 @@
 using System;
 using Content.Client.GameObjects.EntitySystems;
+using Content.Client.HUD;
+using Content.Client.Markers;
 using Content.Client.UserInterface;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Input;
 using Content.Shared.Sandbox;
+using Content.Shared.SubFloor;
 using Robust.Client.Console;
 using Robust.Client.Debugging;
 using Robust.Client.Graphics;
diff --git a/Content.Client/ScreenshotHook.cs b/Content.Client/Screenshot/ScreenshotHook.cs
similarity index 97%
rename from Content.Client/ScreenshotHook.cs
rename to Content.Client/Screenshot/ScreenshotHook.cs
index 2bf3c8b78d..ca9d50e2b7 100644
--- a/Content.Client/ScreenshotHook.cs
+++ b/Content.Client/Screenshot/ScreenshotHook.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using Content.Client.State;
+using Content.Client.Viewport;
 using Content.Shared.Input;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
@@ -14,7 +14,7 @@ using Robust.Shared.Utility;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace Content.Client
+namespace Content.Client.Screenshot
 {
     internal class ScreenshotHook : IScreenshotHook
     {
diff --git a/Content.Client/GameObjects/Components/Singularity/ClientSingularityComponent.cs b/Content.Client/Singularity/Components/ClientSingularityComponent.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/Singularity/ClientSingularityComponent.cs
rename to Content.Client/Singularity/Components/ClientSingularityComponent.cs
index 4f7cbaee49..b56c1a44e6 100644
--- a/Content.Client/GameObjects/Components/Singularity/ClientSingularityComponent.cs
+++ b/Content.Client/Singularity/Components/ClientSingularityComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Singularity;
+using Content.Shared.Singularity.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Singularity
+namespace Content.Client.Singularity.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IClientSingularityInstance))]
diff --git a/Content.Client/GameObjects/Components/Singularity/ContainmentFieldComponent.cs b/Content.Client/Singularity/Components/ContainmentFieldComponent.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Singularity/ContainmentFieldComponent.cs
rename to Content.Client/Singularity/Components/ContainmentFieldComponent.cs
index 603f6516ad..b7cf081019 100644
--- a/Content.Client/GameObjects/Components/Singularity/ContainmentFieldComponent.cs
+++ b/Content.Client/Singularity/Components/ContainmentFieldComponent.cs
@@ -2,7 +2,7 @@ using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 
-namespace Content.Client.GameObjects.Components.Singularity
+namespace Content.Client.Singularity.Components
 {
     public class ContainmentFieldComponent : Component
     {
diff --git a/Content.Client/GameObjects/Components/Singularity/ISingularity.cs b/Content.Client/Singularity/Components/ISingularity.cs
similarity index 69%
rename from Content.Client/GameObjects/Components/Singularity/ISingularity.cs
rename to Content.Client/Singularity/Components/ISingularity.cs
index 7c7290dfe7..e445378548 100644
--- a/Content.Client/GameObjects/Components/Singularity/ISingularity.cs
+++ b/Content.Client/Singularity/Components/ISingularity.cs
@@ -2,7 +2,7 @@
 
 
 
-namespace Content.Client.GameObjects.Components.Singularity
+namespace Content.Client.Singularity.Components
 {
     interface IClientSingularityInstance
     {
diff --git a/Content.Client/GameObjects/Components/Singularity/ToySingularityComponent.cs b/Content.Client/Singularity/Components/ToySingularityComponent.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Singularity/ToySingularityComponent.cs
rename to Content.Client/Singularity/Components/ToySingularityComponent.cs
index e52dd917e2..4238a503cc 100644
--- a/Content.Client/GameObjects/Components/Singularity/ToySingularityComponent.cs
+++ b/Content.Client/Singularity/Components/ToySingularityComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Singularity
+namespace Content.Client.Singularity.Components
 {
 
     [RegisterComponent]
diff --git a/Content.Client/Graphics/Overlays/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs
similarity index 98%
rename from Content.Client/Graphics/Overlays/SingularityOverlay.cs
rename to Content.Client/Singularity/SingularityOverlay.cs
index bb88af0401..abaaf62b3e 100644
--- a/Content.Client/Graphics/Overlays/SingularityOverlay.cs
+++ b/Content.Client/Singularity/SingularityOverlay.cs
@@ -1,17 +1,16 @@
 #nullable enable
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
 using System.Collections.Generic;
-using Robust.Client.Graphics;
 using System.Linq;
-using System;
+using Content.Client.Singularity.Components;
+using Robust.Client.Graphics;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
-using Content.Client.GameObjects.Components.Singularity;
+using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
 
-namespace Content.Client.Graphics.Overlays
+namespace Content.Client.Singularity
 {
     public class SingularityOverlay : Overlay
     {
diff --git a/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs b/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs
rename to Content.Client/Singularity/Visualizers/EmitterVisualizer.cs
index 9f918f330d..74c59b3223 100644
--- a/Content.Client/GameObjects/Components/Singularity/EmitterVisualizer.cs
+++ b/Content.Client/Singularity/Visualizers/EmitterVisualizer.cs
@@ -1,9 +1,9 @@
 using System;
-using Content.Shared.GameObjects.Components.Singularity;
+using Content.Shared.Singularity.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Singularity
+namespace Content.Client.Singularity.Visualizers
 {
     [UsedImplicitly]
     public class EmitterVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs b/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs
rename to Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
index 30c1311a84..459ab2e7a7 100644
--- a/Content.Client/GameObjects/Components/RadiationCollectorVisualizer.cs
+++ b/Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
@@ -1,12 +1,12 @@
 using System;
-using Content.Shared.GameObjects.Components.Singularity;
+using Content.Shared.Singularity.Components;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Singularity.Visualizers
 {
     [UsedImplicitly]
     public class RadiationCollectorVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/GameObjects/Components/Singularity/SingularityVisualizer.cs b/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/Singularity/SingularityVisualizer.cs
rename to Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
index af70cf1da3..c7ac7d2f8f 100644
--- a/Content.Client/GameObjects/Components/Singularity/SingularityVisualizer.cs
+++ b/Content.Client/Singularity/Visualizers/SingularityVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Singularity;
+using Content.Shared.Singularity;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Singularity
+namespace Content.Client.Singularity.Visualizers
 {
     [UsedImplicitly]
     public class SingularityVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Nutrition/BurnStateVisualizer.cs b/Content.Client/Smoking/BurnStateVisualizer.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Nutrition/BurnStateVisualizer.cs
rename to Content.Client/Smoking/BurnStateVisualizer.cs
index 8f756f5756..0beb27a125 100644
--- a/Content.Client/GameObjects/Components/Nutrition/BurnStateVisualizer.cs
+++ b/Content.Client/Smoking/BurnStateVisualizer.cs
@@ -1,11 +1,9 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Smoking;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components.Nutrition
+namespace Content.Client.Smoking
 {
     [UsedImplicitly]
     public class BurnStateVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs b/Content.Client/Solar/SolarControlConsoleBoundUserInterface.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs
rename to Content.Client/Solar/SolarControlConsoleBoundUserInterface.cs
index 5a2823ceed..ed457181ec 100644
--- a/Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs
+++ b/Content.Client/Solar/SolarControlConsoleBoundUserInterface.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Shared.GameObjects.Components.Power;
+using Content.Shared.Solar;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -11,7 +11,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.Components.Power
+namespace Content.Client.Solar
 {
     [UsedImplicitly]
     public class SolarControlConsoleBoundUserInterface : BoundUserInterface
diff --git a/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs b/Content.Client/Sound/LoopingSoundComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs
rename to Content.Client/Sound/LoopingSoundComponent.cs
index 4b78bbadc5..8e4dfc54b8 100644
--- a/Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs
+++ b/Content.Client/Sound/LoopingSoundComponent.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Sound;
 using Content.Shared.Physics;
+using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -10,7 +10,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Sound
+namespace Content.Client.Sound
 {
     [RegisterComponent]
     public class LoopingSoundComponent : SharedLoopingSoundComponent
diff --git a/Content.Client/GameObjects/Components/ClientEntitySpawnerComponent.cs b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/ClientEntitySpawnerComponent.cs
rename to Content.Client/Spawners/ClientEntitySpawnerComponent.cs
index f2224bc2f2..3a6a7e5468 100644
--- a/Content.Client/GameObjects/Components/ClientEntitySpawnerComponent.cs
+++ b/Content.Client/Spawners/ClientEntitySpawnerComponent.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Spawners
 {
     /// <summary>
     ///     Spawns a set of entities on the client only, and removes them when this component is removed.
diff --git a/Content.Client/GameObjects/Components/StackComponent.cs b/Content.Client/Stack/StackComponent.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/StackComponent.cs
rename to Content.Client/Stack/StackComponent.cs
index 10e4f71da8..c3fa29310b 100644
--- a/Content.Client/GameObjects/Components/StackComponent.cs
+++ b/Content.Client/Stack/StackComponent.cs
@@ -1,6 +1,7 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components;
+using Content.Client.Items.Components;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.Stacks;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
@@ -8,7 +9,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Stack
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedStackComponent))]
diff --git a/Content.Client/GameObjects/EntitySystems/StackSystem.cs b/Content.Client/Stack/StackSystem.cs
similarity index 75%
rename from Content.Client/GameObjects/EntitySystems/StackSystem.cs
rename to Content.Client/Stack/StackSystem.cs
index 27e67089d0..6504e99ee8 100644
--- a/Content.Client/GameObjects/EntitySystems/StackSystem.cs
+++ b/Content.Client/Stack/StackSystem.cs
@@ -1,10 +1,8 @@
-using Content.Client.GameObjects.Components;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Stack
 {
     [UsedImplicitly]
     public class StackSystem : SharedStackSystem
diff --git a/Content.Client/GameObjects/Components/StackVisualizer.cs b/Content.Client/Stack/StackVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/StackVisualizer.cs
rename to Content.Client/Stack/StackVisualizer.cs
index b3d3b488cc..3b0197ef93 100644
--- a/Content.Client/GameObjects/Components/StackVisualizer.cs
+++ b/Content.Client/Stack/StackVisualizer.cs
@@ -1,15 +1,15 @@
 #nullable enable
 
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Rounding;
+using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Stack
 {
     /// <summary>
     /// Visualizer for items that come in stacks and have different appearance
diff --git a/Content.Client/GameObjects/EntitySystems/StandingStateSystem.cs b/Content.Client/Standing/StandingStateSystem.cs
similarity index 88%
rename from Content.Client/GameObjects/EntitySystems/StandingStateSystem.cs
rename to Content.Client/Standing/StandingStateSystem.cs
index ce15b07fad..0268055fcc 100644
--- a/Content.Client/GameObjects/EntitySystems/StandingStateSystem.cs
+++ b/Content.Client/Standing/StandingStateSystem.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Rotation;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Rotation;
+using Content.Shared.Standing;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Standing
 {
     public class StandingStateSystem : SharedStandingStateSystem
     {
diff --git a/Content.Client/StationEvents/IStationEventManager.cs b/Content.Client/StationEvents/Managers/IStationEventManager.cs
similarity index 85%
rename from Content.Client/StationEvents/IStationEventManager.cs
rename to Content.Client/StationEvents/Managers/IStationEventManager.cs
index ba1ddf9e4a..84139de958 100644
--- a/Content.Client/StationEvents/IStationEventManager.cs
+++ b/Content.Client/StationEvents/Managers/IStationEventManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Content.Client.StationEvents
+namespace Content.Client.StationEvents.Managers
 {
     public interface IStationEventManager
     {
diff --git a/Content.Client/StationEvents/StationEventManager.cs b/Content.Client/StationEvents/Managers/StationEventManager.cs
similarity index 93%
rename from Content.Client/StationEvents/StationEventManager.cs
rename to Content.Client/StationEvents/Managers/StationEventManager.cs
index d34af8dd82..54917f361b 100644
--- a/Content.Client/StationEvents/StationEventManager.cs
+++ b/Content.Client/StationEvents/Managers/StationEventManager.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.Network.NetMessages;
+using Content.Shared.StationEvents;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
-namespace Content.Client.StationEvents
+namespace Content.Client.StationEvents.Managers
 {
     internal sealed class StationEventManager : IStationEventManager
     {
diff --git a/Content.Client/GameObjects/Components/StationEvents/RadiationPulseComponent.cs b/Content.Client/StationEvents/RadiationPulseComponent.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/StationEvents/RadiationPulseComponent.cs
rename to Content.Client/StationEvents/RadiationPulseComponent.cs
index 439ab8b5bc..00b0f5bdd2 100644
--- a/Content.Client/GameObjects/Components/StationEvents/RadiationPulseComponent.cs
+++ b/Content.Client/StationEvents/RadiationPulseComponent.cs
@@ -1,8 +1,8 @@
 using System;
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Radiation;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.StationEvents
+namespace Content.Client.StationEvents
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedRadiationPulseComponent))]
diff --git a/Content.Client/StationEvents/RadiationPulseOverlay.cs b/Content.Client/StationEvents/RadiationPulseOverlay.cs
index a3aaac651a..02a057a849 100644
--- a/Content.Client/StationEvents/RadiationPulseOverlay.cs
+++ b/Content.Client/StationEvents/RadiationPulseOverlay.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Client.GameObjects.Components.StationEvents;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
diff --git a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs b/Content.Client/Storage/ClientStorageComponent.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
rename to Content.Client/Storage/ClientStorageComponent.cs
index d9352aa355..0ab2341665 100644
--- a/Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
+++ b/Content.Client/Storage/ClientStorageComponent.cs
@@ -2,10 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Client.Animations;
-using Content.Client.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Client.Hands;
+using Content.Shared.DragDrop;
+using Content.Shared.Storage;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -18,7 +17,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 
-namespace Content.Client.GameObjects.Components.Storage
+namespace Content.Client.Storage
 {
     /// <summary>
     /// Client version of item storage containers, contains a UI which displays stored entities and their size
diff --git a/Content.Client/GameObjects/Components/Storage/BagOpenCloseVisualizer.cs b/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/Storage/BagOpenCloseVisualizer.cs
rename to Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
index fa7f650ba9..96f95b10a8 100644
--- a/Content.Client/GameObjects/Components/Storage/BagOpenCloseVisualizer.cs
+++ b/Content.Client/Storage/Visualizers/BagOpenCloseVisualizer.cs
@@ -1,17 +1,16 @@
 #nullable enable
 
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Stacks;
+using Content.Shared.Storage;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
-using YamlDotNet.RepresentationModel;
 using static Robust.Shared.Utility.SpriteSpecifier;
 
-namespace Content.Client.GameObjects.Components.Storage
+namespace Content.Client.Storage.Visualizers
 {
     [UsedImplicitly]
     public class BagOpenCloseVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs b/Content.Client/Storage/Visualizers/StorageVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs
rename to Content.Client/Storage/Visualizers/StorageVisualizer.cs
index cd576f154b..7b7aaf28c4 100644
--- a/Content.Client/GameObjects/Components/Storage/StorageVisualizer.cs
+++ b/Content.Client/Storage/Visualizers/StorageVisualizer.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Storage;
+using Content.Shared.Storage;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Storage
+namespace Content.Client.Storage.Visualizers
 {
     [UsedImplicitly]
     public sealed class StorageVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/GUI/StrippableComponent.cs b/Content.Client/Strip/StrippableComponent.cs
similarity index 67%
rename from Content.Client/GameObjects/Components/GUI/StrippableComponent.cs
rename to Content.Client/Strip/StrippableComponent.cs
index 010b24c796..fa5f871fd2 100644
--- a/Content.Client/GameObjects/Components/GUI/StrippableComponent.cs
+++ b/Content.Client/Strip/StrippableComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.GUI;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Strip.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.GUI
+namespace Content.Client.Strip
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedStrippableComponent))]
diff --git a/Content.Client/UserInterface/StrippingMenu.cs b/Content.Client/Strip/StrippingMenu.cs
similarity index 93%
rename from Content.Client/UserInterface/StrippingMenu.cs
rename to Content.Client/Strip/StrippingMenu.cs
index 18fb27dfa1..a91793d3a2 100644
--- a/Content.Client/UserInterface/StrippingMenu.cs
+++ b/Content.Client/Strip/StrippingMenu.cs
@@ -1,11 +1,10 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Strip
 {
     public class StrippingMenu : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Client/Stunnable/StunnableComponent.cs
similarity index 85%
rename from Content.Client/GameObjects/Components/Mobs/StunnableComponent.cs
rename to Content.Client/Stunnable/StunnableComponent.cs
index ef4179c019..41af623f99 100644
--- a/Content.Client/GameObjects/Components/Mobs/StunnableComponent.cs
+++ b/Content.Client/Stunnable/StunnableComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Movement.Components;
+using Content.Shared.Stunnable;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.Stunnable
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedStunnableComponent))]
diff --git a/Content.Client/UserInterface/Stylesheets/IStylesheetManager.cs b/Content.Client/Stylesheets/IStylesheetManager.cs
similarity index 79%
rename from Content.Client/UserInterface/Stylesheets/IStylesheetManager.cs
rename to Content.Client/Stylesheets/IStylesheetManager.cs
index 2082ffb216..134c7fd3be 100644
--- a/Content.Client/UserInterface/Stylesheets/IStylesheetManager.cs
+++ b/Content.Client/Stylesheets/IStylesheetManager.cs
@@ -1,6 +1,6 @@
 using Robust.Client.UserInterface;
 
-namespace Content.Client.UserInterface.Stylesheets
+namespace Content.Client.Stylesheets
 {
     public interface IStylesheetManager
     {
diff --git a/Content.Client/UserInterface/Stylesheets/StyleBase.cs b/Content.Client/Stylesheets/StyleBase.cs
similarity index 99%
rename from Content.Client/UserInterface/Stylesheets/StyleBase.cs
rename to Content.Client/Stylesheets/StyleBase.cs
index 3b827cf753..ada3880648 100644
--- a/Content.Client/UserInterface/Stylesheets/StyleBase.cs
+++ b/Content.Client/Stylesheets/StyleBase.cs
@@ -1,4 +1,4 @@
-using Content.Client.Utility;
+using Content.Client.Resources;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -6,7 +6,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface.Stylesheets
+namespace Content.Client.Stylesheets
 {
     public abstract class StyleBase
     {
diff --git a/Content.Client/UserInterface/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
similarity index 99%
rename from Content.Client/UserInterface/Stylesheets/StyleNano.cs
rename to Content.Client/Stylesheets/StyleNano.cs
index 0af56865bd..a40dd6bef3 100644
--- a/Content.Client/UserInterface/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -1,9 +1,11 @@
 #nullable enable
 using System.Linq;
-using Content.Client.Chat;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Client.UserInterface.Controls;
-using Content.Client.Utility;
+using Content.Client.Actions.UI;
+using Content.Client.Examine;
+using Content.Client.HUD;
+using Content.Client.HUD.UI;
+using Content.Client.Resources;
+using Content.Client.Targeting;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -12,7 +14,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Maths;
 using static Robust.Client.UserInterface.StylesheetHelpers;
 
-namespace Content.Client.UserInterface.Stylesheets
+namespace Content.Client.Stylesheets
 {
     public sealed class StyleNano : StyleBase
     {
diff --git a/Content.Client/UserInterface/Stylesheets/StyleSpace.cs b/Content.Client/Stylesheets/StyleSpace.cs
similarity index 99%
rename from Content.Client/UserInterface/Stylesheets/StyleSpace.cs
rename to Content.Client/Stylesheets/StyleSpace.cs
index 80b069bf95..6cfb8c78d1 100644
--- a/Content.Client/UserInterface/Stylesheets/StyleSpace.cs
+++ b/Content.Client/Stylesheets/StyleSpace.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.Utility;
+using Content.Client.Resources;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -7,7 +7,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Maths;
 using static Robust.Client.UserInterface.StylesheetHelpers;
 
-namespace Content.Client.UserInterface.Stylesheets
+namespace Content.Client.Stylesheets
 {
     public class StyleSpace : StyleBase
     {
diff --git a/Content.Client/UserInterface/Stylesheets/StylesheetManager.cs b/Content.Client/Stylesheets/StylesheetManager.cs
similarity index 93%
rename from Content.Client/UserInterface/Stylesheets/StylesheetManager.cs
rename to Content.Client/Stylesheets/StylesheetManager.cs
index f4aabf15b7..4c767bd554 100644
--- a/Content.Client/UserInterface/Stylesheets/StylesheetManager.cs
+++ b/Content.Client/Stylesheets/StylesheetManager.cs
@@ -2,7 +2,7 @@ using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Shared.IoC;
 
-namespace Content.Client.UserInterface.Stylesheets
+namespace Content.Client.Stylesheets
 {
     public sealed class StylesheetManager : IStylesheetManager
     {
diff --git a/Content.Client/GameObjects/EntitySystems/SuspicionEndTimerSystem.cs b/Content.Client/Suspicion/SuspicionEndTimerSystem.cs
similarity index 83%
rename from Content.Client/GameObjects/EntitySystems/SuspicionEndTimerSystem.cs
rename to Content.Client/Suspicion/SuspicionEndTimerSystem.cs
index 97f99feda9..a843f496d9 100644
--- a/Content.Client/GameObjects/EntitySystems/SuspicionEndTimerSystem.cs
+++ b/Content.Client/Suspicion/SuspicionEndTimerSystem.cs
@@ -1,8 +1,8 @@
 using System;
-using Content.Shared.GameObjects.EntitySystemMessages;
+using Content.Shared.Suspicion;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Suspicion
 {
     public sealed class SuspicionEndTimerSystem : EntitySystem
     {
diff --git a/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml b/Content.Client/Suspicion/SuspicionGui.xaml
similarity index 100%
rename from Content.Client/UserInterface/Suspicion/SuspicionGui.xaml
rename to Content.Client/Suspicion/SuspicionGui.xaml
diff --git a/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml.cs b/Content.Client/Suspicion/SuspicionGui.xaml.cs
similarity index 95%
rename from Content.Client/UserInterface/Suspicion/SuspicionGui.xaml.cs
rename to Content.Client/Suspicion/SuspicionGui.xaml.cs
index d0c19e40d1..b515a9a83f 100644
--- a/Content.Client/UserInterface/Suspicion/SuspicionGui.xaml.cs
+++ b/Content.Client/Suspicion/SuspicionGui.xaml.cs
@@ -2,9 +2,7 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Linq;
-using Content.Client.GameObjects.Components.Suspicion;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
+using Content.Shared.Notification;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -16,7 +14,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.UserInterface.Suspicion
+namespace Content.Client.Suspicion
 {
     [GenerateTypedNameReferences]
     public partial class SuspicionGui : Control
diff --git a/Content.Client/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs b/Content.Client/Suspicion/SuspicionRoleComponent.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs
rename to Content.Client/Suspicion/SuspicionRoleComponent.cs
index 508079b816..57301e15fb 100644
--- a/Content.Client/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs
+++ b/Content.Client/Suspicion/SuspicionRoleComponent.cs
@@ -1,8 +1,7 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.Suspicion;
-using Content.Shared.GameObjects.Components.Suspicion;
+using Content.Client.HUD;
+using Content.Shared.Suspicion;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -10,7 +9,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Suspicion
+namespace Content.Client.Suspicion
 {
     [RegisterComponent]
     public class SuspicionRoleComponent : SharedSuspicionRoleComponent
diff --git a/Content.Client/GameObjects/Components/Suspicion/TraitorOverlay.cs b/Content.Client/Suspicion/TraitorOverlay.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Suspicion/TraitorOverlay.cs
rename to Content.Client/Suspicion/TraitorOverlay.cs
index ffb6934382..0119597b14 100644
--- a/Content.Client/GameObjects/Components/Suspicion/TraitorOverlay.cs
+++ b/Content.Client/Suspicion/TraitorOverlay.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
 using Robust.Client.ResourceManagement;
@@ -9,7 +9,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 
-namespace Content.Client.GameObjects.Components.Suspicion
+namespace Content.Client.Suspicion
 {
     public class TraitorOverlay : Overlay
     {
diff --git a/Content.Client/UserInterface/TargetingDoll.cs b/Content.Client/Targeting/TargetingDoll.cs
similarity index 95%
rename from Content.Client/UserInterface/TargetingDoll.cs
rename to Content.Client/Targeting/TargetingDoll.cs
index ebaa682d1c..884c12dd80 100644
--- a/Content.Client/UserInterface/TargetingDoll.cs
+++ b/Content.Client/Targeting/TargetingDoll.cs
@@ -1,10 +1,10 @@
 using System;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Client.Resources;
+using Content.Shared.Targeting;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Targeting
 {
     public sealed class TargetingDoll : VBoxContainer
     {
diff --git a/Content.Client/GameObjects/Components/Watercloset/ToiletVisualizer.cs b/Content.Client/Toilet/ToiletVisualizer.cs
similarity index 86%
rename from Content.Client/GameObjects/Components/Watercloset/ToiletVisualizer.cs
rename to Content.Client/Toilet/ToiletVisualizer.cs
index 5231c7db44..1d850f3732 100644
--- a/Content.Client/GameObjects/Components/Watercloset/ToiletVisualizer.cs
+++ b/Content.Client/Toilet/ToiletVisualizer.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Watercloset;
+using Content.Shared.Toilet;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Watercloset
+namespace Content.Client.Toilet
 {
     public class ToiletVisualizer : AppearanceVisualizer
     {
diff --git a/Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs b/Content.Client/Tools/Components/MultiToolComponent.cs
similarity index 90%
rename from Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs
rename to Content.Client/Tools/Components/MultiToolComponent.cs
index 33a9954ae5..4752efef76 100644
--- a/Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs
+++ b/Content.Client/Tools/Components/MultiToolComponent.cs
@@ -1,7 +1,8 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Interactable;
+using Content.Client.Items.Components;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.NetIDs;
+using Content.Shared.Tool;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
@@ -9,7 +10,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Interactable
+namespace Content.Client.Tools.Components
 {
     [RegisterComponent]
     public class MultiToolComponent : Component, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Interactable/WelderComponent.cs b/Content.Client/Tools/Components/WelderComponent.cs
similarity index 91%
rename from Content.Client/GameObjects/Components/Interactable/WelderComponent.cs
rename to Content.Client/Tools/Components/WelderComponent.cs
index feb17bf20e..415de5281d 100644
--- a/Content.Client/GameObjects/Components/Interactable/WelderComponent.cs
+++ b/Content.Client/Tools/Components/WelderComponent.cs
@@ -1,8 +1,9 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Interactable;
+using Content.Client.Items.Components;
+using Content.Client.Message;
+using Content.Client.Stylesheets;
+using Content.Shared.NetIDs;
+using Content.Shared.Tool;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
@@ -10,7 +11,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Interactable
+namespace Content.Client.Tools.Components
 {
     [RegisterComponent]
     public class WelderComponent : SharedToolComponent, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs b/Content.Client/Trigger/TimerTriggerVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs
rename to Content.Client/Trigger/TimerTriggerVisualizer.cs
index d4a4f61e90..96d16890a2 100644
--- a/Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs
+++ b/Content.Client/Trigger/TimerTriggerVisualizer.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Shared.GameObjects.Components.Trigger;
+using Content.Shared.Trigger;
 using JetBrains.Annotations;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
@@ -7,7 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Trigger
+namespace Content.Client.Trigger
 {
     [UsedImplicitly]
     public class TimerTriggerVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.xaml b/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.xaml
deleted file mode 100644
index 4f929dafb6..0000000000
--- a/Content.Client/UserInterface/AdminMenu/AdminMenuWindow.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<SS14Window
-    xmlns="https://spacestation14.io"
-    xmlns:adminMenu="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs;assembly=Content.Client"
-    xmlns:adminTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminTab"
-    xmlns:adminbusTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab"
-    xmlns:atmosTab="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab">
-    <TabContainer Name="MasterTabContainer">
-        <adminTab:AdminTab />
-        <adminbusTab:AdminbusTab />
-        <atmosTab:AtmosTab />
-        <adminMenu:RoundTab />
-        <adminMenu:ServerTab />
-        <adminMenu:PlayerTab Name="PlayerTabControl" />
-    </TabContainer>
-</SS14Window>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/AdminTab.xaml b/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/AdminTab.xaml
deleted file mode 100644
index 15fcc606d5..0000000000
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminTab/AdminTab.xaml
+++ /dev/null
@@ -1,17 +0,0 @@
-<Control
-    xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:at="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminTab"
-    Margin="4"
-    MinSize="50 50">
-    <VBoxContainer>
-        <GridContainer Columns="4">
-            <amc:UICommandButton Command="kick" Text="{Loc Kick}" WindowType="{x:Type at:KickWindow}" />
-            <amc:UICommandButton Command="ban" Text="{Loc Ban}" WindowType="{x:Type at:BanWindow}" />
-            <amc:CommandButton Command="aghost" Text="{Loc Admin Ghost}" />
-            <amc:UICommandButton Command="tpto" Text="{Loc Teleport}" WindowType="{x:Type at:TeleportWindow}" />
-            <amc:CommandButton Command="permissions" Text="{Loc Permissions Panel}" />
-        </GridContainer>
-    </VBoxContainer>
-</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/AdminbusTab.xaml b/Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/AdminbusTab.xaml
deleted file mode 100644
index f087377ed6..0000000000
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AdminbusTab/AdminbusTab.xaml
+++ /dev/null
@@ -1,14 +0,0 @@
-<Control
-    xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:abt="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AdminbusTab"
-    Margin="4"
-    MinSize="50 50">
-    <GridContainer
-        Columns="4">
-        <amc:CommandButton Name="SpawnEntitiesButton" Text="{Loc Spawn Entities}" />
-        <amc:CommandButton Name="SpawnTilesButton" Text="{Loc Spawn Tiles} " />
-        <amc:UICommandButton Command="events" Text="{Loc Station Events}" WindowType="{x:Type abt:StationEventsWindow}" />
-    </GridContainer>
-</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AtmosTab.xaml b/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AtmosTab.xaml
deleted file mode 100644
index c693a4be4b..0000000000
--- a/Content.Client/UserInterface/AdminMenu/Tabs/AtmosTab/AtmosTab.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<Control
-    xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:at="clr-namespace:Content.Client.UserInterface.AdminMenu.Tabs.AtmosTab"
-    Margin="4"
-    MinSize="50 50">
-    <GridContainer Columns="4">
-        <amc:UICommandButton Text="{Loc Add Atmos}" Command="addatmos" WindowType="{x:Type at:AddAtmosWindow}" />
-        <amc:UICommandButton Text="{Loc Add Gas}" Command="addgas" WindowType="{x:Type at:AddGasWindow}" />
-        <amc:UICommandButton Text="{Loc Fill Gas}" Command="fillgas" WindowType="{x:Type at:FillGasWindow}" />
-        <amc:UICommandButton Text="{Loc Set Temperature}" Command="settemp"
-                             WindowType="{x:Type at:SetTemperatureWindow}" />
-    </GridContainer>
-</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/RoundTab.xaml b/Content.Client/UserInterface/AdminMenu/Tabs/RoundTab.xaml
deleted file mode 100644
index 0eef4d4bee..0000000000
--- a/Content.Client/UserInterface/AdminMenu/Tabs/RoundTab.xaml
+++ /dev/null
@@ -1,12 +0,0 @@
-<Control
-    xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    Margin="4"
-    MinSize="50 50">
-    <GridContainer
-        Columns="4">
-        <amc:CommandButton Command="startround" Text="{Loc Start Round}" />
-        <amc:CommandButton Command="endround" Text="{Loc End Round}" />
-        <amc:CommandButton Command="restartround" Text="{Loc Restart Round}" />
-    </GridContainer>
-</Control>
diff --git a/Content.Client/UserInterface/AdminMenu/Tabs/ServerTab.xaml b/Content.Client/UserInterface/AdminMenu/Tabs/ServerTab.xaml
deleted file mode 100644
index 36847af899..0000000000
--- a/Content.Client/UserInterface/AdminMenu/Tabs/ServerTab.xaml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Control
-    xmlns="https://spacestation14.io"
-    xmlns:amc="clr-namespace:Content.Client.UserInterface.AdminMenu.CustomControls"
-    Margin="4"
-    MinSize="50 50">
-    <GridContainer
-        Columns="4" >
-        <amc:CommandButton Command="restart" Text="{Loc Reboot}"></amc:CommandButton>
-        <amc:CommandButton Command="shutdown" Text="{Loc Shutdown}"></amc:CommandButton>
-    </GridContainer>
-</Control>
diff --git a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
index a43adb2dc4..0b7d436924 100644
--- a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
@@ -1,5 +1,6 @@
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
+using Content.Client.Message;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
 using Content.Shared.GameObjects.Components.Atmos.GasTank;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/VendingMachines/VendingMachineMenu.cs b/Content.Client/VendingMachines/UI/VendingMachineMenu.cs
similarity index 91%
rename from Content.Client/VendingMachines/VendingMachineMenu.cs
rename to Content.Client/VendingMachines/UI/VendingMachineMenu.cs
index 92d36e6e8c..201b17aff3 100644
--- a/Content.Client/VendingMachines/VendingMachineMenu.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineMenu.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components.VendingMachines;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -8,9 +6,9 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.VendingMachines.SharedVendingMachineComponent;
+using static Content.Shared.VendingMachines.SharedVendingMachineComponent;
 
-namespace Content.Client.VendingMachines
+namespace Content.Client.VendingMachines.UI
 {
     class VendingMachineMenu : SS14Window
     {
diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs b/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs
similarity index 97%
rename from Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs
rename to Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs
index 066bca711a..54c5906c86 100644
--- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs
+++ b/Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs
@@ -6,9 +6,9 @@ using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
-using static Content.Shared.GameObjects.Components.VendingMachines.SharedVendingMachineComponent;
+using static Content.Shared.VendingMachines.SharedVendingMachineComponent;
 
-namespace Content.Client.GameObjects.Components.VendingMachines
+namespace Content.Client.VendingMachines.UI
 {
     [UsedImplicitly]
     public sealed class VendingMachineVisualizer : AppearanceVisualizer, ISerializationHooks
diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
similarity index 85%
rename from Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs
rename to Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
index 433de84a1d..34f8080832 100644
--- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineBoundUserInterface.cs
+++ b/Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs
@@ -1,11 +1,11 @@
-using Content.Client.VendingMachines;
-using Content.Shared.GameObjects.Components.VendingMachines;
+using Content.Client.VendingMachines.UI;
+using Content.Shared.VendingMachines;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.VendingMachines.SharedVendingMachineComponent;
+using static Content.Shared.VendingMachines.SharedVendingMachineComponent;
 
-namespace Content.Client.GameObjects.Components.VendingMachines
+namespace Content.Client.VendingMachines
 {
     class VendingMachineBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs
similarity index 99%
rename from Content.Client/GameObjects/EntitySystems/VerbSystem.cs
rename to Content.Client/Verbs/VerbSystem.cs
index 1fdb1ae2d5..9873144815 100644
--- a/Content.Client/GameObjects/EntitySystems/VerbSystem.cs
+++ b/Content.Client/Verbs/VerbSystem.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.EntitySystemMessages;
-using Content.Shared.GameObjects.Verbs;
+using Content.Client.ContextMenu.UI;
+using Content.Client.Resources;
 using Content.Shared.GameTicking;
 using Content.Shared.Input;
+using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
 using Robust.Client.Player;
@@ -25,7 +25,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Verbs
 {
     [UsedImplicitly]
     public sealed class VerbSystem : SharedVerbSystem, IResettingEntitySystem
diff --git a/Content.Client/GlobalVerbs/ViewVariablesVerb.cs b/Content.Client/ViewVariables/ViewVariablesVerb.cs
similarity index 93%
rename from Content.Client/GlobalVerbs/ViewVariablesVerb.cs
rename to Content.Client/ViewVariables/ViewVariablesVerb.cs
index b0eb6b228f..2150dda02e 100644
--- a/Content.Client/GlobalVerbs/ViewVariablesVerb.cs
+++ b/Content.Client/ViewVariables/ViewVariablesVerb.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Verbs;
 using Robust.Client.Console;
 using Robust.Client.ViewVariables;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GlobalVerbs
+namespace Content.Client.ViewVariables
 {
     /// <summary>
     /// Global verb that opens a view variables window for the entity in question.
diff --git a/Content.Client/State/GameScreen.cs b/Content.Client/Viewport/GameScreen.cs
similarity index 95%
rename from Content.Client/State/GameScreen.cs
rename to Content.Client/Viewport/GameScreen.cs
index 15ce218bc0..2052f41317 100644
--- a/Content.Client/State/GameScreen.cs
+++ b/Content.Client/Viewport/GameScreen.cs
@@ -1,11 +1,10 @@
-using System.Linq;
-using Content.Client.Administration;
-using Content.Client.Chat;
-using Content.Client.Construction;
-using Content.Client.Interfaces.Chat;
-using Content.Client.UserInterface;
+using Content.Client.Administration.Managers;
+using Content.Client.Chat.Managers;
+using Content.Client.Chat.UI;
+using Content.Client.Construction.UI;
+using Content.Client.HUD;
+using Content.Client.HUD.UI;
 using Content.Client.Voting;
-using Content.Shared;
 using Content.Shared.Chat;
 using Content.Shared.Input;
 using Robust.Client.Graphics;
@@ -15,12 +14,11 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Configuration;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.State
+namespace Content.Client.Viewport
 {
     public class GameScreen : GameScreenBase, IMainViewportState
     {
diff --git a/Content.Client/State/GameScreenBase.cs b/Content.Client/Viewport/GameScreenBase.cs
similarity index 98%
rename from Content.Client/State/GameScreenBase.cs
rename to Content.Client/Viewport/GameScreenBase.cs
index 72b8ac8f24..db9f12e4c4 100644
--- a/Content.Client/State/GameScreenBase.cs
+++ b/Content.Client/Viewport/GameScreenBase.cs
@@ -1,9 +1,10 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using Content.Client.GameObjects.Components;
-using Content.Client.UserInterface;
-using Content.Client.Utility;
+using Content.Client.Clickable;
+using Content.Client.Interactable;
+using Content.Client.Interactable.Components;
+using Content.Client.State;
 using Content.Shared;
 using Robust.Client.GameObjects;
 using Robust.Client.Input;
@@ -19,7 +20,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.State
+namespace Content.Client.Viewport
 {
     // OH GOD.
     // Ok actually it's fine.
diff --git a/Content.Client/State/IMainViewport.cs b/Content.Client/Viewport/IMainViewport.cs
similarity index 81%
rename from Content.Client/State/IMainViewport.cs
rename to Content.Client/Viewport/IMainViewport.cs
index 3dc46ba6b3..d6d18063d2 100644
--- a/Content.Client/State/IMainViewport.cs
+++ b/Content.Client/Viewport/IMainViewport.cs
@@ -1,6 +1,6 @@
-using Content.Client.UserInterface;
+using Content.Client.HUD.UI;
 
-namespace Content.Client.State
+namespace Content.Client.Viewport
 {
     /// <summary>
     ///     Client state that has a main viewport.
diff --git a/Content.Client/UserInterface/ScalingViewport.cs b/Content.Client/Viewport/ScalingViewport.cs
similarity index 99%
rename from Content.Client/UserInterface/ScalingViewport.cs
rename to Content.Client/Viewport/ScalingViewport.cs
index daa1206616..a7051bdae0 100644
--- a/Content.Client/UserInterface/ScalingViewport.cs
+++ b/Content.Client/Viewport/ScalingViewport.cs
@@ -12,7 +12,7 @@ using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Viewport
 {
     /// <summary>
     ///     Viewport control that has a fixed viewport size and scales it appropriately.
diff --git a/Content.Client/UserInterface/ViewportExt.cs b/Content.Client/Viewport/ViewportExt.cs
similarity index 89%
rename from Content.Client/UserInterface/ViewportExt.cs
rename to Content.Client/Viewport/ViewportExt.cs
index 480af7dd7b..74c2b499dc 100644
--- a/Content.Client/UserInterface/ViewportExt.cs
+++ b/Content.Client/Viewport/ViewportExt.cs
@@ -1,6 +1,6 @@
 using Robust.Client.UserInterface.CustomControls;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Viewport
 {
     public static class ViewportExt
     {
diff --git a/Content.Client/UserInterface/ViewportManager.cs b/Content.Client/Viewport/ViewportManager.cs
similarity index 95%
rename from Content.Client/UserInterface/ViewportManager.cs
rename to Content.Client/Viewport/ViewportManager.cs
index 6a0fad1608..cc5f6ba8fe 100644
--- a/Content.Client/UserInterface/ViewportManager.cs
+++ b/Content.Client/Viewport/ViewportManager.cs
@@ -1,9 +1,10 @@
 using System.Collections.Generic;
+using Content.Client.HUD.UI;
 using Content.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Viewport
 {
     /// <summary>
     ///     Event proxy for <see cref="MainViewport"/> to listen to config events.
diff --git a/Content.Client/Voting/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml
similarity index 87%
rename from Content.Client/Voting/VoteCallMenu.xaml
rename to Content.Client/Voting/UI/VoteCallMenu.xaml
index 11e2cc4fb4..727f73c702 100644
--- a/Content.Client/Voting/VoteCallMenu.xaml
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml
@@ -1,6 +1,7 @@
-<v:VoteCallMenu xmlns="https://spacestation14.io"
-                xmlns:cuic="clr-namespace:Content.Client.UserInterface.Controls"
+<ui:VoteCallMenu xmlns="https://spacestation14.io"
                 xmlns:v="clr-namespace:Content.Client.Voting"
+                xmlns:ui="clr-namespace:Content.Client.Voting.UI"
+                xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
                 MouseFilter="Stop" MinSize="350 150">
     <PanelContainer StyleClasses="AngleRect" />
     <VBoxContainer>
@@ -13,7 +14,7 @@
                                SizeFlagsVertical="ShrinkCenter" />
             </MarginContainer>
         </HBoxContainer>
-        <cuic:HighDivider />
+        <ui1:HighDivider />
 
         <MarginContainer SizeFlagsHorizontal="Fill" SizeFlagsVertical="Expand"
                          MarginLeftOverride="8" MarginRightOverride="8" MarginTopOverride="2">
@@ -36,4 +37,4 @@
         </MarginContainer>
 
     </VBoxContainer>
-</v:VoteCallMenu>
+</ui:VoteCallMenu>
diff --git a/Content.Client/Voting/VoteCallMenu.xaml.cs b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
similarity index 97%
rename from Content.Client/Voting/VoteCallMenu.xaml.cs
rename to Content.Client/Voting/UI/VoteCallMenu.xaml.cs
index cb17a694b8..6b964b90ed 100644
--- a/Content.Client/Voting/VoteCallMenu.xaml.cs
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using JetBrains.Annotations;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Console;
@@ -11,7 +11,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 
-namespace Content.Client.Voting
+namespace Content.Client.Voting.UI
 {
     [GenerateTypedNameReferences]
     public partial class VoteCallMenu : BaseWindow
diff --git a/Content.Client/Voting/VoteCallMenuButton.cs b/Content.Client/Voting/UI/VoteCallMenuButton.cs
similarity index 97%
rename from Content.Client/Voting/VoteCallMenuButton.cs
rename to Content.Client/Voting/UI/VoteCallMenuButton.cs
index 74c6a65de8..d934ab8b97 100644
--- a/Content.Client/Voting/VoteCallMenuButton.cs
+++ b/Content.Client/Voting/UI/VoteCallMenuButton.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Client.Voting
+namespace Content.Client.Voting.UI
 {
     /// <summary>
     ///     LITERALLY just a button that opens the vote call menu.
diff --git a/Content.Client/Voting/VotePopup.xaml b/Content.Client/Voting/UI/VotePopup.xaml
similarity index 100%
rename from Content.Client/Voting/VotePopup.xaml
rename to Content.Client/Voting/UI/VotePopup.xaml
diff --git a/Content.Client/Voting/VotePopup.xaml.cs b/Content.Client/Voting/UI/VotePopup.xaml.cs
similarity index 96%
rename from Content.Client/Voting/VotePopup.xaml.cs
rename to Content.Client/Voting/UI/VotePopup.xaml.cs
index 0a4258446f..2d14ba0ca9 100644
--- a/Content.Client/Voting/VotePopup.xaml.cs
+++ b/Content.Client/Voting/UI/VotePopup.xaml.cs
@@ -1,16 +1,15 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
+using Content.Client.Stylesheets;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Client.Voting
+namespace Content.Client.Voting.UI
 {
     [GenerateTypedNameReferences]
     public partial class VotePopup : Control
diff --git a/Content.Client/Voting/VoteManager.cs b/Content.Client/Voting/VoteManager.cs
index 9343839b75..4616cdaeb0 100644
--- a/Content.Client/Voting/VoteManager.cs
+++ b/Content.Client/Voting/VoteManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.Network.NetMessages;
+using Content.Shared.Voting;
 using Robust.Client;
 using Robust.Client.Console;
 using Robust.Client.UserInterface;
@@ -31,7 +31,7 @@ namespace Content.Client.Voting
         [Dependency] private readonly IBaseClient _client = default!;
 
         private readonly Dictionary<int, ActiveVote> _votes = new();
-        private readonly Dictionary<int, VotePopup> _votePopups = new();
+        private readonly Dictionary<int, UI.VotePopup> _votePopups = new();
         private Control? _popupContainer;
 
         public bool CanCallVote { get; private set; }
@@ -83,7 +83,7 @@ namespace Content.Client.Voting
 
             foreach (var (vId, vote) in _votes)
             {
-                var popup = new VotePopup(vote);
+                var popup = new UI.VotePopup(vote);
 
                 _votePopups.Add(vId, popup);
                 _popupContainer.AddChild(popup);
@@ -148,7 +148,7 @@ namespace Content.Client.Voting
 
             if (@new && _popupContainer != null)
             {
-                var popup = new VotePopup(existingVote);
+                var popup = new UI.VotePopup(existingVote);
 
                 _votePopups.Add(voteId, popup);
                 _popupContainer.AddChild(popup);
diff --git a/Content.Client/GameObjects/Components/LowWallComponent.cs b/Content.Client/Wall/Components/LowWallComponent.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/LowWallComponent.cs
rename to Content.Client/Wall/Components/LowWallComponent.cs
index a6d3c89712..e66e2495f7 100644
--- a/Content.Client/GameObjects/Components/LowWallComponent.cs
+++ b/Content.Client/Wall/Components/LowWallComponent.cs
@@ -1,17 +1,17 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
-using Content.Client.GameObjects.Components.IconSmoothing;
+using Content.Client.IconSmoothing;
+using Content.Client.Window;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 using static Robust.Client.GameObjects.SpriteComponent;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Wall.Components
 {
     // TODO: Over layers should be placed ABOVE the window itself too.
     // This is gonna require a client entity & parenting,
diff --git a/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs b/Content.Client/Wall/Components/ReinforcedWallComponent.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/ReinforcedWallComponent.cs
rename to Content.Client/Wall/Components/ReinforcedWallComponent.cs
index f944f3d22c..f4fa8c1c7c 100644
--- a/Content.Client/GameObjects/Components/ReinforcedWallComponent.cs
+++ b/Content.Client/Wall/Components/ReinforcedWallComponent.cs
@@ -1,11 +1,11 @@
-using Content.Client.GameObjects.Components.IconSmoothing;
+using Content.Client.IconSmoothing;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using Robust.Shared.Map;
 using static Robust.Client.GameObjects.SpriteComponent;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Wall.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IconSmoothComponent))]
diff --git a/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs b/Content.Client/Wall/ReinforcedWallVisualizer.cs
similarity index 92%
rename from Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs
rename to Content.Client/Wall/ReinforcedWallVisualizer.cs
index ff0ffbd6b3..9a0d4765f5 100644
--- a/Content.Client/GameObjects/Components/ReinforcedWallVisualizer.cs
+++ b/Content.Client/Wall/ReinforcedWallVisualizer.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Wall;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Wall
 {
     [UsedImplicitly]
     public class ReinforcedWallVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Mobs/MeleeLungeComponent.cs b/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Mobs/MeleeLungeComponent.cs
rename to Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs
index 089a2d6c01..cc61d19c3b 100644
--- a/Content.Client/GameObjects/Components/Mobs/MeleeLungeComponent.cs
+++ b/Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Mobs
+namespace Content.Client.Weapons.Melee.Components
 {
     [RegisterComponent]
     public sealed class MeleeLungeComponent : Component
diff --git a/Content.Client/GameObjects/Components/Weapons/Melee/MeleeWeaponArcAnimationComponent.cs b/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Weapons/Melee/MeleeWeaponArcAnimationComponent.cs
rename to Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs
index 24cdf263af..0abfbe405d 100644
--- a/Content.Client/GameObjects/Components/Weapons/Melee/MeleeWeaponArcAnimationComponent.cs
+++ b/Content.Client/Weapons/Melee/Components/MeleeWeaponArcAnimationComponent.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Weapons.Melee;
+using Content.Shared.Weapons.Melee;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Weapons.Melee
+namespace Content.Client.Weapons.Melee.Components
 {
     [RegisterComponent]
     public sealed class MeleeWeaponArcAnimationComponent : Component
diff --git a/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs b/Content.Client/Weapons/Melee/MeleeLungeSystem.cs
similarity index 82%
rename from Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs
rename to Content.Client/Weapons/Melee/MeleeLungeSystem.cs
index 6ada71ff0a..98b1b5288d 100644
--- a/Content.Client/GameObjects/EntitySystems/MeleeLungeSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeLungeSystem.cs
@@ -1,8 +1,8 @@
-using Content.Client.GameObjects.Components.Mobs;
+using Content.Client.Weapons.Melee.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Weapons.Melee
 {
     [UsedImplicitly]
     public sealed class MeleeLungeSystem : EntitySystem
diff --git a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
similarity index 94%
rename from Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
rename to Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index 9f7d69212f..d793e3c501 100644
--- a/Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -1,7 +1,6 @@
 using System;
-using Content.Client.GameObjects.Components.Mobs;
-using Content.Client.GameObjects.Components.Weapons.Melee;
-using Content.Shared.GameObjects.Components.Weapons.Melee;
+using Content.Client.Weapons.Melee.Components;
+using Content.Shared.Weapons.Melee;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
@@ -10,9 +9,9 @@ using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
-using static Content.Shared.GameObjects.EntitySystemMessages.MeleeWeaponSystemMessages;
+using static Content.Shared.Weapons.Melee.MeleeWeaponSystemMessages;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Weapons.Melee
 {
     [UsedImplicitly]
     public sealed class MeleeWeaponSystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs
rename to Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs
index 0791bf7e4f..d2286b87bd 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBatteryBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBatteryBarrelComponent.cs
@@ -1,7 +1,8 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
+using Content.Client.Items.Components;
+using Content.Client.Stylesheets;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -9,7 +10,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
     public class ClientBatteryBarrelComponent : Component, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBoltActionBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBoltActionBarrelComponent.cs
rename to Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs
index d76cd99f60..f36ccf2995 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientBoltActionBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientBoltActionBarrelComponent.cs
@@ -1,8 +1,10 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
+using Content.Client.IoC;
+using Content.Client.Items.Components;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -10,7 +12,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
     public class ClientBoltActionBarrelComponent : Component, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs
rename to Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs
index 971dfafc23..dd05d7ede1 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientMagazineBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientMagazineBarrelComponent.cs
@@ -1,9 +1,11 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
+using Content.Client.IoC;
+using Content.Client.Items.Components;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Animations;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
@@ -13,12 +15,10 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
     public class ClientMagazineBarrelComponent : Component, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientPumpBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs
similarity index 96%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientPumpBarrelComponent.cs
rename to Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs
index 4d8f7a4af6..3f9f70b885 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientPumpBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientPumpBarrelComponent.cs
@@ -1,8 +1,10 @@
 using System;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
+using Content.Client.IoC;
+using Content.Client.Items.Components;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -10,7 +12,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
     public class ClientPumpBarrelComponent : Component, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientRevolverBarrelComponent.cs b/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientRevolverBarrelComponent.cs
rename to Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs
index 68d603cb7c..1b009c25a3 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/ClientRevolverBarrelComponent.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Components/ClientRevolverBarrelComponent.cs
@@ -1,6 +1,8 @@
-using Content.Client.Utility;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
+using Content.Client.IoC;
+using Content.Client.Items.Components;
+using Content.Client.Resources;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -8,7 +10,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Client.Weapons.Ranged.Barrels.Components
 {
     [RegisterComponent]
     public class ClientRevolverBarrelComponent : Component, IItemStatus
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs b/Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs
similarity index 87%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs
rename to Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs
index 05562565b3..f29a8e4a9d 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Visualizers/BarrelBoltVisualizer.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers
+namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
 {
     [UsedImplicitly]
     public sealed class BarrelBoltVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs b/Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs
rename to Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs
index 6c56a0700d..89d1180306 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Visualizers/MagVisualizer.cs
@@ -1,11 +1,11 @@
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.Utility;
+using Content.Shared.Rounding;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers
+namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
 {
     [UsedImplicitly]
     public sealed class MagVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs b/Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
similarity index 81%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
rename to Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
index cf763d52c6..257527b3f9 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
+++ b/Content.Client/Weapons/Ranged/Barrels/Visualizers/SpentAmmoVisualizer.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged.Barrels.Visualizers
+namespace Content.Client.Weapons.Ranged.Barrels.Visualizers
 {
     [UsedImplicitly]
     public sealed class SpentAmmoVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs b/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs
rename to Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs
index 2c8627dff8..e327931bc1 100644
--- a/Content.Client/GameObjects/Components/Weapons/Ranged/ClientRangedWeaponComponent.cs
+++ b/Content.Client/Weapons/Ranged/ClientRangedWeaponComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Weapons.Ranged;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Client.GameObjects.Components.Weapons.Ranged
+namespace Content.Client.Weapons.Ranged
 {
     // Yeah I put it all in the same enum, don't judge me
     public enum RangedBarrelVisualLayers : byte
diff --git a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs b/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs
similarity index 93%
rename from Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs
rename to Content.Client/Weapons/Ranged/RangedWeaponSystem.cs
index 8f5e612a90..f74a1f322d 100644
--- a/Content.Client/GameObjects/EntitySystems/RangedWeaponSystem.cs
+++ b/Content.Client/Weapons/Ranged/RangedWeaponSystem.cs
@@ -1,7 +1,7 @@
 using System;
-using Content.Client.GameObjects.Components.Items;
-using Content.Client.GameObjects.Components.Weapons.Ranged;
-using Content.Shared.GameObjects.Components.Weapons.Ranged;
+using Content.Client.CombatMode;
+using Content.Client.Hands;
+using Content.Shared.Weapons.Ranged.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
@@ -13,7 +13,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Weapons.Ranged
 {
     [UsedImplicitly]
     public class RangedWeaponSystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/WindowComponent.cs b/Content.Client/Window/WindowComponent.cs
similarity index 94%
rename from Content.Client/GameObjects/Components/WindowComponent.cs
rename to Content.Client/Window/WindowComponent.cs
index 13b980b8d8..60a6ba7ac6 100644
--- a/Content.Client/GameObjects/Components/WindowComponent.cs
+++ b/Content.Client/Window/WindowComponent.cs
@@ -1,15 +1,14 @@
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components;
+using Content.Client.Wall.Components;
+using Content.Shared.Window;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
-using static Content.Client.GameObjects.Components.IconSmoothing.IconSmoothComponent;
+using static Content.Client.IconSmoothing.IconSmoothComponent;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Window
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedWindowComponent))]
diff --git a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs b/Content.Client/Window/WindowSystem.cs
similarity index 95%
rename from Content.Client/GameObjects/EntitySystems/WindowSystem.cs
rename to Content.Client/Window/WindowSystem.cs
index 96ef802c9c..5b39d486c1 100644
--- a/Content.Client/GameObjects/EntitySystems/WindowSystem.cs
+++ b/Content.Client/Window/WindowSystem.cs
@@ -1,9 +1,8 @@
 using System.Collections.Generic;
-using Content.Client.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects.EntitySystems
+namespace Content.Client.Window
 {
     [UsedImplicitly]
     public sealed class WindowSystem : EntitySystem
diff --git a/Content.Client/GameObjects/Components/WindowVisualizer.cs b/Content.Client/Window/WindowVisualizer.cs
similarity index 95%
rename from Content.Client/GameObjects/Components/WindowVisualizer.cs
rename to Content.Client/Window/WindowVisualizer.cs
index 7763d70bd0..131db2b67c 100644
--- a/Content.Client/GameObjects/Components/WindowVisualizer.cs
+++ b/Content.Client/Window/WindowVisualizer.cs
@@ -1,13 +1,14 @@
 using System;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Client.Wall.Components;
+using Content.Shared.Rounding;
+using Content.Shared.Window;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.Window
 {
     [UsedImplicitly]
     public sealed class WindowVisualizer : AppearanceVisualizer
diff --git a/Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs b/Content.Client/Wires/UI/WiresBoundUserInterface.cs
similarity index 89%
rename from Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs
rename to Content.Client/Wires/UI/WiresBoundUserInterface.cs
index d4e258a367..03112691c7 100644
--- a/Content.Client/GameObjects/Components/Wires/WiresBoundUserInterface.cs
+++ b/Content.Client/Wires/UI/WiresBoundUserInterface.cs
@@ -1,8 +1,8 @@
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent;
 
-namespace Content.Client.GameObjects.Components.Wires
+namespace Content.Client.Wires.UI
 {
     public class WiresBoundUserInterface : BoundUserInterface
     {
diff --git a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs b/Content.Client/Wires/UI/WiresMenu.cs
similarity index 98%
rename from Content.Client/GameObjects/Components/Wires/WiresMenu.cs
rename to Content.Client/Wires/UI/WiresMenu.cs
index 9d07afe5eb..64bae3965e 100644
--- a/Content.Client/GameObjects/Components/Wires/WiresMenu.cs
+++ b/Content.Client/Wires/UI/WiresMenu.cs
@@ -1,8 +1,8 @@
 using System;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Utility;
-using Content.Shared.GameObjects.Components;
+using Content.Client.Examine;
+using Content.Client.Resources;
+using Content.Client.Stylesheets;
+using Content.Shared.Wires;
 using Robust.Client.Animations;
 using Robust.Client.Graphics;
 using Robust.Client.ResourceManagement;
@@ -14,9 +14,9 @@ using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent;
 
-namespace Content.Client.GameObjects.Components.Wires
+namespace Content.Client.Wires.UI
 {
     public class WiresMenu : BaseWindow
     {
diff --git a/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs b/Content.Client/Wires/WiresVisualizer.cs
similarity index 86%
rename from Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs
rename to Content.Client/Wires/WiresVisualizer.cs
index 3e44082e32..e20fd1cfa4 100644
--- a/Content.Client/GameObjects/Components/Wires/WiresVisualizer.cs
+++ b/Content.Client/Wires/WiresVisualizer.cs
@@ -1,7 +1,7 @@
 using Robust.Client.GameObjects;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent;
 
-namespace Content.Client.GameObjects.Components.Wires
+namespace Content.Client.Wires
 {
     public class WiresVisualizer : AppearanceVisualizer
     {
diff --git a/Content.IntegrationTests/ContentIntegrationTest.cs b/Content.IntegrationTests/ContentIntegrationTest.cs
index 037235198d..41f254d5e6 100644
--- a/Content.IntegrationTests/ContentIntegrationTest.cs
+++ b/Content.IntegrationTests/ContentIntegrationTest.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Threading.Tasks;
 using Content.Client;
-using Content.Client.Interfaces.Parallax;
+using Content.Client.IoC;
+using Content.Client.Parallax.Managers;
 using Content.Server;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking;
+using Content.Server.IoC;
 using Content.Shared;
 using NUnit.Framework;
 using Robust.Server.Maps;
@@ -15,6 +17,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.UnitTesting;
+using EntryPoint = Content.Client.EntryPoint.EntryPoint;
 
 namespace Content.IntegrationTests
 {
@@ -33,7 +36,7 @@ namespace Content.IntegrationTests
             options.ContentAssemblies = new[]
             {
                 typeof(Shared.EntryPoint).Assembly,
-                typeof(Client.EntryPoint).Assembly,
+                typeof(EntryPoint).Assembly,
                 typeof(ContentIntegrationTest).Assembly
             };
 
@@ -76,7 +79,7 @@ namespace Content.IntegrationTests
             options.ContentAssemblies = new[]
             {
                 typeof(Shared.EntryPoint).Assembly,
-                typeof(Server.EntryPoint).Assembly,
+                typeof(Server.EntryPoint.EntryPoint).Assembly,
                 typeof(ContentIntegrationTest).Assembly
             };
 
diff --git a/Content.IntegrationTests/DummyGameTicker.cs b/Content.IntegrationTests/DummyGameTicker.cs
index 699d66f1a2..f79ea96e4f 100644
--- a/Content.IntegrationTests/DummyGameTicker.cs
+++ b/Content.IntegrationTests/DummyGameTicker.cs
@@ -3,8 +3,8 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Mobs;
+using Content.Server.GameTicking.Rules;
+using Content.Server.Mind;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Server.Player;
diff --git a/Content.IntegrationTests/DummyParallaxManager.cs b/Content.IntegrationTests/DummyParallaxManager.cs
index 3c4275deab..d4312dd706 100644
--- a/Content.IntegrationTests/DummyParallaxManager.cs
+++ b/Content.IntegrationTests/DummyParallaxManager.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Client.Interfaces.Parallax;
+using Content.Client.Parallax.Managers;
 using Robust.Client.Graphics;
 
 namespace Content.IntegrationTests
diff --git a/Content.IntegrationTests/Tests/Body/LegTest.cs b/Content.IntegrationTests/Tests/Body/LegTest.cs
index 25c2d586d0..adde417e4d 100644
--- a/Content.IntegrationTests/Tests/Body/LegTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LegTest.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Rotation;
+using Content.Server.Body;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using Content.Shared.Rotation;
 using NUnit.Framework;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs
index d63a41ce63..9d3314d31c 100644
--- a/Content.IntegrationTests/Tests/Body/LungTest.cs
+++ b/Content.IntegrationTests/Tests/Body/LungTest.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.Body.Behavior;
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Server.GameObjects.Components.Metabolism;
+using Content.Server.Body.Behavior;
+using Content.Server.Body.Circulatory;
+using Content.Server.Metabolism;
 using Content.Shared.Atmos;
-using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.Body.Components;
 using NUnit.Framework;
 using Robust.Server.Maps;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs b/Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs
index 1d7884db11..6e716faf51 100644
--- a/Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs
+++ b/Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Body.Behavior;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Server.Body.Behavior;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
index 0f3a5e519d..b7c4eaa64c 100644
--- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
+++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
@@ -1,15 +1,14 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Buckle;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Strap;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Buckle;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
-using Content.Shared.Utility;
+using Content.Server.Buckle.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Coordinates;
+using Content.Shared.EffectBlocker;
 using NUnit.Framework;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/ClickableTest.cs b/Content.IntegrationTests/Tests/ClickableTest.cs
index 798d66549e..542952537e 100644
--- a/Content.IntegrationTests/Tests/ClickableTest.cs
+++ b/Content.IntegrationTests/Tests/ClickableTest.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Content.Client.Clickable;
 using Content.Client.GameObjects.Components;
 using NUnit.Framework;
 using Robust.Server.GameObjects;
diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
index e376bb5a69..1f9852a6af 100644
--- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
-using Content.Server.GlobalVerbs;
+using Content.Server.Damage;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.Damage.Components;
+using Content.Shared.MobState;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
index 06f3c12f98..078bb9edea 100644
--- a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
+++ b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using Content.Server.Commands.GameTicking;
 using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking.Commands;
 using Content.Shared;
 using NUnit.Framework;
 using Robust.Shared.Configuration;
diff --git a/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs b/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
index d46d0688d2..5fbf5c3d17 100644
--- a/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
+++ b/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs
@@ -2,6 +2,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Content.Server.Construction.Completions;
 using Content.Shared.Construction;
+using Content.Shared.Construction.Prototypes;
 using NUnit.Framework;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
index fb930cf735..e16a77ffa5 100644
--- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
+++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Storage.Components;
 using NUnit.Framework;
 using Robust.Client.GameObjects;
 using Robust.Server.Player;
diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
index 6ea6c33ed2..9e01a4e2ec 100644
--- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
+++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs
index 71fca5aae4..189d3a6a80 100644
--- a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs
+++ b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs
@@ -1,11 +1,11 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Clothing;
+using Content.Server.Clothing.Components;
+using Content.Server.Inventory.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
 namespace Content.IntegrationTests.Tests
 {
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs
index 02ec1a48cb..f335b402a2 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageClassTest.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers;
+using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
index fe8b900752..4a7c2a4ee8 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers;
+using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
index 4755087bc3..ef93259d35 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Destructible.Thresholds;
-using Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors;
+using Content.Server.Destructible.Thresholds;
+using Content.Server.Destructible.Thresholds.Behaviors;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
index 1f4dd39894..00ba58d930 100644
--- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
+++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
@@ -1,11 +1,11 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Destructible;
-using Content.Server.GameObjects.Components.Destructible.Thresholds;
-using Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors;
-using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers;
+using Content.Server.Destructible;
+using Content.Server.Destructible.Thresholds;
+using Content.Server.Destructible.Thresholds.Behaviors;
+using Content.Server.Destructible.Thresholds.Triggers;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs b/Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs
index 4fc80f2bf4..5374de4105 100644
--- a/Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs
+++ b/Content.IntegrationTests/Tests/Destructible/TestThresholdListenerComponent.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Destructible;
+using Content.Server.Destructible;
 using Robust.Shared.GameObjects;
 
 namespace Content.IntegrationTests.Tests.Destructible
diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
index 527eb24aff..6f4b5f5555 100644
--- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
+++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System.Linq;
 using System.Threading.Tasks;
+using Content.Server.Disposal.Tube.Components;
+using Content.Server.Disposal.Unit.Components;
 using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.Components.Disposal;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.Power.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs
index d5c58b9364..16ef7b43c9 100644
--- a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs
+++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server.DoAfter;
 using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
index e367d8d1d4..9e8433b6e0 100644
--- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
+++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Doors;
-using Content.Shared.GameObjects.Components.Doors;
+using Content.Server.Doors.Components;
+using Content.Shared.Doors;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs
index cee014351c..63f5f48633 100644
--- a/Content.IntegrationTests/Tests/EntityTest.cs
+++ b/Content.IntegrationTests/Tests/EntityTest.cs
@@ -2,7 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Shared.Utility;
+using Content.Server.Battery.Components;
+using Content.Server.PowerCell.Components;
+using Content.Shared.Coordinates;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
@@ -259,6 +261,10 @@ namespace Content.IntegrationTests.Tests
             // Split components into groups, ensuring that their references don't conflict
             foreach (var type in componentFactory.AllRegisteredTypes)
             {
+                if (type == typeof(PowerCellComponent) || type == typeof(BatteryComponent))
+                {
+
+                }
                 var registration = componentFactory.GetRegistration(type);
 
                 for (var i = 0; i < distinctComponents.Count; i++)
@@ -316,6 +322,10 @@ namespace Content.IntegrationTests.Tests
 
                             Logger.LogS(LogLevel.Debug, "EntityTest", $"Adding component: {component.Name}");
 
+                            // Note for the future coder: if an exception occurs where a component reference
+                            // was already occupied it might be because some component is ensuring another // initialize.
+                            // If so, search for cases of EnsureComponent<FailingType>, EnsureComponentWarn<FailingType>
+                            // and all others variations (out parameter)
                             Assert.DoesNotThrow(() =>
                                 {
                                     entityManager.ComponentManager.AddComponent(entity, component);
diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
index 70487fd7af..f3048f2c7f 100644
--- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
+++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Fluids;
+using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry;
-using Content.Shared.Utility;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Coordinates;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
index cdbb3bbc02..7220318bed 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
@@ -1,16 +1,16 @@
 #nullable enable
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Client.GameObjects.Components.Items;
-using Content.Server.GameObjects.Components.ActionBlocking;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Body;
+using Content.Server.Cuffs.Components;
+using Content.Server.Hands.Components;
+using Content.Shared.Body.Components;
 using NUnit.Framework;
 using Robust.Server.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using HandsComponent = Content.Client.Hands.HandsComponent;
 
 namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
 {
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs
index 57832bb813..2dc01db2bb 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Content.Client;
+using Content.Client.EntryPoint;
 using NUnit.Framework;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
@@ -14,7 +15,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
 {
     [TestFixture]
     [TestOf(typeof(IgnoredComponents))]
-    [TestOf(typeof(Server.IgnoredComponents))]
+    [TestOf(typeof(Server.EntryPoint.IgnoredComponents))]
     public class EntityPrototypeComponentsTest : ContentIntegrationTest
     {
         [Test]
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs
index aafd484c81..eb129cc71c 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs
@@ -1,14 +1,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Client.GameObjects.Components.Mobs;
+using Content.Client.Actions;
+using Content.Client.Actions.UI;
 using Content.Client.UserInterface;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Actions;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
 using Content.Shared.Actions;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.Utility;
+using Content.Shared.Actions.Components;
+using Content.Shared.Actions.Prototypes;
+using Content.Shared.Cooldown;
 using NUnit.Framework;
 using Robust.Client.UserInterface;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
index a414292942..cad657e3ba 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Client.GameObjects.Components.Mobs;
+using Content.Client.Alerts;
+using Content.Client.Alerts.UI;
 using Content.Client.UserInterface;
-using Content.Client.UserInterface.Controls;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Alert;
 using Content.Shared.Alert;
 using NUnit.Framework;
 using Robust.Client.UserInterface;
diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs
index 34500424c0..c51a9815bd 100644
--- a/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs
+++ b/Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs
@@ -1,7 +1,7 @@
 #nullable enable
 
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Movement;
+using Content.Server.Climbing.Components;
 using Content.Shared.Physics;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
index 83cae4d383..40eec47d23 100644
--- a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
+++ b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using Content.Server.GameTicking;
-using Content.Server.GameTicking.GameRules;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking.Rules;
 using NUnit.Framework;
 using Robust.Shared.Timing;
 
diff --git a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
index 7c7ce168c0..7569427fb2 100644
--- a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
+++ b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
@@ -1,10 +1,11 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Gravity;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Gravity;
+using Content.Server.Gravity.EntitySystems;
+using Content.Shared.Acts;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Coordinates;
 using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Utility;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs
index c620c27133..c828324fdb 100644
--- a/Content.IntegrationTests/Tests/GravityGridTest.cs
+++ b/Content.IntegrationTests/Tests/GravityGridTest.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Gravity;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Shared.GameObjects.Components.Gravity;
-using Content.Shared.Utility;
+using Content.Server.Gravity;
+using Content.Server.Power.Components;
+using Content.Shared.Coordinates;
+using Content.Shared.Gravity;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
index 07cf5576b5..89e016578d 100644
--- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
+++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
@@ -1,10 +1,10 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Inventory.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
 namespace Content.IntegrationTests.Tests
 {
diff --git a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
index 277fafc554..a642c627f9 100644
--- a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
+++ b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
@@ -1,8 +1,3 @@
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Weapon.Melee;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Shared.Interfaces.GameObjects.Components;
 using NUnit.Framework;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -11,6 +6,11 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Reflection;
 using System.Threading.Tasks;
+using Content.Server.Hands.Components;
+using Content.Server.Interaction;
+using Content.Server.Items;
+using Content.Shared.Interaction;
+using Content.Shared.Weapons.Melee;
 
 namespace Content.IntegrationTests.Tests.Interaction.Click
 {
diff --git a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
index f0d4232075..7975038fa7 100644
--- a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
+++ b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
@@ -1,7 +1,8 @@
 using System.Threading.Tasks;
-using Content.Client.Utility;
+using Content.Client.Interactable;
 using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Utility;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using NUnit.Framework;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
index c87dbfe770..f870e563a6 100644
--- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
+++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs
@@ -1,13 +1,13 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Utility;
+using Content.Server.Inventory;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.Stunnable.Components;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
 namespace Content.IntegrationTests.Tests
 {
diff --git a/Content.IntegrationTests/Tests/Kitchen/KitchenTest.cs b/Content.IntegrationTests/Tests/Kitchen/KitchenTest.cs
index 9195e2a17d..9716d9255d 100644
--- a/Content.IntegrationTests/Tests/Kitchen/KitchenTest.cs
+++ b/Content.IntegrationTests/Tests/Kitchen/KitchenTest.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Content.Shared.Chemistry;
-using Content.Shared.Prototypes.Kitchen;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Kitchen;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
diff --git a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
index a6a1cba2bb..94ffe489cb 100644
--- a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
+++ b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
@@ -1,11 +1,12 @@
 using System.Threading.Tasks;
 using Content.Client;
-using Content.Client.Interfaces;
+using Content.Client.Lobby;
+using Content.Client.Preferences;
 using Content.Client.State;
 using Content.Server.GameTicking;
 using Content.Server.Interfaces;
-using Content.Server.Interfaces.GameTicking;
 using Content.Server.Preferences;
+using Content.Server.Preferences.Managers;
 using Content.Shared;
 using Content.Shared.Preferences;
 using NUnit.Framework;
diff --git a/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs b/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs
index 945649e71b..e5e47869af 100644
--- a/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs
+++ b/Content.IntegrationTests/Tests/MindEntityDeletionTest.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.Mobs;
+using Content.Server.Mind;
 using Content.Server.Players;
-using Content.Shared.Utility;
+using Content.Shared.Coordinates;
 using NUnit.Framework;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
index 41ea1faab5..20b452d731 100644
--- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
+++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Shared.GameObjects;
+using Content.Shared.NetIDs;
 using NUnit.Framework;
 using Robust.Client.GameObjects;
 using Robust.Client.GameStates;
diff --git a/Content.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs b/Content.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs
index 36cba26fe7..73027ea48a 100644
--- a/Content.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs
+++ b/Content.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs
@@ -1,10 +1,10 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.PDA;
-using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Server.Access.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.PDA;
 using NUnit.Framework;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs b/Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs
index 09ed1a197c..7030afbd98 100644
--- a/Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs
+++ b/Content.IntegrationTests/Tests/Pathfinding/PathfindingChunkTest.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
+using Content.Server.AI.Pathfinding;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/PowerTest.cs b/Content.IntegrationTests/Tests/PowerTest.cs
index 8df494927a..e50c5558e5 100644
--- a/Content.IntegrationTests/Tests/PowerTest.cs
+++ b/Content.IntegrationTests/Tests/PowerTest.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System.Threading.Tasks;
+using Content.Server.APC.Components;
+using Content.Server.Battery.Components;
 using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
-using Content.Shared.Utility;
+using Content.Server.Power.Components;
+using Content.Shared.Coordinates;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
index 7ca2f6f3a5..2204947180 100644
--- a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
+++ b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.GameTicking;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
diff --git a/Content.IntegrationTests/Tests/RestartRoundTest.cs b/Content.IntegrationTests/Tests/RestartRoundTest.cs
index 9930a871fe..6ecf5a2dc6 100644
--- a/Content.IntegrationTests/Tests/RestartRoundTest.cs
+++ b/Content.IntegrationTests/Tests/RestartRoundTest.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking;
 using NUnit.Framework;
 using Robust.Shared.IoC;
 
diff --git a/Content.IntegrationTests/Tests/Solutions/ReagentDispenserTest.cs b/Content.IntegrationTests/Tests/Solutions/ReagentDispenserTest.cs
index 193939b420..34094ac24b 100644
--- a/Content.IntegrationTests/Tests/Solutions/ReagentDispenserTest.cs
+++ b/Content.IntegrationTests/Tests/Solutions/ReagentDispenserTest.cs
@@ -1,7 +1,8 @@
 #nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
+using Content.Shared.Chemistry.Dispenser;
+using Content.Shared.Chemistry.Reagent;
 using NUnit.Framework;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs b/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs
index a724e9be14..f58c049720 100644
--- a/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs
+++ b/Content.IntegrationTests/Tests/StationEvents/StationEventsSystemTest.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems.StationEvents;
+using Content.Server.StationEvents;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.IntegrationTests/Tests/StorageFillTest.cs b/Content.IntegrationTests/Tests/StorageFillTest.cs
index de502e96c8..43377f1f2c 100644
--- a/Content.IntegrationTests/Tests/StorageFillTest.cs
+++ b/Content.IntegrationTests/Tests/StorageFillTest.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Storage.Components;
 using NUnit.Framework;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
diff --git a/Content.IntegrationTests/Tests/Tag/TagTest.cs b/Content.IntegrationTests/Tests/Tag/TagTest.cs
index ee23b7afb6..de158f4036 100644
--- a/Content.IntegrationTests/Tests/Tag/TagTest.cs
+++ b/Content.IntegrationTests/Tests/Tag/TagTest.cs
@@ -1,8 +1,7 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.Prototypes.Tag;
+using Content.Shared.Tag;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
index 60b376b00b..8f3b154593 100644
--- a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
+++ b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Physics;
-using Content.Shared.Utility;
+using Content.Shared.Spawning;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs b/Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs
index 755890e6e5..629f726e8b 100644
--- a/Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs
+++ b/Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs
@@ -1,10 +1,8 @@
 using System.IO;
 using System.Threading.Tasks;
+using Content.Server.Cabinet;
 using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.Prototypes;
-using Content.Shared.Utility;
+using Content.Shared.Whitelist;
 using NUnit.Framework;
 using NUnit.Framework.Internal;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Commands/AI/AddAiCommand.cs b/Content.Server/AI/Commands/AddAiCommand.cs
similarity index 91%
rename from Content.Server/Commands/AI/AddAiCommand.cs
rename to Content.Server/AI/Commands/AddAiCommand.cs
index 6d7a401c3c..35067fe14d 100644
--- a/Content.Server/Commands/AI/AddAiCommand.cs
+++ b/Content.Server/AI/Commands/AddAiCommand.cs
@@ -1,16 +1,15 @@
 #nullable enable
 using Content.Server.Administration;
+using Content.Server.AI.Components;
 using Content.Server.AI.Utility;
 using Content.Server.AI.Utility.AiLogic;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.EntitySystems.AI;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Movement.Components;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.AI
+namespace Content.Server.AI.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     public class AddAiCommand : IConsoleCommand
diff --git a/Content.Server/Commands/AI/FactionCommand.cs b/Content.Server/AI/Commands/FactionCommand.cs
similarity index 95%
rename from Content.Server/Commands/AI/FactionCommand.cs
rename to Content.Server/AI/Commands/FactionCommand.cs
index 80ca71a445..28e1d8c251 100644
--- a/Content.Server/Commands/AI/FactionCommand.cs
+++ b/Content.Server/AI/Commands/FactionCommand.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Text;
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.AI;
-using Content.Server.GameObjects.EntitySystems.AI;
+using Content.Server.AI.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Server.Commands.AI
+namespace Content.Server.AI.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     public sealed class FactionCommand : IConsoleCommand
@@ -93,4 +92,4 @@ namespace Content.Server.Commands.AI
             return;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs b/Content.Server/AI/Components/AiControllerComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs
rename to Content.Server/AI/Components/AiControllerComponent.cs
index 9f1e87f05c..6c90cb7eef 100644
--- a/Content.Server/GameObjects/Components/Movement/AiControllerComponent.cs
+++ b/Content.Server/AI/Components/AiControllerComponent.cs
@@ -1,6 +1,6 @@
 #nullable enable
-using Content.Server.Interfaces.GameTicking;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Server.GameTicking;
+using Content.Shared.Movement.Components;
 using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -10,7 +10,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Movement
+namespace Content.Server.AI.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IMobMoverComponent))]
diff --git a/Content.Server/GameObjects/Components/AI/AiFactionPrototype.cs b/Content.Server/AI/Components/AiFactionPrototype.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/AI/AiFactionPrototype.cs
rename to Content.Server/AI/Components/AiFactionPrototype.cs
index d00e48be4c..e88c4f53a4 100644
--- a/Content.Server/GameObjects/Components/AI/AiFactionPrototype.cs
+++ b/Content.Server/AI/Components/AiFactionPrototype.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.AI
+namespace Content.Server.AI.Components
 {
     [Prototype("aiFaction")]
     public class AiFactionPrototype : IPrototype
diff --git a/Content.Server/GameObjects/Components/AI/AiFactionTagComponent.cs b/Content.Server/AI/Components/AiFactionTagComponent.cs
similarity index 77%
rename from Content.Server/GameObjects/Components/AI/AiFactionTagComponent.cs
rename to Content.Server/AI/Components/AiFactionTagComponent.cs
index 57f6a0f0b5..3b132c4ad1 100644
--- a/Content.Server/GameObjects/Components/AI/AiFactionTagComponent.cs
+++ b/Content.Server/AI/Components/AiFactionTagComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.EntitySystems.AI;
+using Content.Server.AI.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.AI
+namespace Content.Server.AI.Components
 {
     [RegisterComponent]
     public sealed class AiFactionTagComponent : Component
diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs b/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs
rename to Content.Server/AI/EntitySystems/AiFactionTagSystem.cs
index 2602b09a09..2158c08e36 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/AiFactionTagSystem.cs
+++ b/Content.Server/AI/EntitySystems/AiFactionTagSystem.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.AI;
+using Content.Server.AI.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.GameObjects.EntitySystems.AI
+namespace Content.Server.AI.EntitySystems
 {
     /// <summary>
     ///     Outlines faction relationships with each other for AI.
diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs b/Content.Server/AI/EntitySystems/AiSystem.cs
similarity index 93%
rename from Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs
rename to Content.Server/AI/EntitySystems/AiSystem.cs
index dd0baff191..88fb2c1b82 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs
+++ b/Content.Server/AI/EntitySystems/AiSystem.cs
@@ -1,21 +1,17 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.AI.Utility.Actions;
+using Content.Server.AI.Components;
 using Content.Server.AI.Utility.AiLogic;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Mobs.State;
 using Content.Shared;
+using Content.Shared.MobState;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Reflection;
-using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.AI
+namespace Content.Server.AI.EntitySystems
 {
     /// <summary>
     ///     Handles NPCs running every tick.
diff --git a/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs b/Content.Server/AI/EntitySystems/ServerAiDebugSystem.cs
similarity index 84%
rename from Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs
rename to Content.Server/AI/EntitySystems/ServerAiDebugSystem.cs
index 4f74349675..4af762e5b5 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/ServerAiDebugSystem.cs
+++ b/Content.Server/AI/EntitySystems/ServerAiDebugSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.GameObjects.EntitySystems.AI.LoadBalancer;
+using Content.Server.AI.LoadBalancer;
 using Content.Shared.AI;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.AI
+namespace Content.Server.AI.EntitySystems
 {
 #if DEBUG
     [UsedImplicitly]
diff --git a/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionRequest.cs b/Content.Server/AI/LoadBalancer/AiActionRequest.cs
similarity index 89%
rename from Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionRequest.cs
rename to Content.Server/AI/LoadBalancer/AiActionRequest.cs
index 9c741edd8b..69ef2bbaf8 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionRequest.cs
+++ b/Content.Server/AI/LoadBalancer/AiActionRequest.cs
@@ -3,7 +3,7 @@ using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.WorldState;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.LoadBalancer
+namespace Content.Server.AI.LoadBalancer
 {
     public class AiActionRequest
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionRequestJob.cs b/Content.Server/AI/LoadBalancer/AiActionRequestJob.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionRequestJob.cs
rename to Content.Server/AI/LoadBalancer/AiActionRequestJob.cs
index 3208d930cf..7e9ef0cf4e 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionRequestJob.cs
+++ b/Content.Server/AI/LoadBalancer/AiActionRequestJob.cs
@@ -2,16 +2,16 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server.AI.Components;
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.ExpandableActions;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Utility;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.EntitySystems.JobQueues;
+using Content.Server.CPUJob.JobQueues;
 using Content.Shared.AI;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.LoadBalancer
+namespace Content.Server.AI.LoadBalancer
 {
     public class AiActionRequestJob : Job<UtilityAction>
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionSystem.cs b/Content.Server/AI/LoadBalancer/AiActionSystem.cs
similarity index 86%
rename from Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionSystem.cs
rename to Content.Server/AI/LoadBalancer/AiActionSystem.cs
index bb913e1556..c9fd135dc0 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/LoadBalancer/AiActionSystem.cs
+++ b/Content.Server/AI/LoadBalancer/AiActionSystem.cs
@@ -1,8 +1,8 @@
 using System.Threading;
-using Content.Server.GameObjects.EntitySystems.JobQueues.Queues;
+using Content.Server.CPUJob.JobQueues.Queues;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.LoadBalancer
+namespace Content.Server.AI.LoadBalancer
 {
     /// <summary>
     /// This will queue up an AI's request for an action and give it one when possible
diff --git a/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs b/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs
index 199de1b2c0..0ebf617e0a 100644
--- a/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs
+++ b/Content.Server/AI/Operators/Combat/Melee/SwingMeleeWeaponOperator.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Weapon.Melee;
-using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.CombatMode;
+using Content.Server.Hands.Components;
+using Content.Server.Interaction;
+using Content.Server.Weapon.Melee.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
diff --git a/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs b/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs
index 0a0f1028f3..0a569afaa9 100644
--- a/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs
+++ b/Content.Server/AI/Operators/Combat/Melee/UnarmedCombatOperator.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Weapon.Melee;
-using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.CombatMode;
+using Content.Server.Interaction;
+using Content.Server.Weapon.Melee.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
diff --git a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs
index 369f87cbfb..3780cefe9f 100644
--- a/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/CloseStorageOperator.cs
@@ -1,8 +1,8 @@
 using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Server.Storage.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
diff --git a/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs b/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs
index 1e282624d0..8eaa2ad8a6 100644
--- a/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/DropEntityOperator.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
diff --git a/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs b/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs
index bb281df055..3ab558d009 100644
--- a/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/DropHandItemsOperator.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
diff --git a/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs b/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs
index ce8c0f224d..e42de80336 100644
--- a/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/EquipEntityOperator.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
diff --git a/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs b/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs
index 17d3b919b4..39f3c5a200 100644
--- a/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/InteractWithEntityOperator.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Shared.Utility;
+using Content.Server.CombatMode;
+using Content.Server.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
diff --git a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
index d1823631d9..defbf77b01 100644
--- a/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/OpenStorageOperator.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using Content.Server.AI.Utility;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Server.Storage.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
index e817415e5b..4fcab41407 100644
--- a/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/PickupEntityOperator.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Shared.Utility;
+using Content.Server.Hands.Components;
+using Content.Server.Interaction;
+using Content.Server.Items;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs
index 0535bbc1b5..0ae76846f5 100644
--- a/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs
+++ b/Content.Server/AI/Operators/Inventory/UseItemInInventoryOperator.cs
@@ -1,6 +1,6 @@
 #nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Operators.Inventory
diff --git a/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs b/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs
index f3fc522209..2569ffc04e 100644
--- a/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs
+++ b/Content.Server/AI/Operators/Movement/MoveToEntityOperator.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Server.GameObjects.EntitySystems.AI.Steering;
+using Content.Server.AI.Steering;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
diff --git a/Content.Server/AI/Operators/Movement/MoveToGridOperator.cs b/Content.Server/AI/Operators/Movement/MoveToGridOperator.cs
index ff80659c2b..de560b50c0 100644
--- a/Content.Server/AI/Operators/Movement/MoveToGridOperator.cs
+++ b/Content.Server/AI/Operators/Movement/MoveToGridOperator.cs
@@ -1,5 +1,5 @@
 using System;
-using Content.Server.GameObjects.EntitySystems.AI.Steering;
+using Content.Server.AI.Steering;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
diff --git a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs
index 531d278bd7..ded30b2b83 100644
--- a/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs
+++ b/Content.Server/AI/Operators/Nutrition/UseDrinkInInventoryOperator.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
diff --git a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs
index dcbf6017a7..8b8668e31e 100644
--- a/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs
+++ b/Content.Server/AI/Operators/Nutrition/UseFoodInInventoryOperator.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
similarity index 99%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs
rename to Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
index a0adf2fd7c..18b3f803c4 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/AiReachableSystem.cs
+++ b/Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
@@ -1,11 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
+using Content.Server.Access.Components;
+using Content.Server.AI.Pathfinding.Pathfinders;
 using Content.Shared.AI;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -15,7 +14,7 @@ using Robust.Shared.Physics;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
+namespace Content.Server.AI.Pathfinding.Accessible
 {
     /// <summary>
     /// Determines whether an AI has access to a specific pathfinding node.
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs b/Content.Server/AI/Pathfinding/Accessible/BFSPathfinder.cs
similarity index 94%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs
rename to Content.Server/AI/Pathfinding/Accessible/BFSPathfinder.cs
index dc4c9d8f1d..58382fdf46 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/BFSPathfinder.cs
+++ b/Content.Server/AI/Pathfinding/Accessible/BFSPathfinder.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
+using Content.Server.AI.Pathfinding.Pathfinders;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
+namespace Content.Server.AI.Pathfinding.Accessible
 {
     /// <summary>
     /// The simplest pathfinder
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/PathfindingRegion.cs b/Content.Server/AI/Pathfinding/Accessible/PathfindingRegion.cs
similarity index 98%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/PathfindingRegion.cs
rename to Content.Server/AI/Pathfinding/Accessible/PathfindingRegion.cs
index e78f680cbc..ab5801045a 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/PathfindingRegion.cs
+++ b/Content.Server/AI/Pathfinding/Accessible/PathfindingRegion.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
+namespace Content.Server.AI.Pathfinding.Accessible
 {
     /// <summary>
     /// A group of homogenous PathfindingNodes inside a single chunk
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs b/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs
similarity index 86%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs
rename to Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs
index 8d16f59d5f..2ce6a8a1d1 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Accessible/ReachableArgs.cs
+++ b/Content.Server/AI/Pathfinding/Accessible/ReachableArgs.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.Movement;
+using Content.Server.Access.Components;
+using Content.Server.AI.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible
+namespace Content.Server.AI.Pathfinding.Accessible
 {
     public sealed class ReachableArgs
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs b/Content.Server/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs
rename to Content.Server/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs
index e6e0d6e431..202c79c0ad 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs
+++ b/Content.Server/AI/Pathfinding/Pathfinders/AStarPathfindingJob.cs
@@ -2,12 +2,12 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems.JobQueues;
+using Content.Server.CPUJob.JobQueues;
 using Content.Shared.AI;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders
+namespace Content.Server.AI.Pathfinding.Pathfinders
 {
     public class AStarPathfindingJob : Job<Queue<TileRef>>
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs b/Content.Server/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs
similarity index 99%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs
rename to Content.Server/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs
index d70f06436f..bb5c49320a 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs
+++ b/Content.Server/AI/Pathfinding/Pathfinders/JpsPathfindingJob.cs
@@ -2,14 +2,14 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems.JobQueues;
+using Content.Server.CPUJob.JobQueues;
 using Content.Shared.AI;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders
+namespace Content.Server.AI.Pathfinding.Pathfinders
 {
     public class JpsPathfindingJob : Job<Queue<TileRef>>
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingArgs.cs b/Content.Server/AI/Pathfinding/Pathfinders/PathfindingArgs.cs
similarity index 94%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingArgs.cs
rename to Content.Server/AI/Pathfinding/Pathfinders/PathfindingArgs.cs
index 5b7e9ce3c6..55441f3d22 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingArgs.cs
+++ b/Content.Server/AI/Pathfinding/Pathfinders/PathfindingArgs.cs
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders
+namespace Content.Server.AI.Pathfinding.Pathfinders
 {
     public struct PathfindingArgs
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingComparer.cs b/Content.Server/AI/Pathfinding/Pathfinders/PathfindingComparer.cs
similarity index 79%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingComparer.cs
rename to Content.Server/AI/Pathfinding/Pathfinders/PathfindingComparer.cs
index f338cc9154..c9b6cde52b 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/Pathfinders/PathfindingComparer.cs
+++ b/Content.Server/AI/Pathfinding/Pathfinders/PathfindingComparer.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders
+namespace Content.Server.AI.Pathfinding.Pathfinders
 {
     public class PathfindingComparer : IComparer<ValueTuple<float, PathfindingNode>>
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs b/Content.Server/AI/Pathfinding/PathfindingChunk.cs
similarity index 98%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs
rename to Content.Server/AI/Pathfinding/PathfindingChunk.cs
index 69032cbee3..3a71ec13af 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingChunk.cs
+++ b/Content.Server/AI/Pathfinding/PathfindingChunk.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
+namespace Content.Server.AI.Pathfinding
 {
     public class PathfindingChunkUpdateMessage : EntityEventArgs
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs b/Content.Server/AI/Pathfinding/PathfindingHelpers.cs
similarity index 98%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs
rename to Content.Server/AI/Pathfinding/PathfindingHelpers.cs
index bbf3d7e211..62e19cd01b 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingHelpers.cs
+++ b/Content.Server/AI/Pathfinding/PathfindingHelpers.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
+using Content.Server.AI.Pathfinding.Accessible;
+using Content.Server.AI.Pathfinding.Pathfinders;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
+namespace Content.Server.AI.Pathfinding
 {
     public static class PathfindingHelpers
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs b/Content.Server/AI/Pathfinding/PathfindingNode.cs
similarity index 98%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs
rename to Content.Server/AI/Pathfinding/PathfindingNode.cs
index 918dec28be..b5eaab7d45 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingNode.cs
+++ b/Content.Server/AI/Pathfinding/PathfindingNode.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.Doors;
+using Content.Server.Access.Components;
+using Content.Server.Doors.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
+namespace Content.Server.AI.Pathfinding
 {
     public class PathfindingNode
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs b/Content.Server/AI/Pathfinding/PathfindingSystem.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs
rename to Content.Server/AI/Pathfinding/PathfindingSystem.cs
index 5d8eb20cf6..3d825bb402 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/AI/Pathfinding/PathfindingSystem.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
-using Content.Server.GameObjects.EntitySystems.JobQueues;
-using Content.Server.GameObjects.EntitySystems.JobQueues.Queues;
+using Content.Server.Access;
+using Content.Server.Access.Components;
+using Content.Server.AI.Pathfinding.Pathfinders;
+using Content.Server.CPUJob.JobQueues;
+using Content.Server.CPUJob.JobQueues.Queues;
 using Content.Shared.GameTicking;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
@@ -14,7 +15,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
+namespace Content.Server.AI.Pathfinding
 {
     /*
     // TODO: IMO use rectangular symmetry reduction on the nodes with collision at all. (currently planned to be implemented via AiReachableSystem and expanded later).
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs b/Content.Server/AI/Pathfinding/ServerPathfindingDebugSystem.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs
rename to Content.Server/AI/Pathfinding/ServerPathfindingDebugSystem.cs
index 7d7a583c04..2845bc011a 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Pathfinding/ServerPathfindingDebugSystem.cs
+++ b/Content.Server/AI/Pathfinding/ServerPathfindingDebugSystem.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
+using Content.Server.AI.Pathfinding.Pathfinders;
 using Content.Shared.AI;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -7,7 +7,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Pathfinding
+namespace Content.Server.AI.Pathfinding
 {
 #if DEBUG
     [UsedImplicitly]
diff --git a/Content.Server/GameObjects/EntitySystems/AI/SleepAiMessage.cs b/Content.Server/AI/SleepAiMessage.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/AI/SleepAiMessage.cs
rename to Content.Server/AI/SleepAiMessage.cs
index 5f7a19a2c3..8e5f81b6b9 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/SleepAiMessage.cs
+++ b/Content.Server/AI/SleepAiMessage.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.Movement;
+using Content.Server.AI.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.AI
+namespace Content.Server.AI
 {
     /// <summary>
     ///     Indicates whether an AI should be updated by the AiSystem or not.
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs b/Content.Server/AI/Steering/AiSteeringSystem.cs
similarity index 98%
rename from Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs
rename to Content.Server/AI/Steering/AiSteeringSystem.cs
index 490bd280ca..6bae1b1c54 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Steering/AiSteeringSystem.cs
+++ b/Content.Server/AI/Steering/AiSteeringSystem.cs
@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Pathfinders;
-using Content.Server.GameObjects.EntitySystems.JobQueues;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Utility;
+using Content.Server.Access.Components;
+using Content.Server.AI.Components;
+using Content.Server.AI.Pathfinding;
+using Content.Server.AI.Pathfinding.Pathfinders;
+using Content.Server.CPUJob.JobQueues;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
@@ -19,7 +19,7 @@ using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Steering
+namespace Content.Server.AI.Steering
 {
     public sealed class AiSteeringSystem : EntitySystem
     {
@@ -66,7 +66,7 @@ namespace Content.Server.GameObjects.EntitySystems.AI.Steering
         /// <summary>
         /// Pathfinding request jobs we're waiting on
         /// </summary>
-        private readonly Dictionary<IEntity, (CancellationTokenSource CancelToken, Job<Queue<TileRef>> Job)> _pathfindingRequests =
+        private readonly Dictionary<IEntity, (CancellationTokenSource CancelToken, CPUJob.JobQueues.Job<Queue<TileRef>> Job)> _pathfindingRequests =
             new();
 
         /// <summary>
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/EntityTargetSteeringRequest.cs b/Content.Server/AI/Steering/EntityTargetSteeringRequest.cs
similarity index 95%
rename from Content.Server/GameObjects/EntitySystems/AI/Steering/EntityTargetSteeringRequest.cs
rename to Content.Server/AI/Steering/EntityTargetSteeringRequest.cs
index 96f2048e36..7480ad325c 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Steering/EntityTargetSteeringRequest.cs
+++ b/Content.Server/AI/Steering/EntityTargetSteeringRequest.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Steering
+namespace Content.Server.AI.Steering
 {
     public sealed class EntityTargetSteeringRequest : IAiSteeringRequest
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs b/Content.Server/AI/Steering/GridTargetSteeringRequest.cs
similarity index 95%
rename from Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs
rename to Content.Server/AI/Steering/GridTargetSteeringRequest.cs
index 4c7d227126..92d84eabf4 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Steering/GridTargetSteeringRequest.cs
+++ b/Content.Server/AI/Steering/GridTargetSteeringRequest.cs
@@ -2,7 +2,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Steering
+namespace Content.Server.AI.Steering
 {
     public sealed class GridTargetSteeringRequest : IAiSteeringRequest
     {
diff --git a/Content.Server/GameObjects/EntitySystems/AI/Steering/IAiSteeringRequest.cs b/Content.Server/AI/Steering/IAiSteeringRequest.cs
similarity index 93%
rename from Content.Server/GameObjects/EntitySystems/AI/Steering/IAiSteeringRequest.cs
rename to Content.Server/AI/Steering/IAiSteeringRequest.cs
index bfe9ff15ab..5fef13158c 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/Steering/IAiSteeringRequest.cs
+++ b/Content.Server/AI/Steering/IAiSteeringRequest.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Map;
 
-namespace Content.Server.GameObjects.EntitySystems.AI.Steering
+namespace Content.Server.AI.Steering
 {
     public interface IAiSteeringRequest
     {
diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs
index f135c7d40d..453e793545 100644
--- a/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs
+++ b/Content.Server/AI/Utility/Actions/Combat/Melee/MeleeWeaponAttackEntity.cs
@@ -13,7 +13,7 @@ using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Combat;
 using Content.Server.AI.WorldState.States.Inventory;
 using Content.Server.AI.WorldState.States.Movement;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
diff --git a/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs b/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs
index 08250507f4..873b2440ee 100644
--- a/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs
+++ b/Content.Server/AI/Utility/Actions/Combat/Melee/UnarmedAttackEntity.cs
@@ -11,7 +11,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Combat;
 using Content.Server.AI.WorldState.States.Movement;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
diff --git a/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs b/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs
index e1784ceff9..52d4657094 100644
--- a/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs
+++ b/Content.Server/AI/Utility/Actions/Idle/WanderAndWait.cs
@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using Content.Server.AI.Operators;
 using Content.Server.AI.Operators.Generic;
 using Content.Server.AI.Operators.Movement;
+using Content.Server.AI.Pathfinding;
+using Content.Server.AI.Pathfinding.Accessible;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.ActionBlocker;
 using Content.Server.AI.WorldState;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
diff --git a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs
index ef79c301f5..4cf8330962 100644
--- a/Content.Server/AI/Utility/AiLogic/UtilityAI.cs
+++ b/Content.Server/AI/Utility/AiLogic/UtilityAI.cs
@@ -2,16 +2,15 @@
 using System.Collections.Generic;
 using System.Runtime.ExceptionServices;
 using System.Threading;
+using Content.Server.AI.Components;
+using Content.Server.AI.LoadBalancer;
 using Content.Server.AI.Operators;
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Utility;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.EntitySystems.AI;
-using Content.Server.GameObjects.EntitySystems.AI.LoadBalancer;
-using Content.Server.GameObjects.EntitySystems.JobQueues;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Server.CPUJob.JobQueues;
+using Content.Shared.MobState;
+using Content.Shared.Movement.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
diff --git a/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs b/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs
index 27d2503788..ad708db647 100644
--- a/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs
+++ b/Content.Server/AI/Utility/Considerations/ActionBlocker/CanMoveCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
 
 namespace Content.Server.AI.Utility.Considerations.ActionBlocker
 {
diff --git a/Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs b/Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs
index 63c851d0d3..1dd5b9b8e7 100644
--- a/Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Clothing/ClothingInInventoryCon.cs
@@ -1,8 +1,8 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Clothing;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 
 namespace Content.Server.AI.Utility.Considerations.Clothing
 {
diff --git a/Content.Server/AI/Utility/Considerations/Clothing/ClothingInSlotCon.cs b/Content.Server/AI/Utility/Considerations/Clothing/ClothingInSlotCon.cs
index dfc0b548a7..57ddb53e70 100644
--- a/Content.Server/AI/Utility/Considerations/Clothing/ClothingInSlotCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Clothing/ClothingInSlotCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.Inventory;
 
 namespace Content.Server.AI.Utility.Considerations.Clothing
 {
@@ -12,7 +12,7 @@ namespace Content.Server.AI.Utility.Considerations.Clothing
             context.GetState<ClothingSlotConState>().SetValue(slot);
             return this;
         }
-        
+
         protected override float GetScore(Blackboard context)
         {
             var slot = context.GetState<ClothingSlotConState>().GetValue();
diff --git a/Content.Server/AI/Utility/Considerations/Combat/Melee/CanUnarmedCombatCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Melee/CanUnarmedCombatCon.cs
index 1899ac807a..40877f75eb 100644
--- a/Content.Server/AI/Utility/Considerations/Combat/Melee/CanUnarmedCombatCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Combat/Melee/CanUnarmedCombatCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Combat.Melee
 {
diff --git a/Content.Server/AI/Utility/Considerations/Combat/Melee/HasMeleeWeaponCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Melee/HasMeleeWeaponCon.cs
index e8f9e74224..8c62d2d56d 100644
--- a/Content.Server/AI/Utility/Considerations/Combat/Melee/HasMeleeWeaponCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Combat/Melee/HasMeleeWeaponCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Combat.Melee
 {
diff --git a/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponDamageCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponDamageCon.cs
index e90d8c9f63..a2e0cb148d 100644
--- a/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponDamageCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponDamageCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Combat;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Combat.Melee
 {
diff --git a/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponEquippedCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponEquippedCon.cs
index 856c8b9932..572f042409 100644
--- a/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponEquippedCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponEquippedCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Combat.Melee
 {
diff --git a/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponSpeedCon.cs b/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponSpeedCon.cs
index fcb48f2727..1c877e75bc 100644
--- a/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponSpeedCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Combat/Melee/MeleeWeaponSpeedCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States.Combat;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Combat.Melee
 {
diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs
index 6376feb7ed..368fdadd55 100644
--- a/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Combat/TargetHealthCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Combat
 {
diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs
index 790ec9cc03..159459b10b 100644
--- a/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Combat/TargetIsCritCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
 
 namespace Content.Server.AI.Utility.Considerations.Combat
 {
diff --git a/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs b/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs
index 947c4a2eea..7a36c451b5 100644
--- a/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Combat/TargetIsDeadCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
 
 namespace Content.Server.AI.Utility.Considerations.Combat
 {
diff --git a/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs b/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs
index 9408ef3575..473c436164 100644
--- a/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Containers/TargetAccessibleCon.cs
@@ -1,8 +1,9 @@
+using Content.Server.AI.Pathfinding.Accessible;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems.AI.Pathfinding.Accessible;
+using Content.Server.Storage.Components;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Interaction;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs b/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs
index c18ee94e26..6f12825434 100644
--- a/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Hands/FreeHandCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Hands
 {
diff --git a/Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs b/Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs
index c16ca7d86a..cc7572469e 100644
--- a/Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Inventory/CanPutTargetInInventoryCon.cs
@@ -2,7 +2,7 @@ using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Hands;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Items;
 
 namespace Content.Server.AI.Utility.Considerations.Inventory
 {
diff --git a/Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs b/Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs
index ba00f6303d..63da53c697 100644
--- a/Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Inventory/TargetInOurInventoryCon.cs
@@ -1,7 +1,7 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Items;
 
 namespace Content.Server.AI.Utility.Considerations.Inventory
 {
diff --git a/Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs b/Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs
index 554451f680..04b79925d2 100644
--- a/Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Nutrition/Drink/DrinkValueCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.Chemistry.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Nutrition.Drink
 {
diff --git a/Content.Server/AI/Utility/Considerations/Nutrition/Drink/ThirstCon.cs b/Content.Server/AI/Utility/Considerations/Nutrition/Drink/ThirstCon.cs
index 84e03781bc..1a3c97f718 100644
--- a/Content.Server/AI/Utility/Considerations/Nutrition/Drink/ThirstCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Nutrition/Drink/ThirstCon.cs
@@ -1,7 +1,7 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Nutrition.Drink
 {
diff --git a/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs b/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs
index 1f94a77313..38390e0ed6 100644
--- a/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Nutrition/Food/FoodValueCon.cs
@@ -1,6 +1,6 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.Chemistry.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Nutrition.Food
 {
diff --git a/Content.Server/AI/Utility/Considerations/Nutrition/Food/HungerCon.cs b/Content.Server/AI/Utility/Considerations/Nutrition/Food/HungerCon.cs
index ba3280eb5f..bdc5284094 100644
--- a/Content.Server/AI/Utility/Considerations/Nutrition/Food/HungerCon.cs
+++ b/Content.Server/AI/Utility/Considerations/Nutrition/Food/HungerCon.cs
@@ -1,7 +1,7 @@
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 
 namespace Content.Server.AI.Utility.Considerations.Nutrition.Food
 {
diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs
index 64b8d3841e..139083588f 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/EquipAnyGlovesExp.cs
@@ -7,8 +7,8 @@ using Content.Server.AI.Utility.Considerations.Clothing;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Gloves
diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs
index 794916ac2d..669fe88dc2 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Gloves/PickUpAnyNearbyGlovesExp.cs
@@ -7,8 +7,8 @@ using Content.Server.AI.Utility.Considerations.Clothing;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Clothing;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Gloves
diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs
index 4f0da2993a..23d6af0a6e 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/EquipAnyHeadExp.cs
@@ -7,8 +7,8 @@ using Content.Server.AI.Utility.Considerations.Clothing;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Head
diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs
index 4ce3ac64ec..b69972cbee 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Head/PickUpAnyNearbyHeadExp.cs
@@ -7,8 +7,8 @@ using Content.Server.AI.Utility.Considerations.Clothing;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Clothing;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Head
diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs
index 19f2989544..7dfaf113ac 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/EquipAnyOuterClothingExp.cs
@@ -7,8 +7,8 @@ using Content.Server.AI.Utility.Considerations.Clothing;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.OuterClothing
diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs
index 7732a59111..965ccf9a78 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/OuterClothing/PickUpAnyNearbyOuterClothingExp.cs
@@ -7,8 +7,8 @@ using Content.Server.AI.Utility.Considerations.Clothing;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Clothing;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.OuterClothing
diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs
index 6d27889db3..a5192d9a8e 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/EquipAnyShoesExp.cs
@@ -7,8 +7,8 @@ using Content.Server.AI.Utility.Considerations.Clothing;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Shoes
diff --git a/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs
index fb22fbd202..404db0235b 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Clothing/Shoes/PickUpAnyNearbyShoesExp.cs
@@ -7,8 +7,8 @@ using Content.Server.AI.Utility.Considerations.Clothing;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Clothing;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Clothing.Shoes
diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/EquipMeleeExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/EquipMeleeExp.cs
index 533630b2b2..f00032693d 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/EquipMeleeExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/EquipMeleeExp.cs
@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Combat.Melee;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Combat.Melee
diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs
index 214529cbe7..7b8f7d8144 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/MeleeAttackNearbyExp.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.AI.Components;
+using Content.Server.AI.EntitySystems;
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.Actions.Combat.Melee;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Combat.Melee;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.EntitySystems.AI;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
diff --git a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyHostilesExp.cs b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyHostilesExp.cs
index dcc4d3db8f..97e88c1536 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyHostilesExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Combat/Melee/UnarmedAttackNearbyHostilesExp.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.AI.Components;
+using Content.Server.AI.EntitySystems;
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.Actions.Combat.Melee;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.Utility.Considerations.Combat.Melee;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.EntitySystems.AI;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
diff --git a/Content.Server/AI/Utility/ExpandableActions/Nutrition/UseDrinkInInventoryExp.cs b/Content.Server/AI/Utility/ExpandableActions/Nutrition/UseDrinkInInventoryExp.cs
index 57f492c629..3abcbbcbbe 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Nutrition/UseDrinkInInventoryExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Nutrition/UseDrinkInInventoryExp.cs
@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Nutrition.Drink;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Nutrition
diff --git a/Content.Server/AI/Utility/ExpandableActions/Nutrition/UseFoodInInventoryExp.cs b/Content.Server/AI/Utility/ExpandableActions/Nutrition/UseFoodInInventoryExp.cs
index 0b07d9bfb5..4b2fde45f0 100644
--- a/Content.Server/AI/Utility/ExpandableActions/Nutrition/UseFoodInInventoryExp.cs
+++ b/Content.Server/AI/Utility/ExpandableActions/Nutrition/UseFoodInInventoryExp.cs
@@ -7,7 +7,7 @@ using Content.Server.AI.Utility.Considerations.Nutrition.Food;
 using Content.Server.AI.WorldState;
 using Content.Server.AI.WorldState.States;
 using Content.Server.AI.WorldState.States.Inventory;
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
 using Robust.Shared.IoC;
 
 namespace Content.Server.AI.Utility.ExpandableActions.Nutrition
diff --git a/Content.Server/AI/Utility/NpcBehaviorManager.cs b/Content.Server/AI/Utility/NpcBehaviorManager.cs
index 3fc13290b9..4763f77899 100644
--- a/Content.Server/AI/Utility/NpcBehaviorManager.cs
+++ b/Content.Server/AI/Utility/NpcBehaviorManager.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Server.AI.EntitySystems;
 using Content.Server.AI.Utility.Actions;
 using Content.Server.AI.Utility.AiLogic;
-using Content.Server.GameObjects.EntitySystems.AI;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
diff --git a/Content.Server/AI/Utility/UtilityAiHelpers.cs b/Content.Server/AI/Utility/UtilityAiHelpers.cs
index 9e5938294f..a1765b9390 100644
--- a/Content.Server/AI/Utility/UtilityAiHelpers.cs
+++ b/Content.Server/AI/Utility/UtilityAiHelpers.cs
@@ -1,6 +1,6 @@
+using Content.Server.AI.Components;
 using Content.Server.AI.Utility.AiLogic;
 using Content.Server.AI.WorldState;
-using Content.Server.GameObjects.Components.Movement;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.AI.Utility
diff --git a/Content.Server/AI/Utils/Visibility.cs b/Content.Server/AI/Utils/Visibility.cs
index 957079e3f1..90cb4e5c18 100644
--- a/Content.Server/AI/Utils/Visibility.cs
+++ b/Content.Server/AI/Utils/Visibility.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Movement;
+using Content.Server.AI.Components;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/AI/WorldState/States/Clothing/ClothingSlotConState.cs b/Content.Server/AI/WorldState/States/Clothing/ClothingSlotConState.cs
index e1f87353d7..768bfc0a31 100644
--- a/Content.Server/AI/WorldState/States/Clothing/ClothingSlotConState.cs
+++ b/Content.Server/AI/WorldState/States/Clothing/ClothingSlotConState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.Inventory;
 
 namespace Content.Server.AI.WorldState.States.Clothing
 {
@@ -10,4 +10,4 @@ namespace Content.Server.AI.WorldState.States.Clothing
             Value = EquipmentSlotDefines.Slots.NONE;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/AI/WorldState/States/Clothing/ClothingSlotFlagConState.cs b/Content.Server/AI/WorldState/States/Clothing/ClothingSlotFlagConState.cs
index 6af98349a0..9e48eec82d 100644
--- a/Content.Server/AI/WorldState/States/Clothing/ClothingSlotFlagConState.cs
+++ b/Content.Server/AI/WorldState/States/Clothing/ClothingSlotFlagConState.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.Inventory;
 
 namespace Content.Server.AI.WorldState.States.Clothing
 {
@@ -10,4 +10,4 @@ namespace Content.Server.AI.WorldState.States.Clothing
             Value = EquipmentSlotDefines.SlotFlags.NONE;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs b/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs
index 462683a1bd..c9d642ad04 100644
--- a/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs
+++ b/Content.Server/AI/WorldState/States/Clothing/EquippedClothingState.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Inventory.Components;
+using Content.Shared.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs b/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs
index 40feb0241a..1907c8e019 100644
--- a/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs
+++ b/Content.Server/AI/WorldState/States/Clothing/NearbyClothingState.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
+using Content.Server.AI.Components;
 using Content.Server.AI.Utils;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Movement;
+using Content.Server.Clothing.Components;
+using Content.Server.Storage.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs b/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs
index 5c9d1b01f5..ad817ed313 100644
--- a/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs
+++ b/Content.Server/AI/WorldState/States/Combat/Nearby/NearbyMeleeWeapons.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using Content.Server.AI.Components;
 using Content.Server.AI.Utils;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs b/Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs
index 617ebbfc04..d960685999 100644
--- a/Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs
+++ b/Content.Server/AI/WorldState/States/Hands/AnyFreeHandState.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 using JetBrains.Annotations;
 
 namespace Content.Server.AI.WorldState.States.Hands
diff --git a/Content.Server/AI/WorldState/States/Hands/FreeHands.cs b/Content.Server/AI/WorldState/States/Hands/FreeHands.cs
index 4fe8d4c6ec..5214d65ea2 100644
--- a/Content.Server/AI/WorldState/States/Hands/FreeHands.cs
+++ b/Content.Server/AI/WorldState/States/Hands/FreeHands.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 using JetBrains.Annotations;
 
 namespace Content.Server.AI.WorldState.States.Hands
diff --git a/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs b/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs
index 796a279b8b..7651afcbc6 100644
--- a/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs
+++ b/Content.Server/AI/WorldState/States/Hands/HandItemsState.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs b/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs
index 5b8d30e172..f4615a6e52 100644
--- a/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs
+++ b/Content.Server/AI/WorldState/States/Inventory/EquippedEntityState.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs b/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs
index 7df2e40ed7..a26863f5a1 100644
--- a/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs
+++ b/Content.Server/AI/WorldState/States/Inventory/InventoryState.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Hands.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs b/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs
index c15881fa83..3654ed86d3 100644
--- a/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs
+++ b/Content.Server/AI/WorldState/States/Inventory/LastOpenedStorageState.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Storage.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 
diff --git a/Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs b/Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs
index dca076c4f8..1dbbce8e79 100644
--- a/Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs
+++ b/Content.Server/AI/WorldState/States/Mobs/NearbyBodiesState.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using Content.Server.AI.Components;
 using Content.Server.AI.Utils;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.Body.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
diff --git a/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs b/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs
index 5c4ca134a3..33ed838e46 100644
--- a/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs
+++ b/Content.Server/AI/WorldState/States/Mobs/NearbyPlayersState.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Server.AI.Components;
+using Content.Shared.Damage.Components;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/AI/WorldState/States/Nutrition/HungryState.cs b/Content.Server/AI/WorldState/States/Nutrition/HungryState.cs
index 8a852437d5..4f29487228 100644
--- a/Content.Server/AI/WorldState/States/Nutrition/HungryState.cs
+++ b/Content.Server/AI/WorldState/States/Nutrition/HungryState.cs
@@ -1,6 +1,6 @@
 using System;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using JetBrains.Annotations;
 
 namespace Content.Server.AI.WorldState.States.Nutrition
diff --git a/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs b/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs
index 4816fa09eb..6e64775696 100644
--- a/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs
+++ b/Content.Server/AI/WorldState/States/Nutrition/NearbyDrinkState.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
+using Content.Server.AI.Components;
 using Content.Server.AI.Utils;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
+using Content.Server.Storage.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs b/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs
index 9da058931e..fea5d0e76f 100644
--- a/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs
+++ b/Content.Server/AI/WorldState/States/Nutrition/NearbyFoodState.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
+using Content.Server.AI.Components;
 using Content.Server.AI.Utils;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
+using Content.Server.Storage.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/AI/WorldState/States/Nutrition/ThirstyState.cs b/Content.Server/AI/WorldState/States/Nutrition/ThirstyState.cs
index f71f263ba3..e9c120e91a 100644
--- a/Content.Server/AI/WorldState/States/Nutrition/ThirstyState.cs
+++ b/Content.Server/AI/WorldState/States/Nutrition/ThirstyState.cs
@@ -1,6 +1,6 @@
 using System;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using JetBrains.Annotations;
 
 namespace Content.Server.AI.WorldState.States.Nutrition
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs b/Content.Server/AME/AMENodeGroup.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs
rename to Content.Server/AME/AMENodeGroup.cs
index 7f7f0310b4..920cff987c 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/AMENodeGroup.cs
+++ b/Content.Server/AME/AMENodeGroup.cs
@@ -2,16 +2,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Explosions;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
-using Content.Server.GameObjects.Components.Power.AME;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Random;
+using Content.Server.AME.Components;
+using Content.Server.Explosion;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.Nodes;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
+using Robust.Shared.Random;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
+namespace Content.Server.AME
 {
     /// <summary>
     /// Node group class for handling the Antimatter Engine's console and parts.
diff --git a/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs b/Content.Server/AME/AntimatterEngineSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs
rename to Content.Server/AME/AntimatterEngineSystem.cs
index 7f70d44beb..d72de7e0e7 100644
--- a/Content.Server/GameObjects/EntitySystems/AntimatterEngineSystem.cs
+++ b/Content.Server/AME/AntimatterEngineSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Power.AME;
+using Content.Server.AME.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.AME
 {
     [UsedImplicitly]
     public class AntimatterEngineSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs b/Content.Server/AME/Components/AMEControllerComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs
rename to Content.Server/AME/Components/AMEControllerComponent.cs
index e6f5865a79..add646c0ed 100644
--- a/Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs
+++ b/Content.Server/AME/Components/AMEControllerComponent.cs
@@ -1,18 +1,15 @@
 #nullable enable
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Power.AME;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.NodeContainer;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.AME;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -21,7 +18,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.AME
+namespace Content.Server.AME.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEFuelContainerComponent.cs b/Content.Server/AME/Components/AMEFuelContainerComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Power/AME/AMEFuelContainerComponent.cs
rename to Content.Server/AME/Components/AMEFuelContainerComponent.cs
index 6367ac9002..cc4e79d3d8 100644
--- a/Content.Server/GameObjects/Components/Power/AME/AMEFuelContainerComponent.cs
+++ b/Content.Server/AME/Components/AMEFuelContainerComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.AME
+namespace Content.Server.AME.Components
 {
     [RegisterComponent]
     public class AMEFuelContainerComponent : Component
diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs b/Content.Server/AME/Components/AMEPartComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs
rename to Content.Server/AME/Components/AMEPartComponent.cs
index e240171357..0741dcc53d 100644
--- a/Content.Server/GameObjects/Components/Power/AME/AMEPartComponent.cs
+++ b/Content.Server/AME/Components/AMEPartComponent.cs
@@ -1,11 +1,11 @@
 #nullable enable
-using System.Threading.Tasks;
 using System.Linq;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using System.Threading.Tasks;
+using Content.Server.Hands.Components;
+using Content.Server.Tools.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Tool;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -14,7 +14,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.Components.Power.AME
+namespace Content.Server.AME.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IInteractUsing))]
diff --git a/Content.Server/GameObjects/Components/Power/AME/AMEShieldComponent.cs b/Content.Server/AME/Components/AMEShieldComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Power/AME/AMEShieldComponent.cs
rename to Content.Server/AME/Components/AMEShieldComponent.cs
index f484b3cbe1..6eb28faa2c 100644
--- a/Content.Server/GameObjects/Components/Power/AME/AMEShieldComponent.cs
+++ b/Content.Server/AME/Components/AMEShieldComponent.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Power.AME;
+using Content.Shared.AME;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.AME
+namespace Content.Server.AME.Components
 {
     [RegisterComponent]
     public class AMEShieldComponent : SharedAMEShieldComponent
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs b/Content.Server/APC/ApcNetNodeGroup.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs
rename to Content.Server/APC/ApcNetNodeGroup.cs
index 4da747c4a1..8b2bae38b8 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/ApcNetNodeGroup.cs
+++ b/Content.Server/APC/ApcNetNodeGroup.cs
@@ -1,16 +1,17 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
-using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.APC.Components;
+using Content.Server.Battery.Components;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.Nodes;
+using Content.Server.Power.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
+namespace Content.Server.APC
 {
     public interface IApcNet
     {
diff --git a/Content.Server/GameObjects/EntitySystems/ApcNetSystem.cs b/Content.Server/APC/ApcNetSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/ApcNetSystem.cs
rename to Content.Server/APC/ApcNetSystem.cs
index c478942d44..ccf5835eac 100644
--- a/Content.Server/GameObjects/EntitySystems/ApcNetSystem.cs
+++ b/Content.Server/APC/ApcNetSystem.cs
@@ -1,13 +1,12 @@
 #nullable enable
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using System.Collections.Generic;
+using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using System.Collections.Generic;
-using Content.Shared.GameTicking;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.APC
 {
     [UsedImplicitly]
     internal sealed class ApcNetSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs b/Content.Server/APC/Components/ApcComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs
rename to Content.Server/APC/Components/ApcComponent.cs
index 538ec858af..d7ecbd5247 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs
+++ b/Content.Server/APC/Components/ApcComponent.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Access.Components;
+using Content.Server.Battery.Components;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.APC;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -16,7 +16,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
+namespace Content.Server.APC.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
@@ -56,7 +56,6 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
         {
             base.Initialize();
 
-            Owner.EnsureComponent<BatteryComponent>();
             Owner.EnsureComponent<PowerConsumerComponent>();
             Owner.EnsureComponentWarn<ServerUserInterfaceComponent>();
             Owner.EnsureComponentWarn<AccessReader>();
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/BaseApcNetComponent.cs b/Content.Server/APC/Components/BaseApcNetComponent.cs
similarity index 57%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/BaseApcNetComponent.cs
rename to Content.Server/APC/Components/BaseApcNetComponent.cs
index d13f3fecfe..51fa8b3c43 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/BaseApcNetComponent.cs
+++ b/Content.Server/APC/Components/BaseApcNetComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.Power.Components;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
+namespace Content.Server.APC.Components
 {
     public abstract class BaseApcNetComponent : BaseNetConnectorComponent<IApcNet>
     {
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerApcSystem.cs b/Content.Server/APC/PowerApcSystem.cs
similarity index 76%
rename from Content.Server/GameObjects/EntitySystems/Power/PowerApcSystem.cs
rename to Content.Server/APC/PowerApcSystem.cs
index f880f79e88..1aefa669f4 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerApcSystem.cs
+++ b/Content.Server/APC/PowerApcSystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.APC.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.APC
 {
     [UsedImplicitly]
     internal sealed class PowerApcSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs b/Content.Server/Access/AccessReaderChangeMessage.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs
rename to Content.Server/Access/AccessReaderChangeMessage.cs
index ff919d3944..e9a71e59ac 100644
--- a/Content.Server/GameObjects/Components/Access/AccessReaderChangeMessage.cs
+++ b/Content.Server/Access/AccessReaderChangeMessage.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Access
+namespace Content.Server.Access
 {
     public sealed class AccessReaderChangeMessage : EntityEventArgs
     {
@@ -14,4 +14,4 @@ namespace Content.Server.GameObjects.Components.Access
             Enabled = enabled;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/GameObjects/Components/Access/AccessComponent.cs b/Content.Server/Access/Components/AccessComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Access/AccessComponent.cs
rename to Content.Server/Access/Components/AccessComponent.cs
index e90ecbf9e1..f1393397ab 100644
--- a/Content.Server/GameObjects/Components/Access/AccessComponent.cs
+++ b/Content.Server/Access/Components/AccessComponent.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.Interfaces;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Access
+namespace Content.Server.Access.Components
 {
     /// <summary>
     ///     Simple mutable access provider found on ID cards and such.
diff --git a/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs b/Content.Server/Access/Components/AccessReaderComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs
rename to Content.Server/Access/Components/AccessReaderComponent.cs
index b9ea14bb90..1cedd69eaf 100644
--- a/Content.Server/GameObjects/Components/Access/AccessReaderComponent.cs
+++ b/Content.Server/Access/Components/AccessReaderComponent.cs
@@ -2,12 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.Interfaces;
-using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Server.Hands.Components;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
 using Content.Shared.Access;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -16,7 +15,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Access
+namespace Content.Server.Access.Components
 {
     /// <summary>
     ///     Stores access levels necessary to "use" an entity
diff --git a/Content.Server/Interfaces/IAccess.cs b/Content.Server/Access/Components/IAccess.cs
similarity index 92%
rename from Content.Server/Interfaces/IAccess.cs
rename to Content.Server/Access/Components/IAccess.cs
index bec7cef9b7..7b04b26c48 100644
--- a/Content.Server/Interfaces/IAccess.cs
+++ b/Content.Server/Access/Components/IAccess.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Access;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.Access.Components
 {
     /// <summary>
     ///     Contains access levels that can be checked to see if somebody has access with an <see cref="AccessReader"/>.
diff --git a/Content.Server/GameObjects/Components/Access/IdCardComponent.cs b/Content.Server/Access/Components/IdCardComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Access/IdCardComponent.cs
rename to Content.Server/Access/Components/IdCardComponent.cs
index dc3ec2ace9..b365559954 100644
--- a/Content.Server/GameObjects/Components/Access/IdCardComponent.cs
+++ b/Content.Server/Access/Components/IdCardComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Access
+namespace Content.Server.Access.Components
 {
     [RegisterComponent]
     public class IdCardComponent : Component
diff --git a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs b/Content.Server/Access/Components/IdCardConsoleComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs
rename to Content.Server/Access/Components/IdCardConsoleComponent.cs
index 1bb31160c2..a6b88944ae 100644
--- a/Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs
+++ b/Content.Server/Access/Components/IdCardConsoleComponent.cs
@@ -2,16 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
 using Content.Shared.Access;
-using Content.Shared.GameObjects.Components.Access;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Acts;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -20,9 +20,8 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
 using Robust.Shared.ViewVariables;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 
-namespace Content.Server.GameObjects.Components.Access
+namespace Content.Server.Access.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs b/Content.Server/Access/Components/PresetIdCardComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs
rename to Content.Server/Access/Components/PresetIdCardComponent.cs
index 14ddfb36fd..4442a07944 100644
--- a/Content.Server/GameObjects/Components/Access/PresetIdCardComponent.cs
+++ b/Content.Server/Access/Components/PresetIdCardComponent.cs
@@ -1,13 +1,11 @@
 #nullable enable
 using Content.Shared.Roles;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Access
+namespace Content.Server.Access.Components
 {
     [RegisterComponent]
     public class PresetIdCardComponent : Component, IMapInit
diff --git a/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs b/Content.Server/Act/IDisarmedAct.cs
similarity index 96%
rename from Content.Server/Interfaces/GameObjects/IDisarmedAct.cs
rename to Content.Server/Act/IDisarmedAct.cs
index e54db3d6a6..a51147ecdd 100644
--- a/Content.Server/Interfaces/GameObjects/IDisarmedAct.cs
+++ b/Content.Server/Act/IDisarmedAct.cs
@@ -2,7 +2,7 @@ using System;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Interfaces.GameObjects
+namespace Content.Server.Act
 {
     /// <summary>
     ///     Implements behavior when an entity is disarmed.
diff --git a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs b/Content.Server/Act/ISuicideAct.cs
similarity index 85%
rename from Content.Server/Interfaces/GameObjects/ISuicideAct.cs
rename to Content.Server/Act/ISuicideAct.cs
index 809b4c8e5f..b8e7c3f571 100644
--- a/Content.Server/Interfaces/GameObjects/ISuicideAct.cs
+++ b/Content.Server/Act/ISuicideAct.cs
@@ -1,8 +1,8 @@
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Interfaces.GameObjects
+namespace Content.Server.Act
 {
     [RequiresExplicitImplementation]
     public interface ISuicideAct
diff --git a/Content.Server/Actions/CombatMode.cs b/Content.Server/Actions/Actions/CombatMode.cs
similarity index 82%
rename from Content.Server/Actions/CombatMode.cs
rename to Content.Server/Actions/Actions/CombatMode.cs
index 4c3d5fca24..a43ee87840 100644
--- a/Content.Server/Actions/CombatMode.cs
+++ b/Content.Server/Actions/Actions/CombatMode.cs
@@ -1,12 +1,12 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Shared.Actions;
-using Content.Shared.Interfaces;
+using Content.Server.CombatMode;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Notification;
 using JetBrains.Annotations;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Actions
+namespace Content.Server.Actions.Actions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Server/Actions/DebugInstant.cs b/Content.Server/Actions/Actions/DebugInstant.cs
similarity index 84%
rename from Content.Server/Actions/DebugInstant.cs
rename to Content.Server/Actions/Actions/DebugInstant.cs
index 8ad9ff8366..a1564b5f9c 100644
--- a/Content.Server/Actions/DebugInstant.cs
+++ b/Content.Server/Actions/Actions/DebugInstant.cs
@@ -1,10 +1,11 @@
-using Content.Server.Utility;
-using Content.Shared.Actions;
-using Content.Shared.Utility;
+using Content.Server.Notification;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Cooldown;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Actions
+namespace Content.Server.Actions.Actions
 {
     /// <summary>
     /// Just shows a popup message.asd
diff --git a/Content.Server/Actions/DebugTargetEntity.cs b/Content.Server/Actions/Actions/DebugTargetEntity.cs
similarity index 85%
rename from Content.Server/Actions/DebugTargetEntity.cs
rename to Content.Server/Actions/Actions/DebugTargetEntity.cs
index a6537ae47b..ad1181761f 100644
--- a/Content.Server/Actions/DebugTargetEntity.cs
+++ b/Content.Server/Actions/Actions/DebugTargetEntity.cs
@@ -1,9 +1,9 @@
-using Content.Server.Utility;
-using Content.Shared.Actions;
+using Content.Server.Notification;
+using Content.Shared.Actions.Behaviors;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Actions
+namespace Content.Server.Actions.Actions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Server/Actions/DebugTargetPoint.cs b/Content.Server/Actions/Actions/DebugTargetPoint.cs
similarity index 85%
rename from Content.Server/Actions/DebugTargetPoint.cs
rename to Content.Server/Actions/Actions/DebugTargetPoint.cs
index c26959076a..ee5c6e662b 100644
--- a/Content.Server/Actions/DebugTargetPoint.cs
+++ b/Content.Server/Actions/Actions/DebugTargetPoint.cs
@@ -1,9 +1,9 @@
-using Content.Server.Utility;
-using Content.Shared.Actions;
+using Content.Server.Notification;
+using Content.Shared.Actions.Behaviors;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Actions
+namespace Content.Server.Actions.Actions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Server/Actions/DebugToggle.cs b/Content.Server/Actions/Actions/DebugToggle.cs
similarity index 87%
rename from Content.Server/Actions/DebugToggle.cs
rename to Content.Server/Actions/Actions/DebugToggle.cs
index a2ddaa1500..03c3a95602 100644
--- a/Content.Server/Actions/DebugToggle.cs
+++ b/Content.Server/Actions/Actions/DebugToggle.cs
@@ -1,9 +1,10 @@
-using Content.Server.Utility;
-using Content.Shared.Actions;
+using Content.Server.Notification;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Behaviors.Item;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Actions
+namespace Content.Server.Actions.Actions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Server/Actions/DisarmAction.cs b/Content.Server/Actions/Actions/DisarmAction.cs
similarity index 88%
rename from Content.Server/Actions/DisarmAction.cs
rename to Content.Server/Actions/Actions/DisarmAction.cs
index 9d8f4e45e2..1d63a9efef 100644
--- a/Content.Server/Actions/DisarmAction.cs
+++ b/Content.Server/Actions/Actions/DisarmAction.cs
@@ -1,17 +1,18 @@
 #nullable enable
 using System;
 using System.Linq;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Server.GameObjects.EntitySystems.Weapon.Melee;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Utility;
+using Content.Server.Act;
+using Content.Server.Interaction;
+using Content.Server.Notification;
+using Content.Server.Weapon.Melee;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Components;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Utility;
+using Content.Shared.Cooldown;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -23,7 +24,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Actions
+namespace Content.Server.Actions.Actions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Server/Actions/GhostBoo.cs b/Content.Server/Actions/Actions/GhostBoo.cs
similarity index 85%
rename from Content.Server/Actions/GhostBoo.cs
rename to Content.Server/Actions/Actions/GhostBoo.cs
index 6223fb3cd9..eec44b21ff 100644
--- a/Content.Server/Actions/GhostBoo.cs
+++ b/Content.Server/Actions/Actions/GhostBoo.cs
@@ -1,16 +1,15 @@
 #nullable enable
 using System.Linq;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Shared.Actions;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.Utility;
+using Content.Server.Ghost;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Components;
+using Content.Shared.Cooldown;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Actions
+namespace Content.Server.Actions.Actions
 {
     /// <summary>
     ///     Blink lights and scare livings
diff --git a/Content.Server/Actions/ScreamAction.cs b/Content.Server/Actions/Actions/ScreamAction.cs
similarity index 89%
rename from Content.Server/Actions/ScreamAction.cs
rename to Content.Server/Actions/Actions/ScreamAction.cs
index 44570fd37e..544b064843 100644
--- a/Content.Server/Actions/ScreamAction.cs
+++ b/Content.Server/Actions/Actions/ScreamAction.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Shared.Actions;
+using Content.Server.CharacterAppearance.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Components;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Preferences;
-using Content.Shared.Utility;
+using Content.Shared.CharacterAppearance;
+using Content.Shared.Cooldown;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.IoC;
@@ -15,7 +15,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.Actions
+namespace Content.Server.Actions.Actions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Server/Commands/Actions/CooldownAction.cs b/Content.Server/Actions/Commands/CooldownAction.cs
similarity index 96%
rename from Content.Server/Commands/Actions/CooldownAction.cs
rename to Content.Server/Actions/Commands/CooldownAction.cs
index c313d535a4..6ae705647a 100644
--- a/Content.Server/Commands/Actions/CooldownAction.cs
+++ b/Content.Server/Actions/Commands/CooldownAction.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Commands;
 using Content.Shared.Actions;
 using Content.Shared.Administration;
 using Robust.Server.Player;
@@ -9,7 +9,7 @@ using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Commands.Actions
+namespace Content.Server.Actions.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public sealed class CooldownAction : IConsoleCommand
diff --git a/Content.Server/Commands/Actions/GrantAction.cs b/Content.Server/Actions/Commands/GrantAction.cs
similarity index 95%
rename from Content.Server/Commands/Actions/GrantAction.cs
rename to Content.Server/Actions/Commands/GrantAction.cs
index 4befb8104d..2ad39f0b0c 100644
--- a/Content.Server/Commands/Actions/GrantAction.cs
+++ b/Content.Server/Actions/Commands/GrantAction.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System;
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Commands;
 using Content.Shared.Actions;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Actions
+namespace Content.Server.Actions.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public sealed class GrantAction : IConsoleCommand
diff --git a/Content.Server/Commands/Actions/RevokeAction.cs b/Content.Server/Actions/Commands/RevokeAction.cs
similarity index 95%
rename from Content.Server/Commands/Actions/RevokeAction.cs
rename to Content.Server/Actions/Commands/RevokeAction.cs
index d493f69f38..3c2f938099 100644
--- a/Content.Server/Commands/Actions/RevokeAction.cs
+++ b/Content.Server/Actions/Commands/RevokeAction.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System;
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Commands;
 using Content.Shared.Actions;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Actions
+namespace Content.Server.Actions.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public sealed class RevokeAction : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs b/Content.Server/Actions/ServerActionsComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs
rename to Content.Server/Actions/ServerActionsComponent.cs
index 629cae5789..4760efb3e4 100644
--- a/Content.Server/GameObjects/Components/Mobs/ServerActionsComponent.cs
+++ b/Content.Server/Actions/ServerActionsComponent.cs
@@ -1,8 +1,9 @@
 #nullable enable
 using System;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.Actions.Components;
+using Content.Shared.Actions.Prototypes;
 using Robust.Server.GameObjects;
 using Robust.Server.GameStates;
 using Robust.Shared.GameObjects;
@@ -13,7 +14,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.Actions
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedActionsComponent))]
diff --git a/Content.Server/Administration/Commands/AGhost.cs b/Content.Server/Administration/Commands/AGhost.cs
index ce4ed0d737..336ee5ec8b 100644
--- a/Content.Server/Administration/Commands/AGhost.cs
+++ b/Content.Server/Administration/Commands/AGhost.cs
@@ -1,5 +1,5 @@
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking;
+using Content.Server.Ghost.Components;
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Administration/Commands/ControlMob.cs b/Content.Server/Administration/Commands/ControlMob.cs
index b0797215e2..5409442d31 100644
--- a/Content.Server/Administration/Commands/ControlMob.cs
+++ b/Content.Server/Administration/Commands/ControlMob.cs
@@ -1,5 +1,4 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Observer;
+using Content.Server.Mind.Components;
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Robust.Server.Player;
diff --git a/Content.Server/Administration/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs
index 486e3d5c86..6e6b10d1c6 100644
--- a/Content.Server/Administration/Commands/DSay.cs
+++ b/Content.Server/Administration/Commands/DSay.cs
@@ -1,4 +1,4 @@
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
@@ -35,7 +35,7 @@ namespace Content.Server.Administration.Commands
             var chat = IoCManager.Resolve<IChatManager>();
 
             chat.SendAdminDeadChat(player, message);
-            
+
         }
     }
 }
diff --git a/Content.Server/Administration/Commands/DeAdminCommand.cs b/Content.Server/Administration/Commands/DeAdminCommand.cs
index f50db7c038..e53e5551a6 100644
--- a/Content.Server/Administration/Commands/DeAdminCommand.cs
+++ b/Content.Server/Administration/Commands/DeAdminCommand.cs
@@ -1,3 +1,4 @@
+using Content.Server.Administration.Managers;
 using Content.Shared.Administration;
 using JetBrains.Annotations;
 using Robust.Server.Player;
diff --git a/Content.Server/Commands/Entities/DeleteEntityCommand.cs b/Content.Server/Administration/Commands/DeleteEntityCommand.cs
similarity index 90%
rename from Content.Server/Commands/Entities/DeleteEntityCommand.cs
rename to Content.Server/Administration/Commands/DeleteEntityCommand.cs
index 2ab3f2398f..d6e2815f05 100644
--- a/Content.Server/Commands/Entities/DeleteEntityCommand.cs
+++ b/Content.Server/Administration/Commands/DeleteEntityCommand.cs
@@ -1,10 +1,9 @@
-using Content.Server.Administration;
-using Content.Shared.Administration;
+using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Entities
+namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Spawn)]
     public class DeleteEntityCommand : IConsoleCommand
diff --git a/Content.Server/Administration/Commands/ExplosionCommand.cs b/Content.Server/Administration/Commands/ExplosionCommand.cs
index 588579a155..7b7fc97250 100644
--- a/Content.Server/Administration/Commands/ExplosionCommand.cs
+++ b/Content.Server/Administration/Commands/ExplosionCommand.cs
@@ -1,4 +1,4 @@
-using Content.Server.Explosions;
+using Content.Server.Explosion;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Commands/FindEntitiesWithComponents.cs b/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs
similarity index 96%
rename from Content.Server/Commands/FindEntitiesWithComponents.cs
rename to Content.Server/Administration/Commands/FindEntitiesWithComponents.cs
index 93dc1d2124..5321465bde 100644
--- a/Content.Server/Commands/FindEntitiesWithComponents.cs
+++ b/Content.Server/Administration/Commands/FindEntitiesWithComponents.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands
+namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Mapping)]
     public class FindEntitiesWithComponents : IConsoleCommand
diff --git a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
index ecf736c2c6..11628a0f26 100644
--- a/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
+++ b/Content.Server/Administration/Commands/OpenPermissionsCommand.cs
@@ -1,4 +1,5 @@
-using Content.Server.Eui;
+using Content.Server.Administration.UI;
+using Content.Server.EUI;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/PromoteHostCommand.cs b/Content.Server/Administration/Commands/PromoteHostCommand.cs
index 308f678973..7bd0b39cec 100644
--- a/Content.Server/Administration/Commands/PromoteHostCommand.cs
+++ b/Content.Server/Administration/Commands/PromoteHostCommand.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using Content.Server.Administration.Managers;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/ReAdminCommand.cs b/Content.Server/Administration/Commands/ReAdminCommand.cs
index 04747b8c4a..760638228f 100644
--- a/Content.Server/Administration/Commands/ReAdminCommand.cs
+++ b/Content.Server/Administration/Commands/ReAdminCommand.cs
@@ -1,3 +1,4 @@
+using Content.Server.Administration.Managers;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Administration/Commands/ReadyAll.cs b/Content.Server/Administration/Commands/ReadyAll.cs
index 205b794f99..6575f6295b 100644
--- a/Content.Server/Administration/Commands/ReadyAll.cs
+++ b/Content.Server/Administration/Commands/ReadyAll.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/Rejuvenate.cs b/Content.Server/Administration/Commands/Rejuvenate.cs
index 5350969026..d802a09dc8 100644
--- a/Content.Server/Administration/Commands/Rejuvenate.cs
+++ b/Content.Server/Administration/Commands/Rejuvenate.cs
@@ -1,4 +1,4 @@
-using Content.Server.GlobalVerbs;
+using Content.Server.Damage;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Commands/RemoveExtraComponents.cs b/Content.Server/Administration/Commands/RemoveExtraComponents.cs
similarity index 96%
rename from Content.Server/Commands/RemoveExtraComponents.cs
rename to Content.Server/Administration/Commands/RemoveExtraComponents.cs
index cc58589810..98f7834fe9 100644
--- a/Content.Server/Commands/RemoveExtraComponents.cs
+++ b/Content.Server/Administration/Commands/RemoveExtraComponents.cs
@@ -1,12 +1,11 @@
 #nullable enable
-using Content.Server.Administration;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Commands
+namespace Content.Server.Administration.Commands
 {
     [AdminCommand(AdminFlags.Mapping)]
     public class RemoveExtraComponents : IConsoleCommand
diff --git a/Content.Server/Administration/Commands/SetAdminOOC.cs b/Content.Server/Administration/Commands/SetAdminOOC.cs
index aa331951f1..58b3ce3f25 100644
--- a/Content.Server/Administration/Commands/SetAdminOOC.cs
+++ b/Content.Server/Administration/Commands/SetAdminOOC.cs
@@ -2,6 +2,7 @@
 
 using Content.Server.Database;
 using Content.Server.Interfaces;
+using Content.Server.Preferences.Managers;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/Commands/SetMindCommand.cs b/Content.Server/Administration/Commands/SetMindCommand.cs
index 0cdc6c97cc..31a4f3a3a8 100644
--- a/Content.Server/Administration/Commands/SetMindCommand.cs
+++ b/Content.Server/Administration/Commands/SetMindCommand.cs
@@ -1,6 +1,5 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Mobs;
+using Content.Server.Mind.Components;
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Robust.Server.Player;
@@ -69,7 +68,7 @@ namespace Content.Server.Administration.Commands
             var mind = playerCData.Mind;
             if (mind == null)
             {
-                mind = new Mind(session.UserId)
+                mind = new Mind.Mind(session.UserId)
                 {
                     CharacterName = target.Name
                 };
diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs
index 21b58b95a7..ff2cd95b0e 100644
--- a/Content.Server/Administration/Commands/SetOutfitCommand.cs
+++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs
@@ -1,11 +1,13 @@
 #nullable enable
-using Content.Server.Eui;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.PDA;
+using Content.Server.Administration.UI;
+using Content.Server.EUI;
 using Content.Server.Interfaces;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.PDA;
+using Content.Server.Preferences.Managers;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using NFluidsynth;
diff --git a/Content.Server/Administration/Commands/WarpCommand.cs b/Content.Server/Administration/Commands/WarpCommand.cs
index e5e28ca11f..327c6a021e 100644
--- a/Content.Server/Administration/Commands/WarpCommand.cs
+++ b/Content.Server/Administration/Commands/WarpCommand.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Markers;
+using Content.Server.Warps;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/Administration/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs
similarity index 98%
rename from Content.Server/Administration/AdminManager.cs
rename to Content.Server/Administration/Managers/AdminManager.cs
index 39ddb11d5f..7a16d6872f 100644
--- a/Content.Server/Administration/AdminManager.cs
+++ b/Content.Server/Administration/Managers/AdminManager.cs
@@ -2,16 +2,14 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Reflection;
 using System.Threading.Tasks;
+using Content.Server.Chat.Managers;
 using Content.Server.Database;
-using Content.Server.Interfaces.Chat;
 using Content.Server.Players;
 using Content.Shared;
 using Content.Shared.Administration;
-using Content.Shared.Administration.AdminMenu;
-using Content.Shared.Network.NetMessages;
+using Content.Shared.Administration.Menu;
 using Robust.Server.Console;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -26,7 +24,7 @@ using YamlDotNet.RepresentationModel;
 
 #nullable enable
 
-namespace Content.Server.Administration
+namespace Content.Server.Administration.Managers
 {
     public sealed class AdminManager : IAdminManager, IPostInjectInit, IConGroupControllerImplementation
     {
@@ -416,7 +414,7 @@ namespace Content.Server.Administration
                 addr = addr.MapToIPv4();
             }
 
-            return Equals(addr, IPAddress.Loopback) || Equals(addr, IPAddress.IPv6Loopback);
+            return Equals(addr, System.Net.IPAddress.Loopback) || Equals(addr, System.Net.IPAddress.IPv6Loopback);
         }
 
         public bool CanCommand(IPlayerSession session, string cmdName)
diff --git a/Content.Server/Administration/IAdminManager.cs b/Content.Server/Administration/Managers/IAdminManager.cs
similarity index 98%
rename from Content.Server/Administration/IAdminManager.cs
rename to Content.Server/Administration/Managers/IAdminManager.cs
index e6fcd62667..553628c6c5 100644
--- a/Content.Server/Administration/IAdminManager.cs
+++ b/Content.Server/Administration/Managers/IAdminManager.cs
@@ -5,7 +5,7 @@ using Robust.Server.Player;
 
 #nullable enable
 
-namespace Content.Server.Administration
+namespace Content.Server.Administration.Managers
 {
     /// <summary>
     ///     Manages server administrators and their permission flags.
diff --git a/Content.Server/Administration/PermissionsEui.cs b/Content.Server/Administration/UI/PermissionsEui.cs
similarity index 99%
rename from Content.Server/Administration/PermissionsEui.cs
rename to Content.Server/Administration/UI/PermissionsEui.cs
index 573e360ebf..0fce245536 100644
--- a/Content.Server/Administration/PermissionsEui.cs
+++ b/Content.Server/Administration/UI/PermissionsEui.cs
@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Content.Server.Administration.Managers;
 using Content.Server.Database;
-using Content.Server.Eui;
+using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
 using Robust.Server.Player;
@@ -15,7 +16,7 @@ using static Content.Shared.Administration.PermissionsEuiMsg;
 
 #nullable enable
 
-namespace Content.Server.Administration
+namespace Content.Server.Administration.UI
 {
     public sealed class PermissionsEui : BaseEui
     {
diff --git a/Content.Server/SetOutfitEui.cs b/Content.Server/Administration/UI/SetOutfitEui.cs
similarity index 91%
rename from Content.Server/SetOutfitEui.cs
rename to Content.Server/Administration/UI/SetOutfitEui.cs
index d2c32c3e01..4ffa70c942 100644
--- a/Content.Server/SetOutfitEui.cs
+++ b/Content.Server/Administration/UI/SetOutfitEui.cs
@@ -1,12 +1,12 @@
-using Content.Server.Administration;
-using Content.Server.Eui;
+using Content.Server.Administration.Managers;
+using Content.Server.EUI;
 using Content.Shared.Administration;
 using Content.Shared.Eui;
 using JetBrains.Annotations;
-using Robust.Shared.IoC;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 
-namespace Content.Server
+namespace Content.Server.Administration.UI
 {
     [UsedImplicitly]
     public sealed class SetOutfitEui : BaseEui
diff --git a/Content.Server/GameObjects/Components/Chemistry/AdminAddReagentVerb.cs b/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Chemistry/AdminAddReagentVerb.cs
rename to Content.Server/Administration/Verbs/AdminAddReagentVerb.cs
index f6a8fa36c9..03115e13c3 100644
--- a/Content.Server/GameObjects/Components/Chemistry/AdminAddReagentVerb.cs
+++ b/Content.Server/Administration/Verbs/AdminAddReagentVerb.cs
@@ -1,13 +1,12 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Server.Administration;
-using Content.Server.Eui;
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Administration.Managers;
+using Content.Server.Chemistry.Components;
+using Content.Server.EUI;
 using Content.Shared.Administration;
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Chemistry.Solution.Components;
 using Content.Shared.Eui;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -16,7 +15,7 @@ using Robust.Shared.Localization;
 
 #nullable enable
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Administration.Verbs
 {
     [GlobalVerb]
     internal sealed class AdminAddReagentVerb : GlobalVerb
diff --git a/Content.Server/GlobalVerbs/DeleteVerb.cs b/Content.Server/Administration/Verbs/DeleteVerb.cs
similarity index 95%
rename from Content.Server/GlobalVerbs/DeleteVerb.cs
rename to Content.Server/Administration/Verbs/DeleteVerb.cs
index 553aac2eb1..bb5d354fd9 100644
--- a/Content.Server/GlobalVerbs/DeleteVerb.cs
+++ b/Content.Server/Administration/Verbs/DeleteVerb.cs
@@ -1,12 +1,12 @@
 #nullable enable
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Administration.Verbs
 {
     [GlobalVerb]
     public class DeleteVerb : GlobalVerb
diff --git a/Content.Server/GameObjects/Components/AdvertiseComponent.cs b/Content.Server/Advertise/AdvertiseComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/AdvertiseComponent.cs
rename to Content.Server/Advertise/AdvertiseComponent.cs
index 836e1e9c51..c23504caa4 100644
--- a/Content.Server/GameObjects/Components/AdvertiseComponent.cs
+++ b/Content.Server/Advertise/AdvertiseComponent.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Threading;
 using Content.Server.Advertisements;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
@@ -11,7 +11,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Advertise
 {
     [RegisterComponent]
     public class AdvertiseComponent : Component
diff --git a/Content.Server/Alert/Click/RemoveCuffs.cs b/Content.Server/Alert/Click/RemoveCuffs.cs
index 29a1ea7b81..f00c219928 100644
--- a/Content.Server/Alert/Click/RemoveCuffs.cs
+++ b/Content.Server/Alert/Click/RemoveCuffs.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using Content.Server.GameObjects.Components.ActionBlocking;
+using Content.Server.Cuffs.Components;
 using Content.Shared.Alert;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Alert/Click/StopBeingPulled.cs b/Content.Server/Alert/Click/StopBeingPulled.cs
index 1daa7e4697..f1c16a95a6 100644
--- a/Content.Server/Alert/Click/StopBeingPulled.cs
+++ b/Content.Server/Alert/Click/StopBeingPulled.cs
@@ -1,5 +1,5 @@
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Pulling;
+using Content.Shared.Pulling.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Server/Alert/Click/StopPiloting.cs b/Content.Server/Alert/Click/StopPiloting.cs
index c3dc34d4d6..3708bd2a7f 100644
--- a/Content.Server/Alert/Click/StopPiloting.cs
+++ b/Content.Server/Alert/Click/StopPiloting.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.Movement;
+using Content.Server.Shuttle;
 using Content.Shared.Alert;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Alert/Click/StopPulling.cs b/Content.Server/Alert/Click/StopPulling.cs
index d1cb2b0778..4fd9ecb4de 100644
--- a/Content.Server/Alert/Click/StopPulling.cs
+++ b/Content.Server/Alert/Click/StopPulling.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Pulling;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Pulling;
+using Content.Shared.Pulling.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Alert/Click/Unbuckle.cs b/Content.Server/Alert/Click/Unbuckle.cs
index 1d2b2a3a11..38ac730bfc 100644
--- a/Content.Server/Alert/Click/Unbuckle.cs
+++ b/Content.Server/Alert/Click/Unbuckle.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.Buckle;
+using Content.Server.Buckle.Components;
 using Content.Shared.Alert;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Commands/Alerts/ClearAlert.cs b/Content.Server/Alert/Commands/ClearAlert.cs
similarity index 95%
rename from Content.Server/Commands/Alerts/ClearAlert.cs
rename to Content.Server/Alert/Commands/ClearAlert.cs
index 081016691e..415ac67921 100644
--- a/Content.Server/Commands/Alerts/ClearAlert.cs
+++ b/Content.Server/Alert/Commands/ClearAlert.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System;
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Commands;
 using Content.Shared.Administration;
 using Content.Shared.Alert;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Alerts
+namespace Content.Server.Alert.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public sealed class ClearAlert : IConsoleCommand
diff --git a/Content.Server/Commands/Alerts/ShowAlert.cs b/Content.Server/Alert/Commands/ShowAlert.cs
similarity index 95%
rename from Content.Server/Commands/Alerts/ShowAlert.cs
rename to Content.Server/Alert/Commands/ShowAlert.cs
index 3fd7536077..4a3e56679b 100644
--- a/Content.Server/Commands/Alerts/ShowAlert.cs
+++ b/Content.Server/Alert/Commands/ShowAlert.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System;
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Commands;
 using Content.Shared.Administration;
 using Content.Shared.Alert;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Alerts
+namespace Content.Server.Alert.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public sealed class ShowAlert : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs b/Content.Server/Alert/ServerAlertsComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs
rename to Content.Server/Alert/ServerAlertsComponent.cs
index 8ee70aa95c..d90c8bb555 100644
--- a/Content.Server/GameObjects/Components/Mobs/ServerAlertsComponent.cs
+++ b/Content.Server/Alert/ServerAlertsComponent.cs
@@ -1,13 +1,12 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Gravity.EntitySystems;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.Alert
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedAlertsComponent))]
diff --git a/Content.Server/GameObjects/Components/AnchorableComponent.cs b/Content.Server/Anchor/AnchorableComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/AnchorableComponent.cs
rename to Content.Server/Anchor/AnchorableComponent.cs
index 4998438040..72a2677098 100644
--- a/Content.Server/GameObjects/Components/AnchorableComponent.cs
+++ b/Content.Server/Anchor/AnchorableComponent.cs
@@ -1,17 +1,17 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.Components.Pulling;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Coordinates.Helpers;
+using Content.Server.Pulling;
+using Content.Server.Tools.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Physics;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Anchor
 {
     // TODO: Move this component's logic to an EntitySystem.
     [RegisterComponent]
diff --git a/Content.Server/Commands/AnnounceCommand.cs b/Content.Server/Announcements/AnnounceCommand.cs
similarity index 93%
rename from Content.Server/Commands/AnnounceCommand.cs
rename to Content.Server/Announcements/AnnounceCommand.cs
index 39df734a63..aeb51b686d 100644
--- a/Content.Server/Commands/AnnounceCommand.cs
+++ b/Content.Server/Announcements/AnnounceCommand.cs
@@ -1,12 +1,11 @@
 using System;
-using System.Text;
 using Content.Server.Administration;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands
+namespace Content.Server.Announcements
 {
     [AdminCommand(AdminFlags.Fun)]
     public class AnnounceCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs b/Content.Server/Arcade/BlockGameSystem.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs
rename to Content.Server/Arcade/BlockGameSystem.cs
index 8f42190b08..fd01014c16 100644
--- a/Content.Server/GameObjects/EntitySystems/BlockGameSystem.cs
+++ b/Content.Server/Arcade/BlockGameSystem.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Arcade;
+using Content.Server.Arcade.Components;
 using Content.Shared.Arcade;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Arcade
 {
     // ReSharper disable once ClassNeverInstantiated.Global
     public class BlockGameSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs
rename to Content.Server/Arcade/Components/BlockGameArcadeComponent.cs
index 84bc7e2596..f0faf10fa1 100644
--- a/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs
+++ b/Content.Server/Arcade/Components/BlockGameArcadeComponent.cs
@@ -2,13 +2,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Utility;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Arcade;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -16,7 +15,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.Components.Arcade
+namespace Content.Server.Arcade.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Arcade/RandomArcadeGameComponent.cs b/Content.Server/Arcade/Components/RandomArcadeGameComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Arcade/RandomArcadeGameComponent.cs
rename to Content.Server/Arcade/Components/RandomArcadeGameComponent.cs
index e6c229b6ec..5d5047824b 100644
--- a/Content.Server/GameObjects/Components/Arcade/RandomArcadeGameComponent.cs
+++ b/Content.Server/Arcade/Components/RandomArcadeGameComponent.cs
@@ -1,9 +1,8 @@
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.Components.Arcade
+namespace Content.Server.Arcade.Components
 {
     [RegisterComponent]
     public class RandomArcadeGameComponent : Component, IMapInit
diff --git a/Content.Server/GameObjects/Components/Arcade/SpaceVillainArcadeComponent.cs b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Arcade/SpaceVillainArcadeComponent.cs
rename to Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
index 5bc4b94214..878cc6911e 100644
--- a/Content.Server/GameObjects/Components/Arcade/SpaceVillainArcadeComponent.cs
+++ b/Content.Server/Arcade/Components/SpaceVillainArcadeComponent.cs
@@ -1,12 +1,13 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.Components.VendingMachines;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Arcade;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Server.VendingMachines;
+using Content.Server.Wires.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Arcade;
+using Content.Shared.Interaction;
+using Content.Shared.Wires;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -14,13 +15,11 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Arcade
+namespace Content.Server.Arcade.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/Atmos/IGridAtmosphereComponent.cs b/Content.Server/Atmos/IGridAtmosphereComponent.cs
index 90201c0bf6..8111cdb8c1 100644
--- a/Content.Server/Atmos/IGridAtmosphereComponent.cs
+++ b/Content.Server/Atmos/IGridAtmosphereComponent.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Atmos;
 using Content.Server.GameObjects.Components.Atmos.Piping;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
index 035625def7..5ca5bc6298 100644
--- a/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/PlasmaFireReaction.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
+using Content.Server.Coordinates.Helpers;
 using Content.Server.Interfaces;
-using Content.Server.Utility;
 using Content.Shared.Atmos;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
index e8a1a798e9..c6c596c121 100644
--- a/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
+++ b/Content.Server/Atmos/Reactions/TritiumFireReaction.cs
@@ -1,6 +1,6 @@
 #nullable enable
+using Content.Server.Coordinates.Helpers;
 using Content.Server.Interfaces;
-using Content.Server.Utility;
 using Content.Shared.Atmos;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/Reactions/WaterVaporReaction.cs b/Content.Server/Atmos/Reactions/WaterVaporReaction.cs
index c2838e3964..d01219a245 100644
--- a/Content.Server/Atmos/Reactions/WaterVaporReaction.cs
+++ b/Content.Server/Atmos/Reactions/WaterVaporReaction.cs
@@ -1,7 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Fluids;
+using Content.Server.Fluids.Components;
 using Content.Server.Interfaces;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/Atmos/TileAtmosphere.cs b/Content.Server/Atmos/TileAtmosphere.cs
index a9f709ffb6..d7952adef4 100644
--- a/Content.Server/Atmos/TileAtmosphere.cs
+++ b/Content.Server/Atmos/TileAtmosphere.cs
@@ -5,9 +5,9 @@ using System.Buffers;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Content.Server.Atmos.Reactions;
+using Content.Server.Coordinates.Helpers;
 using Content.Server.GameObjects.Components.Atmos;
 using Content.Server.Interfaces;
-using Content.Server.Utility;
 using Content.Shared.Atmos;
 using Content.Shared.Audio;
 using Content.Shared.Maps;
diff --git a/Content.Server/GameObjects/Components/BarSign/BarSignComponent.cs b/Content.Server/BarSign/BarSignComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/BarSign/BarSignComponent.cs
rename to Content.Server/BarSign/BarSignComponent.cs
index 74fd6db350..e164c15bb0 100644
--- a/Content.Server/GameObjects/Components/BarSign/BarSignComponent.cs
+++ b/Content.Server/BarSign/BarSignComponent.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using System.Linq;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.Power.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -8,11 +8,10 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.BarSign
+namespace Content.Server.BarSign
 {
     [RegisterComponent]
     public class BarSignComponent : Component, IMapInit
diff --git a/Content.Server/GameObjects/Components/BarSign/BarSignPrototype.cs b/Content.Server/BarSign/BarSignPrototype.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/BarSign/BarSignPrototype.cs
rename to Content.Server/BarSign/BarSignPrototype.cs
index bf48b6a10f..1d006b8a0c 100644
--- a/Content.Server/GameObjects/Components/BarSign/BarSignPrototype.cs
+++ b/Content.Server/BarSign/BarSignPrototype.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.BarSign
+namespace Content.Server.BarSign
 {
     [Prototype("barSign")]
     public class BarSignPrototype : IPrototype
diff --git a/Content.Server/GameObjects/Components/Power/BatteryComponent.cs b/Content.Server/Battery/Components/BatteryComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Power/BatteryComponent.cs
rename to Content.Server/Battery/Components/BatteryComponent.cs
index 6fe34a7161..22ba63e605 100644
--- a/Content.Server/GameObjects/Components/Power/BatteryComponent.cs
+++ b/Content.Server/Battery/Components/BatteryComponent.cs
@@ -2,12 +2,10 @@
 using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power
+namespace Content.Server.Battery.Components
 {
     [RegisterComponent]
     public class BatteryComponent : Component
diff --git a/Content.Server/GameObjects/Components/Power/ExaminableBatteryComponent.cs b/Content.Server/Battery/Components/ExaminableBatteryComponent.cs
similarity index 79%
rename from Content.Server/GameObjects/Components/Power/ExaminableBatteryComponent.cs
rename to Content.Server/Battery/Components/ExaminableBatteryComponent.cs
index 29e1aaee09..202572e568 100644
--- a/Content.Server/GameObjects/Components/Power/ExaminableBatteryComponent.cs
+++ b/Content.Server/Battery/Components/ExaminableBatteryComponent.cs
@@ -1,17 +1,11 @@
 #nullable enable
-using System;
+using Content.Shared.Examine;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-using Robust.Shared.ViewVariables;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power
+namespace Content.Server.Battery.Components
 {
     [RegisterComponent]
     public class ExaminableBatteryComponent : Component, IExamine
diff --git a/Content.Server/Commands/DrainAllBatteriesCommand.cs b/Content.Server/Battery/DrainAllBatteriesCommand.cs
similarity index 89%
rename from Content.Server/Commands/DrainAllBatteriesCommand.cs
rename to Content.Server/Battery/DrainAllBatteriesCommand.cs
index 1a5a639cdf..fb7329e783 100644
--- a/Content.Server/Commands/DrainAllBatteriesCommand.cs
+++ b/Content.Server/Battery/DrainAllBatteriesCommand.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Power;
+using Content.Server.Battery.Components;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands
+namespace Content.Server.Battery
 {
     [AdminCommand(AdminFlags.Admin)]
     public class DrainAllBatteriesCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/EntitySystems/Power/BatteryDischargerSystem.cs b/Content.Server/Battery/EntitySystems/BatteryDischargerSystem.cs
similarity index 77%
rename from Content.Server/GameObjects/EntitySystems/Power/BatteryDischargerSystem.cs
rename to Content.Server/Battery/EntitySystems/BatteryDischargerSystem.cs
index 2598449300..37873eaa61 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/BatteryDischargerSystem.cs
+++ b/Content.Server/Battery/EntitySystems/BatteryDischargerSystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Server.Power.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Battery.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class BatteryDischargerSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/Power/BatteryStorageSystem.cs b/Content.Server/Battery/EntitySystems/BatteryStorageSystem.cs
similarity index 77%
rename from Content.Server/GameObjects/EntitySystems/Power/BatteryStorageSystem.cs
rename to Content.Server/Battery/EntitySystems/BatteryStorageSystem.cs
index c1b9d24353..c32b58e725 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/BatteryStorageSystem.cs
+++ b/Content.Server/Battery/EntitySystems/BatteryStorageSystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Server.Power.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Battery.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class BatteryStorageSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs b/Content.Server/Battery/EntitySystems/BatterySystem.cs
similarity index 79%
rename from Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs
rename to Content.Server/Battery/EntitySystems/BatterySystem.cs
index c5088146e5..ace6084dce 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/BatterySystem.cs
+++ b/Content.Server/Battery/EntitySystems/BatterySystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power;
+using Content.Server.Battery.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Battery.EntitySystems
 {
     [UsedImplicitly]
     public class BatterySystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Body/Behavior/BrainBehavior.cs b/Content.Server/Body/Behavior/BrainBehavior.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Body/Behavior/BrainBehavior.cs
rename to Content.Server/Body/Behavior/BrainBehavior.cs
index f079847d9d..aaf7317032 100644
--- a/Content.Server/GameObjects/Components/Body/Behavior/BrainBehavior.cs
+++ b/Content.Server/Body/Behavior/BrainBehavior.cs
@@ -1,12 +1,13 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Server.Ghost;
+using Content.Server.Ghost.Components;
+using Content.Server.Mind.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using Content.Shared.Movement.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Body.Behavior
+namespace Content.Server.Body.Behavior
 {
     public class BrainBehavior : MechanismBehavior
     {
diff --git a/Content.Server/GameObjects/Components/Body/Behavior/HeartBehavior.cs b/Content.Server/Body/Behavior/HeartBehavior.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Body/Behavior/HeartBehavior.cs
rename to Content.Server/Body/Behavior/HeartBehavior.cs
index d4bb7e2539..f354a6b605 100644
--- a/Content.Server/GameObjects/Components/Body/Behavior/HeartBehavior.cs
+++ b/Content.Server/Body/Behavior/HeartBehavior.cs
@@ -1,6 +1,6 @@
-using Content.Shared.GameObjects.Components.Body.Networks;
+using Content.Shared.Body.Networks;
 
-namespace Content.Server.GameObjects.Components.Body.Behavior
+namespace Content.Server.Body.Behavior
 {
     public class HeartBehavior : MechanismBehavior
     {
diff --git a/Content.Server/GameObjects/Components/Body/Behavior/LiverBehavior.cs b/Content.Server/Body/Behavior/LiverBehavior.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Body/Behavior/LiverBehavior.cs
rename to Content.Server/Body/Behavior/LiverBehavior.cs
index 6d8c2dbce2..83360b8edd 100644
--- a/Content.Server/GameObjects/Components/Body/Behavior/LiverBehavior.cs
+++ b/Content.Server/Body/Behavior/LiverBehavior.cs
@@ -1,15 +1,13 @@
 #nullable enable
 using System.Linq;
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Body.Networks;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Server.Body.Circulatory;
+using Content.Shared.Body.Networks;
+using Content.Shared.Chemistry.Metabolizable;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body.Behavior
+namespace Content.Server.Body.Behavior
 {
     /// <summary>
     /// Metabolizes reagents in <see cref="SharedBloodstreamComponent"/> after they are digested.
diff --git a/Content.Server/GameObjects/Components/Body/Behavior/LungBehavior.cs b/Content.Server/Body/Behavior/LungBehavior.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Body/Behavior/LungBehavior.cs
rename to Content.Server/Body/Behavior/LungBehavior.cs
index e92f732e4b..c2ab4e5023 100644
--- a/Content.Server/GameObjects/Components/Body/Behavior/LungBehavior.cs
+++ b/Content.Server/Body/Behavior/LungBehavior.cs
@@ -1,20 +1,20 @@
 #nullable enable
 using System;
 using Content.Server.Atmos;
+using Content.Server.Body.Circulatory;
+using Content.Server.Body.Respiratory;
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Server.GameObjects.Components.Body.Respiratory;
-using Content.Server.Utility;
+using Content.Server.Notification;
 using Content.Shared.Atmos;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.Body.Components;
+using Content.Shared.MobState;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body.Behavior
+namespace Content.Server.Body.Behavior
 {
     [DataDefinition]
     public class LungBehavior : MechanismBehavior
diff --git a/Content.Server/GameObjects/Components/Body/Behavior/MechanismBehavior.cs b/Content.Server/Body/Behavior/MechanismBehavior.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Body/Behavior/MechanismBehavior.cs
rename to Content.Server/Body/Behavior/MechanismBehavior.cs
index e4b42103dd..6ad38b2b21 100644
--- a/Content.Server/GameObjects/Components/Body/Behavior/MechanismBehavior.cs
+++ b/Content.Server/Body/Behavior/MechanismBehavior.cs
@@ -1,12 +1,12 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Behavior;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Behavior;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.Components.Body.Behavior
+namespace Content.Server.Body.Behavior
 {
     public abstract class MechanismBehavior : IMechanismBehavior
     {
diff --git a/Content.Server/GameObjects/Components/Body/Behavior/MechanismExtensions.cs b/Content.Server/Body/Behavior/MechanismExtensions.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Body/Behavior/MechanismExtensions.cs
rename to Content.Server/Body/Behavior/MechanismExtensions.cs
index 8a46a942c0..a62139c524 100644
--- a/Content.Server/GameObjects/Components/Body/Behavior/MechanismExtensions.cs
+++ b/Content.Server/Body/Behavior/MechanismExtensions.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Behavior;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Behavior;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 
-namespace Content.Server.GameObjects.Components.Body.Behavior
+namespace Content.Server.Body.Behavior
 {
     public static class MechanismExtensions
     {
diff --git a/Content.Server/GameObjects/Components/Body/Behavior/StomachBehavior.cs b/Content.Server/Body/Behavior/StomachBehavior.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Body/Behavior/StomachBehavior.cs
rename to Content.Server/Body/Behavior/StomachBehavior.cs
index 5eafd2565e..6383a00eff 100644
--- a/Content.Server/GameObjects/Components/Body/Behavior/StomachBehavior.cs
+++ b/Content.Server/Body/Behavior/StomachBehavior.cs
@@ -1,16 +1,17 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Body.Networks;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.Components;
+using Content.Shared.Body.Networks;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Chemistry.Solution.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body.Behavior
+namespace Content.Server.Body.Behavior
 {
     /// <summary>
     /// Where reagents go when ingested. Tracks ingested reagents over time, and
diff --git a/Content.Server/GameObjects/Components/Body/BodyComponent.cs b/Content.Server/Body/BodyComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Body/BodyComponent.cs
rename to Content.Server/Body/BodyComponent.cs
index fdde3f6f9b..84f52d902a 100644
--- a/Content.Server/GameObjects/Components/Body/BodyComponent.cs
+++ b/Content.Server/Body/BodyComponent.cs
@@ -1,19 +1,15 @@
 #nullable enable
-using System;
-using Content.Server.Commands.Observer;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking;
+using Content.Server.Ghost;
+using Content.Server.Mind.Components;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Body.Slot;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.Utility;
-using Robust.Server.Console;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using Content.Shared.Body.Slot;
+using Content.Shared.MobState;
+using Content.Shared.Movement.Components;
+using Content.Shared.Random.Helpers;
 using Robust.Shared.Audio;
-using Robust.Shared.Console;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -21,7 +17,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Player;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.Components.Body
+namespace Content.Server.Body
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedBodyComponent))]
diff --git a/Content.Server/GameObjects/Components/Body/BodyManagerHealthChangeParams.cs b/Content.Server/Body/BodyManagerHealthChangeParams.cs
similarity index 67%
rename from Content.Server/GameObjects/Components/Body/BodyManagerHealthChangeParams.cs
rename to Content.Server/Body/BodyManagerHealthChangeParams.cs
index 7a1335edf6..19a41c72b9 100644
--- a/Content.Server/GameObjects/Components/Body/BodyManagerHealthChangeParams.cs
+++ b/Content.Server/Body/BodyManagerHealthChangeParams.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Body.Part;
+using Content.Shared.Damage;
 
-namespace Content.Server.GameObjects.Components.Body
+namespace Content.Server.Body
 {
     public interface IBodyHealthChangeParams
     {
diff --git a/Content.Server/GameObjects/Components/Body/Circulatory/BloodstreamComponent.cs b/Content.Server/Body/Circulatory/BloodstreamComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Body/Circulatory/BloodstreamComponent.cs
rename to Content.Server/Body/Circulatory/BloodstreamComponent.cs
index aa416c31ed..6dc37e89ef 100644
--- a/Content.Server/GameObjects/Components/Body/Circulatory/BloodstreamComponent.cs
+++ b/Content.Server/Body/Circulatory/BloodstreamComponent.cs
@@ -1,16 +1,17 @@
 using System.Linq;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.Metabolism;
+using Content.Server.Chemistry.Components;
 using Content.Server.Interfaces;
+using Content.Server.Metabolism;
 using Content.Shared.Atmos;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Body.Networks;
+using Content.Shared.Body.Networks;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body.Circulatory
+namespace Content.Server.Body.Circulatory
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedBloodstreamComponent))]
diff --git a/Content.Server/Commands/Body/AddHandCommand.cs b/Content.Server/Body/Commands/AddHandCommand.cs
similarity index 97%
rename from Content.Server/Commands/Body/AddHandCommand.cs
rename to Content.Server/Body/Commands/AddHandCommand.cs
index fdf99d0780..089afcb72c 100644
--- a/Content.Server/Commands/Body/AddHandCommand.cs
+++ b/Content.Server/Body/Commands/AddHandCommand.cs
@@ -1,8 +1,8 @@
 #nullable enable
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
@@ -10,7 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 
-namespace Content.Server.Commands.Body
+namespace Content.Server.Body.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     class AddHandCommand : IConsoleCommand
diff --git a/Content.Server/Commands/AttachBodyPartCommand.cs b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
similarity index 94%
rename from Content.Server/Commands/AttachBodyPartCommand.cs
rename to Content.Server/Body/Commands/AttachBodyPartCommand.cs
index 5539d61c20..a8aaa198e5 100644
--- a/Content.Server/Commands/AttachBodyPartCommand.cs
+++ b/Content.Server/Body/Commands/AttachBodyPartCommand.cs
@@ -1,15 +1,15 @@
 #nullable enable
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using static Content.Server.GameObjects.Components.Body.Part.BodyPartComponent;
+using static Content.Server.Body.Part.BodyPartComponent;
 
-namespace Content.Server.Commands
+namespace Content.Server.Body.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     public class AttachBodyPartCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Body/DestroyMechanismCommand.cs b/Content.Server/Body/Commands/DestroyMechanismCommand.cs
similarity index 95%
rename from Content.Server/Commands/Body/DestroyMechanismCommand.cs
rename to Content.Server/Body/Commands/DestroyMechanismCommand.cs
index d78f8fbc56..3ec683b8c9 100644
--- a/Content.Server/Commands/Body/DestroyMechanismCommand.cs
+++ b/Content.Server/Body/Commands/DestroyMechanismCommand.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.Body.Components;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 
-namespace Content.Server.Commands.Body
+namespace Content.Server.Body.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     class DestroyMechanismCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Body/RemoveHandCommand.cs b/Content.Server/Body/Commands/RemoveHandCommand.cs
similarity index 91%
rename from Content.Server/Commands/Body/RemoveHandCommand.cs
rename to Content.Server/Body/Commands/RemoveHandCommand.cs
index d5b27c6a0e..b2d7f26a5e 100644
--- a/Content.Server/Commands/Body/RemoveHandCommand.cs
+++ b/Content.Server/Body/Commands/RemoveHandCommand.cs
@@ -2,14 +2,14 @@
 using System.Linq;
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 
-namespace Content.Server.Commands.Body
+namespace Content.Server.Body.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     class RemoveHandCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/Body/MechanismComponent.cs b/Content.Server/Body/Mechanism/MechanismComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Body/MechanismComponent.cs
rename to Content.Server/Body/Mechanism/MechanismComponent.cs
index 932b8cd164..c5485900d1 100644
--- a/Content.Server/GameObjects/Components/Body/MechanismComponent.cs
+++ b/Content.Server/Body/Mechanism/MechanismComponent.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Body.Surgery;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
+using Content.Shared.Body.Surgery;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -15,7 +15,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body
+namespace Content.Server.Body.Mechanism
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedMechanismComponent))]
diff --git a/Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs b/Content.Server/Body/Part/BodyPartComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs
rename to Content.Server/Body/Part/BodyPartComponent.cs
index fbd6e08899..a2afc97e2d 100644
--- a/Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs
+++ b/Content.Server/Body/Part/BodyPartComponent.cs
@@ -1,15 +1,15 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Body.Surgery;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Server.UserInterface;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
+using Content.Shared.Body.Surgery;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -20,7 +20,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body.Part
+namespace Content.Server.Body.Part
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedBodyPartComponent))]
diff --git a/Content.Server/GameObjects/Components/Body/Respiratory/InternalsComponent.cs b/Content.Server/Body/Respiratory/InternalsComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Body/Respiratory/InternalsComponent.cs
rename to Content.Server/Body/Respiratory/InternalsComponent.cs
index b94093c8b6..37c833a614 100644
--- a/Content.Server/GameObjects/Components/Body/Respiratory/InternalsComponent.cs
+++ b/Content.Server/Body/Respiratory/InternalsComponent.cs
@@ -3,7 +3,7 @@ using Content.Server.GameObjects.Components.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body.Respiratory
+namespace Content.Server.Body.Respiratory
 {
     [RegisterComponent]
     public class InternalsComponent : Component
diff --git a/Content.Server/GameObjects/Components/Body/BodyScannerComponent.cs b/Content.Server/Body/Scanner/BodyScannerComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Body/BodyScannerComponent.cs
rename to Content.Server/Body/Scanner/BodyScannerComponent.cs
index 0660314c1e..b54b815e03 100644
--- a/Content.Server/GameObjects/Components/Body/BodyScannerComponent.cs
+++ b/Content.Server/Body/Scanner/BodyScannerComponent.cs
@@ -1,13 +1,13 @@
 #nullable enable
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Scanner;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Scanner;
+using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body
+namespace Content.Server.Body.Scanner
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Body/Surgery/BiologicalSurgeryDataComponent.cs b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Body/Surgery/BiologicalSurgeryDataComponent.cs
rename to Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
index 33645c5b3f..827b305ea2 100644
--- a/Content.Server/GameObjects/Components/Body/Surgery/BiologicalSurgeryDataComponent.cs
+++ b/Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
@@ -3,17 +3,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Body.Surgery;
-using Content.Shared.Interfaces;
+using Content.Server.DoAfter;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
+using Content.Shared.Body.Surgery;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using static Content.Shared.GameObjects.Components.Body.Surgery.ISurgeryData;
+using static Content.Shared.Body.Surgery.ISurgeryData;
 
-namespace Content.Server.GameObjects.Components.Body.Surgery
+namespace Content.Server.Body.Surgery
 {
     /// <summary>
     ///     Data class representing the surgery state of a biological entity.
diff --git a/Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs
rename to Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
index 19d866632b..23428eccc7 100644
--- a/Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs
+++ b/Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
@@ -2,15 +2,16 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Body.Surgery.Messages;
-using Content.Server.Utility;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Body.Surgery;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Body.Mechanism;
+using Content.Server.Body.Surgery.Messages;
+using Content.Server.UserInterface;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
+using Content.Shared.Body.Surgery;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -19,7 +20,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Body.Surgery
+namespace Content.Server.Body.Surgery.Components
 {
     /// <summary>
     ///     Server-side component representing a generic tool capable of performing surgery.
diff --git a/Content.Server/GameObjects/EntitySystems/Body/Surgery/SurgeryToolSystem.cs b/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs
similarity index 86%
rename from Content.Server/GameObjects/EntitySystems/Body/Surgery/SurgeryToolSystem.cs
rename to Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs
index 95b20f1d89..4620591c75 100644
--- a/Content.Server/GameObjects/EntitySystems/Body/Surgery/SurgeryToolSystem.cs
+++ b/Content.Server/Body/Surgery/Components/SurgeryToolSystem.cs
@@ -1,13 +1,12 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Body.Surgery;
-using Content.Server.GameObjects.Components.Body.Surgery.Messages;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Server.Body.Surgery.Messages;
+using Content.Shared.ActionBlocker;
 using Content.Shared.GameTicking;
-using Content.Shared.Utility;
+using Content.Shared.Interaction.Helpers;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.Body.Surgery
+namespace Content.Server.Body.Surgery.Components
 {
     [UsedImplicitly]
     public class SurgeryToolSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/GameObjects/Components/Body/Surgery/Messages/SurgeryWindowCloseMessage.cs b/Content.Server/Body/Surgery/Messages/SurgeryWindowCloseMessage.cs
similarity index 69%
rename from Content.Server/GameObjects/Components/Body/Surgery/Messages/SurgeryWindowCloseMessage.cs
rename to Content.Server/Body/Surgery/Messages/SurgeryWindowCloseMessage.cs
index e149aa40d4..85ce551bea 100644
--- a/Content.Server/GameObjects/Components/Body/Surgery/Messages/SurgeryWindowCloseMessage.cs
+++ b/Content.Server/Body/Surgery/Messages/SurgeryWindowCloseMessage.cs
@@ -1,4 +1,6 @@
-namespace Content.Server.GameObjects.Components.Body.Surgery.Messages
+using Content.Server.Body.Surgery.Components;
+
+namespace Content.Server.Body.Surgery.Messages
 {
     public class SurgeryWindowCloseMessage
     {
diff --git a/Content.Server/GameObjects/Components/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs b/Content.Server/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs
similarity index 65%
rename from Content.Server/GameObjects/Components/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs
rename to Content.Server/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs
index 5b79acb0a6..b0238d4337 100644
--- a/Content.Server/GameObjects/Components/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs
+++ b/Content.Server/Body/Surgery/Messages/SurgeryWindowOpenMessage.cs
@@ -1,6 +1,7 @@
-using Robust.Shared.GameObjects;
+using Content.Server.Body.Surgery.Components;
+using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Body.Surgery.Messages
+namespace Content.Server.Body.Surgery.Messages
 {
     public class SurgeryWindowOpenMessage : ComponentMessage
     {
diff --git a/Content.Server/GameObjects/Components/Botany/LogComponent.cs b/Content.Server/Botany/Components/LogComponent.cs
similarity index 76%
rename from Content.Server/GameObjects/Components/Botany/LogComponent.cs
rename to Content.Server/Botany/Components/LogComponent.cs
index eb3ffa03f9..f8b066c708 100644
--- a/Content.Server/GameObjects/Components/Botany/LogComponent.cs
+++ b/Content.Server/Botany/Components/LogComponent.cs
@@ -1,11 +1,11 @@
 using System.Threading.Tasks;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Botany
+namespace Content.Server.Botany.Components
 {
     [RegisterComponent]
     public class LogComponent : Component, IInteractUsing
diff --git a/Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs b/Content.Server/Botany/Components/PlantHolderComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs
rename to Content.Server/Botany/Components/PlantHolderComponent.cs
index 7449d18a3b..a0022d46af 100644
--- a/Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs
+++ b/Content.Server/Botany/Components/PlantHolderComponent.cs
@@ -3,22 +3,21 @@ using System;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Atmos;
-using Content.Server.Botany;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.Fluids;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Utility;
+using Content.Server.Chemistry.Components;
+using Content.Server.Fluids.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Notification;
+using Content.Server.Plants;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Botany;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Botany;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -33,7 +32,7 @@ using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Botany
+namespace Content.Server.Botany.Components
 {
     [RegisterComponent]
     public class PlantHolderComponent : Component, IInteractUsing, IInteractHand, IActivate, IExamine
diff --git a/Content.Server/GameObjects/Components/Botany/ProduceComponent.cs b/Content.Server/Botany/Components/ProduceComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Botany/ProduceComponent.cs
rename to Content.Server/Botany/Components/ProduceComponent.cs
index b5a9fac0fc..0a6cf284cb 100644
--- a/Content.Server/GameObjects/Components/Botany/ProduceComponent.cs
+++ b/Content.Server/Botany/Components/ProduceComponent.cs
@@ -1,7 +1,6 @@
 #nullable enable
-using Content.Server.Botany;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Shared.Chemistry;
+using Content.Server.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -11,7 +10,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Botany
+namespace Content.Server.Botany.Components
 {
     [RegisterComponent]
     public class ProduceComponent : Component, ISerializationHooks
diff --git a/Content.Server/GameObjects/Components/Botany/SeedComponent.cs b/Content.Server/Botany/Components/SeedComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Botany/SeedComponent.cs
rename to Content.Server/Botany/Components/SeedComponent.cs
index 76085183db..de6c308e0d 100644
--- a/Content.Server/GameObjects/Components/Botany/SeedComponent.cs
+++ b/Content.Server/Botany/Components/SeedComponent.cs
@@ -1,16 +1,14 @@
 #nullable enable
-using Content.Server.Botany;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Botany
+namespace Content.Server.Botany.Components
 {
     [RegisterComponent]
     public class SeedComponent : Component, IExamine
diff --git a/Content.Server/GameObjects/Components/Botany/SeedExtractorComponent.cs b/Content.Server/Botany/Components/SeedExtractorComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Botany/SeedExtractorComponent.cs
rename to Content.Server/Botany/Components/SeedExtractorComponent.cs
index a5e2d0981e..88b82e3bcb 100644
--- a/Content.Server/GameObjects/Components/Botany/SeedExtractorComponent.cs
+++ b/Content.Server/Botany/Components/SeedExtractorComponent.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.Components.Botany
+namespace Content.Server.Botany.Components
 {
     [RegisterComponent]
     public class SeedExtractorComponent : Component, IInteractUsing
diff --git a/Content.Server/Botany/Seed.cs b/Content.Server/Botany/Seed.cs
index 173e98e387..ecb6c81a8b 100644
--- a/Content.Server/Botany/Seed.cs
+++ b/Content.Server/Botany/Seed.cs
@@ -2,12 +2,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Botany;
+using Content.Server.Botany.Components;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Plants;
 using Content.Shared.Atmos;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.Interfaces;
-using Content.Shared.Utility;
+using Content.Shared.Notification;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs b/Content.Server/Buckle/BuckleSystem.cs
similarity index 92%
rename from Content.Server/GameObjects/EntitySystems/BuckleSystem.cs
rename to Content.Server/Buckle/BuckleSystem.cs
index 811c3b7e74..c53cd503b5 100644
--- a/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs
+++ b/Content.Server/Buckle/BuckleSystem.cs
@@ -1,15 +1,14 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Buckle;
-using Content.Server.GameObjects.Components.Strap;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Buckle.Components;
+using Content.Server.Interaction;
+using Content.Shared.Buckle;
+using Content.Shared.Interaction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Buckle
 {
     [UsedImplicitly]
     internal sealed class BuckleSystem : SharedBuckleSystem
diff --git a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs b/Content.Server/Buckle/Components/BuckleComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
rename to Content.Server/Buckle/Components/BuckleComponent.cs
index 9e54d842f3..13c6a8184f 100644
--- a/Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs
+++ b/Content.Server/Buckle/Components/BuckleComponent.cs
@@ -1,19 +1,18 @@
 #nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Mobs.State;
-using Content.Server.GameObjects.Components.Pulling;
-using Content.Server.GameObjects.Components.Strap;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Alert;
+using Content.Server.Hands.Components;
+using Content.Server.MobState.States;
+using Content.Server.Pulling;
+using Content.Server.Standing;
+using Content.Server.Stunnable.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Buckle;
-using Content.Shared.GameObjects.Components.Strap;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Utility;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -27,7 +26,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Buckle
+namespace Content.Server.Buckle.Components
 {
     /// <summary>
     ///     Component that handles sitting entities into <see cref="StrapComponent"/>s.
diff --git a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs b/Content.Server/Buckle/Components/StrapComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Strap/StrapComponent.cs
rename to Content.Server/Buckle/Components/StrapComponent.cs
index d3d87ae239..e668d7bc99 100644
--- a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs
+++ b/Content.Server/Buckle/Components/StrapComponent.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Buckle;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Acts;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Strap;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Buckle.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
@@ -17,7 +17,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Strap
+namespace Content.Server.Buckle.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedStrapComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/JobQueues/IJob.cs b/Content.Server/CPUJob/JobQueues/IJob.cs
similarity index 60%
rename from Content.Server/GameObjects/EntitySystems/JobQueues/IJob.cs
rename to Content.Server/CPUJob/JobQueues/IJob.cs
index 6ecb5826bc..283466f4ba 100644
--- a/Content.Server/GameObjects/EntitySystems/JobQueues/IJob.cs
+++ b/Content.Server/CPUJob/JobQueues/IJob.cs
@@ -1,8 +1,8 @@
-namespace Content.Server.GameObjects.EntitySystems.JobQueues
+namespace Content.Server.CPUJob.JobQueues
 {
     public interface IJob
     {
         JobStatus Status { get; }
         void Run();
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/GameObjects/EntitySystems/JobQueues/Job.cs b/Content.Server/CPUJob/JobQueues/Job.cs
similarity index 99%
rename from Content.Server/GameObjects/EntitySystems/JobQueues/Job.cs
rename to Content.Server/CPUJob/JobQueues/Job.cs
index 3b711ec954..71196f52f3 100644
--- a/Content.Server/GameObjects/EntitySystems/JobQueues/Job.cs
+++ b/Content.Server/CPUJob/JobQueues/Job.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.JobQueues
+namespace Content.Server.CPUJob.JobQueues
 {
     /// <summary>
     ///     CPU-intensive job that can be suspended and resumed on the main thread
diff --git a/Content.Server/CPUJob/JobQueues/Queues/AiActionJobQueue.cs b/Content.Server/CPUJob/JobQueues/Queues/AiActionJobQueue.cs
new file mode 100644
index 0000000000..7b69bb34b0
--- /dev/null
+++ b/Content.Server/CPUJob/JobQueues/Queues/AiActionJobQueue.cs
@@ -0,0 +1,4 @@
+namespace Content.Server.CPUJob.JobQueues.Queues
+{
+    public sealed class AiActionJobQueue : JobQueue {}
+}
diff --git a/Content.Server/GameObjects/EntitySystems/JobQueues/Queues/JobQueue.cs b/Content.Server/CPUJob/JobQueues/Queues/JobQueue.cs
similarity index 95%
rename from Content.Server/GameObjects/EntitySystems/JobQueues/Queues/JobQueue.cs
rename to Content.Server/CPUJob/JobQueues/Queues/JobQueue.cs
index 3ed10fc590..050b1928b9 100644
--- a/Content.Server/GameObjects/EntitySystems/JobQueues/Queues/JobQueue.cs
+++ b/Content.Server/CPUJob/JobQueues/Queues/JobQueue.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems.JobQueues.Queues
+namespace Content.Server.CPUJob.JobQueues.Queues
 {
     public class JobQueue
     {
@@ -20,7 +20,7 @@ namespace Content.Server.GameObjects.EntitySystems.JobQueues.Queues
         /// How long the job's allowed to run for before suspending
         /// </summary>
         public virtual double MaxTime => 0.002;
-        
+
         private readonly Queue<IJob> _pendingQueue = new();
         private readonly List<IJob> _waitingJobs = new();
 
diff --git a/Content.Server/GameObjects/EntitySystems/JobQueues/Queues/PathfindingJobQueue.cs b/Content.Server/CPUJob/JobQueues/Queues/PathfindingJobQueue.cs
similarity index 63%
rename from Content.Server/GameObjects/EntitySystems/JobQueues/Queues/PathfindingJobQueue.cs
rename to Content.Server/CPUJob/JobQueues/Queues/PathfindingJobQueue.cs
index 60ca114cdd..5dade1671c 100644
--- a/Content.Server/GameObjects/EntitySystems/JobQueues/Queues/PathfindingJobQueue.cs
+++ b/Content.Server/CPUJob/JobQueues/Queues/PathfindingJobQueue.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameObjects.EntitySystems.JobQueues.Queues
+namespace Content.Server.CPUJob.JobQueues.Queues
 {
     public sealed class PathfindingJobQueue : JobQueue
     {
diff --git a/Content.Server/GameObjects/Components/ItemCabinetComponent.cs b/Content.Server/Cabinet/ItemCabinetComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/ItemCabinetComponent.cs
rename to Content.Server/Cabinet/ItemCabinetComponent.cs
index 5b74560b6b..486bd7d7d7 100644
--- a/Content.Server/GameObjects/Components/ItemCabinetComponent.cs
+++ b/Content.Server/Cabinet/ItemCabinetComponent.cs
@@ -1,16 +1,13 @@
-using System.Collections;
-using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Utility;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Verbs;
+using Content.Shared.Whitelist;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Cabinet
 {
     /// <summary>
     ///     Used for entities that can hold one item that fits the whitelist, which can be extracted by interacting with
diff --git a/Content.Server/GameObjects/EntitySystems/ItemCabinetSystem.cs b/Content.Server/Cabinet/ItemCabinetSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/ItemCabinetSystem.cs
rename to Content.Server/Cabinet/ItemCabinetSystem.cs
index bc120e0ef0..db63565aea 100644
--- a/Content.Server/GameObjects/EntitySystems/ItemCabinetSystem.cs
+++ b/Content.Server/Cabinet/ItemCabinetSystem.cs
@@ -1,23 +1,16 @@
-using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Microsoft.EntityFrameworkCore;
-using Robust.Server.GameObjects;
+using Content.Shared.Cabinet;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Cabinet
 {
     public class ItemCabinetSystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/Components/Mobs/CameraRecoilComponent.cs b/Content.Server/Camera/CameraRecoilComponent.cs
similarity index 79%
rename from Content.Server/GameObjects/Components/Mobs/CameraRecoilComponent.cs
rename to Content.Server/Camera/CameraRecoilComponent.cs
index 42fc2fba63..3064f1f50b 100644
--- a/Content.Server/GameObjects/Components/Mobs/CameraRecoilComponent.cs
+++ b/Content.Server/Camera/CameraRecoilComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Camera;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.Camera
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedCameraRecoilComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs b/Content.Server/Cargo/CargoConsoleSystem.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs
rename to Content.Server/Cargo/CargoConsoleSystem.cs
index 747a1c2c25..db81e4629b 100644
--- a/Content.Server/GameObjects/EntitySystems/CargoConsoleSystem.cs
+++ b/Content.Server/Cargo/CargoConsoleSystem.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.Cargo;
-using Content.Server.GameObjects.Components.Cargo;
+using Content.Server.Cargo.Components;
+using Content.Shared.Cargo;
 using Content.Shared.GameTicking;
-using Content.Shared.Prototypes.Cargo;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Cargo
 {
     public class CargoConsoleSystem : EntitySystem, IResettingEntitySystem
     {
diff --git a/Content.Server/Cargo/CargoOrderDatabase.cs b/Content.Server/Cargo/CargoOrderDatabase.cs
index 3afee6bc7c..0eee8f24c7 100644
--- a/Content.Server/Cargo/CargoOrderDatabase.cs
+++ b/Content.Server/Cargo/CargoOrderDatabase.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Shared.Prototypes.Cargo;
+using Content.Shared.Cargo;
 using Robust.Shared.Localization;
 
 namespace Content.Server.Cargo
diff --git a/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs b/Content.Server/Cargo/Components/CargoConsoleComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs
rename to Content.Server/Cargo/Components/CargoConsoleComponent.cs
index a8a31e87a8..969da406d2 100644
--- a/Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs
+++ b/Content.Server/Cargo/Components/CargoConsoleComponent.cs
@@ -1,12 +1,11 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.Cargo;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Cargo;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Prototypes.Cargo;
+using Content.Server.Coordinates.Helpers;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Cargo;
+using Content.Shared.Cargo.Components;
+using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -17,7 +16,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Cargo
+namespace Content.Server.Cargo.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs
similarity index 80%
rename from Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs
rename to Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs
index d42ad09cee..ab42071acb 100644
--- a/Content.Server/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs
+++ b/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs
@@ -1,10 +1,8 @@
-using Content.Server.Cargo;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Cargo;
+using Content.Shared.Cargo.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.Components.Cargo
+namespace Content.Server.Cargo.Components
 {
     [RegisterComponent]
     public class CargoOrderDatabaseComponent : SharedCargoOrderDatabaseComponent
diff --git a/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs
rename to Content.Server/Cargo/Components/CargoTelepadComponent.cs
index f286536c77..1d87a7cf2b 100644
--- a/Content.Server/GameObjects/Components/Cargo/CargoTelepadComponent.cs
+++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs
@@ -1,13 +1,13 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Shared.Prototypes.Cargo;
+using System.Collections.Generic;
+using Content.Server.Power.Components;
+using Content.Shared.Cargo;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using System.Collections.Generic;
 using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.Components.Cargo
+namespace Content.Server.Cargo.Components
 {
 
     //This entire class is a PLACEHOLDER for the cargo shuttle.
diff --git a/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs b/Content.Server/Cargo/Components/GalacticMarketComponent.cs
similarity index 75%
rename from Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs
rename to Content.Server/Cargo/Components/GalacticMarketComponent.cs
index 1fa261d5cd..004ea52589 100644
--- a/Content.Server/GameObjects/Components/Cargo/GalacticMarketComponent.cs
+++ b/Content.Server/Cargo/Components/GalacticMarketComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Cargo;
+using Content.Shared.Cargo.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.Components.Cargo
+namespace Content.Server.Cargo.Components
 {
     [RegisterComponent]
     public class GalacticMarketComponent : SharedGalacticMarketComponent
diff --git a/Content.Server/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs b/Content.Server/CharacterAppearance/Components/HumanoidAppearanceComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs
rename to Content.Server/CharacterAppearance/Components/HumanoidAppearanceComponent.cs
index d74f9431c6..243d636fc5 100644
--- a/Content.Server/GameObjects/Components/Mobs/HumanoidAppearanceComponent.cs
+++ b/Content.Server/CharacterAppearance/Components/HumanoidAppearanceComponent.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.Preferences;
+using Content.Shared.Body.Components;
+using Content.Shared.CharacterAppearance;
+using Content.Shared.CharacterAppearance.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.CharacterAppearance.Components
 {
     [RegisterComponent]
     public sealed class HumanoidAppearanceComponent : SharedHumanoidAppearanceComponent
diff --git a/Content.Server/GameObjects/Components/MagicMirrorComponent.cs b/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/MagicMirrorComponent.cs
rename to Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs
index 7588c8adb3..80a6873390 100644
--- a/Content.Server/GameObjects/Components/MagicMirrorComponent.cs
+++ b/Content.Server/CharacterAppearance/Components/MagicMirrorComponent.cs
@@ -1,10 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Preferences.Appearance;
+using Content.Server.UserInterface;
+using Content.Shared.CharacterAppearance;
+using Content.Shared.CharacterAppearance.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -12,7 +11,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.CharacterAppearance.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs b/Content.Server/CharacterInfo/CharacterInfoComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs
rename to Content.Server/CharacterInfo/CharacterInfoComponent.cs
index 4d15ade315..f5ff7e976e 100644
--- a/Content.Server/GameObjects/Components/Actor/CharacterInfoComponent.cs
+++ b/Content.Server/CharacterInfo/CharacterInfoComponent.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Mobs.Roles;
-using Content.Shared.GameObjects.Components.Actor;
+using Content.Server.Mind.Components;
+using Content.Server.Roles;
+using Content.Shared.CharacterInfo;
 using Content.Shared.Objectives;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.Components.Actor
+namespace Content.Server.CharacterInfo
 {
     [RegisterComponent]
     public class CharacterInfoComponent : SharedCharacterInfoComponent
diff --git a/Content.Server/Commands/Chat/AdminChatCommand.cs b/Content.Server/Chat/Commands/AdminChatCommand.cs
similarity index 93%
rename from Content.Server/Commands/Chat/AdminChatCommand.cs
rename to Content.Server/Chat/Commands/AdminChatCommand.cs
index ce1d1d76fc..0af611733d 100644
--- a/Content.Server/Commands/Chat/AdminChatCommand.cs
+++ b/Content.Server/Chat/Commands/AdminChatCommand.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Chat
+namespace Content.Server.Chat.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
     internal class AdminChatCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Chat/MeCommand.cs b/Content.Server/Chat/Commands/MeCommand.cs
similarity index 95%
rename from Content.Server/Commands/Chat/MeCommand.cs
rename to Content.Server/Chat/Commands/MeCommand.cs
index 65b5eda999..6aa2f05ab3 100644
--- a/Content.Server/Commands/Chat/MeCommand.cs
+++ b/Content.Server/Chat/Commands/MeCommand.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Content.Server.Players;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Chat
+namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
     internal class MeCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Chat/OOCCommand.cs b/Content.Server/Chat/Commands/OOCCommand.cs
similarity index 92%
rename from Content.Server/Commands/Chat/OOCCommand.cs
rename to Content.Server/Chat/Commands/OOCCommand.cs
index 3144e74fe0..22f72d10f1 100644
--- a/Content.Server/Commands/Chat/OOCCommand.cs
+++ b/Content.Server/Chat/Commands/OOCCommand.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Chat
+namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
     internal class OOCCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Chat/SayCommand.cs b/Content.Server/Chat/Commands/SayCommand.cs
similarity index 93%
rename from Content.Server/Commands/Chat/SayCommand.cs
rename to Content.Server/Chat/Commands/SayCommand.cs
index 282b1fd57b..193798a976 100644
--- a/Content.Server/Commands/Chat/SayCommand.cs
+++ b/Content.Server/Chat/Commands/SayCommand.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
+using Content.Server.Ghost.Components;
 using Content.Server.Players;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Chat
+namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
     internal class SayCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Chat/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs
similarity index 91%
rename from Content.Server/Commands/Chat/SuicideCommand.cs
rename to Content.Server/Chat/Commands/SuicideCommand.cs
index 61e36b8505..7ad4b8b998 100644
--- a/Content.Server/Commands/Chat/SuicideCommand.cs
+++ b/Content.Server/Chat/Commands/SuicideCommand.cs
@@ -1,18 +1,16 @@
 #nullable enable
-using System;
 using System.Linq;
+using Content.Server.Act;
 using Content.Server.Administration;
-using Content.Server.Commands.Observer;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Notification;
 using Content.Server.Players;
-using Content.Server.Utility;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.Interfaces;
+using Content.Shared.Damage.Components;
+using Content.Shared.Notification;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.Enums;
@@ -20,7 +18,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.Commands.Chat
+namespace Content.Server.Chat.Commands
 {
     [AnyCommand]
     internal class SuicideCommand : IConsoleCommand
diff --git a/Content.Server/Chat/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs
similarity index 95%
rename from Content.Server/Chat/ChatManager.cs
rename to Content.Server/Chat/Managers/ChatManager.cs
index fb1b7885b2..ef884c9e2d 100644
--- a/Content.Server/Chat/ChatManager.cs
+++ b/Content.Server/Chat/Managers/ChatManager.cs
@@ -1,19 +1,19 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Administration;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Headset;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Administration.Managers;
+using Content.Server.Ghost.Components;
+using Content.Server.Headset;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.MoMMI;
+using Content.Server.Preferences.Managers;
+using Content.Server.Radio.EntitySystems;
 using Content.Shared;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Administration;
 using Content.Shared.Chat;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
+using Content.Shared.Inventory;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -23,9 +23,9 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
-using static Content.Server.Interfaces.Chat.IChatManager;
+using static Content.Server.Chat.Managers.IChatManager;
 
-namespace Content.Server.Chat
+namespace Content.Server.Chat.Managers
 {
     /// <summary>
     ///     Dispatches chat messages to clients.
diff --git a/Content.Server/Interfaces/Chat/IChatManager.cs b/Content.Server/Chat/Managers/IChatManager.cs
similarity index 96%
rename from Content.Server/Interfaces/Chat/IChatManager.cs
rename to Content.Server/Chat/Managers/IChatManager.cs
index 2480d243d8..a163967ae2 100644
--- a/Content.Server/Interfaces/Chat/IChatManager.cs
+++ b/Content.Server/Chat/Managers/IChatManager.cs
@@ -1,7 +1,7 @@
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Interfaces.Chat
+namespace Content.Server.Chat.Managers
 {
     public interface IChatManager
     {
diff --git a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs
rename to Content.Server/Chemistry/Components/ChemMasterComponent.cs
index 1653c3edde..f187fb111f 100644
--- a/Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs
+++ b/Content.Server/Chemistry/Components/ChemMasterComponent.cs
@@ -2,31 +2,28 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     /// <summary>
     /// Contains all the server-side logic for chem masters. See also <see cref="SharedChemMasterComponent"/>.
diff --git a/Content.Server/GameObjects/Components/Projectiles/ChemicalInjectionProjectileComponent.cs b/Content.Server/Chemistry/Components/ChemicalInjectionProjectileComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Projectiles/ChemicalInjectionProjectileComponent.cs
rename to Content.Server/Chemistry/Components/ChemicalInjectionProjectileComponent.cs
index 6054031c9f..c268b920c8 100644
--- a/Content.Server/GameObjects/Components/Projectiles/ChemicalInjectionProjectileComponent.cs
+++ b/Content.Server/Chemistry/Components/ChemicalInjectionProjectileComponent.cs
@@ -1,15 +1,13 @@
 using System;
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Shared.Chemistry;
+using Content.Server.Body.Circulatory;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Projectiles
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     public class ChemicalInjectionProjectileComponent : Component, IStartCollide
diff --git a/Content.Server/GameObjects/Components/Chemistry/FoamSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Chemistry/FoamSolutionAreaEffectComponent.cs
rename to Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
index 0627cb9619..c668d06a6f 100644
--- a/Content.Server/GameObjects/Components/Chemistry/FoamSolutionAreaEffectComponent.cs
+++ b/Content.Server/Chemistry/Components/FoamSolutionAreaEffectComponent.cs
@@ -1,15 +1,15 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Body.Circulatory;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Foam;
+using Content.Shared.Inventory;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SolutionAreaEffectComponent))]
diff --git a/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs b/Content.Server/Chemistry/Components/HyposprayComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs
rename to Content.Server/Chemistry/Components/HyposprayComponent.cs
index 88e3b6723f..a8bc5f32db 100644
--- a/Content.Server/GameObjects/Components/Chemistry/HyposprayComponent.cs
+++ b/Content.Server/Chemistry/Components/HyposprayComponent.cs
@@ -1,10 +1,10 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Mobs.State;
-using Content.Server.GameObjects.EntitySystems.Weapon.Melee;
+using Content.Server.Interaction.Components;
+using Content.Server.MobState.States;
+using Content.Server.Weapon.Melee;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
@@ -14,7 +14,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     public sealed class HyposprayComponent : SharedHyposprayComponent, ISolutionChange
diff --git a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs b/Content.Server/Chemistry/Components/InjectorComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs
rename to Content.Server/Chemistry/Components/InjectorComponent.cs
index ce26f92a6c..49628289d5 100644
--- a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs
+++ b/Content.Server/Chemistry/Components/InjectorComponent.cs
@@ -1,21 +1,21 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Body.Circulatory;
+using Content.Server.Body.Circulatory;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Players;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     /// <summary>
     /// Server behavior for reagent injectors and syringes. Can optionally support both
diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeChemicalInjectorComponent.cs b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Weapon/Melee/MeleeChemicalInjectorComponent.cs
rename to Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
index 3e806a496f..93c64e8aec 100644
--- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeChemicalInjectorComponent.cs
+++ b/Content.Server/Chemistry/Components/MeleeChemicalInjectorComponent.cs
@@ -1,10 +1,10 @@
-using Content.Shared.Chemistry;
+using System;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
-using Robust.Shared.ViewVariables;
-using System;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Melee
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     public class MeleeChemicalInjectorComponent : Component
diff --git a/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs b/Content.Server/Chemistry/Components/PillComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Chemistry/PillComponent.cs
rename to Content.Server/Chemistry/Components/PillComponent.cs
index cd25cc5f88..ab78e823b1 100644
--- a/Content.Server/GameObjects/Components/Chemistry/PillComponent.cs
+++ b/Content.Server/Chemistry/Components/PillComponent.cs
@@ -1,23 +1,20 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Body.Behavior;
-using Content.Server.GameObjects.Components.Culinary;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
-using Robust.Server.GameObjects;
+using Content.Server.Body.Behavior;
+using Content.Server.Nutrition.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     public class PillComponent : FoodComponent, IUse, IAfterInteract
diff --git a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs
rename to Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
index f0cc4322ab..50ab14f1a7 100644
--- a/Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs
+++ b/Content.Server/Chemistry/Components/ReagentDispenserComponent.cs
@@ -3,18 +3,18 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Chemistry.Dispenser;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -24,11 +24,10 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     /// <summary>
     /// Contains all the server-side logic for reagent dispensers. See also <see cref="SharedReagentDispenserComponent"/>.
diff --git a/Content.Server/GameObjects/Components/Chemistry/ReagentTankComponent.cs b/Content.Server/Chemistry/Components/ReagentTankComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Chemistry/ReagentTankComponent.cs
rename to Content.Server/Chemistry/Components/ReagentTankComponent.cs
index ab1a5fdec6..acd9480802 100644
--- a/Content.Server/GameObjects/Components/Chemistry/ReagentTankComponent.cs
+++ b/Content.Server/Chemistry/Components/ReagentTankComponent.cs
@@ -1,11 +1,11 @@
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
 #nullable enable
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     public class ReagentTankComponent : Component
diff --git a/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs b/Content.Server/Chemistry/Components/RehydratableComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs
rename to Content.Server/Chemistry/Components/RehydratableComponent.cs
index 38b395ade1..fe3da8cee0 100644
--- a/Content.Server/GameObjects/Components/Chemistry/RehydratableComponent.cs
+++ b/Content.Server/Chemistry/Components/RehydratableComponent.cs
@@ -1,16 +1,13 @@
 #nullable enable
-using Content.Server.Utility;
+using Content.Server.Notification;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     /// <summary>
     /// Basically, monkey cubes.
diff --git a/Content.Server/GameObjects/Components/Chemistry/SmokeSolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Chemistry/SmokeSolutionAreaEffectComponent.cs
rename to Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs
index 7a8970131a..0e04210ba4 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SmokeSolutionAreaEffectComponent.cs
+++ b/Content.Server/Chemistry/Components/SmokeSolutionAreaEffectComponent.cs
@@ -1,15 +1,14 @@
 #nullable enable
 using System.Linq;
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Server.GameObjects.Components.Body.Respiratory;
+using Content.Server.Body.Circulatory;
+using Content.Server.Body.Respiratory;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Smoking;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SolutionAreaEffectComponent))]
diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs
rename to Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
index 206193bbe2..db5b3e3f78 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionAreaEffectComponent.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
 using System.Linq;
+using Content.Server.Coordinates.Helpers;
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Server.Utility;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -12,7 +13,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     /// <summary>
     /// Used to clone its owner repeatedly and group up them all so they behave like one unit, that way you can have
diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectInceptionComponent.cs b/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectInceptionComponent.cs
rename to Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs
index 2eb1ccebdc..0d5a31304b 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SolutionAreaEffectInceptionComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionAreaEffectInceptionComponent.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     /// <summary>
     /// The "mastermind" of a SolutionAreaEffect group. It gets updated by the SolutionAreaEffectSystem and tells the
diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs b/Content.Server/Chemistry/Components/SolutionContainerComponent.cs
similarity index 72%
rename from Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs
rename to Content.Server/Chemistry/Components/SolutionContainerComponent.cs
index bfb464c99d..b9944a28fc 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SolutionContainerComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionContainerComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.Chemistry.Solution.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedSolutionContainerComponent))]
diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionTransferComponent.cs b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Chemistry/SolutionTransferComponent.cs
rename to Content.Server/Chemistry/Components/SolutionTransferComponent.cs
index 099f4afa31..00e31ab7d5 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SolutionTransferComponent.cs
+++ b/Content.Server/Chemistry/Components/SolutionTransferComponent.cs
@@ -1,16 +1,16 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     /// <summary>
     ///     Gives click behavior for transferring to/from other reagent containers.
diff --git a/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs
rename to Content.Server/Chemistry/Components/TransformableContainerComponent.cs
index aebb426632..c99766d0ef 100644
--- a/Content.Server/GameObjects/Components/Chemistry/TransformableContainerComponent.cs
+++ b/Content.Server/Chemistry/Components/TransformableContainerComponent.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     public class TransformableContainerComponent : Component, ISolutionChange
diff --git a/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs b/Content.Server/Chemistry/Components/VaporComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs
rename to Content.Server/Chemistry/Components/VaporComponent.cs
index 9ffd0b3a60..a6866d1804 100644
--- a/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs
+++ b/Content.Server/Chemistry/Components/VaporComponent.cs
@@ -1,20 +1,19 @@
 using System.Linq;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using Content.Shared.Physics;
+using Content.Shared.Vapor;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Chemistry
+namespace Content.Server.Chemistry.Components
 {
     [RegisterComponent]
     class VaporComponent : SharedVaporComponent, IStartCollide
diff --git a/Content.Server/GameObjects/EntitySystems/ChemicalReactionSystem.cs b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs
similarity index 78%
rename from Content.Server/GameObjects/EntitySystems/ChemicalReactionSystem.cs
rename to Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs
index f6ba40a3f6..f60c5417c7 100644
--- a/Content.Server/GameObjects/EntitySystems/ChemicalReactionSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/ChemicalReactionSystem.cs
@@ -1,11 +1,11 @@
 #nullable enable
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.EntitySystems.NewFolder
+namespace Content.Server.Chemistry.EntitySystems
 {
     public class ChemicalReactionSystem : SharedChemicalReactionSystem
     {
diff --git a/Content.Server/GameObjects/EntitySystems/HypospraySystem.cs b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
similarity index 84%
rename from Content.Server/GameObjects/EntitySystems/HypospraySystem.cs
rename to Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
index 340becbba9..a6c8aaa54e 100644
--- a/Content.Server/GameObjects/EntitySystems/HypospraySystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/HypospraySystem.cs
@@ -1,8 +1,9 @@
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Chemistry.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Weapons.Melee;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Chemistry.EntitySystems
 {
     public class HypospraySystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs b/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs
similarity index 81%
rename from Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs
rename to Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs
index 61aae955a7..cacd3a5d6b 100644
--- a/Content.Server/GameObjects/EntitySystems/SolutionAreaEffectSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/SolutionAreaEffectSystem.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System.Linq;
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Chemistry.EntitySystems
 {
     [UsedImplicitly]
     public class SolutionAreaEffectSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
similarity index 77%
rename from Content.Server/GameObjects/EntitySystems/VaporSystem.cs
rename to Content.Server/Chemistry/EntitySystems/VaporSystem.cs
index 20805e4d8a..14203c5dbb 100644
--- a/Content.Server/GameObjects/EntitySystems/VaporSystem.cs
+++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Chemistry.EntitySystems
 {
     [UsedImplicitly]
     public class VaporSystem : EntitySystem
diff --git a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs
index adaa63a6ff..3b32776c85 100644
--- a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs
+++ b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs
@@ -1,6 +1,7 @@
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Metabolizable;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Server/Chemistry/Metabolism/DefaultFood.cs b/Content.Server/Chemistry/Metabolism/DefaultFood.cs
index 4fcfb67727..aeba8ed95d 100644
--- a/Content.Server/Chemistry/Metabolism/DefaultFood.cs
+++ b/Content.Server/Chemistry/Metabolism/DefaultFood.cs
@@ -1,6 +1,7 @@
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Metabolizable;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Server/Chemistry/Metabolism/HealthChangeMetabolism.cs b/Content.Server/Chemistry/Metabolism/HealthChangeMetabolism.cs
index 8269e62b57..45bbff68d7 100644
--- a/Content.Server/Chemistry/Metabolism/HealthChangeMetabolism.cs
+++ b/Content.Server/Chemistry/Metabolism/HealthChangeMetabolism.cs
@@ -1,10 +1,10 @@
-using Content.Server.GameObjects.Components.Nutrition;
 using Content.Shared.Chemistry;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Metabolizable;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 
 namespace Content.Server.Chemistry.Metabolism
 {
@@ -17,7 +17,7 @@ namespace Content.Server.Chemistry.Metabolism
     {
         /// <summary>
         /// How much of the reagent should be metabolized each sec.
-        /// </summary> 
+        /// </summary>
         [DataField("rate")]
         public ReagentUnit MetabolismRate { get; set; } = ReagentUnit.New(1);
 
@@ -29,7 +29,7 @@ namespace Content.Server.Chemistry.Metabolism
 
         /// <summary>
         /// Class of damage changed, Brute, Burn, Toxin, Airloss.
-        /// </summary> 
+        /// </summary>
         [DataField("damageClass")]
         public DamageClass DamageType { get; set; } =  DamageClass.Brute;
 
@@ -55,7 +55,7 @@ namespace Content.Server.Chemistry.Metabolism
                     health.ChangeDamage(DamageType, 1, true);
                     _accumulatedHealth -= 1;
                 }
-                
+
                 else if(_accumulatedHealth <= -1)
                 {
                     health.ChangeDamage(DamageType, -1, true);
diff --git a/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs b/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs
index 27bb681f30..c0f7a742a8 100644
--- a/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/AdjustAttribute.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.Components.Botany;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Server.Botany.Components;
+using Content.Shared.Botany;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
diff --git a/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs b/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs
index 546567bfa9..0320f8dc84 100644
--- a/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/Clonexadone.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.Components.Botany;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Server.Botany.Components;
+using Content.Shared.Botany;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs b/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs
index 3e7d40fa6b..0a476a90e1 100644
--- a/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/Diethylamine.cs
@@ -1,6 +1,6 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Botany;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Server.Botany.Components;
+using Content.Shared.Botany;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs b/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs
index 68b36c9349..f91877acd2 100644
--- a/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs
+++ b/Content.Server/Chemistry/PlantMetabolism/RobustHarvest.cs
@@ -1,6 +1,6 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Botany;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Server.Botany.Components;
+using Content.Shared.Botany;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
index aa1b17c22a..ed9f447f0e 100644
--- a/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.Utility;
+using Content.Server.Chemistry.Components;
+using Content.Server.Coordinates.Helpers;
 using Content.Shared.Audio;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Reaction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
index a5ed1b2244..1b2dd70f80 100644
--- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
@@ -1,7 +1,7 @@
 using System;
-using Content.Server.Explosions;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Server.Chemistry.Components;
+using Content.Server.Explosion;
+using Content.Shared.Chemistry.Reaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs
index afa22d2e7f..29f496fedc 100644
--- a/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/FoamAreaReactionEffect.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs
index 993fdbec6b..ce575a619a 100644
--- a/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/SmokeAreaReactionEffect.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.Chemistry.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs
index f61ecf7b96..3d6975a36a 100644
--- a/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs
+++ b/Content.Server/Chemistry/ReagentEntityReactions/AddToSolutionReaction.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.Chemistry.Components;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs
index b3bc2a142b..b105f88093 100644
--- a/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs
+++ b/Content.Server/Chemistry/ReagentEntityReactions/ExtinguishReaction.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Atmos;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs
index c4692a5f7c..f60c855e2a 100644
--- a/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs
+++ b/Content.Server/Chemistry/ReagentEntityReactions/FlammableReaction.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Atmos;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs b/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs
index ef2c230f35..97b258c8d1 100644
--- a/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs
+++ b/Content.Server/Chemistry/ReagentEntityReactions/WashCreamPieReaction.cs
@@ -1,6 +1,8 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
index a47215d53a..c2101d8704 100644
--- a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
@@ -1,8 +1,10 @@
 using System.Linq;
+using Content.Server.Cleanable;
+using Content.Server.Coordinates.Helpers;
 using Content.Server.GameObjects.Components;
-using Content.Server.Utility;
 using Content.Shared.Chemistry;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
index c865af2eda..61705c27e9 100644
--- a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs
@@ -2,7 +2,8 @@
 using Content.Server.Atmos;
 using Content.Shared.Atmos;
 using Content.Shared.Chemistry;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
diff --git a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
index 57c331516d..d8a4cfb0b8 100644
--- a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs
@@ -1,7 +1,8 @@
 using System;
 using Content.Server.Atmos;
 using Content.Shared.Chemistry;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
diff --git a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs
index 410d788ffc..577b6f7b48 100644
--- a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs
@@ -1,6 +1,8 @@
-using Content.Server.GameObjects.Components.Fluids;
+using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
index 76a0179de0..3fbb874f25 100644
--- a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
+++ b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
@@ -1,8 +1,9 @@
-using Content.Server.GameObjects.Components.Fluids;
-using Content.Server.GameObjects.Components.Movement;
+using Content.Server.Fluids.Components;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Slippery;
 using JetBrains.Annotations;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/GameObjects/Components/CleanableComponent.cs b/Content.Server/Cleanable/CleanableComponent.cs
similarity index 75%
rename from Content.Server/GameObjects/Components/CleanableComponent.cs
rename to Content.Server/Cleanable/CleanableComponent.cs
index 055c06c24c..a9c34121e1 100644
--- a/Content.Server/GameObjects/Components/CleanableComponent.cs
+++ b/Content.Server/Cleanable/CleanableComponent.cs
@@ -1,11 +1,9 @@
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Cleanable
 {
     [RegisterComponent]
     public class CleanableComponent : Component
diff --git a/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs b/Content.Server/Climbing/ClimbSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/ClimbSystem.cs
rename to Content.Server/Climbing/ClimbSystem.cs
index 69bbc1b033..862795ddec 100644
--- a/Content.Server/GameObjects/EntitySystems/ClimbSystem.cs
+++ b/Content.Server/Climbing/ClimbSystem.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Server.Climbing.Components;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Climbing
 {
     [UsedImplicitly]
     internal sealed class ClimbSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs b/Content.Server/Climbing/Components/ClimbableComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs
rename to Content.Server/Climbing/Components/ClimbableComponent.cs
index bb7444d898..3e13d67ac2 100644
--- a/Content.Server/GameObjects/Components/Movement/ClimbableComponent.cs
+++ b/Content.Server/Climbing/Components/ClimbableComponent.cs
@@ -1,14 +1,14 @@
 using System;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Server.DoAfter;
+using Content.Server.Notification;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using Content.Shared.Climbing;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
@@ -16,7 +16,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Movement
+namespace Content.Server.Climbing.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IClimbable))]
diff --git a/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs b/Content.Server/Climbing/Components/ClimbingComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs
rename to Content.Server/Climbing/Components/ClimbingComponent.cs
index b7b0e5377b..00c871b125 100644
--- a/Content.Server/GameObjects/Components/Movement/ClimbingComponent.cs
+++ b/Content.Server/Climbing/Components/ClimbingComponent.cs
@@ -1,15 +1,14 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Buckle;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Climbing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.Components.Movement
+namespace Content.Server.Climbing.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedClimbingComponent))]
diff --git a/Content.Server/GameObjects/Components/Observer/AcceptCloningEui.cs b/Content.Server/Cloning/AcceptCloningEui.cs
similarity index 68%
rename from Content.Server/GameObjects/Components/Observer/AcceptCloningEui.cs
rename to Content.Server/Cloning/AcceptCloningEui.cs
index 3967d702b9..c39fbf9021 100644
--- a/Content.Server/GameObjects/Components/Observer/AcceptCloningEui.cs
+++ b/Content.Server/Cloning/AcceptCloningEui.cs
@@ -1,17 +1,15 @@
-using Content.Server.Eui;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Mobs;
+using Content.Server.EUI;
+using Content.Shared.Cloning;
 using Content.Shared.Eui;
-using Content.Shared.GameObjects.Components.Observer;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Observer
+namespace Content.Server.Cloning
 {
     public class AcceptCloningEui : BaseEui
     {
-        private readonly Mind _mind;
+        private readonly Mind.Mind _mind;
 
-        public AcceptCloningEui(Mind mind)
+        public AcceptCloningEui(Mind.Mind mind)
         {
             _mind = mind;
         }
diff --git a/Content.Server/GameObjects/EntitySystems/CloningSystem.cs b/Content.Server/Cloning/CloningSystem.cs
similarity index 89%
rename from Content.Server/GameObjects/EntitySystems/CloningSystem.cs
rename to Content.Server/Cloning/CloningSystem.cs
index f192aecdac..5553eb4215 100644
--- a/Content.Server/GameObjects/EntitySystems/CloningSystem.cs
+++ b/Content.Server/Cloning/CloningSystem.cs
@@ -1,30 +1,29 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Medical;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Mobs;
+using Content.Server.Cloning.Components;
+using Content.Server.Mind.Components;
+using Content.Server.Power.Components;
 using Content.Shared.GameTicking;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
 using Content.Shared.Preferences;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Timing;
-using Robust.Shared.IoC;
-using static Content.Shared.GameObjects.Components.Medical.SharedCloningPodComponent;
+using static Content.Shared.Cloning.SharedCloningPodComponent;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Cloning
 {
     internal sealed class CloningSystem : EntitySystem, IResettingEntitySystem
     {
         [Dependency] private readonly IGameTiming _timing = default!;
-        public readonly Dictionary<Mind, int> MindToId = new();
+        public readonly Dictionary<Mind.Mind, int> MindToId = new();
         public readonly Dictionary<int, ClonerDNAEntry> IdToDNA = new();
         private int _nextAllocatedMindId = 0;
         private float _quickAndDirtyUserUpdatePreventerTimer = 0.0f;
-        public readonly Dictionary<Mind, EntityUid> ClonesWaitingForMind = new();
+        public readonly Dictionary<Mind.Mind, EntityUid> ClonesWaitingForMind = new();
 
         public override void Initialize()
         {
@@ -42,7 +41,7 @@ namespace Content.Server.GameObjects.EntitySystems
             UnsubscribeLocalEvent<BeingClonedComponent, MindAddedMessage>(HandleMindAdded);
         }
 
-        internal void TransferMindToClone(Mind mind)
+        internal void TransferMindToClone(Mind.Mind mind)
         {
             if (!ClonesWaitingForMind.TryGetValue(mind, out var entityUid) ||
                 !EntityManager.TryGetEntity(entityUid, out var entity) ||
@@ -141,7 +140,7 @@ namespace Content.Server.GameObjects.EntitySystems
                 UpdateUserInterface(cloning);
         }
 
-        public bool HasDnaScan(Mind mind)
+        public bool HasDnaScan(Mind.Mind mind)
         {
             return MindToId.ContainsKey(mind);
         }
@@ -166,9 +165,9 @@ namespace Content.Server.GameObjects.EntitySystems
     // It should carry a reference or copy of itself with the mobs that it affects.
     // See TODO in MedicalScannerComponent.
     struct ClonerDNAEntry {
-        public Mind Mind;
+        public Mind.Mind Mind;
         public HumanoidCharacterProfile Profile;
-        public ClonerDNAEntry(Mind m, HumanoidCharacterProfile hcp)
+        public ClonerDNAEntry(Mind.Mind m, HumanoidCharacterProfile hcp)
         {
             Mind = m;
             Profile = hcp;
diff --git a/Content.Server/GameObjects/Components/Medical/BeingClonedComponent.cs b/Content.Server/Cloning/Components/BeingClonedComponent.cs
similarity index 71%
rename from Content.Server/GameObjects/Components/Medical/BeingClonedComponent.cs
rename to Content.Server/Cloning/Components/BeingClonedComponent.cs
index bdd0e5979a..7ed98aec3d 100644
--- a/Content.Server/GameObjects/Components/Medical/BeingClonedComponent.cs
+++ b/Content.Server/Cloning/Components/BeingClonedComponent.cs
@@ -1,8 +1,7 @@
-using Content.Server.Mobs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Medical
+namespace Content.Server.Cloning.Components
 {
     [RegisterComponent]
     public class BeingClonedComponent : Component
@@ -10,7 +9,7 @@ namespace Content.Server.GameObjects.Components.Medical
         public override string Name => "BeingCloned";
 
         [ViewVariables]
-        public Mind? Mind = default;
+        public Mind.Mind? Mind = default;
 
         [ViewVariables]
         public EntityUid Parent;
diff --git a/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs b/Content.Server/Cloning/Components/CloningPodComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs
rename to Content.Server/Cloning/Components/CloningPodComponent.cs
index c1d2feab29..331d52359a 100644
--- a/Content.Server/GameObjects/Components/Medical/CloningPodComponent.cs
+++ b/Content.Server/Cloning/Components/CloningPodComponent.cs
@@ -1,26 +1,22 @@
 using System;
-using Content.Server.Eui;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Mobs;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Medical;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.Interfaces;
-using Content.Shared.Preferences;
+using Content.Server.CharacterAppearance.Components;
+using Content.Server.EUI;
+using Content.Server.Mind.Components;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Cloning;
+using Content.Shared.MobState;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Network;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Medical
+namespace Content.Server.Cloning.Components
 {
     [RegisterComponent]
     public class CloningPodComponent : SharedCloningPodComponent
@@ -36,7 +32,7 @@ namespace Content.Server.GameObjects.Components.Medical
             Owner.GetUIOrNull(CloningPodUIKey.Key);
 
         [ViewVariables] public ContainerSlot BodyContainer = default!;
-        [ViewVariables] public Mind? CapturedMind;
+        [ViewVariables] public Mind.Mind? CapturedMind;
         [ViewVariables] public float CloningProgress = 0;
         [DataField("cloningTime")]
         [ViewVariables] public float CloningTime = 30f;
diff --git a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs b/Content.Server/Clothing/Components/ClothingComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
rename to Content.Server/Clothing/Components/ClothingComponent.cs
index f195780aa7..25c26d10a3 100644
--- a/Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
+++ b/Content.Server/Clothing/Components/ClothingComponent.cs
@@ -1,17 +1,18 @@
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Shared.Clothing;
+using Content.Shared.Interaction;
+using Content.Shared.Item;
+using Content.Shared.NetIDs;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.GameObjects.Components.Items.Clothing
+namespace Content.Server.Clothing.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedItemComponent))]
diff --git a/Content.Server/GameObjects/Components/MagbootsComponent.cs b/Content.Server/Clothing/Components/MagbootsComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/MagbootsComponent.cs
rename to Content.Server/Clothing/Components/MagbootsComponent.cs
index 041793540d..32ee8babc9 100644
--- a/Content.Server/GameObjects/Components/MagbootsComponent.cs
+++ b/Content.Server/Clothing/Components/MagbootsComponent.cs
@@ -1,15 +1,17 @@
 #nullable enable
+using Content.Server.Alert;
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
+using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Actions.Components;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Clothing;
+using Content.Shared.Interaction;
+using Content.Shared.Inventory;
+using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
@@ -18,9 +20,9 @@ using Robust.Shared.Localization;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Clothing.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Mobs/CombatModeComponent.cs b/Content.Server/CombatMode/CombatModeComponent.cs
similarity index 80%
rename from Content.Server/GameObjects/Components/Mobs/CombatModeComponent.cs
rename to Content.Server/CombatMode/CombatModeComponent.cs
index feeff6d44e..571cbe3c93 100644
--- a/Content.Server/GameObjects/Components/Mobs/CombatModeComponent.cs
+++ b/Content.Server/CombatMode/CombatModeComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.CombatMode;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.CombatMode
 {
     /// <summary>
     ///     Stores whether an entity is in "combat mode"
diff --git a/Content.Server/GameObjects/EntitySystems/CombatModeSystem.cs b/Content.Server/CombatMode/CombatModeSystem.cs
similarity index 56%
rename from Content.Server/GameObjects/EntitySystems/CombatModeSystem.cs
rename to Content.Server/CombatMode/CombatModeSystem.cs
index 12e4963718..cbb595c84f 100644
--- a/Content.Server/GameObjects/EntitySystems/CombatModeSystem.cs
+++ b/Content.Server/CombatMode/CombatModeSystem.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.CombatMode;
 using JetBrains.Annotations;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.CombatMode
 {
     [UsedImplicitly]
     public sealed class CombatModeSystem : SharedCombatModeSystem
diff --git a/Content.Server/Commands/DONT_PUT_NEW_COMMANDS_HERE_ATMOS_LEFTOVER b/Content.Server/Commands/DONT_PUT_NEW_COMMANDS_HERE_ATMOS_LEFTOVER
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs b/Content.Server/Communications/CommunicationsConsoleComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs
rename to Content.Server/Communications/CommunicationsConsoleComponent.cs
index ee28d33a5f..6810726ef6 100644
--- a/Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs
+++ b/Content.Server/Communications/CommunicationsConsoleComponent.cs
@@ -2,13 +2,13 @@
 using System;
 using System.Globalization;
 using System.Threading;
-using Content.Server.GameObjects.Components.PDA;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Command;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Chat.Managers;
+using Content.Server.PDA;
+using Content.Server.Power.Components;
+using Content.Server.RoundEnd;
+using Content.Server.UserInterface;
+using Content.Shared.Communications;
+using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -17,7 +17,7 @@ using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameObjects.Components.Command
+namespace Content.Server.Communications
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/ComputerComponent.cs b/Content.Server/Computer/ComputerComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/ComputerComponent.cs
rename to Content.Server/Computer/ComputerComponent.cs
index 8bb647de19..7da6aa8634 100644
--- a/Content.Server/GameObjects/Components/ComputerComponent.cs
+++ b/Content.Server/Computer/ComputerComponent.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameObjects.Components.Construction;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Shared.GameObjects.Components;
+using Content.Server.Construction.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Computer;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -8,7 +8,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Computer
 {
     [RegisterComponent]
     public sealed class ComputerComponent : SharedComputerComponent, IMapInit
diff --git a/Content.Server/GameObjects/Components/ConfigurationComponent.cs b/Content.Server/Configurable/ConfigurationComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/ConfigurationComponent.cs
rename to Content.Server/Configurable/ConfigurationComponent.cs
index f693ad1d66..39ffa01aa6 100644
--- a/Content.Server/GameObjects/Components/ConfigurationComponent.cs
+++ b/Content.Server/Configurable/ConfigurationComponent.cs
@@ -2,12 +2,12 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Tools.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Configurable;
+using Content.Shared.Interaction;
+using Content.Shared.Tool;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -18,7 +18,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Configurable
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedConfigurationComponent))]
diff --git a/Content.Server/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
similarity index 98%
rename from Content.Server/ConnectionManager.cs
rename to Content.Server/Connection/ConnectionManager.cs
index 56b4026018..e4067f0ba9 100644
--- a/Content.Server/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -2,7 +2,7 @@
 using System.Collections.Immutable;
 using System.Threading.Tasks;
 using Content.Server.Database;
-using Content.Server.Preferences;
+using Content.Server.Preferences.Managers;
 using Content.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
@@ -10,7 +10,7 @@ using Robust.Shared.Network;
 
 #nullable enable
 
-namespace Content.Server
+namespace Content.Server.Connection
 {
     public interface IConnectionManager
     {
diff --git a/Content.Server/Commands/GameTicking/FixRotationsCommand.cs b/Content.Server/Construction/Commands/FixRotationsCommand.cs
similarity index 95%
rename from Content.Server/Commands/GameTicking/FixRotationsCommand.cs
rename to Content.Server/Construction/Commands/FixRotationsCommand.cs
index c2b8c6edc6..224d337d4b 100644
--- a/Content.Server/Commands/GameTicking/FixRotationsCommand.cs
+++ b/Content.Server/Construction/Commands/FixRotationsCommand.cs
@@ -1,7 +1,7 @@
 using Content.Server.Administration;
-using Content.Shared.GameObjects.Components;
-using Content.Server.GameObjects.Components;
+using Content.Server.Window;
 using Content.Shared.Administration;
+using Content.Shared.Construction;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
@@ -9,7 +9,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.Construction.Commands
 {
     [AdminCommand(AdminFlags.Mapping)]
     class FixRotationsCommand : IConsoleCommand
diff --git a/Content.Server/Commands/GameTicking/TileWallsCommand.cs b/Content.Server/Construction/Commands/TileWallsCommand.cs
similarity index 96%
rename from Content.Server/Commands/GameTicking/TileWallsCommand.cs
rename to Content.Server/Construction/Commands/TileWallsCommand.cs
index 1e1a64f6ed..eeb1e32552 100644
--- a/Content.Server/Commands/GameTicking/TileWallsCommand.cs
+++ b/Content.Server/Construction/Commands/TileWallsCommand.cs
@@ -8,7 +8,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.Construction.Commands
 {
     [AdminCommand(AdminFlags.Mapping)]
     class TileWallsCommand : IConsoleCommand
@@ -65,7 +65,7 @@ namespace Content.Server.Commands.GameTicking
             var tileDefinitionManager = IoCManager.Resolve<ITileDefinitionManager>();
             var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
             var underplating = tileDefinitionManager["underplating"];
-            var underplatingTile = new Tile(underplating.TileId);
+            var underplatingTile = new Robust.Shared.Map.Tile(underplating.TileId);
             var changed = 0;
             foreach (var childUid in gridEntity.Transform.ChildEntityUids)
             {
diff --git a/Content.Server/Construction/Completions/AddContainer.cs b/Content.Server/Construction/Completions/AddContainer.cs
index dda330691f..426937a3c1 100644
--- a/Content.Server/Construction/Completions/AddContainer.cs
+++ b/Content.Server/Construction/Completions/AddContainer.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Construction;
+using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Completions/BuildComputer.cs b/Content.Server/Construction/Completions/BuildComputer.cs
index 7c7f63ccea..f3e0da8f02 100644
--- a/Content.Server/Construction/Completions/BuildComputer.cs
+++ b/Content.Server/Construction/Completions/BuildComputer.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Construction;
+using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Construction/Completions/BuildMachine.cs b/Content.Server/Construction/Completions/BuildMachine.cs
index ecac0dc52b..06874641c0 100644
--- a/Content.Server/Construction/Completions/BuildMachine.cs
+++ b/Content.Server/Construction/Completions/BuildMachine.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Construction;
+using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
diff --git a/Content.Server/Construction/Completions/DestroyEntity.cs b/Content.Server/Construction/Completions/DestroyEntity.cs
index ec19d58574..cc94ebf1fd 100644
--- a/Content.Server/Construction/Completions/DestroyEntity.cs
+++ b/Content.Server/Construction/Completions/DestroyEntity.cs
@@ -5,6 +5,7 @@ using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using System.Threading.Tasks;
+using Content.Server.Destructible;
 
 namespace Content.Server.Construction.Completions
 {
diff --git a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
index 404e76fac9..0d5e580af0 100644
--- a/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
+++ b/Content.Server/Construction/Completions/MachineFrameRegenerateProgress.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Construction;
+using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Completions/PopupEveryone.cs b/Content.Server/Construction/Completions/PopupEveryone.cs
index 580fe65773..b1f17c54e1 100644
--- a/Content.Server/Construction/Completions/PopupEveryone.cs
+++ b/Content.Server/Construction/Completions/PopupEveryone.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.Utility;
+using Content.Server.Notification;
 using Content.Shared.Construction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Construction/Completions/PopupUser.cs b/Content.Server/Construction/Completions/PopupUser.cs
index 6723324024..94f80ec320 100644
--- a/Content.Server/Construction/Completions/PopupUser.cs
+++ b/Content.Server/Construction/Completions/PopupUser.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Construction;
-using Content.Shared.Interfaces;
+using Content.Shared.Notification;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
diff --git a/Content.Server/Construction/Completions/SetStackCount.cs b/Content.Server/Construction/Completions/SetStackCount.cs
index 36d730a9f4..82f6683a06 100644
--- a/Content.Server/Construction/Completions/SetStackCount.cs
+++ b/Content.Server/Construction/Completions/SetStackCount.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Stack;
+using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
diff --git a/Content.Server/Construction/Completions/SnapToGrid.cs b/Content.Server/Construction/Completions/SnapToGrid.cs
index dba3151742..6f61665b24 100644
--- a/Content.Server/Construction/Completions/SnapToGrid.cs
+++ b/Content.Server/Construction/Completions/SnapToGrid.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.Utility;
+using Content.Server.Coordinates.Helpers;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Completions/SpawnPrototype.cs b/Content.Server/Construction/Completions/SpawnPrototype.cs
index ce8864c50c..f1b7e3b1f2 100644
--- a/Content.Server/Construction/Completions/SpawnPrototype.cs
+++ b/Content.Server/Construction/Completions/SpawnPrototype.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Stack;
+using Content.Server.Stack;
 using Content.Shared.Construction;
 using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Utility;
+using Content.Shared.Prototypes;
+using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/GameObjects/Components/Construction/ComputerBoardComponent.cs b/Content.Server/Construction/Components/ComputerBoardComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Construction/ComputerBoardComponent.cs
rename to Content.Server/Construction/Components/ComputerBoardComponent.cs
index 4e52c5cc56..73521dc38a 100644
--- a/Content.Server/GameObjects/Components/Construction/ComputerBoardComponent.cs
+++ b/Content.Server/Construction/Components/ComputerBoardComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Construction
+namespace Content.Server.Construction.Components
 {
     [RegisterComponent]
     public class ComputerBoardComponent : Component
diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.Verbs.cs b/Content.Server/Construction/Components/ConstructionComponent.Verbs.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Construction/ConstructionComponent.Verbs.cs
rename to Content.Server/Construction/Components/ConstructionComponent.Verbs.cs
index 27c16a95cd..5e209521e6 100644
--- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.Verbs.cs
+++ b/Content.Server/Construction/Components/ConstructionComponent.Verbs.cs
@@ -1,10 +1,10 @@
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GameObjects.Components.Construction
+namespace Content.Server.Construction.Components
 {
     public partial class ConstructionComponent
     {
diff --git a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs b/Content.Server/Construction/Components/ConstructionComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
rename to Content.Server/Construction/Components/ConstructionComponent.cs
index 9af31581ab..6885169dd4 100644
--- a/Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
+++ b/Content.Server/Construction/Components/ConstructionComponent.cs
@@ -4,14 +4,15 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
+using Content.Server.DoAfter;
+using Content.Server.Stack;
+using Content.Server.Tools.Components;
 using Content.Shared.Construction;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Construction.Prototypes;
+using Content.Shared.Construction.Steps;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Tool;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -23,7 +24,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Construction
+namespace Content.Server.Construction.Components
 {
     [RegisterComponent]
     public partial class ConstructionComponent : Component, IExamine, IInteractUsing
diff --git a/Content.Server/Interfaces/GameObjects/IRefreshParts.cs b/Content.Server/Construction/Components/IRefreshParts.cs
similarity index 67%
rename from Content.Server/Interfaces/GameObjects/IRefreshParts.cs
rename to Content.Server/Construction/Components/IRefreshParts.cs
index e6455c2f7f..e6fa95cb55 100644
--- a/Content.Server/Interfaces/GameObjects/IRefreshParts.cs
+++ b/Content.Server/Construction/Components/IRefreshParts.cs
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Construction;
 using Robust.Shared.Analyzers;
 
-namespace Content.Server.Interfaces.GameObjects
+namespace Content.Server.Construction.Components
 {
     [RequiresExplicitImplementation]
     public interface IRefreshParts
diff --git a/Content.Server/GameObjects/Components/Construction/MachineBoardComponent.cs b/Content.Server/Construction/Components/MachineBoardComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Construction/MachineBoardComponent.cs
rename to Content.Server/Construction/Components/MachineBoardComponent.cs
index 166a3ef071..cdee5f1826 100644
--- a/Content.Server/GameObjects/Components/Construction/MachineBoardComponent.cs
+++ b/Content.Server/Construction/Components/MachineBoardComponent.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.Construction;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using Content.Shared.Stacks;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -11,7 +10,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Construction
+namespace Content.Server.Construction.Components
 {
     [RegisterComponent]
     public class MachineBoardComponent : Component, IExamine
diff --git a/Content.Server/GameObjects/Components/Construction/MachineComponent.cs b/Content.Server/Construction/Components/MachineComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Construction/MachineComponent.cs
rename to Content.Server/Construction/Components/MachineComponent.cs
index f64bf4afcd..de3b870287 100644
--- a/Content.Server/GameObjects/Components/Construction/MachineComponent.cs
+++ b/Content.Server/Construction/Components/MachineComponent.cs
@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.Construction;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.GameObjects;
+using Content.Server.Stack;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Construction
+namespace Content.Server.Construction.Components
 {
     [RegisterComponent]
     public class MachineComponent : Component, IMapInit
diff --git a/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs b/Content.Server/Construction/Components/MachineFrameComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs
rename to Content.Server/Construction/Components/MachineFrameComponent.cs
index fcd86d3fb3..23c7887f82 100644
--- a/Content.Server/GameObjects/Components/Construction/MachineFrameComponent.cs
+++ b/Content.Server/Construction/Components/MachineFrameComponent.cs
@@ -1,18 +1,16 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.Construction;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Construction;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Stack;
+using Content.Shared.Construction;
+using Content.Shared.Interaction;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Construction
+namespace Content.Server.Construction.Components
 {
     [RegisterComponent]
     public class MachineFrameComponent : Component, IInteractUsing
diff --git a/Content.Server/GameObjects/Components/Construction/MachinePartComponent.cs b/Content.Server/Construction/Components/MachinePartComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Construction/MachinePartComponent.cs
rename to Content.Server/Construction/Components/MachinePartComponent.cs
index 145709aaee..e8ef2a0445 100644
--- a/Content.Server/GameObjects/Components/Construction/MachinePartComponent.cs
+++ b/Content.Server/Construction/Components/MachinePartComponent.cs
@@ -1,15 +1,12 @@
 using System.Collections.Generic;
-using Content.Server.Construction;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Construction
+namespace Content.Server.Construction.Components
 {
     [RegisterComponent]
     public class MachinePartComponent : Component, IExamine
diff --git a/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs
rename to Content.Server/Construction/Components/WelderRefinableComponent.cs
index 8d2ab518ce..4daad665d1 100644
--- a/Content.Server/GameObjects/Components/Construction/WelderRefinableComponent.cs
+++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs
@@ -1,18 +1,16 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Stack;
+using Content.Server.Tools.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Stacks;
+using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Construction
+namespace Content.Server.Construction.Components
 {
     /// <summary>
     /// Used for something that can be refined by welder.
diff --git a/Content.Server/Construction/Conditions/AirlockBolted.cs b/Content.Server/Construction/Conditions/AirlockBolted.cs
index dcfdac85ec..e0aa3972ae 100644
--- a/Content.Server/Construction/Conditions/AirlockBolted.cs
+++ b/Content.Server/Construction/Conditions/AirlockBolted.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Doors;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -7,6 +6,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using System.Threading.Tasks;
+using Content.Server.Doors.Components;
 
 namespace Content.Server.Construction.Conditions
 {
diff --git a/Content.Server/Construction/Conditions/AllWiresCut.cs b/Content.Server/Construction/Conditions/AllWiresCut.cs
index 10a85255df..0370978f64 100644
--- a/Content.Server/Construction/Conditions/AllWiresCut.cs
+++ b/Content.Server/Construction/Conditions/AllWiresCut.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components;
+using Content.Server.Wires.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Conditions/DoorWelded.cs b/Content.Server/Construction/Conditions/DoorWelded.cs
index ffee0a2f1a..85aa328982 100644
--- a/Content.Server/Construction/Conditions/DoorWelded.cs
+++ b/Content.Server/Construction/Conditions/DoorWelded.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Doors;
+using Content.Server.Doors.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
-using static Content.Shared.GameObjects.Components.Doors.SharedDoorComponent;
+using static Content.Shared.Doors.SharedDoorComponent;
 
 namespace Content.Server.Construction.Conditions
 {
diff --git a/Content.Server/Construction/Conditions/MachineFrameComplete.cs b/Content.Server/Construction/Conditions/MachineFrameComplete.cs
index 77a3fa3731..ce0e4bbc64 100644
--- a/Content.Server/Construction/Conditions/MachineFrameComplete.cs
+++ b/Content.Server/Construction/Conditions/MachineFrameComplete.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Construction;
+using Content.Server.Construction.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Conditions/ToiletLidClosed.cs b/Content.Server/Construction/Conditions/ToiletLidClosed.cs
index 0c45e4c8b8..1f66c53d8b 100644
--- a/Content.Server/Construction/Conditions/ToiletLidClosed.cs
+++ b/Content.Server/Construction/Conditions/ToiletLidClosed.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Watercloset;
+using Content.Server.Toilet;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Construction/Conditions/WirePanel.cs b/Content.Server/Construction/Conditions/WirePanel.cs
index 02890a0ce7..cbd2c8fc40 100644
--- a/Content.Server/Construction/Conditions/WirePanel.cs
+++ b/Content.Server/Construction/Conditions/WirePanel.cs
@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components;
+using Content.Server.Wires.Components;
 using Content.Shared.Construction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs b/Content.Server/Construction/ConstructionSystem.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs
rename to Content.Server/Construction/ConstructionSystem.cs
index 828396351a..1993ac6725 100644
--- a/Content.Server/GameObjects/EntitySystems/ConstructionSystem.cs
+++ b/Content.Server/Construction/ConstructionSystem.cs
@@ -3,16 +3,20 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Construction;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
+using Content.Server.Construction.Components;
+using Content.Server.DoAfter;
+using Content.Server.Hands.Components;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.Stack;
+using Content.Server.Storage.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Construction;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Utility;
+using Content.Shared.Construction.Prototypes;
+using Content.Shared.Construction.Steps;
+using Content.Shared.Coordinates;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -25,7 +29,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Construction
 {
     /// <summary>
     /// The server-side implementation of the construction system, which is used for constructing entities in game.
diff --git a/Content.Server/Commands/HideContainedContextCommand.cs b/Content.Server/Containers/Commands/HideContainedContextCommand.cs
similarity index 91%
rename from Content.Server/Commands/HideContainedContextCommand.cs
rename to Content.Server/Containers/Commands/HideContainedContextCommand.cs
index 75fae2f00c..f150d2bbad 100644
--- a/Content.Server/Commands/HideContainedContextCommand.cs
+++ b/Content.Server/Containers/Commands/HideContainedContextCommand.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Verbs;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Commands
+namespace Content.Server.Containers.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class HideContainedContextCommand : IConsoleCommand
diff --git a/Content.Server/Commands/ShowContainedContextCommand.cs b/Content.Server/Containers/Commands/ShowContainedContextCommand.cs
similarity index 92%
rename from Content.Server/Commands/ShowContainedContextCommand.cs
rename to Content.Server/Containers/Commands/ShowContainedContextCommand.cs
index 9739e7b807..5a556d4142 100644
--- a/Content.Server/Commands/ShowContainedContextCommand.cs
+++ b/Content.Server/Containers/Commands/ShowContainedContextCommand.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Verbs;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Commands
+namespace Content.Server.Containers.Commands
 {
     [AdminCommand(AdminFlags.Debug)]
     public class ShowContainedContextCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs b/Content.Server/Containers/ContainerExt.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs
rename to Content.Server/Containers/ContainerExt.cs
index 71488f0280..ed7c338dd0 100644
--- a/Content.Server/GameObjects/Components/ContainerExt/ContainerExt.cs
+++ b/Content.Server/Containers/ContainerExt.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.Containers;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.Containers
 {
     public static class ContainerExt
     {
diff --git a/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs b/Content.Server/Conveyor/ConveyorComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs
rename to Content.Server/Conveyor/ConveyorComponent.cs
index e7597a6f26..1cd3e32696 100644
--- a/Content.Server/GameObjects/Components/Conveyor/ConveyorComponent.cs
+++ b/Content.Server/Conveyor/ConveyorComponent.cs
@@ -1,22 +1,18 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.MachineLinking;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Shared.GameObjects.Components.Conveyor;
-using Content.Shared.GameObjects.Components.MachineLinking;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.Physics;
+using Content.Server.Items;
+using Content.Server.MachineLinking.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Conveyor;
+using Content.Shared.MachineLinking;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Physics;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Conveyor
+namespace Content.Server.Conveyor
 {
     [RegisterComponent]
     public class ConveyorComponent : Component, ISignalReceiver<TwoWayLeverSignal>, ISignalReceiver<bool>
diff --git a/Content.Server/GameObjects/EntitySystems/ItemCooldownSystem.cs b/Content.Server/Cooldown/ItemCooldownSystem.cs
similarity index 90%
rename from Content.Server/GameObjects/EntitySystems/ItemCooldownSystem.cs
rename to Content.Server/Cooldown/ItemCooldownSystem.cs
index aeb1ec924e..55a91aae7a 100644
--- a/Content.Server/GameObjects/EntitySystems/ItemCooldownSystem.cs
+++ b/Content.Server/Cooldown/ItemCooldownSystem.cs
@@ -1,8 +1,8 @@
 using System;
-using Content.Shared.GameObjects.Components.Items;
+using Content.Shared.Cooldown;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Cooldown
 {
     public class ItemCooldownSystem : EntitySystem
     {
diff --git a/Content.Server/Utility/GridTileLookupHelpers.cs b/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs
similarity index 96%
rename from Content.Server/Utility/GridTileLookupHelpers.cs
rename to Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs
index 41e2a8ea27..5f1c7263be 100644
--- a/Content.Server/Utility/GridTileLookupHelpers.cs
+++ b/Content.Server/Coordinates/Helpers/GridTileLookupHelpers.cs
@@ -6,7 +6,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Server.Utility
+namespace Content.Server.Coordinates.Helpers
 {
     public static class GridTileLookupHelpers
     {
diff --git a/Content.Server/Utility/SnapgridHelper.cs b/Content.Server/Coordinates/Helpers/SnapgridHelper.cs
similarity index 97%
rename from Content.Server/Utility/SnapgridHelper.cs
rename to Content.Server/Coordinates/Helpers/SnapgridHelper.cs
index 4c1f630ce1..c2ab7f3124 100644
--- a/Content.Server/Utility/SnapgridHelper.cs
+++ b/Content.Server/Coordinates/Helpers/SnapgridHelper.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.Utility
+namespace Content.Server.Coordinates.Helpers
 {
     public static class SnapgridHelper
     {
diff --git a/Content.Server/GameObjects/Components/CrayonComponent.cs b/Content.Server/Crayon/CrayonComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/CrayonComponent.cs
rename to Content.Server/Crayon/CrayonComponent.cs
index 2c74584bd8..e629a761b9 100644
--- a/Content.Server/GameObjects/Components/CrayonComponent.cs
+++ b/Content.Server/Crayon/CrayonComponent.cs
@@ -1,12 +1,13 @@
 #nullable enable
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.Utility;
+using Content.Server.UserInterface;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Crayon;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -20,7 +21,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Crayon
 {
     [RegisterComponent]
     public class CrayonComponent : SharedCrayonComponent, IAfterInteract, IUse, IDropped, ISerializationHooks
diff --git a/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs b/Content.Server/Cuffs/Components/CuffableComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs
rename to Content.Server/Cuffs/Components/CuffableComponent.cs
index 115bc9d2ee..65a569f687 100644
--- a/Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs
+++ b/Content.Server/Cuffs/Components/CuffableComponent.cs
@@ -2,15 +2,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
+using Content.Server.Alert;
+using Content.Server.DoAfter;
+using Content.Server.Hands.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.ActionBlocking;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Utility;
+using Content.Shared.Cuffs.Components;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -22,7 +22,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.ActionBlocking
+namespace Content.Server.Cuffs.Components
 {
     [RegisterComponent]
     public class CuffableComponent : SharedCuffableComponent
diff --git a/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs b/Content.Server/Cuffs/Components/HandcuffComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
rename to Content.Server/Cuffs/Components/HandcuffComponent.cs
index 4cf0d035ce..fadaddca3b 100644
--- a/Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
+++ b/Content.Server/Cuffs/Components/HandcuffComponent.cs
@@ -1,15 +1,14 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Shared.GameObjects.Components.ActionBlocking;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
-using Robust.Server.GameObjects;
+using Content.Server.DoAfter;
+using Content.Server.Hands.Components;
+using Content.Server.Stunnable.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Cuffs.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
@@ -19,7 +18,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.ActionBlocking
+namespace Content.Server.Cuffs.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedHandcuffComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/CuffableSystem.cs b/Content.Server/Cuffs/CuffableSystem.cs
similarity index 90%
rename from Content.Server/GameObjects/EntitySystems/CuffableSystem.cs
rename to Content.Server/Cuffs/CuffableSystem.cs
index 0c1ecdf2e6..ceaab04074 100644
--- a/Content.Server/GameObjects/EntitySystems/CuffableSystem.cs
+++ b/Content.Server/Cuffs/CuffableSystem.cs
@@ -1,10 +1,10 @@
 #nullable enable
-using Content.Server.GameObjects.Components.ActionBlocking;
-using Content.Server.GameObjects.Components.GUI;
+using Content.Server.Cuffs.Components;
+using Content.Server.Hands.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Cuffs
 {
     [UsedImplicitly]
     public class CuffableSystem : EntitySystem
diff --git a/Content.Server/Commands/Damage/AddDamageFlagCommand.cs b/Content.Server/Damage/Commands/AddDamageFlagCommand.cs
similarity index 95%
rename from Content.Server/Commands/Damage/AddDamageFlagCommand.cs
rename to Content.Server/Damage/Commands/AddDamageFlagCommand.cs
index ecd0512afd..9931608497 100644
--- a/Content.Server/Commands/Damage/AddDamageFlagCommand.cs
+++ b/Content.Server/Damage/Commands/AddDamageFlagCommand.cs
@@ -4,7 +4,7 @@ using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 
-namespace Content.Server.Commands.Damage
+namespace Content.Server.Damage.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     public class AddDamageFlagCommand : DamageFlagCommand
diff --git a/Content.Server/Commands/Damage/DamageFlagCommand.cs b/Content.Server/Damage/Commands/DamageFlagCommand.cs
similarity index 97%
rename from Content.Server/Commands/Damage/DamageFlagCommand.cs
rename to Content.Server/Damage/Commands/DamageFlagCommand.cs
index cb19ca374c..be897d39cc 100644
--- a/Content.Server/Commands/Damage/DamageFlagCommand.cs
+++ b/Content.Server/Damage/Commands/DamageFlagCommand.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Damage
+namespace Content.Server.Damage.Commands
 {
     public abstract class DamageFlagCommand : IConsoleCommand
     {
diff --git a/Content.Server/Commands/Damage/GodModeCommand.cs b/Content.Server/Damage/Commands/GodModeCommand.cs
similarity index 96%
rename from Content.Server/Commands/Damage/GodModeCommand.cs
rename to Content.Server/Damage/Commands/GodModeCommand.cs
index d6f37b05f2..bbb58323d4 100644
--- a/Content.Server/Commands/Damage/GodModeCommand.cs
+++ b/Content.Server/Damage/Commands/GodModeCommand.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Damage
+namespace Content.Server.Damage.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
     public class GodModeCommand : IConsoleCommand
diff --git a/Content.Server/Commands/HurtCommand.cs b/Content.Server/Damage/Commands/HurtCommand.cs
similarity index 98%
rename from Content.Server/Commands/HurtCommand.cs
rename to Content.Server/Damage/Commands/HurtCommand.cs
index e288f0cf4e..ccc9753be4 100644
--- a/Content.Server/Commands/HurtCommand.cs
+++ b/Content.Server/Damage/Commands/HurtCommand.cs
@@ -5,13 +5,13 @@ using System.Text;
 using Content.Server.Administration;
 using Content.Shared.Administration;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands
+namespace Content.Server.Damage.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     class HurtCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Damage/RemoveDamageFlagCommand.cs b/Content.Server/Damage/Commands/RemoveDamageFlagCommand.cs
similarity index 95%
rename from Content.Server/Commands/Damage/RemoveDamageFlagCommand.cs
rename to Content.Server/Damage/Commands/RemoveDamageFlagCommand.cs
index 6924c5832d..39322ab316 100644
--- a/Content.Server/Commands/Damage/RemoveDamageFlagCommand.cs
+++ b/Content.Server/Damage/Commands/RemoveDamageFlagCommand.cs
@@ -4,7 +4,7 @@ using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 
-namespace Content.Server.Commands.Damage
+namespace Content.Server.Damage.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     public class RemoveDamageFlagCommand : DamageFlagCommand
diff --git a/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs
rename to Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
index cdcb341637..7d1b1a38ee 100644
--- a/Content.Server/GameObjects/Components/Damage/DamageOnHighSpeedImpactComponent.cs
+++ b/Content.Server/Damage/Components/DamageOnHighSpeedImpactComponent.cs
@@ -1,13 +1,11 @@
 using System;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Stunnable.Components;
 using Content.Shared.Audio;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Robust.Server.GameObjects;
+using Content.Shared.Damage.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;
@@ -15,7 +13,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.Components.Damage
+namespace Content.Server.Damage.Components
 {
     [RegisterComponent]
     public class DamageOnHighSpeedImpactComponent : Component, IStartCollide
diff --git a/Content.Server/GameObjects/Components/Damage/DamageOnLandComponent.cs b/Content.Server/Damage/Components/DamageOnLandComponent.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/Damage/DamageOnLandComponent.cs
rename to Content.Server/Damage/Components/DamageOnLandComponent.cs
index 83832c359f..e7a28fd05c 100644
--- a/Content.Server/GameObjects/Components/Damage/DamageOnLandComponent.cs
+++ b/Content.Server/Damage/Components/DamageOnLandComponent.cs
@@ -1,10 +1,10 @@
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Throwing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Damage
+namespace Content.Server.Damage.Components
 {
     [RegisterComponent]
     public class DamageOnLandComponent : Component, ILand
diff --git a/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs b/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs
rename to Content.Server/Damage/Components/DamageOnToolInteractComponent.cs
index 782050cb44..54ef9c45c9 100644
--- a/Content.Server/GameObjects/Components/Damage/DamageOnToolInteractComponent.cs
+++ b/Content.Server/Damage/Components/DamageOnToolInteractComponent.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.Tools.Components;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Damage
+namespace Content.Server.Damage.Components
 {
     [RegisterComponent]
     public class DamageOnToolInteractComponent : Component, IInteractUsing
diff --git a/Content.Server/GameObjects/Components/Damage/DamageOtherOnHitComponent.cs b/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
similarity index 83%
rename from Content.Server/GameObjects/Components/Damage/DamageOtherOnHitComponent.cs
rename to Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
index e9ca21b4fb..1e110f414c 100644
--- a/Content.Server/GameObjects/Components/Damage/DamageOtherOnHitComponent.cs
+++ b/Content.Server/Damage/Components/DamageOtherOnHitComponent.cs
@@ -1,10 +1,10 @@
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Throwing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Damage
+namespace Content.Server.Damage.Components
 {
     [RegisterComponent]
     public class DamageOtherOnHitComponent : Component, IThrowCollide
diff --git a/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs b/Content.Server/Damage/GodmodeSystem.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs
rename to Content.Server/Damage/GodmodeSystem.cs
index ada6f7dace..c768fcb1fa 100644
--- a/Content.Server/GameObjects/EntitySystems/GodmodeSystem.cs
+++ b/Content.Server/Damage/GodmodeSystem.cs
@@ -1,12 +1,13 @@
 #nullable enable
 using System.Collections.Generic;
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Damage
 {
     [UsedImplicitly]
     public class GodmodeSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/GlobalVerbs/RejuvenateVerb.cs b/Content.Server/Damage/RejuvenateVerb.cs
similarity index 90%
rename from Content.Server/GlobalVerbs/RejuvenateVerb.cs
rename to Content.Server/Damage/RejuvenateVerb.cs
index ced66261cd..68a68cdcd5 100644
--- a/Content.Server/GlobalVerbs/RejuvenateVerb.cs
+++ b/Content.Server/Damage/RejuvenateVerb.cs
@@ -1,16 +1,16 @@
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Verbs;
+using Content.Server.Nutrition.Components;
+using Content.Server.Stunnable.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.MobState;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Damage
 {
     /// <summary>
     ///     Completely removes all damage from the DamageableComponent (heals the mob).
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index ef048901f2..a79ce19338 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Shared.CharacterAppearance;
 using Content.Shared.Preferences;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Enums;
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index af60837bc6..d1bb9f07e4 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -6,8 +6,9 @@ using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server.IP;
 using Content.Server.Preferences;
-using Content.Server.Utility;
+using Content.Server.Preferences.Managers;
 using Content.Shared;
 using Microsoft.EntityFrameworkCore;
 using Robust.Shared.Configuration;
@@ -103,7 +104,7 @@ namespace Content.Server.Database
             NetUserId? userId,
             ImmutableArray<byte>? hwId)
         {
-            if (address != null && ban.Address != null && address.IsInSubnet(ban.Address))
+            if (address != null && ban.Address != null && IPAddressExt.IsInSubnet(address, ban.Address))
             {
                 return true;
             }
diff --git a/Content.Server/GameObjects/Components/Destructible/DestructibleComponent.cs b/Content.Server/Destructible/DestructibleComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Destructible/DestructibleComponent.cs
rename to Content.Server/Destructible/DestructibleComponent.cs
index 13333d0191..daf19dcaed 100644
--- a/Content.Server/GameObjects/Components/Destructible/DestructibleComponent.cs
+++ b/Content.Server/Destructible/DestructibleComponent.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Destructible.Thresholds;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Server.Destructible.Thresholds;
+using Content.Shared.Damage;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Destructible
+namespace Content.Server.Destructible
 {
     /// <summary>
     ///     When attached to an <see cref="IEntity"/>, allows it to take damage
diff --git a/Content.Server/GameObjects/EntitySystems/DestructibleSystem.cs b/Content.Server/Destructible/DestructibleSystem.cs
similarity index 86%
rename from Content.Server/GameObjects/EntitySystems/DestructibleSystem.cs
rename to Content.Server/Destructible/DestructibleSystem.cs
index 8753851745..f2ad5d4922 100644
--- a/Content.Server/GameObjects/EntitySystems/DestructibleSystem.cs
+++ b/Content.Server/Destructible/DestructibleSystem.cs
@@ -1,11 +1,11 @@
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Acts;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Destructible
 {
     [UsedImplicitly]
     public class DestructibleSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Destructible/DestructibleThresholdReachedMessage.cs b/Content.Server/Destructible/DestructibleThresholdReachedMessage.cs
similarity index 75%
rename from Content.Server/GameObjects/Components/Destructible/DestructibleThresholdReachedMessage.cs
rename to Content.Server/Destructible/DestructibleThresholdReachedMessage.cs
index 6bbad73fbc..9a608c09e0 100644
--- a/Content.Server/GameObjects/Components/Destructible/DestructibleThresholdReachedMessage.cs
+++ b/Content.Server/Destructible/DestructibleThresholdReachedMessage.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.Destructible.Thresholds;
+using Content.Server.Destructible.Thresholds;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Destructible
+namespace Content.Server.Destructible
 {
     public class DestructibleThresholdReachedMessage : ComponentMessage
     {
diff --git a/Content.Server/Destructible/Thresholds/ActsFlags.cs b/Content.Server/Destructible/Thresholds/ActsFlags.cs
new file mode 100644
index 0000000000..5193499aa9
--- /dev/null
+++ b/Content.Server/Destructible/Thresholds/ActsFlags.cs
@@ -0,0 +1,4 @@
+namespace Content.Server.Destructible.Thresholds
+{
+    public sealed class ActsFlags { }
+}
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
similarity index 77%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
index e115ef3a29..6aab46c822 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/ChangeConstructionNodeBehavior.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.Components.Construction;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Construction.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     [Serializable]
     [DataDefinition]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/DoActsBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
similarity index 83%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
index dc64c30904..76472affd1 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/DoActsBehavior.cs
@@ -1,10 +1,9 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Acts;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     [Serializable]
     [DataDefinition]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs b/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs
index 0991a4743e..7ade5c290d 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/EmptyAllContainersBehaviour.cs
@@ -1,10 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.EntitySystems;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     /// <summary>
     ///     Drop all items from all containers
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/GibBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
similarity index 73%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/GibBehavior.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
index cc43dfbace..70a838d430 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/GibBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/GibBehavior.cs
@@ -1,10 +1,9 @@
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.Body.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs
similarity index 73%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs
index 1caa5cff0c..057a64f2c5 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/IThresholdBehavior.cs
@@ -1,7 +1,6 @@
-using Content.Server.GameObjects.EntitySystems;
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     public interface IThresholdBehavior
     {
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs
index 27086a82a3..2e531a9d59 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundBehavior.cs
@@ -1,12 +1,11 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Audio;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     [Serializable]
     [DataDefinition]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs
index e377795539..e3ec950665 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/PlaySoundCollectionBehavior.cs
@@ -1,12 +1,11 @@
 using System;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Audio;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     [Serializable]
     [DataDefinition]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
index 64a288a070..b788be5fda 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpawnEntitiesBehavior.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Utility;
+using Content.Server.Stack;
+using Content.Shared.Prototypes;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Stacks;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     [Serializable]
     [DataDefinition]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpillBehavior.cs b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
similarity index 69%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpillBehavior.cs
rename to Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
index 0cd2299f82..a8d6ae0f36 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Behaviors/SpillBehavior.cs
+++ b/Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs
@@ -1,12 +1,11 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.Fluids;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Chemistry.Components;
+using Content.Server.Fluids.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors
+namespace Content.Server.Destructible.Thresholds.Behaviors
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs b/Content.Server/Destructible/Thresholds/MinMax.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs
rename to Content.Server/Destructible/Thresholds/MinMax.cs
index a402e08168..daa0d629a3 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/MinMax.cs
+++ b/Content.Server/Destructible/Thresholds/MinMax.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds
+namespace Content.Server.Destructible.Thresholds
 {
     [Serializable]
     [DataDefinition]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Threshold.cs b/Content.Server/Destructible/Thresholds/Threshold.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Threshold.cs
rename to Content.Server/Destructible/Thresholds/Threshold.cs
index 99275614c7..886d0b44b8 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Threshold.cs
+++ b/Content.Server/Destructible/Thresholds/Threshold.cs
@@ -1,14 +1,13 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Destructible.Thresholds.Behaviors;
-using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Server.Destructible.Thresholds.Behaviors;
+using Content.Server.Destructible.Thresholds.Triggers;
+using Content.Shared.Damage.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds
+namespace Content.Server.Destructible.Thresholds
 {
     [DataDefinition]
     public class Threshold
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/ThresholdActs.cs b/Content.Server/Destructible/Thresholds/ThresholdActs.cs
similarity index 74%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/ThresholdActs.cs
rename to Content.Server/Destructible/Thresholds/ThresholdActs.cs
index 02a89fc803..ceef2157df 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/ThresholdActs.cs
+++ b/Content.Server/Destructible/Thresholds/ThresholdActs.cs
@@ -1,7 +1,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds
+namespace Content.Server.Destructible.Thresholds
 {
     [Flags, FlagsFor(typeof(ActsFlags))]
     [Serializable]
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/AndTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs
similarity index 81%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/AndTrigger.cs
rename to Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs
index 90736f1889..da293e7f90 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/AndTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/AndTrigger.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+namespace Content.Server.Destructible.Thresholds.Triggers
 {
     /// <summary>
     ///     A trigger that will activate when all of its triggers have activated.
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageClassTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageClassTrigger.cs
rename to Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs
index 91749bd928..43a4d595ac 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageClassTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/DamageClassTrigger.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+namespace Content.Server.Destructible.Thresholds.Triggers
 {
     /// <summary>
     ///     A trigger that will activate when the amount of damage received
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs
similarity index 79%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTrigger.cs
rename to Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs
index 1ecc5b151e..ab2b10a7eb 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/DamageTrigger.cs
@@ -1,10 +1,9 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+namespace Content.Server.Destructible.Thresholds.Triggers
 {
     /// <summary>
     ///     A trigger that will activate when the amount of damage received
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
rename to Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
index fd281d2632..f46cf7e615 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/DamageTypeTrigger.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+namespace Content.Server.Destructible.Thresholds.Triggers
 {
     /// <summary>
     ///     A trigger that will activate when the amount of damage received
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/IThresholdTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
similarity index 76%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
rename to Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
index 19495a756e..bc5ada7752 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/IThresholdTrigger.cs
@@ -1,8 +1,7 @@
 #nullable enable
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+namespace Content.Server.Destructible.Thresholds.Triggers
 {
     public interface IThresholdTrigger
     {
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/OrTrigger.cs b/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs
similarity index 81%
rename from Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/OrTrigger.cs
rename to Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs
index 0c58f12db9..016529f1ea 100644
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/Triggers/OrTrigger.cs
+++ b/Content.Server/Destructible/Thresholds/Triggers/OrTrigger.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers
+namespace Content.Server.Destructible.Thresholds.Triggers
 {
     /// <summary>
     ///     A trigger that will activate when any of its triggers have activated.
diff --git a/Content.Server/DeviceNetwork/NetworkConnections/BaseNetworkConnection.cs b/Content.Server/DeviceNetwork/Connections/BaseNetworkConnection.cs
similarity index 94%
rename from Content.Server/DeviceNetwork/NetworkConnections/BaseNetworkConnection.cs
rename to Content.Server/DeviceNetwork/Connections/BaseNetworkConnection.cs
index 9706bb36b9..e81d111cd8 100644
--- a/Content.Server/DeviceNetwork/NetworkConnections/BaseNetworkConnection.cs
+++ b/Content.Server/DeviceNetwork/Connections/BaseNetworkConnection.cs
@@ -1,9 +1,8 @@
-using Content.Server.Interfaces;
+using System.Collections.Generic;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
 
-namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork
+namespace Content.Server.DeviceNetwork.Connections
 {
     public abstract class BaseNetworkConnection : IDeviceNetworkConnection
     {
diff --git a/Content.Server/DeviceNetwork/DeviceNetworkConnection.cs b/Content.Server/DeviceNetwork/Connections/DeviceNetworkConnection.cs
similarity index 94%
rename from Content.Server/DeviceNetwork/DeviceNetworkConnection.cs
rename to Content.Server/DeviceNetwork/Connections/DeviceNetworkConnection.cs
index 1b7116b799..a435fce031 100644
--- a/Content.Server/DeviceNetwork/DeviceNetworkConnection.cs
+++ b/Content.Server/DeviceNetwork/Connections/DeviceNetworkConnection.cs
@@ -1,8 +1,7 @@
-using Content.Server.Interfaces;
+using System.Collections.Generic;
 using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
 
-namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork
+namespace Content.Server.DeviceNetwork.Connections
 {
     public class DeviceNetworkConnection : IDeviceNetworkConnection
     {
diff --git a/Content.Server/Interfaces/IDeviceNetworkConnection.cs b/Content.Server/DeviceNetwork/Connections/IDeviceNetworkConnection.cs
similarity index 95%
rename from Content.Server/Interfaces/IDeviceNetworkConnection.cs
rename to Content.Server/DeviceNetwork/Connections/IDeviceNetworkConnection.cs
index e23749f1d3..3adfc52f27 100644
--- a/Content.Server/Interfaces/IDeviceNetworkConnection.cs
+++ b/Content.Server/DeviceNetwork/Connections/IDeviceNetworkConnection.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.DeviceNetwork.Connections
 {
     public interface IDeviceNetworkConnection
     {
diff --git a/Content.Server/DeviceNetwork/NetworkConnections/WiredNetworkConnection.cs b/Content.Server/DeviceNetwork/Connections/WiredNetworkConnection.cs
similarity index 90%
rename from Content.Server/DeviceNetwork/NetworkConnections/WiredNetworkConnection.cs
rename to Content.Server/DeviceNetwork/Connections/WiredNetworkConnection.cs
index b48c601ea0..c49abd3d61 100644
--- a/Content.Server/DeviceNetwork/NetworkConnections/WiredNetworkConnection.cs
+++ b/Content.Server/DeviceNetwork/Connections/WiredNetworkConnection.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.Power.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork
+namespace Content.Server.DeviceNetwork.Connections
 {
     public class WiredNetworkConnection : BaseNetworkConnection
     {
diff --git a/Content.Server/DeviceNetwork/NetworkConnections/WirelessNetworkConnection.cs b/Content.Server/DeviceNetwork/Connections/WirelessNetworkConnection.cs
similarity index 94%
rename from Content.Server/DeviceNetwork/NetworkConnections/WirelessNetworkConnection.cs
rename to Content.Server/DeviceNetwork/Connections/WirelessNetworkConnection.cs
index 3ad98ed8b3..a205949ab6 100644
--- a/Content.Server/DeviceNetwork/NetworkConnections/WirelessNetworkConnection.cs
+++ b/Content.Server/DeviceNetwork/Connections/WirelessNetworkConnection.cs
@@ -1,9 +1,9 @@
-using Robust.Shared.Maths;
-using System;
+using System;
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork
+namespace Content.Server.DeviceNetwork.Connections
 {
     public class WirelessNetworkConnection : BaseNetworkConnection
     {
diff --git a/Content.Server/DeviceNetwork/DeviceNetwork.cs b/Content.Server/DeviceNetwork/DeviceNetwork.cs
index 939d9cf1da..a16c993bd0 100644
--- a/Content.Server/DeviceNetwork/DeviceNetwork.cs
+++ b/Content.Server/DeviceNetwork/DeviceNetwork.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.Interfaces;
+using Content.Server.DeviceNetwork.Connections;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork
+namespace Content.Server.DeviceNetwork
 {
     public delegate void OnReceiveNetMessage(int frequency, string sender, IReadOnlyDictionary<string, string> payload, Metadata metadata, bool broadcast);
 
diff --git a/Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs b/Content.Server/DeviceNetwork/DeviceNetworkSystem.cs
similarity index 82%
rename from Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs
rename to Content.Server/DeviceNetwork/DeviceNetworkSystem.cs
index 8d717ffcf5..0cec3813bf 100644
--- a/Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs
+++ b/Content.Server/DeviceNetwork/DeviceNetworkSystem.cs
@@ -1,9 +1,8 @@
-using Content.Server.Interfaces;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.DeviceNetwork
 {
     [UsedImplicitly]
     internal sealed class DeviceNetworkSystem : EntitySystem
diff --git a/Content.Server/Interfaces/IDeviceNetwork.cs b/Content.Server/DeviceNetwork/IDeviceNetwork.cs
similarity index 91%
rename from Content.Server/Interfaces/IDeviceNetwork.cs
rename to Content.Server/DeviceNetwork/IDeviceNetwork.cs
index a3c85a4e18..10e77cd714 100644
--- a/Content.Server/Interfaces/IDeviceNetwork.cs
+++ b/Content.Server/DeviceNetwork/IDeviceNetwork.cs
@@ -1,6 +1,6 @@
-using Content.Server.GameObjects.EntitySystems.DeviceNetwork;
+using Content.Server.DeviceNetwork.Connections;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.DeviceNetwork
 {
     /// <summary>
     /// Package based device network allowing devices to communicate with eachother
diff --git a/Content.Server/DeviceNetwork/Metadata.cs b/Content.Server/DeviceNetwork/Metadata.cs
index a0f1a18b3b..1f052eb34a 100644
--- a/Content.Server/DeviceNetwork/Metadata.cs
+++ b/Content.Server/DeviceNetwork/Metadata.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork
+namespace Content.Server.DeviceNetwork
 {
     public class Metadata : Dictionary<string, object>
     {
diff --git a/Content.Server/DeviceNetwork/NetworkUtils.cs b/Content.Server/DeviceNetwork/NetworkUtils.cs
index 308de60c76..ff51c7b8ba 100644
--- a/Content.Server/DeviceNetwork/NetworkUtils.cs
+++ b/Content.Server/DeviceNetwork/NetworkUtils.cs
@@ -1,7 +1,7 @@
-using Content.Server.Interfaces;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using Content.Server.DeviceNetwork.Connections;
 
-namespace Content.Server.GameObjects.EntitySystems.DeviceNetwork
+namespace Content.Server.DeviceNetwork
 {
     /// <summary>
     /// A collection of utilities to help with using device networks
diff --git a/Content.Server/GameObjects/Components/Items/DiceComponent.cs b/Content.Server/Dice/DiceComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Items/DiceComponent.cs
rename to Content.Server/Dice/DiceComponent.cs
index 1b44ead6e2..9ece67c8c2 100644
--- a/Content.Server/GameObjects/Components/Items/DiceComponent.cs
+++ b/Content.Server/Dice/DiceComponent.cs
@@ -1,6 +1,7 @@
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Throwing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -13,7 +14,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Items
+namespace Content.Server.Dice
 {
     [RegisterComponent]
     public class DiceComponent : Component, IActivate, IUse, ILand, IExamine
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs
rename to Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs
index 6588853bed..c0c157cec0 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs
+++ b/Content.Server/Disposal/Mailing/DisposalMailingUnitComponent.cs
@@ -5,20 +5,24 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems.DeviceNetwork;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Disposal;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Anchor;
+using Content.Server.DeviceNetwork;
+using Content.Server.DeviceNetwork.Connections;
+using Content.Server.Disposal.Tube.Components;
+using Content.Server.Disposal.Unit.Components;
+using Content.Server.DoAfter;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Body.Components;
+using Content.Shared.Configurable;
+using Content.Shared.Disposal.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -27,15 +31,14 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Physics;
 using Robust.Shared.Player;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Mailing
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedDisposalMailingUnitComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/Disposal/DisposalMailingUnitSystem.cs b/Content.Server/Disposal/Mailing/DisposalMailingUnitSystem.cs
similarity index 82%
rename from Content.Server/GameObjects/EntitySystems/Disposal/DisposalMailingUnitSystem.cs
rename to Content.Server/Disposal/Mailing/DisposalMailingUnitSystem.cs
index 1082d93fee..40ef380c51 100644
--- a/Content.Server/GameObjects/EntitySystems/Disposal/DisposalMailingUnitSystem.cs
+++ b/Content.Server/Disposal/Mailing/DisposalMailingUnitSystem.cs
@@ -1,7 +1,6 @@
-using Content.Server.GameObjects.Components.Disposal;
-using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.Disposal
+namespace Content.Server.Disposal.Mailing
 {
     public sealed class DisposalMailingUnitSystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalBendComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Disposal/DisposalBendComponent.cs
rename to Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs
index aa48e19e17..c8618bbeb4 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalBendComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalBendComponent.cs
@@ -1,10 +1,9 @@
-using Robust.Shared.GameObjects;
+using Content.Server.Disposal.Unit.Components;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Tube.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IDisposalTubeComponent))]
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs
rename to Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
index ceb5e0bd4a..910176f23c 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalEntryComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalEntryComponent.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Linq;
+using Content.Server.Disposal.Unit.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Tube.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IDisposalTubeComponent))]
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalJunctionComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Disposal/DisposalJunctionComponent.cs
rename to Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs
index 0c1e15b16c..f499655f54 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalJunctionComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalJunctionComponent.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.Disposal.Unit.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
@@ -7,7 +8,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Tube.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IDisposalTubeComponent))]
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs
rename to Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
index 7c1a7c0571..4ab7856da7 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalRouterComponent.cs
@@ -2,12 +2,13 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Disposal.Unit.Components;
+using Content.Server.Hands.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -19,9 +20,9 @@ using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Player;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalRouterComponent;
+using static Content.Shared.Disposal.Components.SharedDisposalRouterComponent;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Tube.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTaggerComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Disposal/DisposalTaggerComponent.cs
rename to Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
index 3560b1557f..b6ff0b2528 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalTaggerComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTaggerComponent.cs
@@ -1,24 +1,25 @@
 #nullable enable
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Disposal.Unit.Components;
+using Content.Server.Hands.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
+using Robust.Server.GameObjects;
+using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using Robust.Shared.ViewVariables;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Robust.Server.GameObjects;
-using Robust.Server.Player;
-using Robust.Shared.Player;
-using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalTaggerComponent;
 using Robust.Shared.Physics;
+using Robust.Shared.Player;
+using Robust.Shared.ViewVariables;
+using static Content.Shared.Disposal.Components.SharedDisposalTaggerComponent;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Tube.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTransitComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Disposal/DisposalTransitComponent.cs
rename to Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs
index b4cbc1731c..9252024531 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalTransitComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTransitComponent.cs
@@ -1,8 +1,9 @@
 using System;
+using Content.Server.Disposal.Unit.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Tube.Components
 {
     // TODO: Different types of tubes eject in random direction with no exit point
     [RegisterComponent]
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs
rename to Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
index 9755610ff4..0f18584b37 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/DisposalTubeComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Disposal;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
+using Content.Server.Anchor;
+using Content.Server.Disposal.Unit.Components;
+using Content.Shared.Acts;
+using Content.Shared.Disposal.Components;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -15,15 +16,13 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Timing;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.ViewVariables;
 using Robust.Shared.Physics;
+using Robust.Shared.Player;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Timing;
+using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Tube.Components
 {
     public abstract class DisposalTubeComponent : Component, IDisposalTubeComponent, IBreakAct
     {
diff --git a/Content.Server/GameObjects/Components/Disposal/IDisposalTubeComponent.cs b/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Disposal/IDisposalTubeComponent.cs
rename to Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs
index 0ae78d41a4..d615cf154a 100644
--- a/Content.Server/GameObjects/Components/Disposal/IDisposalTubeComponent.cs
+++ b/Content.Server/Disposal/Tube/Components/IDisposalTubeComponent.cs
@@ -1,10 +1,10 @@
 #nullable enable
-using Robust.Server.GameObjects;
+using Content.Server.Disposal.Unit.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Tube.Components
 {
     public interface IDisposalTubeComponent : IComponent
     {
diff --git a/Content.Server/GameObjects/EntitySystems/Disposal/DisposalTubeSystem.cs b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/Disposal/DisposalTubeSystem.cs
rename to Content.Server/Disposal/Tube/DisposalTubeSystem.cs
index 1b89a9f39e..caba2e4569 100644
--- a/Content.Server/GameObjects/EntitySystems/Disposal/DisposalTubeSystem.cs
+++ b/Content.Server/Disposal/Tube/DisposalTubeSystem.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.Disposal;
+using Content.Server.Disposal.Tube.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.Disposal
+namespace Content.Server.Disposal.Tube
 {
     public sealed class DisposalTubeSystem : EntitySystem
     {
diff --git a/Content.Server/Commands/Disposal/TubeConnectionsCommand.cs b/Content.Server/Disposal/TubeConnectionsCommand.cs
similarity index 94%
rename from Content.Server/Commands/Disposal/TubeConnectionsCommand.cs
rename to Content.Server/Disposal/TubeConnectionsCommand.cs
index 3a9934dfdb..df507e8924 100644
--- a/Content.Server/Commands/Disposal/TubeConnectionsCommand.cs
+++ b/Content.Server/Disposal/TubeConnectionsCommand.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Disposal;
+using Content.Server.Disposal.Tube.Components;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
@@ -8,7 +8,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.Commands.Disposal
+namespace Content.Server.Disposal
 {
     [AdminCommand(AdminFlags.Debug)]
     public class TubeConnectionsCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs
rename to Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
index 898de449b4..86feb33126 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalHolderComponent.cs
+++ b/Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
@@ -3,22 +3,19 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Disposal.Tube.Components;
 using Content.Server.Interfaces;
+using Content.Server.Items;
 using Content.Shared.Atmos;
-using Content.Shared.GameObjects.Components.Body;
-using Robust.Shared.Asynchronous;
+using Content.Shared.Body.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Physics;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Unit.Components
 {
     // TODO: Add gas
     [RegisterComponent]
diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs
rename to Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs
index db97252d92..00d370a86b 100644
--- a/Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs
+++ b/Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs
@@ -4,23 +4,23 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Content.Server.Anchor;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.Disposal.Tube.Components;
+using Content.Server.DoAfter;
 using Content.Server.GameObjects.EntitySystems;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
+using Content.Server.Hands.Components;
 using Content.Server.Interfaces;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Atmos;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Disposal;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Disposal.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Throwing;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -29,14 +29,13 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
-using Robust.Shared.Physics;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Disposal
+namespace Content.Server.Disposal.Unit.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedDisposalUnitComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
similarity index 78%
rename from Content.Server/GameObjects/EntitySystems/DisposableSystem.cs
rename to Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
index 9148a683ee..92786009cf 100644
--- a/Content.Server/GameObjects/EntitySystems/DisposableSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Disposal;
+using Content.Server.Disposal.Unit.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Disposal.Unit.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class DisposableSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/Disposal/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/Disposal/DisposalUnitSystem.cs
rename to Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
index dad718a116..05eab4a226 100644
--- a/Content.Server/GameObjects/EntitySystems/Disposal/DisposalUnitSystem.cs
+++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.Disposal;
+using Content.Server.Disposal.Unit.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.Disposal
+namespace Content.Server.Disposal.Unit.EntitySystems
 {
     public sealed class DisposalUnitSystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs b/Content.Server/DoAfter/DoAfter.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs
rename to Content.Server/DoAfter/DoAfter.cs
index db84d76b84..3c41363818 100644
--- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfter.cs
+++ b/Content.Server/DoAfter/DoAfter.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Stunnable.Components;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems.DoAfter
+namespace Content.Server.DoAfter
 {
     public sealed class DoAfter
     {
diff --git a/Content.Server/GameObjects/Components/DoAfterComponent.cs b/Content.Server/DoAfter/DoAfterComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/DoAfterComponent.cs
rename to Content.Server/DoAfter/DoAfterComponent.cs
index 277c44eda8..053b741d6a 100644
--- a/Content.Server/GameObjects/Components/DoAfterComponent.cs
+++ b/Content.Server/DoAfter/DoAfterComponent.cs
@@ -1,12 +1,11 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage;
+using Content.Shared.DoAfter;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.DoAfter
 {
     [RegisterComponent]
     public sealed class DoAfterComponent : SharedDoAfterComponent
diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs b/Content.Server/DoAfter/DoAfterEventArgs.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs
rename to Content.Server/DoAfter/DoAfterEventArgs.cs
index 6e9f51a1f1..b7ec522f5c 100644
--- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterEventArgs.cs
+++ b/Content.Server/DoAfter/DoAfterEventArgs.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System;
 using System.Threading;
+using Content.Shared.Interaction.Helpers;
 using Content.Shared.Physics;
-using Content.Shared.Utility;
 using Robust.Shared.GameObjects;
 
 // ReSharper disable UnassignedReadonlyField
 
-namespace Content.Server.GameObjects.EntitySystems.DoAfter
+namespace Content.Server.DoAfter
 {
     public sealed class DoAfterEventArgs
     {
diff --git a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs b/Content.Server/DoAfter/DoAfterSystem.cs
similarity index 95%
rename from Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
rename to Content.Server/DoAfter/DoAfterSystem.cs
index fe2eda58c5..8ee9372983 100644
--- a/Content.Server/GameObjects/EntitySystems/DoAfter/DoAfterSystem.cs
+++ b/Content.Server/DoAfter/DoAfterSystem.cs
@@ -3,11 +3,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.DoAfter
+namespace Content.Server.DoAfter
 {
     [UsedImplicitly]
     public sealed class DoAfterSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs b/Content.Server/Doors/Components/AirlockComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
rename to Content.Server/Doors/Components/AirlockComponent.cs
index 9d749161bf..f95053c256 100644
--- a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
+++ b/Content.Server/Doors/Components/AirlockComponent.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using System;
 using System.Threading;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.Components.VendingMachines;
-using Content.Server.Interfaces.GameObjects.Components.Doors;
-using Content.Shared.GameObjects.Components.Doors;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Power.Components;
+using Content.Server.VendingMachines;
+using Content.Server.Wires.Components;
+using Content.Shared.Doors;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -14,10 +14,10 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent.WiresAction;
+using static Content.Shared.Wires.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent.WiresAction;
 
-namespace Content.Server.GameObjects.Components.Doors
+namespace Content.Server.Doors.Components
 {
     /// <summary>
     /// Companion component to ServerDoorComponent that handles airlock-specific behavior -- wires, requiring power to operate, bolts, and allowing automatic closing.
diff --git a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs b/Content.Server/Doors/Components/ServerDoorComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
rename to Content.Server/Doors/Components/ServerDoorComponent.cs
index 9a0a743ec5..fc3d35bdb1 100644
--- a/Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
+++ b/Content.Server/Doors/Components/ServerDoorComponent.cs
@@ -3,40 +3,33 @@ using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Access;
+using Content.Server.Access;
+using Content.Server.Access.Components;
+using Content.Server.Construction.Components;
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.GameObjects.Components.Doors;
+using Content.Server.Hands.Components;
+using Content.Server.Stunnable.Components;
+using Content.Server.Tools.Components;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Doors;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Server.GameObjects;
+using Content.Shared.Damage.Components;
+using Content.Shared.Doors;
+using Content.Shared.Interaction;
+using Content.Shared.Tool;
 using Robust.Shared.Audio;
+using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
-using Robust.Shared.Players;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Physics.Broadphase;
 using Robust.Shared.Physics.Collision;
+using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;
-using Robust.Shared.Serialization;
+using Robust.Shared.Players;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 using Timer = Robust.Shared.Timing.Timer;
-using Content.Server.GameObjects.Components.Construction;
-using Robust.Shared.Containers;
-using Robust.Shared.Physics.Dynamics;
 
-namespace Content.Server.GameObjects.Components.Doors
+namespace Content.Server.Doors.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/EntitySystems/DoorSystem.cs b/Content.Server/Doors/DoorSystem.cs
similarity index 88%
rename from Content.Server/GameObjects/EntitySystems/DoorSystem.cs
rename to Content.Server/Doors/DoorSystem.cs
index f02fd14dd0..e6467f2b6b 100644
--- a/Content.Server/GameObjects/EntitySystems/DoorSystem.cs
+++ b/Content.Server/Doors/DoorSystem.cs
@@ -1,9 +1,7 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems;
-using JetBrains.Annotations;
-using Robust.Shared.GameObjects;
+using Content.Shared.Doors;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Doors
 {
     /// <summary>
     /// Used on the server side to manage global access level overrides.
diff --git a/Content.Server/Interfaces/GameObjects/Components/Doors/IDoorCheck.cs b/Content.Server/Doors/IDoorCheck.cs
similarity index 94%
rename from Content.Server/Interfaces/GameObjects/Components/Doors/IDoorCheck.cs
rename to Content.Server/Doors/IDoorCheck.cs
index 61737e0de6..dfa5810458 100644
--- a/Content.Server/Interfaces/GameObjects/Components/Doors/IDoorCheck.cs
+++ b/Content.Server/Doors/IDoorCheck.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Doors;
-using Content.Shared.Interfaces.GameObjects.Components;
 using System;
+using Content.Shared.Doors;
+using Content.Shared.Interaction;
 
-namespace Content.Server.Interfaces.GameObjects.Components.Doors
+namespace Content.Server.Doors
 {
     public interface IDoorCheck
     {
diff --git a/Content.Server/Eui/BaseEui.cs b/Content.Server/EUI/BaseEui.cs
similarity index 98%
rename from Content.Server/Eui/BaseEui.cs
rename to Content.Server/EUI/BaseEui.cs
index db436d1839..0126a0f40f 100644
--- a/Content.Server/Eui/BaseEui.cs
+++ b/Content.Server/EUI/BaseEui.cs
@@ -1,13 +1,12 @@
 using System;
 using Content.Shared.Eui;
-using Content.Shared.Network.NetMessages;
 using Robust.Server.Player;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
 #nullable enable
 
-namespace Content.Server.Eui
+namespace Content.Server.EUI
 {
     /// <summary>
     ///     Base class to implement server-side for an EUI.
diff --git a/Content.Server/Eui/EuiManager.cs b/Content.Server/EUI/EuiManager.cs
similarity index 98%
rename from Content.Server/Eui/EuiManager.cs
rename to Content.Server/EUI/EuiManager.cs
index 6a9d263835..1e4f5ea950 100644
--- a/Content.Server/Eui/EuiManager.cs
+++ b/Content.Server/EUI/EuiManager.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.Network.NetMessages;
+using Content.Shared.Eui;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;
@@ -10,7 +10,7 @@ using Robust.Shared.Utility;
 
 #nullable enable
 
-namespace Content.Server.Eui
+namespace Content.Server.EUI
 {
     public sealed class EuiManager : IPostInjectInit
     {
diff --git a/Content.Server/GameObjects/Components/Engineering/DisassembleOnActivateComponent.cs b/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Engineering/DisassembleOnActivateComponent.cs
rename to Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs
index bedd06c5ef..214f22a46b 100644
--- a/Content.Server/GameObjects/Components/Engineering/DisassembleOnActivateComponent.cs
+++ b/Content.Server/Engineering/Components/DisassembleOnActivateComponent.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System.Threading;
-using Content.Shared.GameObjects;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Engineering
+namespace Content.Server.Engineering.Components
     {
         [RegisterComponent]
         public class DisassembleOnActivateComponent : Component
diff --git a/Content.Server/GameObjects/Components/Engineering/SpawnAfterInteractComponent.cs b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Engineering/SpawnAfterInteractComponent.cs
rename to Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
index a7d1463b31..64958de3a5 100644
--- a/Content.Server/GameObjects/Components/Engineering/SpawnAfterInteractComponent.cs
+++ b/Content.Server/Engineering/Components/SpawnAfterInteractComponent.cs
@@ -1,12 +1,12 @@
 #nullable enable
-using Content.Shared.GameObjects;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Engineering
+namespace Content.Server.Engineering.Components
 {
     [RegisterComponent]
     public class SpawnAfterInteractComponent : Component
diff --git a/Content.Server/GameObjects/EntitySystems/DisassembleOnActivateSystem.cs b/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs
similarity index 81%
rename from Content.Server/GameObjects/EntitySystems/DisassembleOnActivateSystem.cs
rename to Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs
index a6ed357192..2b5ecdc642 100644
--- a/Content.Server/GameObjects/EntitySystems/DisassembleOnActivateSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/DisassembleOnActivateSystem.cs
@@ -1,15 +1,13 @@
-using Content.Server.GameObjects.Components.Engineering;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Server.DoAfter;
+using Content.Server.Engineering.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using System.Threading;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Engineering.EntitySystems
 {
     [UsedImplicitly]
     public class DisassembleOnActivateSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/SpawnAfterInteractSystem.cs b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
similarity index 88%
rename from Content.Server/GameObjects/EntitySystems/SpawnAfterInteractSystem.cs
rename to Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
index 8611dcac2c..4e24554bf8 100644
--- a/Content.Server/GameObjects/EntitySystems/SpawnAfterInteractSystem.cs
+++ b/Content.Server/Engineering/EntitySystems/SpawnAfterInteractSystem.cs
@@ -1,16 +1,16 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Engineering;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Server.Utility;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Server.Coordinates.Helpers;
+using Content.Server.DoAfter;
+using Content.Server.Engineering.Components;
+using Content.Server.Stack;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Engineering.EntitySystems
 {
     [UsedImplicitly]
     public class SpawnAfterInteractSystem : EntitySystem
diff --git a/Content.Server/Commands/EntityList/SpawnEntityListCommand.cs b/Content.Server/EntityList/SpawnEntityListCommand.cs
similarity index 95%
rename from Content.Server/Commands/EntityList/SpawnEntityListCommand.cs
rename to Content.Server/EntityList/SpawnEntityListCommand.cs
index df22664e50..aaf85a2171 100644
--- a/Content.Server/Commands/EntityList/SpawnEntityListCommand.cs
+++ b/Content.Server/EntityList/SpawnEntityListCommand.cs
@@ -1,13 +1,13 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Prototypes.EntityList;
+using Content.Shared.EntityList;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Commands.EntityList
+namespace Content.Server.EntityList
 {
     [AdminCommand(AdminFlags.Spawn)]
     public class SpawnEntityListCommand : IConsoleCommand
diff --git a/Content.Server/EntryPoint.cs b/Content.Server/EntryPoint/EntryPoint.cs
similarity index 88%
rename from Content.Server/EntryPoint.cs
rename to Content.Server/EntryPoint/EntryPoint.cs
index f5b0c17ef2..35dd8a6318 100644
--- a/Content.Server/EntryPoint.cs
+++ b/Content.Server/EntryPoint/EntryPoint.cs
@@ -1,18 +1,22 @@
-using Content.Server.Administration;
+using Content.Server.Administration.Managers;
 using Content.Server.AI.Utility;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.WorldState;
+using Content.Server.Chat.Managers;
+using Content.Server.Connection;
 using Content.Server.Database;
-using Content.Server.Eui;
-using Content.Server.GameObjects.Components.Mobs.Speech;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.EUI;
+using Content.Server.GameTicking;
 using Content.Server.Holiday.Interfaces;
-using Content.Server.Interfaces;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Interfaces.PDA;
+using Content.Server.IoC;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.Notification.Managers;
+using Content.Server.PDA.Managers;
+using Content.Server.Preferences.Managers;
 using Content.Server.Sandbox;
-using Content.Server.Voting;
+using Content.Server.Shell;
+using Content.Server.Speech;
+using Content.Server.Voting.Managers;
 using Content.Shared.Actions;
 using Content.Shared.Alert;
 using Content.Shared.Kitchen;
@@ -23,7 +27,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Timing;
 
-namespace Content.Server
+namespace Content.Server.EntryPoint
 {
     public class EntryPoint : GameServer
     {
diff --git a/Content.Server/IgnoredComponents.cs b/Content.Server/EntryPoint/IgnoredComponents.cs
similarity index 94%
rename from Content.Server/IgnoredComponents.cs
rename to Content.Server/EntryPoint/IgnoredComponents.cs
index 49a1f6fc2b..ecd4cce0f7 100644
--- a/Content.Server/IgnoredComponents.cs
+++ b/Content.Server/EntryPoint/IgnoredComponents.cs
@@ -1,5 +1,5 @@
 // ReSharper disable ArrangeTrailingCommaInMultilineLists
-namespace Content.Server
+namespace Content.Server.EntryPoint
 {
     public static class IgnoredComponents
     {
diff --git a/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs b/Content.Server/Examine/ExamineSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs
rename to Content.Server/Examine/ExamineSystem.cs
index 09afc6198d..23cb7d5db1 100644
--- a/Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs
+++ b/Content.Server/Examine/ExamineSystem.cs
@@ -1,5 +1,4 @@
-using Content.Shared.GameObjects.EntitySystemMessages;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -7,7 +6,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems.Click
+namespace Content.Server.Examine
 {
     [UsedImplicitly]
     public class ExamineSystem : ExamineSystemShared
diff --git a/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs b/Content.Server/Explosion/Components/ClusterFlashComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs
rename to Content.Server/Explosion/Components/ClusterFlashComponent.cs
index 9295855b7f..8b9b8bc0d9 100644
--- a/Content.Server/GameObjects/Components/Explosion/ClusterFlashComponent.cs
+++ b/Content.Server/Explosion/Components/ClusterFlashComponent.cs
@@ -2,20 +2,19 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Trigger.TimerTrigger;
-using Content.Server.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Explosion;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Throwing;
+using Content.Shared.Explosion;
+using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Containers;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Explosion
+namespace Content.Server.Explosion.Components
 {
     [RegisterComponent]
     public sealed class ClusterFlashComponent : Component, IInteractUsing, IUse
diff --git a/Content.Server/GameObjects/Components/Explosion/ExplosionLaunchedComponent.cs b/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Explosion/ExplosionLaunchedComponent.cs
rename to Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs
index e660e63668..b48507ef4c 100644
--- a/Content.Server/GameObjects/Components/Explosion/ExplosionLaunchedComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosionLaunchedComponent.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Items;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.Throwing;
+using Content.Shared.Acts;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Explosion
+namespace Content.Server.Explosion.Components
 {
     [RegisterComponent]
     public class ExplosionLaunchedComponent : Component, IExAct
diff --git a/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs b/Content.Server/Explosion/Components/ExplosiveComponent.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs
rename to Content.Server/Explosion/Components/ExplosiveComponent.cs
index 6c7fa0900f..721dcc0fc6 100644
--- a/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosiveComponent.cs
@@ -1,12 +1,8 @@
-using Content.Server.Explosions;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Acts;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Explosion
+namespace Content.Server.Explosion.Components
 {
     [RegisterComponent]
     public class ExplosiveComponent : Component, ITimerTrigger, IDestroyAct
diff --git a/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs b/Content.Server/Explosion/Components/ExplosiveProjectileComponent.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs
rename to Content.Server/Explosion/Components/ExplosiveProjectileComponent.cs
index 74e1c3ba37..d9e9f9a2da 100644
--- a/Content.Server/GameObjects/Components/Projectiles/ExplosiveProjectileComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosiveProjectileComponent.cs
@@ -1,10 +1,8 @@
-using Content.Server.GameObjects.Components.Explosion;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 
-namespace Content.Server.GameObjects.Components.Projectiles
+namespace Content.Server.Explosion.Components
 {
     [RegisterComponent]
     public class ExplosiveProjectileComponent : Component, IStartCollide
diff --git a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs b/Content.Server/Explosion/Components/FlashExplosiveComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs
rename to Content.Server/Explosion/Components/FlashExplosiveComponent.cs
index adb8d1f9c7..7762e3e8ab 100644
--- a/Content.Server/GameObjects/Components/Explosion/FlashExplosiveComponent.cs
+++ b/Content.Server/Explosion/Components/FlashExplosiveComponent.cs
@@ -1,15 +1,13 @@
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Weapon;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems;
-using Robust.Server.GameObjects;
+using Content.Server.Flash.Components;
+using Content.Server.Storage.Components;
+using Content.Shared.Acts;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Explosion
+namespace Content.Server.Explosion.Components
 {
     /// <summary>
     /// When triggered will flash in an area around the object and destroy itself
diff --git a/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
similarity index 79%
rename from Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs
rename to Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
index 47b216e8a9..eb428ed043 100644
--- a/Content.Server/GameObjects/Components/Trigger/TimerTrigger/OnUseTimerTriggerComponent.cs
+++ b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Trigger;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Trigger;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Trigger.TimerTrigger
+namespace Content.Server.Explosion.Components
 {
     [RegisterComponent]
     public class OnUseTimerTriggerComponent : Component, IUse
diff --git a/Content.Server/Explosions/ExplosionHelper.cs b/Content.Server/Explosion/ExplosionHelper.cs
similarity index 96%
rename from Content.Server/Explosions/ExplosionHelper.cs
rename to Content.Server/Explosion/ExplosionHelper.cs
index 2a88ea5c5e..c85e1036fa 100644
--- a/Content.Server/Explosions/ExplosionHelper.cs
+++ b/Content.Server/Explosion/ExplosionHelper.cs
@@ -2,13 +2,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Explosion;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.Camera;
+using Content.Server.Explosion.Components;
+using Content.Shared.Acts;
+using Content.Shared.Interaction.Helpers;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
-using Content.Shared.Utility;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
@@ -21,7 +21,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Explosions
+namespace Content.Server.Explosion
 {
     public static class ExplosionHelper
     {
@@ -193,8 +193,8 @@ namespace Content.Server.Explosions
                     continue;
                 }
 
-                var zeroTile = new Tile(tileDefinitionManager[baseTurfs[0]].TileId);
-                var previousTile = new Tile(tileDefinitionManager[baseTurfs[^1]].TileId);
+                var zeroTile = new Robust.Shared.Map.Tile(tileDefinitionManager[baseTurfs[0]].TileId);
+                var previousTile = new Robust.Shared.Map.Tile(tileDefinitionManager[baseTurfs[^1]].TileId);
 
                 var severity = CalculateSeverity(distance, devastationRange, heaveyRange);
 
diff --git a/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/TriggerSystem.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/TriggerSystem.cs
rename to Content.Server/Explosion/TriggerSystem.cs
index 8348386a0d..1dce4012ea 100644
--- a/Content.Server/GameObjects/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/TriggerSystem.cs
@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Explosion
 {
     /// <summary>
     /// This interface gives components behavior when being "triggered" by timer or other conditions
diff --git a/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs b/Content.Server/Extinguisher/FireExtinguisherComponent.cs
similarity index 83%
rename from Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs
rename to Content.Server/Extinguisher/FireExtinguisherComponent.cs
index 2c5b0d4e15..309a1f7754 100644
--- a/Content.Server/GameObjects/Components/Items/FireExtinguisherComponent.cs
+++ b/Content.Server/Extinguisher/FireExtinguisherComponent.cs
@@ -1,10 +1,9 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Server.GameObjects;
+using Content.Server.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
@@ -12,7 +11,7 @@ using Robust.Shared.Player;
 
 #nullable enable
 
-namespace Content.Server.GameObjects.Components.Items
+namespace Content.Server.Extinguisher
 {
     [RegisterComponent]
     public class FireExtinguisherComponent : Component, IAfterInteract
diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs b/Content.Server/Flash/Components/FlashComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs
rename to Content.Server/Flash/Components/FlashComponent.cs
index 573ddef367..3b2d77f70e 100644
--- a/Content.Server/GameObjects/Components/Weapon/Melee/FlashComponent.cs
+++ b/Content.Server/Flash/Components/FlashComponent.cs
@@ -2,7 +2,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Melee
+namespace Content.Server.Flash.Components
 {
     [RegisterComponent]
     public class FlashComponent : Component
diff --git a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs b/Content.Server/Flash/Components/FlashProjectileComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs
rename to Content.Server/Flash/Components/FlashProjectileComponent.cs
index 873eb7880e..31b3589642 100644
--- a/Content.Server/GameObjects/Components/Projectiles/FlashProjectileComponent.cs
+++ b/Content.Server/Flash/Components/FlashProjectileComponent.cs
@@ -1,12 +1,10 @@
-using Content.Server.GameObjects.Components.Weapon;
+using Content.Server.Projectiles.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Projectiles
+namespace Content.Server.Flash.Components
 {
     /// <summary>
     /// Upon colliding with an object this will flash in an area around it
diff --git a/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs b/Content.Server/Flash/Components/FlashableComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs
rename to Content.Server/Flash/Components/FlashableComponent.cs
index 8d95dd3fe4..10aa9baf52 100644
--- a/Content.Server/GameObjects/Components/Weapon/FlashableComponent.cs
+++ b/Content.Server/Flash/Components/FlashableComponent.cs
@@ -1,8 +1,7 @@
 using System;
-using Content.Shared.GameObjects.Components.Weapons;
+using Content.Shared.Flash;
+using Content.Shared.Interaction.Helpers;
 using Content.Shared.Physics;
-using Content.Shared.Utility;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -10,7 +9,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.Components.Weapon
+namespace Content.Server.Flash.Components
 {
     [RegisterComponent]
     public sealed class FlashableComponent : SharedFlashableComponent
diff --git a/Content.Server/GameObjects/EntitySystems/Weapon/Melee/FlashSystem.cs b/Content.Server/Flash/FlashSystem.cs
similarity index 92%
rename from Content.Server/GameObjects/EntitySystems/Weapon/Melee/FlashSystem.cs
rename to Content.Server/Flash/FlashSystem.cs
index ffb50dfc34..c7204ab13c 100644
--- a/Content.Server/GameObjects/EntitySystems/Weapon/Melee/FlashSystem.cs
+++ b/Content.Server/Flash/FlashSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Weapon;
-using Content.Server.GameObjects.Components.Weapon.Melee;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Flash.Components;
+using Content.Server.Stunnable.Components;
+using Content.Server.Weapon.Melee;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -11,7 +11,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.EntitySystems.Weapon.Melee
+namespace Content.Server.Flash
 {
     public class FlashSystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs b/Content.Server/Fluids/Components/BucketComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Fluids/BucketComponent.cs
rename to Content.Server/Fluids/Components/BucketComponent.cs
index 2dffb39656..d98c35139b 100644
--- a/Content.Server/GameObjects/Components/Fluids/BucketComponent.cs
+++ b/Content.Server/Fluids/Components/BucketComponent.cs
@@ -1,20 +1,19 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Shared.Chemistry;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
-using Robust.Server.GameObjects;
+using Content.Server.Chemistry.Components;
+using Content.Server.DoAfter;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Fluids
+namespace Content.Server.Fluids.Components
 {
     /// <summary>
     /// Can a mop click on this entity and dump its fluids
diff --git a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs b/Content.Server/Fluids/Components/MopComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Fluids/MopComponent.cs
rename to Content.Server/Fluids/Components/MopComponent.cs
index 49c9f45fbc..72dbcf2327 100644
--- a/Content.Server/GameObjects/Components/Fluids/MopComponent.cs
+++ b/Content.Server/Fluids/Components/MopComponent.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Shared.Chemistry;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Server.Chemistry.Components;
+using Content.Server.DoAfter;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
@@ -13,7 +13,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Fluids
+namespace Content.Server.Fluids.Components
 {
     /// <summary>
     /// For cleaning up puddles
diff --git a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs b/Content.Server/Fluids/Components/PuddleComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs
rename to Content.Server/Fluids/Components/PuddleComponent.cs
index 9b8c8043bb..43d4fcebfb 100644
--- a/Content.Server/GameObjects/Components/Fluids/PuddleComponent.cs
+++ b/Content.Server/Fluids/Components/PuddleComponent.cs
@@ -3,13 +3,14 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.Chemistry.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Directions;
+using Content.Shared.Examine;
 using Content.Shared.Maps;
 using Content.Shared.Physics;
-using Content.Shared.Utility;
+using Content.Shared.Slippery;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -24,7 +25,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Fluids
+namespace Content.Server.Fluids.Components
 {
     /// <summary>
     /// Puddle on a floor
diff --git a/Content.Server/GameObjects/Components/Fluids/SpillExtensions.cs b/Content.Server/Fluids/Components/SpillExtensions.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Fluids/SpillExtensions.cs
rename to Content.Server/Fluids/Components/SpillExtensions.cs
index f43e98a7c2..85f8725961 100644
--- a/Content.Server/GameObjects/Components/Fluids/SpillExtensions.cs
+++ b/Content.Server/Fluids/Components/SpillExtensions.cs
@@ -1,15 +1,16 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.Utility;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Server.Coordinates.Helpers;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Chemistry.Solution.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.GameObjects.Components.Fluids
+namespace Content.Server.Fluids.Components
 {
     public static class SpillExtensions
     {
diff --git a/Content.Server/GameObjects/Components/Fluids/SpillableComponent.cs b/Content.Server/Fluids/Components/SpillableComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Fluids/SpillableComponent.cs
rename to Content.Server/Fluids/Components/SpillableComponent.cs
index a3876ec309..a8b1a7ac43 100644
--- a/Content.Server/GameObjects/Components/Fluids/SpillableComponent.cs
+++ b/Content.Server/Fluids/Components/SpillableComponent.cs
@@ -1,13 +1,13 @@
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GameObjects.Components.Fluids
+namespace Content.Server.Fluids.Components
 {
     [RegisterComponent]
     public class SpillableComponent : Component, IDropped
diff --git a/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs b/Content.Server/Fluids/Components/SprayComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Fluids/SprayComponent.cs
rename to Content.Server/Fluids/Components/SprayComponent.cs
index 230af1776a..8f41632a2a 100644
--- a/Content.Server/GameObjects/Components/Fluids/SprayComponent.cs
+++ b/Content.Server/Fluids/Components/SprayComponent.cs
@@ -1,14 +1,15 @@
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Chemistry;
+using Content.Server.Chemistry.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Fluids;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Cooldown;
+using Content.Shared.DragDrop;
+using Content.Shared.Fluids;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Vapor;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -16,12 +17,12 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Player;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Fluids
+namespace Content.Server.Fluids.Components
 {
     [RegisterComponent]
     class SprayComponent : SharedSprayComponent, IAfterInteract, IUse, IActivate, IDropped
diff --git a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/PuddleSystem.cs
similarity index 93%
rename from Content.Server/GameObjects/EntitySystems/PuddleSystem.cs
rename to Content.Server/Fluids/PuddleSystem.cs
index 595c81e8e8..e4ae3aee5a 100644
--- a/Content.Server/GameObjects/EntitySystems/PuddleSystem.cs
+++ b/Content.Server/Fluids/PuddleSystem.cs
@@ -1,11 +1,10 @@
-using Content.Server.GameObjects.Components.Fluids;
+using Content.Server.Fluids.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Fluids
 {
     [UsedImplicitly]
     internal sealed class PuddleSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs b/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs
index 9c5726040d..3790ac173a 100644
--- a/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/AtmosExposedComponent.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.Temperature;
+using Content.Server.Temperature.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs b/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs
index 924c361db6..1a8459f2c3 100644
--- a/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/BarotraumaComponent.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Runtime.CompilerServices;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Interfaces.GameObjects;
+using Content.Server.Alert;
+using Content.Server.Pressure;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Shared.GameObjects;
 
 namespace Content.Server.GameObjects.Components.Atmos
diff --git a/Content.Server/GameObjects/Components/Atmos/BreathToolComponent.cs b/Content.Server/GameObjects/Components/Atmos/BreathToolComponent.cs
index 7a4d365b4a..33c6610677 100644
--- a/Content.Server/GameObjects/Components/Atmos/BreathToolComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/BreathToolComponent.cs
@@ -1,7 +1,6 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Body.Respiratory;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Body.Respiratory;
+using Content.Shared.Inventory;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
diff --git a/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs b/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs
index 1f1ee3ede6..6d1afa9b3d 100644
--- a/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs
@@ -1,12 +1,12 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Doors;
-using Content.Server.Interfaces.GameObjects.Components.Doors;
-using Content.Shared.GameObjects.Components.Doors;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Content.Server.Atmos;
+using Content.Server.Doors;
+using Content.Server.Doors.Components;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Shared.Doors;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Shared.Localization;
 
 namespace Content.Server.GameObjects.Components.Atmos
diff --git a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
index 1698a6d178..bb0f511faf 100644
--- a/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/FlammableComponent.cs
@@ -1,19 +1,20 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using Content.Server.Alert;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Temperature;
+using Content.Server.Stunnable.Components;
+using Content.Server.Temperature.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Chemistry;
 using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
 using Content.Shared.GameObjects.Components.Atmos;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Temperature;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
diff --git a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
index 54fcb56606..5fa19d74f9 100644
--- a/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
@@ -2,14 +2,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
+using Content.Server.Hands.Components;
+using Content.Server.UserInterface;
 using Content.Shared.Atmos;
+using Content.Shared.DragDrop;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.Components.Atmos;
 using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs
index cb8b816b0e..70107ee86b 100644
--- a/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs
@@ -5,11 +5,11 @@ using System.Linq;
 using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.Atmos.Piping;
 using Content.Server.Interfaces;
-using Content.Server.Utility;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Atmos;
 using Content.Shared.GameObjects.Components.Atmos;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs b/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs
index 55686eb4d5..9eb7525ca8 100644
--- a/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs
@@ -2,19 +2,22 @@
 #nullable disable warnings
 using System;
 using Content.Server.Atmos;
-using Content.Server.Explosions;
-using Content.Server.GameObjects.Components.Body.Respiratory;
+using Content.Server.Body.Respiratory;
+using Content.Server.Explosion;
 using Content.Server.Interfaces;
-using Content.Server.Utility;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
+using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Actions.Components;
 using Content.Shared.Atmos;
 using Content.Shared.Audio;
+using Content.Shared.DragDrop;
+using Content.Shared.Examine;
 using Content.Shared.GameObjects.Components.Atmos.GasTank;
-using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
diff --git a/Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs b/Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
index bc9984e716..bf9a5a1d8f 100644
--- a/Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
@@ -7,9 +7,9 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.Atmos.Piping;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.GameObjects.EntitySystems.Atmos;
+using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Atmos;
 using Content.Shared.Maps;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs b/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs
index 2513d5616f..2169a2f1d5 100644
--- a/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Atmos;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs
index c97745d136..deadca50a4 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasCanisterPortComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs
index d442f6807b..ed6fbddf64 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasFilterComponent.cs
@@ -2,8 +2,8 @@
 using System;
 using System.Linq;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using Content.Shared.GameObjects.Components.Atmos;
 using Robust.Server.GameObjects;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/GasGeneratorComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/GasGeneratorComponent.cs
index e10f44a496..de4fa9ad35 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/GasGeneratorComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/GasGeneratorComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Linq;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/PipeHeaterComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/PipeHeaterComponent.cs
index eada074075..14ccd7fb75 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/PipeHeaterComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/PipeHeaterComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Linq;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.ViewVariables;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs
index 432c607fd6..b1cefc91a3 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/BasePumpComponent.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System.Linq;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
 using Content.Shared.GameObjects.Components.Atmos;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs
index 011e53da51..93dc3eee3f 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/PressurePumpComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
 using Content.Server.Atmos;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs
index e58472df79..68afed389a 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/Pumps/VolumePumpComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
 using Content.Server.Atmos;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs
index 1ac02cec53..1be82b03af 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/Scrubbers/BaseSiphonComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System.Linq;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
 using Content.Shared.GameObjects.Components.Atmos;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs b/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs
index 976100b8c5..96f0bfbcce 100644
--- a/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/Piping/Vents/BaseVentComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System.Linq;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.EntitySystems;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.Nodes;
 using Content.Shared.GameObjects.Components.Atmos;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs b/Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs
index e8de0df2f7..8b43e1ae01 100644
--- a/Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/PressureProtectionComponent.cs
@@ -1,4 +1,4 @@
-using Content.Server.Interfaces.GameObjects;
+using Content.Server.Pressure;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
diff --git a/Content.Server/GameObjects/Components/Atmos/UnsimulatedGridAtmosphereComponent.cs b/Content.Server/GameObjects/Components/Atmos/UnsimulatedGridAtmosphereComponent.cs
index 299eefe531..09add70c15 100644
--- a/Content.Server/GameObjects/Components/Atmos/UnsimulatedGridAtmosphereComponent.cs
+++ b/Content.Server/GameObjects/Components/Atmos/UnsimulatedGridAtmosphereComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Content.Server.Atmos;
 using Content.Server.GameObjects.Components.Atmos.Piping;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.Atmos;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
diff --git a/Content.Server/GameObjects/Components/Destructible/Thresholds/ActsFlags.cs b/Content.Server/GameObjects/Components/Destructible/Thresholds/ActsFlags.cs
deleted file mode 100644
index 37ebda2e56..0000000000
--- a/Content.Server/GameObjects/Components/Destructible/Thresholds/ActsFlags.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Server.GameObjects.Components.Destructible.Thresholds
-{
-    public sealed class ActsFlags { }
-}
diff --git a/Content.Server/GameObjects/Components/MachineLinking/Signals/ToggleSignal.cs b/Content.Server/GameObjects/Components/MachineLinking/Signals/ToggleSignal.cs
deleted file mode 100644
index 4d9e835bef..0000000000
--- a/Content.Server/GameObjects/Components/MachineLinking/Signals/ToggleSignal.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Server.GameObjects.Components.MachineLinking.Signals
-{
-    public struct ToggleSignal {}
-}
diff --git a/Content.Server/GameObjects/Components/Observer/IGhostOnMove.cs b/Content.Server/GameObjects/Components/Observer/IGhostOnMove.cs
deleted file mode 100644
index 8d06aaec7d..0000000000
--- a/Content.Server/GameObjects/Components/Observer/IGhostOnMove.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Content.Server.GameObjects.Components.Observer
-{
-    public interface IGhostOnMove
-    {
-    }
-}
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponentData.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponentData.cs
deleted file mode 100644
index c6420f1a35..0000000000
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponentData.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using Robust.Shared.Log;
-using Robust.Shared.Serialization;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
-
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
-{
-    public partial class AmmoComponentData : ISerializationHooks
-    {
-    }
-}
diff --git a/Content.Server/GameObjects/DONT_PUT_STUFF_HERE_ATMOS_LEFTOVER b/Content.Server/GameObjects/DONT_PUT_STUFF_HERE_ATMOS_LEFTOVER
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
index b9ed00390f..50137e559c 100644
--- a/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AtmosphereSystem.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using Content.Server.Atmos;
 using Content.Server.Atmos.Reactions;
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Shared;
 using Content.Shared.Atmos;
 using Content.Shared.GameObjects.EntitySystems.Atmos;
diff --git a/Content.Server/GameObjects/EntitySystems/JobQueues/Queues/AiActionJobQueue.cs b/Content.Server/GameObjects/EntitySystems/JobQueues/Queues/AiActionJobQueue.cs
deleted file mode 100644
index 731185477a..0000000000
--- a/Content.Server/GameObjects/EntitySystems/JobQueues/Queues/AiActionJobQueue.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace Content.Server.GameObjects.EntitySystems.JobQueues.Queues
-{
-    public sealed class AiActionJobQueue : JobQueue {}
-}
diff --git a/Content.Server/Commands/GameTicking/DelayStartCommand.cs b/Content.Server/GameTicking/Commands/DelayStartCommand.cs
similarity index 92%
rename from Content.Server/Commands/GameTicking/DelayStartCommand.cs
rename to Content.Server/GameTicking/Commands/DelayStartCommand.cs
index 4ba57bf6f6..239611b7dd 100644
--- a/Content.Server/Commands/GameTicking/DelayStartCommand.cs
+++ b/Content.Server/GameTicking/Commands/DelayStartCommand.cs
@@ -1,12 +1,10 @@
 using System;
 using Content.Server.Administration;
-using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server)]
     class DelayStartCommand : IConsoleCommand
@@ -50,4 +48,4 @@ namespace Content.Server.Commands.GameTicking
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Commands/GameTicking/EndRoundCommand.cs b/Content.Server/GameTicking/Commands/EndRoundCommand.cs
similarity index 86%
rename from Content.Server/Commands/GameTicking/EndRoundCommand.cs
rename to Content.Server/GameTicking/Commands/EndRoundCommand.cs
index 3fb9205ce8..88fa4f2e04 100644
--- a/Content.Server/Commands/GameTicking/EndRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/EndRoundCommand.cs
@@ -1,12 +1,10 @@
 using System;
 using Content.Server.Administration;
-using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server)]
     class EndRoundCommand : IConsoleCommand
@@ -28,4 +26,4 @@ namespace Content.Server.Commands.GameTicking
             ticker.EndRound();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Commands/GameTicking/ForcePresetCommand.cs b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
similarity index 91%
rename from Content.Server/Commands/GameTicking/ForcePresetCommand.cs
rename to Content.Server/GameTicking/Commands/ForcePresetCommand.cs
index 7f98c52fb1..2af366c9be 100644
--- a/Content.Server/Commands/GameTicking/ForcePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/ForcePresetCommand.cs
@@ -1,11 +1,9 @@
 using Content.Server.Administration;
-using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server)]
     class ForcePresetCommand : IConsoleCommand
diff --git a/Content.Server/Commands/GameTicking/GoLobbyCommand.cs b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
similarity index 94%
rename from Content.Server/Commands/GameTicking/GoLobbyCommand.cs
rename to Content.Server/GameTicking/Commands/GoLobbyCommand.cs
index f43131cadc..d3787877a0 100644
--- a/Content.Server/Commands/GameTicking/GoLobbyCommand.cs
+++ b/Content.Server/GameTicking/Commands/GoLobbyCommand.cs
@@ -1,14 +1,13 @@
 #nullable enable
 using System;
 using Content.Server.Administration;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared;
 using Content.Shared.Administration;
 using Robust.Shared.Configuration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server)]
     public class GoLobbyCommand : IConsoleCommand
diff --git a/Content.Server/Commands/GameTicking/JoinGameCommand.cs b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
similarity index 93%
rename from Content.Server/Commands/GameTicking/JoinGameCommand.cs
rename to Content.Server/GameTicking/Commands/JoinGameCommand.cs
index b18638c94d..6714719826 100644
--- a/Content.Server/Commands/GameTicking/JoinGameCommand.cs
+++ b/Content.Server/GameTicking/Commands/JoinGameCommand.cs
@@ -1,14 +1,12 @@
 using System.Collections.Generic;
 using Content.Server.Administration;
-using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AnyCommand]
     class JoinGameCommand : IConsoleCommand
diff --git a/Content.Server/Commands/GameTicking/MappingCommand.cs b/Content.Server/GameTicking/Commands/MappingCommand.cs
similarity index 97%
rename from Content.Server/Commands/GameTicking/MappingCommand.cs
rename to Content.Server/GameTicking/Commands/MappingCommand.cs
index 7999680b4d..59fbd7f597 100644
--- a/Content.Server/Commands/GameTicking/MappingCommand.cs
+++ b/Content.Server/GameTicking/Commands/MappingCommand.cs
@@ -1,5 +1,6 @@
 // ReSharper disable once RedundantUsingDirective
 // Used to warn the player in big red letters in debug mode
+
 using System.Linq;
 using Content.Server.Administration;
 using Content.Shared.Administration;
@@ -7,11 +8,10 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server | AdminFlags.Mapping)]
     class MappingCommand : IConsoleCommand
diff --git a/Content.Server/Commands/GameTicking/NewRoundCommand.cs b/Content.Server/GameTicking/Commands/NewRoundCommand.cs
similarity index 87%
rename from Content.Server/Commands/GameTicking/NewRoundCommand.cs
rename to Content.Server/GameTicking/Commands/NewRoundCommand.cs
index 160419fa1b..f54ca06cbf 100644
--- a/Content.Server/Commands/GameTicking/NewRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/NewRoundCommand.cs
@@ -1,11 +1,10 @@
 using System;
 using Content.Server.Administration;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server)]
     public class NewRoundCommand : IConsoleCommand
@@ -20,4 +19,4 @@ namespace Content.Server.Commands.GameTicking
             ticker.RestartRound();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Commands/GameTicking/ObserveCommand.cs b/Content.Server/GameTicking/Commands/ObserveCommand.cs
similarity index 87%
rename from Content.Server/Commands/GameTicking/ObserveCommand.cs
rename to Content.Server/GameTicking/Commands/ObserveCommand.cs
index b0d4f6a164..0bbd4949fe 100644
--- a/Content.Server/Commands/GameTicking/ObserveCommand.cs
+++ b/Content.Server/GameTicking/Commands/ObserveCommand.cs
@@ -1,10 +1,9 @@
 using Content.Server.Administration;
-using Content.Server.Interfaces.GameTicking;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AnyCommand]
     class ObserveCommand : IConsoleCommand
diff --git a/Content.Server/Commands/GameTicking/RespawnCommand.cs b/Content.Server/GameTicking/Commands/RespawnCommand.cs
similarity index 95%
rename from Content.Server/Commands/GameTicking/RespawnCommand.cs
rename to Content.Server/GameTicking/Commands/RespawnCommand.cs
index e765d5d0af..9474e90623 100644
--- a/Content.Server/Commands/GameTicking/RespawnCommand.cs
+++ b/Content.Server/GameTicking/Commands/RespawnCommand.cs
@@ -1,11 +1,10 @@
-using Content.Server.Interfaces.GameTicking;
 using Content.Server.Players;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     class RespawnCommand : IConsoleCommand
     {
diff --git a/Content.Server/Commands/GameTicking/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
similarity index 88%
rename from Content.Server/Commands/GameTicking/SetGamePresetCommand.cs
rename to Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
index ee98b1f7ab..82e91a99ee 100644
--- a/Content.Server/Commands/GameTicking/SetGamePresetCommand.cs
+++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
@@ -1,10 +1,9 @@
 using Content.Server.Administration;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server)]
     class SetGamePresetCommand : IConsoleCommand
@@ -26,4 +25,4 @@ namespace Content.Server.Commands.GameTicking
             ticker.SetStartPreset(args[0]);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Commands/GameTicking/StartRoundCommand.cs b/Content.Server/GameTicking/Commands/StartRoundCommand.cs
similarity index 86%
rename from Content.Server/Commands/GameTicking/StartRoundCommand.cs
rename to Content.Server/GameTicking/Commands/StartRoundCommand.cs
index 8de6bf1997..47261a341b 100644
--- a/Content.Server/Commands/GameTicking/StartRoundCommand.cs
+++ b/Content.Server/GameTicking/Commands/StartRoundCommand.cs
@@ -1,12 +1,10 @@
 using System;
 using Content.Server.Administration;
-using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server)]
     class StartRoundCommand : IConsoleCommand
@@ -28,4 +26,4 @@ namespace Content.Server.Commands.GameTicking
             ticker.StartRound();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Server/Commands/GameTicking/ToggleDisallowLateJoinCommand.cs b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
similarity index 92%
rename from Content.Server/Commands/GameTicking/ToggleDisallowLateJoinCommand.cs
rename to Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
index 04ff29e091..0b0966ef80 100644
--- a/Content.Server/Commands/GameTicking/ToggleDisallowLateJoinCommand.cs
+++ b/Content.Server/GameTicking/Commands/ToggleDisallowLateJoinCommand.cs
@@ -1,10 +1,9 @@
 using Content.Server.Administration;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AdminCommand(AdminFlags.Server)]
     class ToggleDisallowLateJoinCommand : IConsoleCommand
diff --git a/Content.Server/Commands/GameTicking/ToggleReadyCommand.cs b/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs
similarity index 88%
rename from Content.Server/Commands/GameTicking/ToggleReadyCommand.cs
rename to Content.Server/GameTicking/Commands/ToggleReadyCommand.cs
index fc0f20eaa8..ac105cda59 100644
--- a/Content.Server/Commands/GameTicking/ToggleReadyCommand.cs
+++ b/Content.Server/GameTicking/Commands/ToggleReadyCommand.cs
@@ -1,10 +1,9 @@
 using Content.Server.Administration;
-using Content.Server.Interfaces.GameTicking;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GameTicking
+namespace Content.Server.GameTicking.Commands
 {
     [AnyCommand]
     class ToggleReadyCommand : IConsoleCommand
diff --git a/Content.Server/GameTicking/GameTicker.cs b/Content.Server/GameTicking/GameTicker.cs
index f44761d123..3c04ebce54 100644
--- a/Content.Server/GameTicking/GameTicker.cs
+++ b/Content.Server/GameTicking/GameTicker.cs
@@ -6,29 +6,30 @@ using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Markers;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Mobs.Speech;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.Components.PDA;
-using Content.Server.GameTicking.GamePresets;
+using Content.Server.Access.Components;
+using Content.Server.CharacterAppearance.Components;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking.Presets;
+using Content.Server.GameTicking.Rules;
+using Content.Server.Ghost.Components;
+using Content.Server.Hands.Components;
 using Content.Server.Interfaces;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Mobs;
-using Content.Server.Mobs.Roles;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.PDA;
 using Content.Server.Players;
+using Content.Server.Preferences.Managers;
+using Content.Server.Roles;
+using Content.Server.Spawners.Components;
+using Content.Server.Speech.Components;
 using Content.Shared;
 using Content.Shared.Audio;
 using Content.Shared.Chat;
+using Content.Shared.Coordinates;
 using Content.Shared.GameTicking;
-using Content.Shared.Network.NetMessages;
+using Content.Shared.GameWindow;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
-using Content.Shared.Utility;
 using Prometheus;
 using Robust.Server;
 using Robust.Server.Maps;
@@ -48,7 +49,7 @@ using Robust.Shared.Reflection;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Server.GameTicking
@@ -467,7 +468,7 @@ namespace Content.Server.GameTicking
             UpdateJobsAvailable();
         }
 
-        public bool OnGhostAttempt(Mind mind, bool canReturnGlobal)
+        public bool OnGhostAttempt(Mind.Mind mind, bool canReturnGlobal)
         {
             return Preset?.OnGhostAttempt(mind, canReturnGlobal) ?? false;
         }
@@ -922,7 +923,7 @@ namespace Content.Server.GameTicking
             DebugTools.AssertNotNull(data);
 
             data!.WipeMind();
-            data.Mind = new Mind(session.UserId)
+            data.Mind = new Mind.Mind(session.UserId)
             {
                 CharacterName = character.Name
             };
@@ -1002,7 +1003,7 @@ namespace Content.Server.GameTicking
             DebugTools.AssertNotNull(data);
 
             data!.WipeMind();
-            data.Mind = new Mind(session.UserId);
+            data.Mind = new Mind.Mind(session.UserId);
 
             var mob = _spawnObserverMob();
             mob.Name = name;
diff --git a/Content.Server/Interfaces/GameTicking/IGameTicker.cs b/Content.Server/GameTicking/IGameTicker.cs
similarity index 93%
rename from Content.Server/Interfaces/GameTicking/IGameTicker.cs
rename to Content.Server/GameTicking/IGameTicker.cs
index f72a62a6e9..f33835da15 100644
--- a/Content.Server/Interfaces/GameTicking/IGameTicker.cs
+++ b/Content.Server/GameTicking/IGameTicker.cs
@@ -1,8 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameTicking;
-using Content.Server.Mobs;
+using Content.Server.GameTicking.Rules;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Server.Player;
@@ -10,7 +9,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Interfaces.GameTicking
+namespace Content.Server.GameTicking
 {
     /// <summary>
     ///     The game ticker is responsible for managing the round-by-round system of the game.
@@ -46,7 +45,7 @@ namespace Content.Server.Interfaces.GameTicking
         void ToggleDisallowLateJoin(bool disallowLateJoin);
 
         /// <summary>proxy to GamePreset (actual handler)</summary>
-        bool OnGhostAttempt(Mind mind, bool canReturnGlobal);
+        bool OnGhostAttempt(Mind.Mind mind, bool canReturnGlobal);
 
         EntityCoordinates GetLateJoinSpawnPoint();
         EntityCoordinates GetJobSpawnPoint(string jobId);
diff --git a/Content.Server/GameTicking/GamePreset.cs b/Content.Server/GameTicking/Presets/GamePreset.cs
similarity index 91%
rename from Content.Server/GameTicking/GamePreset.cs
rename to Content.Server/GameTicking/Presets/GamePreset.cs
index d0fb398175..3fe7a83797 100644
--- a/Content.Server/GameTicking/GamePreset.cs
+++ b/Content.Server/GameTicking/Presets/GamePreset.cs
@@ -1,18 +1,16 @@
 #nullable enable annotations
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Mobs;
+using Content.Server.Ghost.Components;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.Damage.Components;
+using Content.Shared.MobState;
 using Content.Shared.Preferences;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 
-namespace Content.Server.GameTicking
+namespace Content.Server.GameTicking.Presets
 {
     /// <summary>
     ///     A round-start setup preset, such as which antagonists to spawn.
@@ -35,7 +33,7 @@ namespace Content.Server.GameTicking
         /// <summary>
         /// Called when a player attempts to ghost.
         /// </summary>
-        public virtual bool OnGhostAttempt(Mind mind, bool canReturnGlobal)
+        public virtual bool OnGhostAttempt(Mind.Mind mind, bool canReturnGlobal)
         {
             var playerEntity = mind.OwnedEntity;
 
diff --git a/Content.Server/GameTicking/GamePresets/GamePresetAttribute.cs b/Content.Server/GameTicking/Presets/GamePresetAttribute.cs
similarity index 93%
rename from Content.Server/GameTicking/GamePresets/GamePresetAttribute.cs
rename to Content.Server/GameTicking/Presets/GamePresetAttribute.cs
index 5f9b2fa397..83473cea27 100644
--- a/Content.Server/GameTicking/GamePresets/GamePresetAttribute.cs
+++ b/Content.Server/GameTicking/Presets/GamePresetAttribute.cs
@@ -2,7 +2,7 @@
 using System.Collections.Immutable;
 using JetBrains.Annotations;
 
-namespace Content.Server.GameTicking.GamePresets
+namespace Content.Server.GameTicking.Presets
 {
     /// <summary>
     ///     Attribute that marks a game preset.
diff --git a/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs b/Content.Server/GameTicking/Presets/PresetDeathMatch.cs
similarity index 81%
rename from Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs
rename to Content.Server/GameTicking/Presets/PresetDeathMatch.cs
index a434661c61..a50e434245 100644
--- a/Content.Server/GameTicking/GamePresets/PresetDeathMatch.cs
+++ b/Content.Server/GameTicking/Presets/PresetDeathMatch.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
-using Content.Server.GameTicking.GameRules;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking.Rules;
 using Robust.Server.Player;
 using Robust.Shared.IoC;
 
-namespace Content.Server.GameTicking.GamePresets
+namespace Content.Server.GameTicking.Presets
 {
     [GamePreset("deathmatch")]
     public sealed class PresetDeathMatch : GamePreset
diff --git a/Content.Server/GameTicking/GamePresets/PresetExtended.cs b/Content.Server/GameTicking/Presets/PresetExtended.cs
similarity index 90%
rename from Content.Server/GameTicking/GamePresets/PresetExtended.cs
rename to Content.Server/GameTicking/Presets/PresetExtended.cs
index a469cec3c5..6989656bf2 100644
--- a/Content.Server/GameTicking/GamePresets/PresetExtended.cs
+++ b/Content.Server/GameTicking/Presets/PresetExtended.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Robust.Server.Player;
 
-namespace Content.Server.GameTicking.GamePresets
+namespace Content.Server.GameTicking.Presets
 {
     [GamePreset("extended")]
     public class PresetExtended : GamePreset
diff --git a/Content.Server/GameTicking/GamePresets/PresetSandbox.cs b/Content.Server/GameTicking/Presets/PresetSandbox.cs
similarity index 92%
rename from Content.Server/GameTicking/GamePresets/PresetSandbox.cs
rename to Content.Server/GameTicking/Presets/PresetSandbox.cs
index 3288002a2f..fe17cdb69b 100644
--- a/Content.Server/GameTicking/GamePresets/PresetSandbox.cs
+++ b/Content.Server/GameTicking/Presets/PresetSandbox.cs
@@ -3,7 +3,7 @@ using Content.Server.Sandbox;
 using Robust.Server.Player;
 using Robust.Shared.IoC;
 
-namespace Content.Server.GameTicking.GamePresets
+namespace Content.Server.GameTicking.Presets
 {
     [GamePreset("sandbox")]
     public sealed class PresetSandbox : GamePreset
diff --git a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs b/Content.Server/GameTicking/Presets/PresetSuspicion.cs
similarity index 91%
rename from Content.Server/GameTicking/GamePresets/PresetSuspicion.cs
rename to Content.Server/GameTicking/Presets/PresetSuspicion.cs
index 44a1a218b6..67489d954a 100644
--- a/Content.Server/GameTicking/GamePresets/PresetSuspicion.cs
+++ b/Content.Server/GameTicking/Presets/PresetSuspicion.cs
@@ -1,17 +1,15 @@
 using System.Collections.Generic;
-using System.Linq;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.PDA;
-using Content.Server.GameObjects.Components.Suspicion;
-using Content.Server.GameTicking.GameRules;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Mobs.Roles.Suspicion;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking.Rules;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.PDA;
 using Content.Server.Players;
+using Content.Server.Suspicion;
+using Content.Server.Suspicion.Roles;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.PDA;
+using Content.Shared.Inventory;
+using Content.Shared.PDA;
 using Content.Shared.Roles;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
@@ -23,7 +21,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameTicking.GamePresets
+namespace Content.Server.GameTicking.Presets
 {
     [GamePreset("suspicion")]
     public class PresetSuspicion : GamePreset
diff --git a/Content.Server/GameTicking/GamePresets/PresetTraitor.cs b/Content.Server/GameTicking/Presets/PresetTraitor.cs
similarity index 94%
rename from Content.Server/GameTicking/GamePresets/PresetTraitor.cs
rename to Content.Server/GameTicking/Presets/PresetTraitor.cs
index a46fb48080..304de91e35 100644
--- a/Content.Server/GameTicking/GamePresets/PresetTraitor.cs
+++ b/Content.Server/GameTicking/Presets/PresetTraitor.cs
@@ -1,19 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.PDA;
-using Content.Server.GameTicking.GameRules;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Mobs.Roles.Traitor;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking.Rules;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
 using Content.Server.Objectives.Interfaces;
+using Content.Server.PDA;
 using Content.Server.Players;
+using Content.Server.Traitor;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.PDA;
-using Content.Shared.Prototypes;
+using Content.Shared.Dataset;
+using Content.Shared.Inventory;
+using Content.Shared.PDA;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
@@ -24,7 +23,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameTicking.GamePresets
+namespace Content.Server.GameTicking.Presets
 {
     [GamePreset("traitor")]
     public class PresetTraitor : GamePreset
diff --git a/Content.Server/GameTicking/GamePresets/PresetTraitorDeathMatch.cs b/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs
similarity index 91%
rename from Content.Server/GameTicking/GamePresets/PresetTraitorDeathMatch.cs
rename to Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs
index eea941b415..83eed2dda1 100644
--- a/Content.Server/GameTicking/GamePresets/PresetTraitorDeathMatch.cs
+++ b/Content.Server/GameTicking/Presets/PresetTraitorDeathMatch.cs
@@ -1,23 +1,22 @@
 using System;
 using System.Collections.Generic;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Markers;
-using Content.Server.GameObjects.Components.PDA;
-using Content.Server.GameObjects.Components.TraitorDeathMatch;
-using Content.Server.GameTicking.GameRules;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Mobs;
-using Content.Server.Mobs.Roles.Traitor;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking.Rules;
+using Content.Server.Hands.Components;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.PDA;
 using Content.Server.Players;
+using Content.Server.Spawners.Components;
+using Content.Server.Traitor;
+using Content.Server.TraitorDeathMatch.Components;
 using Content.Shared;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.PDA;
+using Content.Shared.Damage.Components;
+using Content.Shared.Inventory;
+using Content.Shared.MobState;
+using Content.Shared.PDA;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
@@ -27,7 +26,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameTicking.GamePresets
+namespace Content.Server.GameTicking.Presets
 {
     [GamePreset("traitordm", "traitordeathmatch")]
     public sealed class PresetTraitorDeathMatch : GamePreset
@@ -128,7 +127,7 @@ namespace Content.Server.GameTicking.GamePresets
         }
 
         // It would be nice if this function were moved to some generic helpers class.
-        private bool FindAnyIsolatedSpawnLocation(Mind ignoreMe, out EntityCoordinates bestTarget)
+        private bool FindAnyIsolatedSpawnLocation(Mind.Mind ignoreMe, out EntityCoordinates bestTarget)
         {
             // Collate people to avoid...
             var existingPlayerPoints = new List<EntityCoordinates>();
@@ -182,7 +181,7 @@ namespace Content.Server.GameTicking.GamePresets
             return foundATarget;
         }
 
-        public override bool OnGhostAttempt(Mind mind, bool canReturnGlobal)
+        public override bool OnGhostAttempt(Mind.Mind mind, bool canReturnGlobal)
         {
             var entity = mind.OwnedEntity;
             if ((entity != null) && (entity.TryGetComponent(out IMobStateComponent? mobState)))
diff --git a/Content.Server/GameTicking/GameRule.cs b/Content.Server/GameTicking/Rules/GameRule.cs
similarity index 83%
rename from Content.Server/GameTicking/GameRule.cs
rename to Content.Server/GameTicking/Rules/GameRule.cs
index 6e92818a77..fff89c6368 100644
--- a/Content.Server/GameTicking/GameRule.cs
+++ b/Content.Server/GameTicking/Rules/GameRule.cs
@@ -1,6 +1,6 @@
 using JetBrains.Annotations;
 
-namespace Content.Server.GameTicking
+namespace Content.Server.GameTicking.Rules
 {
     [PublicAPI]
     public abstract class GameRule
diff --git a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs b/Content.Server/GameTicking/Rules/RuleDeathMatch.cs
similarity index 93%
rename from Content.Server/GameTicking/GameRules/RuleDeathMatch.cs
rename to Content.Server/GameTicking/Rules/RuleDeathMatch.cs
index 7b185178b1..1f1f0a1d87 100644
--- a/Content.Server/GameTicking/GameRules/RuleDeathMatch.cs
+++ b/Content.Server/GameTicking/Rules/RuleDeathMatch.cs
@@ -1,10 +1,9 @@
 using System;
 using System.Threading;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Chat.Managers;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.Damage;
+using Content.Shared.MobState;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
@@ -13,7 +12,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameTicking.GameRules
+namespace Content.Server.GameTicking.Rules
 {
     /// <summary>
     ///     Simple GameRule that will do a free-for-all death match.
diff --git a/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs b/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs
similarity index 95%
rename from Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs
rename to Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs
index b7a0e81022..fed121072e 100644
--- a/Content.Server/GameTicking/GameRules/RuleInactivityTimeRestart.cs
+++ b/Content.Server/GameTicking/Rules/RuleInactivityTimeRestart.cs
@@ -1,14 +1,13 @@
 #nullable enable
 using System;
 using System.Threading;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Chat.Managers;
 using Robust.Server.Player;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameTicking.GameRules
+namespace Content.Server.GameTicking.Rules
 {
     public class RuleInactivityTimeRestart : GameRule
     {
diff --git a/Content.Server/GameTicking/GameRules/RuleMaxTimeRestart.cs b/Content.Server/GameTicking/Rules/RuleMaxTimeRestart.cs
similarity index 93%
rename from Content.Server/GameTicking/GameRules/RuleMaxTimeRestart.cs
rename to Content.Server/GameTicking/Rules/RuleMaxTimeRestart.cs
index bb0be79ea8..ded90f7f72 100644
--- a/Content.Server/GameTicking/GameRules/RuleMaxTimeRestart.cs
+++ b/Content.Server/GameTicking/Rules/RuleMaxTimeRestart.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Threading;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Chat.Managers;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameTicking.GameRules
+namespace Content.Server.GameTicking.Rules
 {
     public sealed class RuleMaxTimeRestart : GameRule
     {
diff --git a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs b/Content.Server/GameTicking/Rules/RuleSuspicion.cs
similarity index 93%
rename from Content.Server/GameTicking/GameRules/RuleSuspicion.cs
rename to Content.Server/GameTicking/Rules/RuleSuspicion.cs
index 64a468f3a9..6bed47bd8a 100644
--- a/Content.Server/GameTicking/GameRules/RuleSuspicion.cs
+++ b/Content.Server/GameTicking/Rules/RuleSuspicion.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Threading;
-using Content.Server.GameObjects.Components.Suspicion;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.GameObjects.EntitySystems.GameMode;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Mobs.Roles.Suspicion;
+using Content.Server.Chat.Managers;
+using Content.Server.Doors;
 using Content.Server.Players;
+using Content.Server.Suspicion;
+using Content.Server.Suspicion.EntitySystems;
+using Content.Server.Suspicion.Roles;
 using Content.Shared;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
@@ -19,7 +18,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameTicking.GameRules
+namespace Content.Server.GameTicking.Rules
 {
     /// <summary>
     ///     Simple GameRule that will do a TTT-like gamemode with traitors.
diff --git a/Content.Server/GameTicking/GameRules/RuleTraitor.cs b/Content.Server/GameTicking/Rules/RuleTraitor.cs
similarity index 84%
rename from Content.Server/GameTicking/GameRules/RuleTraitor.cs
rename to Content.Server/GameTicking/Rules/RuleTraitor.cs
index d892d05afd..1ede045b5d 100644
--- a/Content.Server/GameTicking/GameRules/RuleTraitor.cs
+++ b/Content.Server/GameTicking/Rules/RuleTraitor.cs
@@ -1,13 +1,13 @@
-using Content.Server.Interfaces.Chat;
-using Content.Server.Mobs.Roles.Traitor;
+using Content.Server.Chat.Managers;
 using Content.Server.Players;
+using Content.Server.Traitor;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 
-namespace Content.Server.GameTicking.GameRules
+namespace Content.Server.GameTicking.Rules
 {
     public class RuleTraitor : GameRule
     {
diff --git a/Content.Server/GameTicking/GameRules/RuleTraitorDeathMatch.cs b/Content.Server/GameTicking/Rules/RuleTraitorDeathMatch.cs
similarity index 76%
rename from Content.Server/GameTicking/GameRules/RuleTraitorDeathMatch.cs
rename to Content.Server/GameTicking/Rules/RuleTraitorDeathMatch.cs
index d97cdd4fbd..8873d870c6 100644
--- a/Content.Server/GameTicking/GameRules/RuleTraitorDeathMatch.cs
+++ b/Content.Server/GameTicking/Rules/RuleTraitorDeathMatch.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameTicking.GameRules
+namespace Content.Server.GameTicking.Rules
 {
     public class RuleTraitorDeathMatch : GameRule
     {
diff --git a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs b/Content.Server/Ghost/Components/GhostComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Observer/GhostComponent.cs
rename to Content.Server/Ghost/Components/GhostComponent.cs
index 29677d3fc8..1fe64ad568 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostComponent.cs
+++ b/Content.Server/Ghost/Components/GhostComponent.cs
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Markers;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Mobs;
 using Content.Server.Players;
-using Content.Shared.GameObjects.Components.Observer;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.Visible;
+using Content.Server.Warps;
+using Content.Shared.Examine;
+using Content.Shared.Ghost;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -20,7 +19,7 @@ using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 #nullable enable
-namespace Content.Server.GameObjects.Components.Observer
+namespace Content.Server.Ghost.Components
 {
     [RegisterComponent]
     public class GhostComponent : SharedGhostComponent, IExamine
diff --git a/Content.Server/GameObjects/Components/Observer/GhostOnMoveComponent.cs b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
similarity index 77%
rename from Content.Server/GameObjects/Components/Observer/GhostOnMoveComponent.cs
rename to Content.Server/Ghost/Components/GhostOnMoveComponent.cs
index cd166be7e3..d1155e2775 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostOnMoveComponent.cs
+++ b/Content.Server/Ghost/Components/GhostOnMoveComponent.cs
@@ -1,16 +1,13 @@
 #nullable enable
-using System;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Interfaces.GameTicking;
-using Content.Shared.GameObjects.Components.Movement;
-using Robust.Server.Console;
-using Robust.Shared.Console;
+using Content.Server.GameTicking;
+using Content.Server.Mind.Components;
+using Content.Shared.Movement.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Observer
+namespace Content.Server.Ghost.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IGhostOnMove))]
diff --git a/Content.Server/Commands/Observer/Ghost.cs b/Content.Server/Ghost/Ghost.cs
similarity index 91%
rename from Content.Server/Commands/Observer/Ghost.cs
rename to Content.Server/Ghost/Ghost.cs
index 27ea1df0e6..15cc1ca265 100644
--- a/Content.Server/Commands/Observer/Ghost.cs
+++ b/Content.Server/Ghost/Ghost.cs
@@ -1,13 +1,12 @@
 #nullable enable
-using System;
 using Content.Server.Administration;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking;
 using Content.Server.Players;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Observer
+namespace Content.Server.Ghost
 {
     [AnyCommand]
     public class Ghost : IConsoleCommand
diff --git a/Content.Server/GameObjects/EntitySystems/GhostSystem.cs b/Content.Server/Ghost/GhostSystem.cs
similarity index 90%
rename from Content.Server/GameObjects/EntitySystems/GhostSystem.cs
rename to Content.Server/Ghost/GhostSystem.cs
index 6f11eff817..5ca66270f5 100644
--- a/Content.Server/GameObjects/EntitySystems/GhostSystem.cs
+++ b/Content.Server/Ghost/GhostSystem.cs
@@ -1,9 +1,9 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Observer;
+using Content.Server.Ghost.Components;
+using Content.Server.Mind.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Ghost
 {
     [UsedImplicitly]
     public class GhostSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Observer/IGhostBooAffected.cs b/Content.Server/Ghost/IGhostBooAffected.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Observer/IGhostBooAffected.cs
rename to Content.Server/Ghost/IGhostBooAffected.cs
index 26bc68b6ba..339ccd74b6 100644
--- a/Content.Server/GameObjects/Components/Observer/IGhostBooAffected.cs
+++ b/Content.Server/Ghost/IGhostBooAffected.cs
@@ -1,7 +1,7 @@
 #nullable enable
-using Content.Shared.Actions;
+using Content.Shared.Actions.Behaviors;
 
-namespace Content.Server.GameObjects.Components.Observer
+namespace Content.Server.Ghost
 {
     /// <summary>
     ///     Allow ghost to interact with object by boo action
diff --git a/Content.Server/Ghost/IGhostOnMove.cs b/Content.Server/Ghost/IGhostOnMove.cs
new file mode 100644
index 0000000000..d6b7a59b57
--- /dev/null
+++ b/Content.Server/Ghost/IGhostOnMove.cs
@@ -0,0 +1,6 @@
+namespace Content.Server.Ghost
+{
+    public interface IGhostOnMove
+    {
+    }
+}
diff --git a/Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRoleComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRoleComponent.cs
rename to Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
index e4e8f41483..c58a3cf141 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRoleComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleComponent.cs
@@ -1,10 +1,9 @@
-using Content.Server.GameObjects.EntitySystems;
-using Robust.Server.Player;
+using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Observer.GhostRoles
+namespace Content.Server.Ghost.Roles.Components
 {
     public abstract class GhostRoleComponent : Component
     {
diff --git a/Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRoleMobSpawnerComponent.cs b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRoleMobSpawnerComponent.cs
rename to Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
index 6b4bad68f0..bb428b45c9 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRoleMobSpawnerComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostRoleMobSpawnerComponent.cs
@@ -1,6 +1,6 @@
 using System;
-using Content.Server.Commands;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Mind.Commands;
+using Content.Server.Mind.Components;
 using Content.Server.Players;
 using JetBrains.Annotations;
 using Robust.Server.Player;
@@ -9,7 +9,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Observer.GhostRoles
+namespace Content.Server.Ghost.Roles.Components
 {
     /// <summary>
     ///     Allows a ghost to take this role, spawning a new entity.
diff --git a/Content.Server/GameObjects/Components/Observer/GhostRoles/GhostTakeoverAvailableComponent.cs b/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Observer/GhostRoles/GhostTakeoverAvailableComponent.cs
rename to Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs
index b4a331dcac..e6e411aa33 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostRoles/GhostTakeoverAvailableComponent.cs
+++ b/Content.Server/Ghost/Roles/Components/GhostTakeoverAvailableComponent.cs
@@ -1,12 +1,11 @@
 using System;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Mind.Components;
 using Content.Server.Players;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.Components.Observer.GhostRoles
+namespace Content.Server.Ghost.Roles.Components
 {
     /// <summary>
     ///     Allows a ghost to take over the Owner entity.
diff --git a/Content.Server/GameObjects/EntitySystems/GhostRoleSystem.cs b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
similarity index 95%
rename from Content.Server/GameObjects/EntitySystems/GhostRoleSystem.cs
rename to Content.Server/Ghost/Roles/GhostRoleSystem.cs
index 32a5f67031..141f675a37 100644
--- a/Content.Server/GameObjects/EntitySystems/GhostRoleSystem.cs
+++ b/Content.Server/Ghost/Roles/GhostRoleSystem.cs
@@ -1,10 +1,11 @@
 using System.Collections.Generic;
 using Content.Server.Administration;
-using Content.Server.Eui;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.Components.Observer.GhostRoles;
-using Content.Shared.GameObjects.Components.Observer.GhostRoles;
+using Content.Server.EUI;
+using Content.Server.Ghost.Components;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Ghost.Roles.UI;
 using Content.Shared.GameTicking;
+using Content.Shared.Ghost.Roles;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -13,7 +14,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Ghost.Roles
 {
     [UsedImplicitly]
     public class GhostRoleSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/Commands/GhostRoles/MakeGhostRoleCommand.cs b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
similarity index 92%
rename from Content.Server/Commands/GhostRoles/MakeGhostRoleCommand.cs
rename to Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
index 107852b302..ab48146fce 100644
--- a/Content.Server/Commands/GhostRoles/MakeGhostRoleCommand.cs
+++ b/Content.Server/Ghost/Roles/MakeGhostRoleCommand.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Observer.GhostRoles;
+using Content.Server.Ghost.Roles.Components;
+using Content.Server.Mind.Components;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.GhostRoles
+namespace Content.Server.Ghost.Roles
 {
     [AdminCommand(AdminFlags.Fun)]
     public class MakeGhostRoleCommand : IConsoleCommand
diff --git a/Content.Server/GlobalVerbs/MakeGhostRoleVerb.cs b/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs
similarity index 91%
rename from Content.Server/GlobalVerbs/MakeGhostRoleVerb.cs
rename to Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs
index e9b8017ca5..b38c2d8244 100644
--- a/Content.Server/GlobalVerbs/MakeGhostRoleVerb.cs
+++ b/Content.Server/Ghost/Roles/MakeGhostRoleVerb.cs
@@ -1,14 +1,13 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Verbs;
+using Content.Server.Mind.Components;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Ghost.Roles
 {
     [GlobalVerb]
     public class MakeGhostRoleVerb : GlobalVerb
diff --git a/Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRolesEui.cs b/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs
similarity index 81%
rename from Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRolesEui.cs
rename to Content.Server/Ghost/Roles/UI/GhostRolesEui.cs
index 82728330e3..d5cc2bb594 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostRoles/GhostRolesEui.cs
+++ b/Content.Server/Ghost/Roles/UI/GhostRolesEui.cs
@@ -1,10 +1,9 @@
-using Content.Server.Eui;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.EUI;
 using Content.Shared.Eui;
-using Content.Shared.GameObjects.Components.Observer.GhostRoles;
+using Content.Shared.Ghost.Roles;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Observer.GhostRoles
+namespace Content.Server.Ghost.Roles.UI
 {
     public class GhostRolesEui : BaseEui
     {
diff --git a/Content.Server/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEui.cs b/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs
similarity index 80%
rename from Content.Server/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEui.cs
rename to Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs
index 732c658271..ff2dca964e 100644
--- a/Content.Server/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEui.cs
+++ b/Content.Server/Ghost/Roles/UI/MakeGhostRoleEui.cs
@@ -1,10 +1,9 @@
-using Content.Server.Eui;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.EUI;
 using Content.Shared.Eui;
-using Content.Shared.GameObjects.Components.Observer.GhostRoles;
+using Content.Shared.Ghost.Roles;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Observer.GhostRoles
+namespace Content.Server.Ghost.Roles.UI
 {
     public class MakeGhostRoleEui : BaseEui
     {
diff --git a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs b/Content.Server/Gravity/EntitySystems/GravitySystem.cs
similarity index 93%
rename from Content.Server/GameObjects/EntitySystems/GravitySystem.cs
rename to Content.Server/Gravity/EntitySystems/GravitySystem.cs
index cf9c41de78..406b3b260c 100644
--- a/Content.Server/GameObjects/EntitySystems/GravitySystem.cs
+++ b/Content.Server/Gravity/EntitySystems/GravitySystem.cs
@@ -1,11 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Gravity;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Gravity;
-using Content.Shared.GameObjects.EntitySystemMessages.Gravity;
+using Content.Server.Camera;
+using Content.Shared.Gravity;
 using JetBrains.Annotations;
-using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -15,7 +12,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Gravity.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class GravitySystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
similarity index 95%
rename from Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs
rename to Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
index 74608420a9..c7e0711b12 100644
--- a/Content.Server/GameObjects/EntitySystems/WeightlessSystem.cs
+++ b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
@@ -1,15 +1,15 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Alert;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.EntitySystemMessages.Gravity;
 using Content.Shared.GameTicking;
+using Content.Shared.Gravity;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Gravity.EntitySystems
 {
     [UsedImplicitly]
     public class WeightlessSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs b/Content.Server/Gravity/GravityGeneratorComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
rename to Content.Server/Gravity/GravityGeneratorComponent.cs
index 16fa567b4c..6ed0a476e0 100644
--- a/Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
+++ b/Content.Server/Gravity/GravityGeneratorComponent.cs
@@ -1,19 +1,16 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Gravity;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Acts;
+using Content.Shared.Gravity;
+using Content.Shared.Interaction;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Gravity
+namespace Content.Server.Gravity
 {
     [RegisterComponent]
     public class GravityGeneratorComponent : SharedGravityGeneratorComponent, IBreakAct, IInteractHand
diff --git a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs b/Content.Server/Hands/Components/HandsComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/GUI/HandsComponent.cs
rename to Content.Server/Hands/Components/HandsComponent.cs
index 7bb337a8a6..04e2f696b6 100644
--- a/Content.Server/GameObjects/Components/GUI/HandsComponent.cs
+++ b/Content.Server/Hands/Components/HandsComponent.cs
@@ -3,19 +3,18 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Pulling;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
+using Content.Server.Act;
+using Content.Server.Interaction;
+using Content.Server.Items;
+using Content.Server.Notification;
+using Content.Server.Pulling;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Pulling;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
+using Content.Shared.Body.Part;
+using Content.Shared.Hands.Components;
+using Content.Shared.Notification;
 using Content.Shared.Physics.Pull;
+using Content.Shared.Pulling.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -27,11 +26,11 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Network;
 using Robust.Shared.Physics;
+using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;
-using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.Components.GUI
+namespace Content.Server.Hands.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IHandsComponent))]
diff --git a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs b/Content.Server/Hands/Components/IHandsComponent.cs
similarity index 97%
rename from Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs
rename to Content.Server/Hands/Components/IHandsComponent.cs
index 8a945272f3..a048576493 100644
--- a/Content.Server/Interfaces/GameObjects/Components/Items/IHandsComponent.cs
+++ b/Content.Server/Hands/Components/IHandsComponent.cs
@@ -2,15 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Robust.Server.GameObjects;
+using Content.Server.Items;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Hands.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Server.Interfaces.GameObjects.Components.Items
+namespace Content.Server.Hands.Components
 {
     public interface IHandsComponent : ISharedHandsComponent
     {
@@ -166,7 +165,7 @@ namespace Content.Server.Interfaces.GameObjects.Components.Items
         /// </summary>
         /// <param name="slot">The slot of which to drop the entity.</param>
         /// <param name="targetContainer">The container to drop into.</param>
-        /// <param name="doMobChecks">Whether to check the <see cref="ActionBlockerSystem.CanDrop(IEntity)"/> for the mob or not.</param>
+        /// <param name="doMobChecks">Whether to check the <see cref="ActionBlockerSystem.CanDrop"/> for the mob or not.</param>
         /// <param name="doDropInteraction">Whether to perform Dropped interactions.</param>
         /// <returns>True on success, false if something was blocked (insertion or removal).</returns>
         /// <exception cref="InvalidOperationException">
diff --git a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs b/Content.Server/Hands/HandsSystem.cs
similarity index 94%
rename from Content.Server/GameObjects/EntitySystems/HandsSystem.cs
rename to Content.Server/Hands/HandsSystem.cs
index 321690f428..728487a79c 100644
--- a/Content.Server/GameObjects/EntitySystems/HandsSystem.cs
+++ b/Content.Server/Hands/HandsSystem.cs
@@ -1,13 +1,18 @@
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Server.Hands.Components;
+using Content.Server.Interaction;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.Stack;
+using Content.Server.Storage.Components;
+using Content.Server.Throwing;
+using Content.Shared.Examine;
 using Content.Shared.Input;
-using Content.Shared.Interfaces;
+using Content.Shared.Interaction;
+using Content.Shared.Movement.Components;
+using Content.Shared.Notification;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Containers;
@@ -17,12 +22,9 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Hands
 {
     [UsedImplicitly]
     internal sealed class HandsSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs b/Content.Server/Headset/HeadsetComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs
rename to Content.Server/Headset/HeadsetComponent.cs
index 435bcc0b93..88b1ad4187 100644
--- a/Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs
+++ b/Content.Server/Headset/HeadsetComponent.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces;
+using Content.Server.Radio.Components;
+using Content.Server.Radio.EntitySystems;
 using Content.Shared.Chat;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -13,7 +13,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Headset
+namespace Content.Server.Headset
 {
     [RegisterComponent]
     [ComponentReference(typeof(IRadio))]
diff --git a/Content.Server/Holiday/HolidayManager.cs b/Content.Server/Holiday/HolidayManager.cs
index 8824a300b4..f82bd40312 100644
--- a/Content.Server/Holiday/HolidayManager.cs
+++ b/Content.Server/Holiday/HolidayManager.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Content.Server.Chat.Managers;
 using Content.Server.GameTicking;
 using Content.Server.Holiday.Interfaces;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
 using Content.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Utility/IPAddressExt.cs b/Content.Server/IP/IPAddressExt.cs
similarity index 93%
rename from Content.Server/Utility/IPAddressExt.cs
rename to Content.Server/IP/IPAddressExt.cs
index f343727ee0..51230e20cd 100644
--- a/Content.Server/Utility/IPAddressExt.cs
+++ b/Content.Server/IP/IPAddressExt.cs
@@ -1,15 +1,14 @@
 using System;
 using System.Collections;
 using System.Linq;
-using System.Net;
 using System.Net.Sockets;
 
-namespace Content.Server.Utility
+namespace Content.Server.IP
 {
     public static class IPAddressExt
     {
         // Taken from https://stackoverflow.com/a/56461160/4678631
-        public static bool IsInSubnet(this IPAddress address, string subnetMask)
+        public static bool IsInSubnet(this System.Net.IPAddress address, string subnetMask)
         {
             var slashIdx = subnetMask.IndexOf("/", StringComparison.Ordinal);
             if (slashIdx == -1)
@@ -19,7 +18,7 @@ namespace Content.Server.Utility
             }
 
             // First parse the address of the netmask before the prefix length.
-            var maskAddress = IPAddress.Parse(subnetMask.Substring(0, slashIdx));
+            var maskAddress = System.Net.IPAddress.Parse(subnetMask.Substring(0, slashIdx));
 
             if (maskAddress.AddressFamily != address.AddressFamily)
             {
diff --git a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs b/Content.Server/Instruments/InstrumentComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
rename to Content.Server/Instruments/InstrumentComponent.cs
index 5cfedb0427..a567b03ec9 100644
--- a/Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
+++ b/Content.Server/Instruments/InstrumentComponent.cs
@@ -1,13 +1,16 @@
 #nullable enable
 using System;
 using System.Linq;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Instruments;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Standing;
+using Content.Server.Stunnable.Components;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.DragDrop;
+using Content.Shared.Hands;
+using Content.Shared.Instruments;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Throwing;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
@@ -18,7 +21,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Instruments
+namespace Content.Server.Instruments
 {
 
     [RegisterComponent]
diff --git a/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs b/Content.Server/Instruments/InstrumentSystem.cs
similarity index 94%
rename from Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs
rename to Content.Server/Instruments/InstrumentSystem.cs
index 3fb9bb852d..a26e0aeecc 100644
--- a/Content.Server/GameObjects/EntitySystems/InstrumentSystem.cs
+++ b/Content.Server/Instruments/InstrumentSystem.cs
@@ -1,11 +1,10 @@
-using Content.Server.GameObjects.Components.Instruments;
 using Content.Shared;
 using JetBrains.Annotations;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Instruments
 {
     [UsedImplicitly]
     internal sealed class InstrumentSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Mobs/ClumsyComponent.cs b/Content.Server/Interaction/Components/ClumsyComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Mobs/ClumsyComponent.cs
rename to Content.Server/Interaction/Components/ClumsyComponent.cs
index e1a57b9eff..7e2b8cacd7 100644
--- a/Content.Server/GameObjects/Components/Mobs/ClumsyComponent.cs
+++ b/Content.Server/Interaction/Components/ClumsyComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Random;
 
 #nullable enable
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.Interaction.Components
 {
     /// <summary>
     /// A simple clumsy tag-component.
diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs b/Content.Server/Interaction/Components/EmitSoundOnUseComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs
rename to Content.Server/Interaction/Components/EmitSoundOnUseComponent.cs
index de28408820..7a65f2e1bd 100644
--- a/Content.Server/GameObjects/Components/Sound/EmitSoundOnUseComponent.cs
+++ b/Content.Server/Interaction/Components/EmitSoundOnUseComponent.cs
@@ -1,12 +1,12 @@
 using Content.Shared.Audio;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Sound
+namespace Content.Server.Interaction.Components
 {
     /// <summary>
     /// Simple sound emitter that emits sound on use in hand
diff --git a/Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs b/Content.Server/Interaction/InRangeUnoccludedVerb.cs
similarity index 91%
rename from Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs
rename to Content.Server/Interaction/InRangeUnoccludedVerb.cs
index 04d2057c50..f5f1530688 100644
--- a/Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs
+++ b/Content.Server/Interaction/InRangeUnoccludedVerb.cs
@@ -1,13 +1,13 @@
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Utility;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Interaction
 {
     [GlobalVerb]
     public class InRangeUnoccludedVerb : GlobalVerb
diff --git a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs b/Content.Server/Interaction/InteractionSystem.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
rename to Content.Server/Interaction/InteractionSystem.cs
index 726cfff1a7..5ede40ca4c 100644
--- a/Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
+++ b/Content.Server/Interaction/InteractionSystem.cs
@@ -2,21 +2,24 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Pulling;
-using Content.Server.GameObjects.Components.Buckle;
-using Content.Server.GameObjects.Components.Timing;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Rotatable;
-using Content.Shared.GameObjects.EntitySystemMessages;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Server.Buckle.Components;
+using Content.Server.CombatMode;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Pulling;
+using Content.Server.Timing;
+using Content.Shared.ActionBlocker;
+using Content.Shared.DragDrop;
+using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
 using Content.Shared.Input;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Inventory;
+using Content.Shared.Notification;
+using Content.Shared.Rotatable;
+using Content.Shared.Throwing;
+using Content.Shared.Weapons.Melee;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -25,15 +28,14 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
+using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Random;
-using Robust.Shared.Localization;
-using Content.Shared.Interfaces;
 
-namespace Content.Server.GameObjects.EntitySystems.Click
+namespace Content.Server.Interaction
 {
     /// <summary>
     /// Governs interactions during clicking on entities
diff --git a/Content.Server/Commands/Interactable/TilePryCommand.cs b/Content.Server/Interaction/TilePryCommand.cs
similarity index 92%
rename from Content.Server/Commands/Interactable/TilePryCommand.cs
rename to Content.Server/Interaction/TilePryCommand.cs
index 9b843faa20..273799363c 100644
--- a/Content.Server/Commands/Interactable/TilePryCommand.cs
+++ b/Content.Server/Interaction/TilePryCommand.cs
@@ -1,6 +1,6 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.Tools.Components;
 using Content.Shared.Administration;
 using Content.Shared.Maps;
 using Robust.Server.Player;
@@ -8,7 +8,7 @@ using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.Commands.Interactable
+namespace Content.Server.Interaction
 {
     /// <summary>
     /// <see cref="TilePryingComponent.TryPryTile"/>
@@ -63,7 +63,7 @@ namespace Content.Server.Commands.Interactable
                     if (!tileDef.CanCrowbar) continue;
 
                     var underplating = tileDefinitionManager["underplating"];
-                    mapGrid.SetTile(coordinates, new Tile(underplating.TileId));
+                    mapGrid.SetTile(coordinates, new Robust.Shared.Map.Tile(underplating.TileId));
                 }
             }
         }
diff --git a/Content.Server/Interfaces/DONT_PUT_STUFF_HERE_ATMOS_LEFTOVER b/Content.Server/Interfaces/DONT_PUT_STUFF_HERE_ATMOS_LEFTOVER
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Content.Server/GameObjects/Components/Items/DebugEquipComponent.cs b/Content.Server/Inventory/Components/DebugEquipComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Items/DebugEquipComponent.cs
rename to Content.Server/Inventory/Components/DebugEquipComponent.cs
index daf5696cfa..e2f91ddae3 100644
--- a/Content.Server/GameObjects/Components/Items/DebugEquipComponent.cs
+++ b/Content.Server/Inventory/Components/DebugEquipComponent.cs
@@ -1,8 +1,9 @@
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Hands;
+using Content.Shared.Inventory;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Items
+namespace Content.Server.Inventory.Components
 {
     /// <summary>
     /// Pops up a message when equipped / unequipped (including hands).
diff --git a/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs b/Content.Server/Inventory/Components/HumanInventoryControllerComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs
rename to Content.Server/Inventory/Components/HumanInventoryControllerComponent.cs
index ee5745bc1a..609c2da8a5 100644
--- a/Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs
+++ b/Content.Server/Inventory/Components/HumanInventoryControllerComponent.cs
@@ -1,12 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.GameObjects.Components.Storage;
+using Content.Server.Items;
+using Content.Shared.Item;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.GameObjects.Components.GUI
+namespace Content.Server.Inventory.Components
 {
     // Handles the special behavior of pockets/ID card slot and their relation to uniforms.
     [RegisterComponent]
diff --git a/Content.Server/GameObjects/Components/GUI/IInventoryController.cs b/Content.Server/Inventory/Components/IInventoryController.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/GUI/IInventoryController.cs
rename to Content.Server/Inventory/Components/IInventoryController.cs
index 238d9c9267..bd980e3b4f 100644
--- a/Content.Server/GameObjects/Components/GUI/IInventoryController.cs
+++ b/Content.Server/Inventory/Components/IInventoryController.cs
@@ -1,8 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
 using Robust.Shared.GameObjects;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.GameObjects.Components.GUI
+namespace Content.Server.Inventory.Components
 {
     /// <summary>
     ///     Allows for overriding inventory-related behavior on an entity.
diff --git a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs b/Content.Server/Inventory/Components/InventoryComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
rename to Content.Server/Inventory/Components/InventoryComponent.cs
index 4ca58b50bb..f321243b50 100644
--- a/Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
+++ b/Content.Server/Inventory/Components/InventoryComponent.cs
@@ -3,17 +3,19 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration.Commands;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Server.Interfaces.GameObjects;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
+using Content.Server.Clothing.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Interaction;
+using Content.Server.Items;
+using Content.Server.Pressure;
+using Content.Server.Storage.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Acts;
+using Content.Shared.EffectBlocker;
+using Content.Shared.Inventory;
+using Content.Shared.Movement.Components;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -26,10 +28,10 @@ using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
-using static Content.Shared.GameObjects.Components.Inventory.SharedInventoryComponent.ClientInventoryMessage;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.SharedInventoryComponent.ClientInventoryMessage;
 
-namespace Content.Server.GameObjects.Components.GUI
+namespace Content.Server.Inventory.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedInventoryComponent))]
diff --git a/Content.Server/Utility/InventoryHelpers.cs b/Content.Server/Inventory/InventoryHelpers.cs
similarity index 87%
rename from Content.Server/Utility/InventoryHelpers.cs
rename to Content.Server/Inventory/InventoryHelpers.cs
index 5e3874d725..438ac1e285 100644
--- a/Content.Server/Utility/InventoryHelpers.cs
+++ b/Content.Server/Inventory/InventoryHelpers.cs
@@ -1,10 +1,10 @@
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.Utility
+namespace Content.Server.Inventory
 {
     public static class InventoryHelpers
     {
diff --git a/Content.Server/ServerContentIoC.cs b/Content.Server/IoC/ServerContentIoC.cs
similarity index 77%
rename from Content.Server/ServerContentIoC.cs
rename to Content.Server/IoC/ServerContentIoC.cs
index d5bda609ae..612aeaf2d2 100644
--- a/Content.Server/ServerContentIoC.cs
+++ b/Content.Server/IoC/ServerContentIoC.cs
@@ -1,35 +1,36 @@
 using Content.Server.Administration;
+using Content.Server.Administration.Managers;
 using Content.Server.AI.Utility;
 using Content.Server.AI.Utility.Considerations;
 using Content.Server.AI.WorldState;
-using Content.Server.Chat;
+using Content.Server.Chat.Managers;
+using Content.Server.Connection;
 using Content.Server.Database;
-using Content.Server.Eui;
-using Content.Server.GameObjects.Components.Mobs.Speech;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
-using Content.Server.GameObjects.EntitySystems.DeviceNetwork;
+using Content.Server.DeviceNetwork;
+using Content.Server.EUI;
 using Content.Server.GameTicking;
 using Content.Server.Holiday;
 using Content.Server.Holiday.Interfaces;
-using Content.Server.Interfaces;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Interfaces.PDA;
+using Content.Server.Module;
+using Content.Server.MoMMI;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.Notification.Managers;
 using Content.Server.Objectives;
 using Content.Server.Objectives.Interfaces;
-using Content.Server.PDA;
-using Content.Server.Preferences;
+using Content.Server.PDA.Managers;
+using Content.Server.Power.Components;
+using Content.Server.Preferences.Managers;
 using Content.Server.Sandbox;
-using Content.Server.Utility;
-using Content.Server.Voting;
+using Content.Server.Speech;
+using Content.Server.Voting.Managers;
 using Content.Shared.Actions;
-using Content.Shared.Interfaces;
-using Content.Shared.Kitchen;
 using Content.Shared.Alert;
+using Content.Shared.Kitchen;
+using Content.Shared.Module;
+using Content.Shared.Notification;
 using Robust.Shared.IoC;
 
-namespace Content.Server
+namespace Content.Server.IoC
 {
     internal static class ServerContentIoC
     {
@@ -56,7 +57,7 @@ namespace Content.Server
             IoCManager.Register<IConnectionManager, ConnectionManager>();
             IoCManager.Register<IObjectivesManager, ObjectivesManager>();
             IoCManager.Register<IAdminManager, AdminManager>();
-            IoCManager.Register<IDeviceNetwork, DeviceNetwork>();
+            IoCManager.Register<IDeviceNetwork, DeviceNetwork.DeviceNetwork>();
             IoCManager.Register<EuiManager, EuiManager>();
             IoCManager.Register<IHolidayManager, HolidayManager>();
             IoCManager.Register<IVoteManager, VoteManager>();
diff --git a/Content.Server/ServerModuleTestingCallbacks.cs b/Content.Server/IoC/ServerModuleTestingCallbacks.cs
similarity index 86%
rename from Content.Server/ServerModuleTestingCallbacks.cs
rename to Content.Server/IoC/ServerModuleTestingCallbacks.cs
index c40196e8b8..de9cf838e4 100644
--- a/Content.Server/ServerModuleTestingCallbacks.cs
+++ b/Content.Server/IoC/ServerModuleTestingCallbacks.cs
@@ -1,7 +1,7 @@
 using System;
 using Content.Shared;
 
-namespace Content.Server
+namespace Content.Server.IoC
 {
     public sealed class ServerModuleTestingCallbacks : SharedModuleTestingCallbacks
     {
diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/Items/ItemComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
rename to Content.Server/Items/ItemComponent.cs
index ebbbbf0660..3024b3fdbc 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
+++ b/Content.Server/Items/ItemComponent.cs
@@ -1,17 +1,14 @@
 #nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Utility;
+using Content.Server.Hands.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Item;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Physics;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Items
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedItemComponent))]
diff --git a/Content.Server/Jobs/ClownSpecial.cs b/Content.Server/Jobs/ClownSpecial.cs
index 543706999b..95bc2c753a 100644
--- a/Content.Server/Jobs/ClownSpecial.cs
+++ b/Content.Server/Jobs/ClownSpecial.cs
@@ -1,4 +1,4 @@
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Interaction.Components;
 using Content.Shared.Roles;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Jobs/JanitorSpecial.cs b/Content.Server/Jobs/JanitorSpecial.cs
index 164188ea86..cd845960ec 100644
--- a/Content.Server/Jobs/JanitorSpecial.cs
+++ b/Content.Server/Jobs/JanitorSpecial.cs
@@ -1,7 +1,7 @@
 #nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Hands.Components;
 using Content.Server.Holiday.Interfaces;
+using Content.Server.Items;
 using Content.Shared.Roles;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/GameObjects/Components/Kitchen/JuiceableComponent.cs b/Content.Server/Kitchen/Components/JuiceableComponent.cs
similarity index 73%
rename from Content.Server/GameObjects/Components/Kitchen/JuiceableComponent.cs
rename to Content.Server/Kitchen/Components/JuiceableComponent.cs
index 9e5f285bdf..c91d6af2cc 100644
--- a/Content.Server/GameObjects/Components/Kitchen/JuiceableComponent.cs
+++ b/Content.Server/Kitchen/Components/JuiceableComponent.cs
@@ -1,11 +1,9 @@
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Solution;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Kitchen
+namespace Content.Server.Kitchen.Components
 {
     /// <summary>
     /// Tag component that denotes an entity as Juiceable
diff --git a/Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs
rename to Content.Server/Kitchen/Components/KitchenSpikeComponent.cs
index 34fc5d00b7..43c8bc717a 100644
--- a/Content.Server/GameObjects/Components/Kitchen/KitchenSpikeComponent.cs
+++ b/Content.Server/Kitchen/Components/KitchenSpikeComponent.cs
@@ -1,22 +1,23 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Nutrition;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Kitchen;
+using Content.Server.Act;
+using Content.Server.Chat.Managers;
+using Content.Server.DoAfter;
+using Content.Server.Notification;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.MobState;
+using Content.Shared.Notification;
+using Content.Shared.Nutrition.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.Components.Kitchen
+namespace Content.Server.Kitchen.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs
rename to Content.Server/Kitchen/Components/MicrowaveComponent.cs
index adf45e57fd..a90b26a978 100644
--- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveComponent.cs
@@ -3,23 +3,25 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Utility;
+using Content.Server.Act;
+using Content.Server.Chat.Managers;
+using Content.Server.Chemistry.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Notification;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.Interaction;
 using Content.Shared.Kitchen;
-using Content.Shared.Prototypes.Kitchen;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Notification;
+using Content.Shared.Power;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -30,7 +32,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Kitchen
+namespace Content.Server.Kitchen.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Kitchen/MicrowaveSuccessState.cs b/Content.Server/Kitchen/Components/MicrowaveSuccessState.cs
similarity index 69%
rename from Content.Server/GameObjects/Components/Kitchen/MicrowaveSuccessState.cs
rename to Content.Server/Kitchen/Components/MicrowaveSuccessState.cs
index 48c33a5409..011b2215af 100644
--- a/Content.Server/GameObjects/Components/Kitchen/MicrowaveSuccessState.cs
+++ b/Content.Server/Kitchen/Components/MicrowaveSuccessState.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameObjects.Components.Kitchen
+namespace Content.Server.Kitchen.Components
 {
     public enum MicrowaveSuccessState
     {
diff --git a/Content.Server/GameObjects/Components/Kitchen/ReagentGrinderComponent.cs b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Kitchen/ReagentGrinderComponent.cs
rename to Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
index b5294245d6..38d5f2ec42 100644
--- a/Content.Server/GameObjects/Components/Kitchen/ReagentGrinderComponent.cs
+++ b/Content.Server/Kitchen/Components/ReagentGrinderComponent.cs
@@ -2,30 +2,27 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Kitchen;
-using Content.Shared.Utility;
+using Content.Server.Chemistry.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Interaction;
+using Content.Shared.Kitchen.Components;
+using Content.Shared.Notification;
+using Content.Shared.Random.Helpers;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Kitchen
+namespace Content.Server.Kitchen.Components
 {
 
     /// <summary>
diff --git a/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
similarity index 80%
rename from Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs
rename to Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
index 521fc1a120..7a1791c786 100644
--- a/Content.Server/GameObjects/EntitySystems/MicrowaveSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Kitchen;
+using Content.Server.Kitchen.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Kitchen.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class MicrowaveSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
similarity index 79%
rename from Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs
rename to Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
index e80e958144..95f3dbe5f8 100644
--- a/Content.Server/GameObjects/EntitySystems/ReagentGrinderSystem.cs
+++ b/Content.Server/Kitchen/EntitySystems/ReagentGrinderSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Kitchen;
+using Content.Server.Kitchen.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Kitchen.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class ReagentGrinderSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Research/LatheComponent.cs b/Content.Server/Lathe/Components/LatheComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Research/LatheComponent.cs
rename to Content.Server/Lathe/Components/LatheComponent.cs
index 531ea8fd95..34595d9d83 100644
--- a/Content.Server/GameObjects/Components/Research/LatheComponent.cs
+++ b/Content.Server/Lathe/Components/LatheComponent.cs
@@ -3,20 +3,21 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Materials;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Research;
+using Content.Server.Materials;
+using Content.Server.Power.Components;
+using Content.Server.Research.Components;
+using Content.Server.Stack;
+using Content.Server.UserInterface;
+using Content.Shared.Interaction;
+using Content.Shared.Lathe;
+using Content.Shared.Power;
+using Content.Shared.Research.Prototypes;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Lathe.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Research/LatheDatabaseComponent.cs b/Content.Server/Lathe/Components/LatheDatabaseComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Research/LatheDatabaseComponent.cs
rename to Content.Server/Lathe/Components/LatheDatabaseComponent.cs
index 6f9ec0f884..0d0623609d 100644
--- a/Content.Server/GameObjects/Components/Research/LatheDatabaseComponent.cs
+++ b/Content.Server/Lathe/Components/LatheDatabaseComponent.cs
@@ -1,11 +1,11 @@
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Shared.Lathe;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Lathe.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
diff --git a/Content.Server/GameObjects/Components/Research/MaterialStorageComponent.cs b/Content.Server/Lathe/Components/MaterialStorageComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Research/MaterialStorageComponent.cs
rename to Content.Server/Lathe/Components/MaterialStorageComponent.cs
index e82e9cfbd0..70c8310747 100644
--- a/Content.Server/GameObjects/Components/Research/MaterialStorageComponent.cs
+++ b/Content.Server/Lathe/Components/MaterialStorageComponent.cs
@@ -1,13 +1,11 @@
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Research;
+using Content.Shared.Lathe;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Lathe.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedMaterialStorageComponent))]
diff --git a/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs b/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs
rename to Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs
index 8765109629..1145cb533a 100644
--- a/Content.Server/GameObjects/Components/Research/ProtolatheDatabaseComponent.cs
+++ b/Content.Server/Lathe/Components/ProtolatheDatabaseComponent.cs
@@ -1,12 +1,13 @@
 using System.Linq;
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Server.Research.Components;
+using Content.Shared.Lathe;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Lathe.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
similarity index 82%
rename from Content.Server/GameObjects/EntitySystems/LatheSystem.cs
rename to Content.Server/Lathe/LatheSystem.cs
index 9e2e0cb6e9..f06da5bc98 100644
--- a/Content.Server/GameObjects/EntitySystems/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Research;
+using Content.Server.Lathe.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Lathe
 {
     [UsedImplicitly]
     internal sealed class LatheSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs
rename to Content.Server/Light/Components/EmergencyLightComponent.cs
index 2abb7beae3..310f189849 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/EmergencyLightComponent.cs
+++ b/Content.Server/Light/Components/EmergencyLightComponent.cs
@@ -1,17 +1,17 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.Battery.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Examine;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
+namespace Content.Server.Light.Components
 {
     /// <summary>
     ///     Component that represents an emergency light, it has an internal battery that charges when the power is on.
diff --git a/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs b/Content.Server/Light/Components/ExpendableLightComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs
rename to Content.Server/Light/Components/ExpendableLightComponent.cs
index 4fb51b2adb..fb25d315ea 100644
--- a/Content.Server/GameObjects/Components/Interactable/ExpendableLightComponent.cs
+++ b/Content.Server/Light/Components/ExpendableLightComponent.cs
@@ -1,18 +1,17 @@
-
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Sound;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Clothing.Components;
+using Content.Server.Items;
+using Content.Server.Sound;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Light.Component;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.Light.Components
 {
     /// <summary>
     ///     Component that represents a handheld expendable light which can be activated and eventually dies over time.
diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
rename to Content.Server/Light/Components/HandheldLightComponent.cs
index a1a4809b71..5aee7b75dd 100644
--- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs
+++ b/Content.Server/Light/Components/HandheldLightComponent.cs
@@ -1,17 +1,18 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power;
+using Content.Server.Clothing.Components;
+using Content.Server.Items;
+using Content.Server.PowerCell.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Actions;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Actions.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Light.Component;
+using Content.Shared.Notification;
+using Content.Shared.Rounding;
+using Content.Shared.Verbs;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -20,12 +21,11 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.Players;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.Light.Components
 {
     /// <summary>
     ///     Component that represents a powered handheld light source which can be toggled on and off.
diff --git a/Content.Server/GameObjects/Components/LightBehaviourComponent.cs b/Content.Server/Light/Components/LightBehaviourComponent.cs
similarity index 74%
rename from Content.Server/GameObjects/Components/LightBehaviourComponent.cs
rename to Content.Server/Light/Components/LightBehaviourComponent.cs
index bae49f598a..f90edd129b 100644
--- a/Content.Server/GameObjects/Components/LightBehaviourComponent.cs
+++ b/Content.Server/Light/Components/LightBehaviourComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Light.Component;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Light.Components
 {
     /// <summary>
     /// A component which applies a specific behaviour to a PointLightComponent on its owner.
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs b/Content.Server/Light/Components/LightBulbComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs
rename to Content.Server/Light/Components/LightBulbComponent.cs
index 3ed09df96a..445cdbb58c 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/LightBulbComponent.cs
+++ b/Content.Server/Light/Components/LightBulbComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
 using System;
+using Content.Shared.Acts;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Throwing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -11,11 +11,10 @@ using Robust.Shared.Maths;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
+namespace Content.Server.Light.Components
 {
     public enum LightBulbState
     {
diff --git a/Content.Server/GameObjects/Components/Janitorial/LightReplacerComponent.cs b/Content.Server/Light/Components/LightReplacerComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Janitorial/LightReplacerComponent.cs
rename to Content.Server/Light/Components/LightReplacerComponent.cs
index 7ec4df5dd6..9a7fca1f9b 100644
--- a/Content.Server/GameObjects/Components/Janitorial/LightReplacerComponent.cs
+++ b/Content.Server/Light/Components/LightReplacerComponent.cs
@@ -1,10 +1,10 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Content.Server.Storage.Components;
+using Content.Shared.NetIDs;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -15,12 +15,8 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Content.Server.GameObjects.Components.Janitorial
+namespace Content.Server.Light.Components
 {
     /// <summary>
     ///     Device that allows user to quikly change bulbs in <see cref="PoweredLightComponent"/>
diff --git a/Content.Server/GameObjects/Components/Interactable/MatchboxComponent.cs b/Content.Server/Light/Components/MatchboxComponent.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/Interactable/MatchboxComponent.cs
rename to Content.Server/Light/Components/MatchboxComponent.cs
index 65b9e67ee9..19de9fcf6a 100644
--- a/Content.Server/GameObjects/Components/Interactable/MatchboxComponent.cs
+++ b/Content.Server/Light/Components/MatchboxComponent.cs
@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Smoking;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.Light.Components
 {
     // TODO make changes in icons when different threshold reached
     // e.g. different icons for 10% 50% 100%
diff --git a/Content.Server/GameObjects/Components/Interactable/MatchstickComponent.cs b/Content.Server/Light/Components/MatchstickComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Interactable/MatchstickComponent.cs
rename to Content.Server/Light/Components/MatchstickComponent.cs
index 140933c3ed..670527effe 100644
--- a/Content.Server/GameObjects/Components/Interactable/MatchstickComponent.cs
+++ b/Content.Server/Light/Components/MatchstickComponent.cs
@@ -1,8 +1,9 @@
 #nullable enable
 using System.Threading.Tasks;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Smoking;
+using Content.Shared.Temperature;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -10,7 +11,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.Light.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IHotItem))]
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs
rename to Content.Server/Light/Components/PoweredLightComponent.cs
index ad78398cf9..33fabefb27 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PoweredLightComponent.cs
+++ b/Content.Server/Light/Components/PoweredLightComponent.cs
@@ -1,18 +1,19 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.MachineLinking;
-using Content.Server.GameObjects.Components.MachineLinking.Signals;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Shared.Actions;
+using Content.Server.Ghost;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.MachineLinking.Components;
+using Content.Server.MachineLinking.Signals;
+using Content.Server.Power.Components;
+using Content.Server.Temperature.Components;
+using Content.Shared.Actions.Behaviors;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Light;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -24,7 +25,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
+namespace Content.Server.Light.Components
 {
     /// <summary>
     ///     Component that represents a wall light. It has a light bulb that can be replaced when broken.
diff --git a/Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
similarity index 90%
rename from Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs
rename to Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
index 61cec70900..e365f201f8 100644
--- a/Content.Server/GameObjects/EntitySystems/EmergencyLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/EmergencyLightSystem.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
+using Content.Server.Light.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Light.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class EmergencyLightSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
similarity index 77%
rename from Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs
rename to Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
index c5a19e2493..fb394b568f 100644
--- a/Content.Server/GameObjects/EntitySystems/ExpendableLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/ExpendableLightSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.Light.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Light.EntitySystems
 {
     [UsedImplicitly]
     public class ExpendableLightSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs b/Content.Server/Light/EntitySystems/HandHeldLightSystem.cs
similarity index 93%
rename from Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs
rename to Content.Server/Light/EntitySystems/HandHeldLightSystem.cs
index d056b7b196..3b83b10947 100644
--- a/Content.Server/GameObjects/EntitySystems/HandHeldLightSystem.cs
+++ b/Content.Server/Light/EntitySystems/HandHeldLightSystem.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.Light.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Light.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class HandHeldLightSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/Janitorial/LightReplacerSystem.cs b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/Janitorial/LightReplacerSystem.cs
rename to Content.Server/Light/EntitySystems/LightReplacerSystem.cs
index 301ad2fa1d..505f3c8170 100644
--- a/Content.Server/GameObjects/EntitySystems/Janitorial/LightReplacerSystem.cs
+++ b/Content.Server/Light/EntitySystems/LightReplacerSystem.cs
@@ -1,14 +1,12 @@
 #nullable enable
-using System;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Janitorial;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Light.Components;
+using Content.Server.Storage.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.Janitorial
+namespace Content.Server.Light.EntitySystems
 {
     [UsedImplicitly]
     public class LightReplacerSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/MachineLinking/ISignalReceiver.cs b/Content.Server/MachineLinking/Components/ISignalReceiver.cs
similarity index 59%
rename from Content.Server/GameObjects/Components/MachineLinking/ISignalReceiver.cs
rename to Content.Server/MachineLinking/Components/ISignalReceiver.cs
index 721bdcc910..1b36d893a4 100644
--- a/Content.Server/GameObjects/Components/MachineLinking/ISignalReceiver.cs
+++ b/Content.Server/MachineLinking/Components/ISignalReceiver.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.GameObjects.Components.MachineLinking
+namespace Content.Server.MachineLinking.Components
 {
     public interface ISignalReceiver<in T>
     {
diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalButtonComponent.cs b/Content.Server/MachineLinking/Components/SignalButtonComponent.cs
similarity index 83%
rename from Content.Server/GameObjects/Components/MachineLinking/SignalButtonComponent.cs
rename to Content.Server/MachineLinking/Components/SignalButtonComponent.cs
index 8b220f62f6..2b83e50b67 100644
--- a/Content.Server/GameObjects/Components/MachineLinking/SignalButtonComponent.cs
+++ b/Content.Server/MachineLinking/Components/SignalButtonComponent.cs
@@ -1,10 +1,10 @@
-using Content.Server.GameObjects.Components.MachineLinking.Signals;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.MachineLinking.Signals;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GameObjects.Components.MachineLinking
+namespace Content.Server.MachineLinking.Components
 {
     [RegisterComponent]
     public class SignalButtonComponent : Component, IActivate, IInteractHand
diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalLinkerComponent.cs b/Content.Server/MachineLinking/Components/SignalLinkerComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/MachineLinking/SignalLinkerComponent.cs
rename to Content.Server/MachineLinking/Components/SignalLinkerComponent.cs
index 58eb076211..014f73eb26 100644
--- a/Content.Server/GameObjects/Components/MachineLinking/SignalLinkerComponent.cs
+++ b/Content.Server/MachineLinking/Components/SignalLinkerComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.MachineLinking
+namespace Content.Server.MachineLinking.Components
 {
     [RegisterComponent]
     public class SignalLinkerComponent : Component
diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs b/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs
rename to Content.Server/MachineLinking/Components/SignalReceiverComponent.cs
index 8d9041ebbc..127f05f578 100644
--- a/Content.Server/GameObjects/Components/MachineLinking/SignalReceiverComponent.cs
+++ b/Content.Server/MachineLinking/Components/SignalReceiverComponent.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Tools.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.MachineLinking
+namespace Content.Server.MachineLinking.Components
 {
     [RegisterComponent]
     public class SignalReceiverComponent : Component, IInteractUsing
diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalSwitchComponent.cs b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/MachineLinking/SignalSwitchComponent.cs
rename to Content.Server/MachineLinking/Components/SignalSwitchComponent.cs
index 0c9ca69532..202b031e1e 100644
--- a/Content.Server/GameObjects/Components/MachineLinking/SignalSwitchComponent.cs
+++ b/Content.Server/MachineLinking/Components/SignalSwitchComponent.cs
@@ -1,14 +1,14 @@
-using Content.Shared.GameObjects.Components.MachineLinking;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.MachineLinking;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.MachineLinking
+namespace Content.Server.MachineLinking.Components
 {
     [RegisterComponent]
     public class SignalSwitchComponent : Component, IInteractHand, IActivate
diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs b/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs
rename to Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs
index a38492c4e6..2c8a184f12 100644
--- a/Content.Server/GameObjects/Components/MachineLinking/SignalTransmitterComponent.cs
+++ b/Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs
@@ -1,16 +1,16 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Tools.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.MachineLinking
+namespace Content.Server.MachineLinking.Components
 {
     [RegisterComponent]
     public class SignalTransmitterComponent : Component, IInteractUsing, ISerializationHooks
diff --git a/Content.Server/GameObjects/Components/MachineLinking/SignalTwoWayLeverComponent.cs b/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/MachineLinking/SignalTwoWayLeverComponent.cs
rename to Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs
index bf450d9a18..39c796786f 100644
--- a/Content.Server/GameObjects/Components/MachineLinking/SignalTwoWayLeverComponent.cs
+++ b/Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs
@@ -1,12 +1,12 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.MachineLinking;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.MachineLinking;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GameObjects.Components.MachineLinking
+namespace Content.Server.MachineLinking.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/Commands/MachineLinking/SignalLinkerCommand.cs b/Content.Server/MachineLinking/SignalLinkerCommand.cs
similarity index 94%
rename from Content.Server/Commands/MachineLinking/SignalLinkerCommand.cs
rename to Content.Server/MachineLinking/SignalLinkerCommand.cs
index 3cca0f84a8..017eb11c96 100644
--- a/Content.Server/Commands/MachineLinking/SignalLinkerCommand.cs
+++ b/Content.Server/MachineLinking/SignalLinkerCommand.cs
@@ -1,12 +1,11 @@
 using Content.Server.Administration;
-using Content.Server.GameObjects.EntitySystems;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.MachineLinking
+namespace Content.Server.MachineLinking
 {
     [AdminCommand(AdminFlags.Debug)]
     public class SignalLinkerCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs b/Content.Server/MachineLinking/SignalLinkerSystem.cs
similarity index 93%
rename from Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs
rename to Content.Server/MachineLinking/SignalLinkerSystem.cs
index 85471eea82..2526bc9d36 100644
--- a/Content.Server/GameObjects/EntitySystems/SignalLinkerSystem.cs
+++ b/Content.Server/MachineLinking/SignalLinkerSystem.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.MachineLinking;
-using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interaction;
+using Content.Server.MachineLinking.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
@@ -8,7 +8,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.MachineLinking
 {
     public class SignalLinkerSystem : EntitySystem
     {
diff --git a/Content.Server/MachineLinking/Signals/ToggleSignal.cs b/Content.Server/MachineLinking/Signals/ToggleSignal.cs
new file mode 100644
index 0000000000..9c4ab77a89
--- /dev/null
+++ b/Content.Server/MachineLinking/Signals/ToggleSignal.cs
@@ -0,0 +1,4 @@
+namespace Content.Server.MachineLinking.Signals
+{
+    public struct ToggleSignal {}
+}
diff --git a/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs b/Content.Server/Materials/MaterialComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Materials/MaterialComponent.cs
rename to Content.Server/Materials/MaterialComponent.cs
index 0d4836e116..71845a3ae8 100644
--- a/Content.Server/GameObjects/Components/Materials/MaterialComponent.cs
+++ b/Content.Server/Materials/MaterialComponent.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Materials
+namespace Content.Server.Materials
 {
     /// <summary>
     ///     Component to store data such as "this object is made out of steel".
diff --git a/Content.Server/GameObjects/Components/Medical/HealingComponent.cs b/Content.Server/Medical/Components/HealingComponent.cs
similarity index 81%
rename from Content.Server/GameObjects/Components/Medical/HealingComponent.cs
rename to Content.Server/Medical/Components/HealingComponent.cs
index 1df64437ec..c6b94f72c5 100644
--- a/Content.Server/GameObjects/Components/Medical/HealingComponent.cs
+++ b/Content.Server/Medical/Components/HealingComponent.cs
@@ -1,16 +1,15 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Stack;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Damage.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Medical
+namespace Content.Server.Medical.Components
 {
     [RegisterComponent]
     public class HealingComponent : Component, IAfterInteract
diff --git a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs b/Content.Server/Medical/Components/MedicalScannerComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs
rename to Content.Server/Medical/Components/MedicalScannerComponent.cs
index e0ef37a86a..a2e405a1d1 100644
--- a/Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs
+++ b/Content.Server/Medical/Components/MedicalScannerComponent.cs
@@ -1,21 +1,22 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Utility;
-using Content.Server.Interfaces;
+using Content.Server.Cloning;
+using Content.Server.Mind.Components;
+using Content.Server.Power.Components;
+using Content.Server.Preferences.Managers;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Acts;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Medical;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
+using Content.Shared.MedicalScanner;
+using Content.Shared.MobState;
+using Content.Shared.Notification;
 using Content.Shared.Preferences;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Containers;
@@ -27,7 +28,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Medical
+namespace Content.Server.Medical.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs b/Content.Server/Medical/MedicalScannerSystem.cs
similarity index 79%
rename from Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs
rename to Content.Server/Medical/MedicalScannerSystem.cs
index cdfb84bd89..93758edeba 100644
--- a/Content.Server/GameObjects/EntitySystems/MedicalScannerSystem.cs
+++ b/Content.Server/Medical/MedicalScannerSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Medical;
+using Content.Server.Medical.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Medical
 {
     [UsedImplicitly]
     internal sealed class MedicalScannerSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Metabolism/MetabolismComponent.cs b/Content.Server/Metabolism/MetabolismComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Metabolism/MetabolismComponent.cs
rename to Content.Server/Metabolism/MetabolismComponent.cs
index 2c0b95a876..9d2d5b1a70 100644
--- a/Content.Server/GameObjects/Components/Metabolism/MetabolismComponent.cs
+++ b/Content.Server/Metabolism/MetabolismComponent.cs
@@ -2,27 +2,25 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Server.Alert;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.Body.Behavior;
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Temperature;
+using Content.Server.Body.Behavior;
+using Content.Server.Body.Circulatory;
+using Content.Server.Temperature.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
+using Content.Shared.Body.Components;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
+using Content.Shared.Damage.Components;
+using Content.Shared.MobState;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Metabolism
+namespace Content.Server.Metabolism
 {
     [RegisterComponent]
     public class MetabolismComponent : Component
diff --git a/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs b/Content.Server/Metabolism/MetabolismSystem.cs
similarity index 74%
rename from Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs
rename to Content.Server/Metabolism/MetabolismSystem.cs
index 835dddc205..6616d013d5 100644
--- a/Content.Server/GameObjects/EntitySystems/MetabolismSystem.cs
+++ b/Content.Server/Metabolism/MetabolismSystem.cs
@@ -1,8 +1,7 @@
-using Content.Server.GameObjects.Components.Metabolism;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Metabolism
 {
     [UsedImplicitly]
     public class MetabolismSystem : EntitySystem
diff --git a/Content.Server/Commands/MakeSentientCommand.cs b/Content.Server/Mind/Commands/MakeSentientCommand.cs
similarity index 88%
rename from Content.Server/Commands/MakeSentientCommand.cs
rename to Content.Server/Mind/Commands/MakeSentientCommand.cs
index b8fb7e356d..d162fab864 100644
--- a/Content.Server/Commands/MakeSentientCommand.cs
+++ b/Content.Server/Mind/Commands/MakeSentientCommand.cs
@@ -1,17 +1,17 @@
 #nullable enable
-using System.Threading;
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Movement;
+using Content.Server.AI.Components;
+using Content.Server.Mind.Components;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Mobs.Speech;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Emoting;
+using Content.Shared.Movement.Components;
+using Content.Shared.Speech;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.Commands
+namespace Content.Server.Mind.Commands
 {
     [AdminCommand(AdminFlags.Fun)]
     public class MakeSentientCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Mobs/MindInfoCommand.cs b/Content.Server/Mind/Commands/MindInfoCommand.cs
similarity index 97%
rename from Content.Server/Commands/Mobs/MindInfoCommand.cs
rename to Content.Server/Mind/Commands/MindInfoCommand.cs
index b568691686..d069588a66 100644
--- a/Content.Server/Commands/Mobs/MindInfoCommand.cs
+++ b/Content.Server/Mind/Commands/MindInfoCommand.cs
@@ -6,7 +6,7 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Mobs
+namespace Content.Server.Mind.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
     public class MindInfoCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs b/Content.Server/Mind/Components/MindComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Mobs/MindComponent.cs
rename to Content.Server/Mind/Components/MindComponent.cs
index 8dc41eced3..2c2169a0f8 100644
--- a/Content.Server/GameObjects/Components/Mobs/MindComponent.cs
+++ b/Content.Server/Mind/Components/MindComponent.cs
@@ -1,10 +1,8 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Observer;
 using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
-using Content.Server.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.Ghost.Components;
+using Content.Shared.Examine;
+using Content.Shared.MobState;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
@@ -14,10 +12,10 @@ using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.Mind.Components
 {
     /// <summary>
-    ///     Stores a <see cref="Server.Mobs.Mind"/> on a mob.
+    ///     Stores a <see cref="Server.Mind.Mind"/> on a mob.
     /// </summary>
     [RegisterComponent]
     public class MindComponent : Component, IExamine
diff --git a/Content.Server/GameObjects/Components/Mobs/VisitingMindComponent.cs b/Content.Server/Mind/Components/VisitingMindComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Mobs/VisitingMindComponent.cs
rename to Content.Server/Mind/Components/VisitingMindComponent.cs
index 5f3b8db61f..a592968c26 100644
--- a/Content.Server/GameObjects/Components/Mobs/VisitingMindComponent.cs
+++ b/Content.Server/Mind/Components/VisitingMindComponent.cs
@@ -1,9 +1,8 @@
 #nullable enable
-using Content.Server.Mobs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.Mind.Components
 {
     [RegisterComponent]
     public sealed class VisitingMindComponent : Component
diff --git a/Content.Server/Mobs/Mind.cs b/Content.Server/Mind/Mind.cs
similarity index 98%
rename from Content.Server/Mobs/Mind.cs
rename to Content.Server/Mind/Mind.cs
index 079dcd9e0e..2e19f40d36 100644
--- a/Content.Server/Mobs/Mind.cs
+++ b/Content.Server/Mind/Mind.cs
@@ -2,12 +2,12 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.Mobs.Roles;
+using Content.Server.Ghost.Components;
+using Content.Server.Mind.Components;
 using Content.Server.Objectives;
 using Content.Server.Players;
+using Content.Server.Roles;
+using Content.Shared.MobState;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
@@ -17,7 +17,7 @@ using Robust.Shared.Network;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.Mobs
+namespace Content.Server.Mind
 {
     /// <summary>
     ///     A mind represents the IC "mind" of a player. Stores roles currently.
diff --git a/Content.Server/Mobs/MindHelpers.cs b/Content.Server/Mind/MindHelpers.cs
similarity index 86%
rename from Content.Server/Mobs/MindHelpers.cs
rename to Content.Server/Mind/MindHelpers.cs
index 654a37b1ff..5a6f4bfacb 100644
--- a/Content.Server/Mobs/MindHelpers.cs
+++ b/Content.Server/Mind/MindHelpers.cs
@@ -1,10 +1,10 @@
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking;
 using Content.Server.Players;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Mobs
+namespace Content.Server.Mind
 {
     internal static class MindHelpers
     {
diff --git a/Content.Server/GlobalVerbs/ControlMobVerb.cs b/Content.Server/Mind/Verbs/ControlMobVerb.cs
similarity index 91%
rename from Content.Server/GlobalVerbs/ControlMobVerb.cs
rename to Content.Server/Mind/Verbs/ControlMobVerb.cs
index 58583a9da5..89460fbbaf 100644
--- a/Content.Server/GlobalVerbs/ControlMobVerb.cs
+++ b/Content.Server/Mind/Verbs/ControlMobVerb.cs
@@ -1,14 +1,13 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Observer;
+using Content.Server.Mind.Components;
 using Content.Server.Players;
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Mind.Verbs
 {
     [GlobalVerb]
     public class ControlMobVerb : GlobalVerb
diff --git a/Content.Server/GlobalVerbs/MakeSentientVerb.cs b/Content.Server/Mind/Verbs/MakeSentientVerb.cs
similarity index 91%
rename from Content.Server/GlobalVerbs/MakeSentientVerb.cs
rename to Content.Server/Mind/Verbs/MakeSentientVerb.cs
index 7c4039afe6..054e997bce 100644
--- a/Content.Server/GlobalVerbs/MakeSentientVerb.cs
+++ b/Content.Server/Mind/Verbs/MakeSentientVerb.cs
@@ -1,6 +1,6 @@
-using Content.Server.Commands;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Verbs;
+using Content.Server.Mind.Commands;
+using Content.Server.Mind.Components;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.Console;
@@ -8,7 +8,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Mind.Verbs
 {
     [GlobalVerb]
     public class MakeSentientVerb : GlobalVerb
diff --git a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs b/Content.Server/Mining/Components/AsteroidRockComponent.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs
rename to Content.Server/Mining/Components/AsteroidRockComponent.cs
index b469036177..c19bb769dc 100644
--- a/Content.Server/GameObjects/Components/Mining/AsteroidRockComponent.cs
+++ b/Content.Server/Mining/Components/AsteroidRockComponent.cs
@@ -1,9 +1,9 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Weapon.Melee.Components;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mining;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Mining;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -11,7 +11,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.Components.Mining
+namespace Content.Server.Mining.Components
 {
     [RegisterComponent]
     public class AsteroidRockComponent : Component, IInteractUsing
diff --git a/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs b/Content.Server/Mining/Components/PickaxeComponent.cs
similarity index 77%
rename from Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs
rename to Content.Server/Mining/Components/PickaxeComponent.cs
index 0b6acb5a97..5d64163182 100644
--- a/Content.Server/GameObjects/Components/Mining/PickaxeComponent.cs
+++ b/Content.Server/Mining/Components/PickaxeComponent.cs
@@ -1,9 +1,7 @@
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Mining
+namespace Content.Server.Mining.Components
 {
     [RegisterComponent]
     public class PickaxeComponent : Component
diff --git a/Content.Server/Interfaces/IMoMMILink.cs b/Content.Server/MoMMI/IMoMMILink.cs
similarity index 75%
rename from Content.Server/Interfaces/IMoMMILink.cs
rename to Content.Server/MoMMI/IMoMMILink.cs
index 3ce30a4fa9..b33a406770 100644
--- a/Content.Server/Interfaces/IMoMMILink.cs
+++ b/Content.Server/MoMMI/IMoMMILink.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Interfaces
+namespace Content.Server.MoMMI
 {
     public interface IMoMMILink
     {
diff --git a/Content.Server/MoMMILink.cs b/Content.Server/MoMMI/MoMMILink.cs
similarity index 97%
rename from Content.Server/MoMMILink.cs
rename to Content.Server/MoMMI/MoMMILink.cs
index 7f2a7aa062..02ac3bf196 100644
--- a/Content.Server/MoMMILink.cs
+++ b/Content.Server/MoMMI/MoMMILink.cs
@@ -3,8 +3,7 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Content.Server.Interfaces;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Content.Shared;
 using Newtonsoft.Json;
 using Robust.Server.ServerStatus;
@@ -13,7 +12,7 @@ using Robust.Shared.Configuration;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 
-namespace Content.Server
+namespace Content.Server.MoMMI
 {
     internal sealed class MoMMILink : IMoMMILink, IPostInjectInit
     {
diff --git a/Content.Server/GameObjects/Components/Mobs/State/CriticalMobState.cs b/Content.Server/MobState/States/CriticalMobState.cs
similarity index 74%
rename from Content.Server/GameObjects/Components/Mobs/State/CriticalMobState.cs
rename to Content.Server/MobState/States/CriticalMobState.cs
index 78e32b9e94..3b0afbc510 100644
--- a/Content.Server/GameObjects/Components/Mobs/State/CriticalMobState.cs
+++ b/Content.Server/MobState/States/CriticalMobState.cs
@@ -1,10 +1,11 @@
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Server.Standing;
+using Content.Server.Stunnable.Components;
+using Content.Shared.MobState;
+using Content.Shared.MobState.State;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Mobs.State
+namespace Content.Server.MobState.States
 {
     public class CriticalMobState : SharedCriticalMobState
     {
diff --git a/Content.Server/GameObjects/Components/Mobs/State/DeadMobState.cs b/Content.Server/MobState/States/DeadMobState.cs
similarity index 76%
rename from Content.Server/GameObjects/Components/Mobs/State/DeadMobState.cs
rename to Content.Server/MobState/States/DeadMobState.cs
index a0562ac755..1cad5f05d0 100644
--- a/Content.Server/GameObjects/Components/Mobs/State/DeadMobState.cs
+++ b/Content.Server/MobState/States/DeadMobState.cs
@@ -1,12 +1,13 @@
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Alert;
+using Content.Server.Standing;
+using Content.Server.Stunnable.Components;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
+using Content.Shared.MobState.State;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
 
-namespace Content.Server.GameObjects.Components.Mobs.State
+namespace Content.Server.MobState.States
 {
     public class DeadMobState : SharedDeadMobState
     {
diff --git a/Content.Server/GameObjects/Components/Mobs/State/MobStateManager.cs b/Content.Server/MobState/States/MobStateManager.cs
similarity index 67%
rename from Content.Server/GameObjects/Components/Mobs/State/MobStateManager.cs
rename to Content.Server/MobState/States/MobStateManager.cs
index 298d43bae1..3e607b46e2 100644
--- a/Content.Server/GameObjects/Components/Mobs/State/MobStateManager.cs
+++ b/Content.Server/MobState/States/MobStateManager.cs
@@ -1,7 +1,8 @@
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
+using Content.Shared.MobState.State;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Mobs.State
+namespace Content.Server.MobState.States
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedMobStateComponent))]
diff --git a/Content.Server/GameObjects/Components/Mobs/State/NormalMobState.cs b/Content.Server/MobState/States/NormalMobState.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Mobs/State/NormalMobState.cs
rename to Content.Server/MobState/States/NormalMobState.cs
index 4ce8b0c3a3..1b7aeb03a4 100644
--- a/Content.Server/GameObjects/Components/Mobs/State/NormalMobState.cs
+++ b/Content.Server/MobState/States/NormalMobState.cs
@@ -1,13 +1,14 @@
 #nullable enable
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Alert;
+using Content.Server.Standing;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.Damage.Components;
+using Content.Shared.MobState;
+using Content.Shared.MobState.State;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Mobs.State
+namespace Content.Server.MobState.States
 {
     public class NormalMobState : SharedNormalMobState
     {
diff --git a/Content.Server/Mobs/Roles/Suspicion/SuspicionRole.cs b/Content.Server/Mobs/Roles/Suspicion/SuspicionRole.cs
deleted file mode 100644
index f9b46aecd3..0000000000
--- a/Content.Server/Mobs/Roles/Suspicion/SuspicionRole.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server.Mobs.Roles.Suspicion
-{
-    public abstract class SuspicionRole : Role
-    {
-        protected SuspicionRole(Mind mind) : base(mind) { }
-    }
-}
diff --git a/Content.Server/Utility/ServerModuleManager.cs b/Content.Server/Module/ServerModuleManager.cs
similarity index 84%
rename from Content.Server/Utility/ServerModuleManager.cs
rename to Content.Server/Module/ServerModuleManager.cs
index 0058cbefb4..23282bea32 100644
--- a/Content.Server/Utility/ServerModuleManager.cs
+++ b/Content.Server/Module/ServerModuleManager.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Interfaces;
+using Content.Shared.Module;
 
-namespace Content.Server.Utility
+namespace Content.Server.Module
 {
     /// <summary>
     /// Server implementation of IModuleManager.
diff --git a/Content.Server/GameObjects/Components/Morgue/BodyBagEntityStorageComponent.cs b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Morgue/BodyBagEntityStorageComponent.cs
rename to Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs
index 61b379b9c2..f0bf3628c4 100644
--- a/Content.Server/GameObjects/Components/Morgue/BodyBagEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/BodyBagEntityStorageComponent.cs
@@ -1,25 +1,25 @@
 #nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Paper;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Morgue;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using System.Threading.Tasks;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Paper;
+using Content.Server.Standing;
+using Content.Server.Storage.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Body.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Morgue;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
+using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using System.Threading.Tasks;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Robust.Shared.Containers;
 
-namespace Content.Server.GameObjects.Components.Morgue
+namespace Content.Server.Morgue.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(EntityStorageComponent))]
diff --git a/Content.Server/GameObjects/Components/Morgue/CrematoriumEntityStorageComponent.cs b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Morgue/CrematoriumEntityStorageComponent.cs
rename to Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
index a34df4b521..68d7e0d0bc 100644
--- a/Content.Server/GameObjects/Components/Morgue/CrematoriumEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/CrematoriumEntityStorageComponent.cs
@@ -1,28 +1,28 @@
 #nullable enable
 using System.Threading;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Act;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking;
+using Content.Server.Notification;
 using Content.Server.Players;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Morgue;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Server.GameObjects;
+using Content.Server.Storage.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Morgue;
+using Content.Shared.Notification;
+using Content.Shared.Standing;
+using Content.Shared.Verbs;
 using Robust.Server.Player;
+using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
+using Robust.Shared.Player;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.Components.Morgue
+namespace Content.Server.Morgue.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(MorgueEntityStorageComponent))]
diff --git a/Content.Server/GameObjects/Components/Morgue/MorgueEntityStorageComponent.cs b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Morgue/MorgueEntityStorageComponent.cs
rename to Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
index 528a7123df..71d908d895 100644
--- a/Content.Server/GameObjects/Components/Morgue/MorgueEntityStorageComponent.cs
+++ b/Content.Server/Morgue/Components/MorgueEntityStorageComponent.cs
@@ -1,13 +1,14 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Morgue;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Standing;
+using Content.Server.Storage.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Directions;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Morgue;
+using Content.Shared.Notification;
 using Content.Shared.Physics;
-using Content.Shared.Utility;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -15,13 +16,11 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Morgue
+namespace Content.Server.Morgue.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(EntityStorageComponent))]
diff --git a/Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs b/Content.Server/Morgue/Components/MorgueTrayComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs
rename to Content.Server/Morgue/Components/MorgueTrayComponent.cs
index e7c9d0a6a2..cedb15a009 100644
--- a/Content.Server/GameObjects/Components/Morgue/MorgueTrayComponent.cs
+++ b/Content.Server/Morgue/Components/MorgueTrayComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Morgue
+namespace Content.Server.Morgue.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs b/Content.Server/Morgue/MorgueSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/MorgueSystem.cs
rename to Content.Server/Morgue/MorgueSystem.cs
index 3574f27c2e..96600cd129 100644
--- a/Content.Server/GameObjects/EntitySystems/MorgueSystem.cs
+++ b/Content.Server/Morgue/MorgueSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Morgue;
+using Content.Server.Morgue.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Morgue
 {
     [UsedImplicitly]
     public class MorgueSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs b/Content.Server/Movement/Components/FootstepModifierComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs
rename to Content.Server/Movement/Components/FootstepModifierComponent.cs
index a44788567e..10453c8f13 100644
--- a/Content.Server/GameObjects/Components/Sound/FootstepModifierComponent.cs
+++ b/Content.Server/Movement/Components/FootstepModifierComponent.cs
@@ -1,5 +1,4 @@
 using Content.Shared.Audio;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -8,7 +7,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Sound
+namespace Content.Server.Movement.Components
 {
     /// <summary>
     /// Changes footstep sound
diff --git a/Content.Server/GameObjects/Components/StressTestMovementComponent.cs b/Content.Server/Movement/Components/StressTestMovementComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/StressTestMovementComponent.cs
rename to Content.Server/Movement/Components/StressTestMovementComponent.cs
index 7bfe367948..b6081a3b91 100644
--- a/Content.Server/GameObjects/Components/StressTestMovementComponent.cs
+++ b/Content.Server/Movement/Components/StressTestMovementComponent.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Movement.Components
 {
     [RegisterComponent]
     public class StressTestMovementComponent : Component
diff --git a/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs b/Content.Server/Movement/StressTestMovementSystem.cs
similarity index 90%
rename from Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs
rename to Content.Server/Movement/StressTestMovementSystem.cs
index 19c4702e23..6e88adbaac 100644
--- a/Content.Server/GameObjects/EntitySystems/StressTestMovementSystem.cs
+++ b/Content.Server/Movement/StressTestMovementSystem.cs
@@ -1,10 +1,10 @@
 using System;
-using Content.Server.GameObjects.Components;
+using Content.Server.Movement.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Movement
 {
     [UsedImplicitly]
     internal sealed class StressTestMovementSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/NodeContainerSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
similarity index 87%
rename from Content.Server/GameObjects/EntitySystems/NodeContainerSystem.cs
rename to Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
index d19119febb..eba0b020c2 100644
--- a/Content.Server/GameObjects/EntitySystems/NodeContainerSystem.cs
+++ b/Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs
@@ -1,10 +1,8 @@
-using System.Linq;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
+using Content.Server.NodeContainer.Nodes;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.NodeContainer.EntitySystems
 {
     [UsedImplicitly]
     public class NodeContainerSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/NodeGroupSystem.cs b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs
similarity index 86%
rename from Content.Server/GameObjects/EntitySystems/NodeGroupSystem.cs
rename to Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs
index 368b4a6519..01b8ed8d10 100644
--- a/Content.Server/GameObjects/EntitySystems/NodeGroupSystem.cs
+++ b/Content.Server/NodeContainer/EntitySystems/NodeGroupSystem.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.NodeGroups;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.NodeContainer.EntitySystems
 {
     [UsedImplicitly]
     public class NodeGroupSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs b/Content.Server/NodeContainer/NodeContainerComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs
rename to Content.Server/NodeContainer/NodeContainerComponent.cs
index e41f2accf6..847aa0794e 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeContainerComponent.cs
+++ b/Content.Server/NodeContainer/NodeContainerComponent.cs
@@ -1,16 +1,16 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.Nodes;
+using Content.Shared.Examine;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Utility;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.NodeContainer
+namespace Content.Server.NodeContainer
 {
     /// <summary>
     ///     Creates and maintains a set of <see cref="Node"/>s.
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs
rename to Content.Server/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs
index ea6eb28ba9..bee595ac19 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs
+++ b/Content.Server/NodeContainer/NodeGroups/BaseNetConnectorNodeGroup.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
-using Content.Server.GameObjects.Components.Power;
+using Content.Server.NodeContainer.Nodes;
+using Content.Server.Power.Components;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
+namespace Content.Server.NodeContainer.NodeGroups
 {
     public abstract class BaseNetConnectorNodeGroup<TNetConnector, TNetType> : BaseNodeGroup where TNetConnector : BaseNetConnectorComponent<TNetType>
     {
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/INodeGroup.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs
rename to Content.Server/NodeContainer/NodeGroups/INodeGroup.cs
index a3cbf37dd5..a727ebe099 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/INodeGroup.cs
+++ b/Content.Server/NodeContainer/NodeGroups/INodeGroup.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.NodeContainer.EntitySystems;
+using Content.Server.NodeContainer.Nodes;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
+namespace Content.Server.NodeContainer.NodeGroups
 {
     /// <summary>
     ///     Maintains a collection of <see cref="Node"/>s, and performs operations requiring a list of
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs b/Content.Server/NodeContainer/NodeGroups/IPipeNet.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs
rename to Content.Server/NodeContainer/NodeGroups/IPipeNet.cs
index 7b5204ca98..9856e55aa1 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/IPipeNet.cs
+++ b/Content.Server/NodeContainer/NodeGroups/IPipeNet.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System.Collections.Generic;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.NodeContainer.Nodes;
 using Content.Server.GameObjects.EntitySystems;
 using Content.Server.Interfaces;
+using Content.Server.NodeContainer.Nodes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
+namespace Content.Server.NodeContainer.NodeGroups
 {
     public interface IPipeNet : IGasMixtureHolder
     {
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupAttribute.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupAttribute.cs
rename to Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs
index 6fd7ae37c6..d41b8dc265 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupAttribute.cs
+++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupAttribute.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
+namespace Content.Server.NodeContainer.NodeGroups
 {
     /// <summary>
     ///     Associates a <see cref="INodeGroup"/> implementation with a <see cref="NodeGroupID"/>.
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs
rename to Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs
index 8dc923f728..0391439ec3 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/NodeGroupFactory.cs
+++ b/Content.Server/NodeContainer/NodeGroups/NodeGroupFactory.cs
@@ -1,12 +1,12 @@
 #nullable enable
- using System;
- using System.Collections.Generic;
- using System.Reflection;
- using Content.Server.GameObjects.Components.NodeContainer.Nodes;
- using Robust.Shared.IoC;
- using Robust.Shared.Reflection;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using Content.Server.NodeContainer.Nodes;
+using Robust.Shared.IoC;
+using Robust.Shared.Reflection;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
+namespace Content.Server.NodeContainer.NodeGroups
 {
     public interface INodeGroupFactory
     {
diff --git a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs b/Content.Server/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
rename to Content.Server/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
index 933eeb34af..331a3de40f 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
+++ b/Content.Server/NodeContainer/NodeGroups/PowerNetNodeGroup.cs
@@ -2,11 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Server.Power.Components;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.NodeGroups
+namespace Content.Server.NodeContainer.NodeGroups
 {
     public interface IPowerNet
     {
diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs b/Content.Server/NodeContainer/Nodes/AdjacentNode.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs
rename to Content.Server/NodeContainer/Nodes/AdjacentNode.cs
index fc17a1c6c9..43e9c78c1d 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/AdjacentNode.cs
+++ b/Content.Server/NodeContainer/Nodes/AdjacentNode.cs
@@ -4,7 +4,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
+namespace Content.Server.NodeContainer.Nodes
 {
     /// <summary>
     ///     A <see cref="Node"/> that can reach other <see cref="AdjacentNode"/>s that are directly adjacent to it.
diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/IRotatableNode.cs b/Content.Server/NodeContainer/Nodes/IRotatableNode.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/NodeContainer/Nodes/IRotatableNode.cs
rename to Content.Server/NodeContainer/Nodes/IRotatableNode.cs
index 6d7c0cd11c..07539ce436 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/IRotatableNode.cs
+++ b/Content.Server/NodeContainer/Nodes/IRotatableNode.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
+namespace Content.Server.NodeContainer.Nodes
 {
     /// <summary>
     ///     A <see cref="Node"/> that implements this will have its <see cref="RotateEvent(RotateEvent)"/> called when its
diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs b/Content.Server/NodeContainer/Nodes/Node.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs
rename to Content.Server/NodeContainer/Nodes/Node.cs
index 9edaa5246d..2d4d8163af 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/Node.cs
+++ b/Content.Server/NodeContainer/Nodes/Node.cs
@@ -2,15 +2,14 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.NodeGroups;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Physics;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
+namespace Content.Server.NodeContainer.Nodes
 {
     /// <summary>
     ///     Organizes themselves into distinct <see cref="INodeGroup"/>s with other <see cref="Node"/>s
diff --git a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs b/Content.Server/NodeContainer/Nodes/PipeNode.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs
rename to Content.Server/NodeContainer/Nodes/PipeNode.cs
index 0218a1b02d..21ef2801fe 100644
--- a/Content.Server/GameObjects/Components/NodeContainer/Nodes/PipeNode.cs
+++ b/Content.Server/NodeContainer/Nodes/PipeNode.cs
@@ -1,8 +1,8 @@
 #nullable enable
 using System.Collections.Generic;
 using Content.Server.Atmos;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
 using Content.Server.Interfaces;
+using Content.Server.NodeContainer.NodeGroups;
 using Content.Shared.GameObjects.Components.Atmos;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
@@ -12,7 +12,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.NodeContainer.Nodes
+namespace Content.Server.NodeContainer.Nodes
 {
     /// <summary>
     ///     Connects with other <see cref="PipeNode"/>s whose <see cref="PipeDirection"/>
diff --git a/Content.Server/Interfaces/IServerNotifyManager.cs b/Content.Server/Notification/Managers/IServerNotifyManager.cs
similarity index 57%
rename from Content.Server/Interfaces/IServerNotifyManager.cs
rename to Content.Server/Notification/Managers/IServerNotifyManager.cs
index 09afa47581..76548ebcf5 100644
--- a/Content.Server/Interfaces/IServerNotifyManager.cs
+++ b/Content.Server/Notification/Managers/IServerNotifyManager.cs
@@ -1,6 +1,6 @@
-using Content.Shared.Interfaces;
+using Content.Shared.Notification;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.Notification.Managers
 {
     public interface IServerNotifyManager : ISharedNotifyManager
     {
diff --git a/Content.Server/ServerNotifyManager.cs b/Content.Server/Notification/Managers/ServerNotifyManager.cs
similarity index 97%
rename from Content.Server/ServerNotifyManager.cs
rename to Content.Server/Notification/Managers/ServerNotifyManager.cs
index 7ce782aa5f..cb4aeb3729 100644
--- a/Content.Server/ServerNotifyManager.cs
+++ b/Content.Server/Notification/Managers/ServerNotifyManager.cs
@@ -1,4 +1,3 @@
-using Content.Server.Interfaces;
 using Content.Shared;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
@@ -7,7 +6,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
 
-namespace Content.Server
+namespace Content.Server.Notification.Managers
 {
     public class ServerNotifyManager : SharedNotifyManager, IServerNotifyManager
     {
diff --git a/Content.Server/Utility/NotifyExtensions.cs b/Content.Server/Notification/NotifyExtensions.cs
similarity index 96%
rename from Content.Server/Utility/NotifyExtensions.cs
rename to Content.Server/Notification/NotifyExtensions.cs
index 3cd7eb74bf..ca6b3f713c 100644
--- a/Content.Server/Utility/NotifyExtensions.cs
+++ b/Content.Server/Notification/NotifyExtensions.cs
@@ -1,9 +1,9 @@
-using Content.Shared.Interfaces;
+using Content.Shared.Notification;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Utility
+namespace Content.Server.Notification
 {
     public static class NotifyExtensions
     {
diff --git a/Content.Server/Commands/Notify/PopupMsgCommand.cs b/Content.Server/Notification/PopupMsgCommand.cs
similarity index 91%
rename from Content.Server/Commands/Notify/PopupMsgCommand.cs
rename to Content.Server/Notification/PopupMsgCommand.cs
index 0da87926ba..63239ae9cd 100644
--- a/Content.Server/Commands/Notify/PopupMsgCommand.cs
+++ b/Content.Server/Notification/PopupMsgCommand.cs
@@ -1,11 +1,11 @@
 using Content.Server.Administration;
 using Content.Shared.Administration;
-using Content.Shared.Interfaces;
+using Content.Shared.Notification;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Notify
+namespace Content.Server.Notification
 {
     [AdminCommand(AdminFlags.Debug)]
     public class PopupMsgCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/Nutrition/CreamPieComponent.cs b/Content.Server/Nutrition/Components/CreamPieComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Nutrition/CreamPieComponent.cs
rename to Content.Server/Nutrition/Components/CreamPieComponent.cs
index b9cadc3bc4..8d4c7ef9c5 100644
--- a/Content.Server/GameObjects/Components/Nutrition/CreamPieComponent.cs
+++ b/Content.Server/Nutrition/Components/CreamPieComponent.cs
@@ -1,14 +1,14 @@
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.Fluids;
+using Content.Server.Chemistry.Components;
+using Content.Server.Fluids.Components;
 using Content.Shared.Audio;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Throwing;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Nutrition
+namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
     public class CreamPieComponent : Component, ILand, IThrowCollide
diff --git a/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs b/Content.Server/Nutrition/Components/CreamPiedComponent.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs
rename to Content.Server/Nutrition/Components/CreamPiedComponent.cs
index 85bcb23f20..dd77efe25e 100644
--- a/Content.Server/GameObjects/Components/Nutrition/CreamPiedComponent.cs
+++ b/Content.Server/Nutrition/Components/CreamPiedComponent.cs
@@ -1,15 +1,14 @@
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Utility;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Nutrition;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Notification;
+using Content.Server.Stunnable.Components;
+using Content.Shared.Notification;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Throwing;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Nutrition
+namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
     public class CreamPiedComponent : SharedCreamPiedComponent, IThrowCollide
diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/Nutrition/Components/DrinkComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
rename to Content.Server/Nutrition/Components/DrinkComponent.cs
index 7f8a0f7cb0..4ebe9a4f51 100644
--- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
+++ b/Content.Server/Nutrition/Components/DrinkComponent.cs
@@ -1,17 +1,20 @@
 #nullable enable
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Body.Behavior;
-using Content.Server.GameObjects.Components.Fluids;
+using Content.Server.Body.Behavior;
+using Content.Server.Fluids.Components;
 using Content.Shared.Audio;
+using Content.Shared.Body.Components;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Throwing;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -25,7 +28,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Nutrition
+namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
     public class DrinkComponent : Component, IUse, IAfterInteract, ISolutionChange, IExamine, ILand
diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
rename to Content.Server/Nutrition/Components/FoodComponent.cs
index 8f4ef1bdac..64376386d6 100644
--- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
+++ b/Content.Server/Nutrition/Components/FoodComponent.cs
@@ -3,20 +3,17 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Body.Behavior;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.Culinary;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
-using Robust.Server.GameObjects;
+using Content.Server.Body.Behavior;
+using Content.Server.Chemistry.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Shared.Body.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -24,7 +21,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Nutrition
+namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IAfterInteract))]
diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs b/Content.Server/Nutrition/Components/FoodContainerComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs
rename to Content.Server/Nutrition/Components/FoodContainerComponent.cs
index 5ca2cf0593..dc2ef954f4 100644
--- a/Content.Server/GameObjects/Components/Nutrition/FoodContainerComponent.cs
+++ b/Content.Server/Nutrition/Components/FoodContainerComponent.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Shared.GameObjects.Components.Nutrition;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Shared.Interaction;
+using Content.Shared.Nutrition.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -12,7 +12,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Nutrition
+namespace Content.Server.Nutrition.Components
 {
     /// <summary>
     /// This container acts as a master object for things like Pizza, which holds slices.
diff --git a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs b/Content.Server/Nutrition/Components/HungerComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs
rename to Content.Server/Nutrition/Components/HungerComponent.cs
index 36c3329355..c53047bd45 100644
--- a/Content.Server/GameObjects/Components/Nutrition/HungerComponent.cs
+++ b/Content.Server/Nutrition/Components/HungerComponent.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Alert;
 using Content.Shared.Alert;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Shared.Damage.Components;
+using Content.Shared.MobState;
+using Content.Shared.Movement.Components;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -15,7 +15,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Nutrition
+namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
     public sealed class HungerComponent : SharedHungerComponent
diff --git a/Content.Server/GameObjects/Components/Culinary/SliceableFoodComponent.cs b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Culinary/SliceableFoodComponent.cs
rename to Content.Server/Nutrition/Components/SliceableFoodComponent.cs
index 824f27a4b6..609885cf0d 100644
--- a/Content.Server/GameObjects/Components/Culinary/SliceableFoodComponent.cs
+++ b/Content.Server/Nutrition/Components/SliceableFoodComponent.cs
@@ -1,12 +1,10 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Server.GameObjects;
+using Content.Server.Chemistry.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -16,7 +14,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Culinary
+namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
     class SliceableFoodComponent : Component, IInteractUsing, IExamine
diff --git a/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs b/Content.Server/Nutrition/Components/SmokingComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs
rename to Content.Server/Nutrition/Components/SmokingComponent.cs
index 4dd2824382..f84b8efa74 100644
--- a/Content.Server/GameObjects/Components/Nutrition/SmokingComponent.cs
+++ b/Content.Server/Nutrition/Components/SmokingComponent.cs
@@ -1,15 +1,15 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Clothing.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Smoking;
+using Content.Shared.Temperature;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Nutrition
+namespace Content.Server.Nutrition.Components
 {
     /// <summary>
     /// This item acts as a representation for smokable consumables.
diff --git a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs b/Content.Server/Nutrition/Components/ThirstComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs
rename to Content.Server/Nutrition/Components/ThirstComponent.cs
index 56ce11e49a..0717a0849f 100644
--- a/Content.Server/GameObjects/Components/Nutrition/ThirstComponent.cs
+++ b/Content.Server/Nutrition/Components/ThirstComponent.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Alert;
 using Content.Shared.Alert;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Shared.Damage.Components;
+using Content.Shared.MobState;
+using Content.Shared.Movement.Components;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -15,7 +15,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Nutrition
+namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
     public sealed class ThirstComponent : SharedThirstComponent
diff --git a/Content.Server/GameObjects/Components/Culinary/UtensilComponent.cs b/Content.Server/Nutrition/Components/UtensilComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Culinary/UtensilComponent.cs
rename to Content.Server/Nutrition/Components/UtensilComponent.cs
index 1ea9ab4e02..ca243f04af 100644
--- a/Content.Server/GameObjects/Components/Culinary/UtensilComponent.cs
+++ b/Content.Server/Nutrition/Components/UtensilComponent.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Nutrition;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -12,7 +11,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Culinary
+namespace Content.Server.Nutrition.Components
 {
     [RegisterComponent]
     public class UtensilComponent : Component, IAfterInteract
diff --git a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs b/Content.Server/Nutrition/EntitySystems/HungerSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/HungerSystem.cs
rename to Content.Server/Nutrition/EntitySystems/HungerSystem.cs
index 6961ceb730..b2bf8eaee9 100644
--- a/Content.Server/GameObjects/EntitySystems/HungerSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/HungerSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Nutrition.EntitySystems
 {
     [UsedImplicitly]
     public class HungerSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs b/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/ThirstSystem.cs
rename to Content.Server/Nutrition/EntitySystems/ThirstSystem.cs
index cb2537f04e..e26dbff1c1 100644
--- a/Content.Server/GameObjects/EntitySystems/ThirstSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/ThirstSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Nutrition.EntitySystems
 {
     [UsedImplicitly]
     public class ThirstSystem : EntitySystem
diff --git a/Content.Server/Commands/Hungry.cs b/Content.Server/Nutrition/Hungry.cs
similarity index 89%
rename from Content.Server/Commands/Hungry.cs
rename to Content.Server/Nutrition/Hungry.cs
index 0adee94b04..c84b59b713 100644
--- a/Content.Server/Commands/Hungry.cs
+++ b/Content.Server/Nutrition/Hungry.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Nutrition;
+using Content.Server.Nutrition.Components;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components.Nutrition;
+using Content.Shared.Nutrition.Components;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 
-namespace Content.Server.Commands
+namespace Content.Server.Nutrition
 {
     [AdminCommand(AdminFlags.Debug)]
     public class Hungry : IConsoleCommand
diff --git a/Content.Server/Commands/Objectives/AddObjectiveCommand.cs b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
similarity index 95%
rename from Content.Server/Commands/Objectives/AddObjectiveCommand.cs
rename to Content.Server/Objectives/Commands/AddObjectiveCommand.cs
index 021f7f4860..68c1f7d001 100644
--- a/Content.Server/Commands/Objectives/AddObjectiveCommand.cs
+++ b/Content.Server/Objectives/Commands/AddObjectiveCommand.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.Objectives;
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Robust.Server.Player;
@@ -8,7 +7,7 @@ using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Commands.Objectives
+namespace Content.Server.Objectives.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
     public class AddObjectiveCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Objectives/ListObjectivesCommand.cs b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
similarity index 97%
rename from Content.Server/Commands/Objectives/ListObjectivesCommand.cs
rename to Content.Server/Objectives/Commands/ListObjectivesCommand.cs
index 33201d962a..ba315995f8 100644
--- a/Content.Server/Commands/Objectives/ListObjectivesCommand.cs
+++ b/Content.Server/Objectives/Commands/ListObjectivesCommand.cs
@@ -7,7 +7,7 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Objectives
+namespace Content.Server.Objectives.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
     public class ListObjectivesCommand : IConsoleCommand
diff --git a/Content.Server/Commands/Objectives/RemoveObjectiveCommand.cs b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
similarity index 97%
rename from Content.Server/Commands/Objectives/RemoveObjectiveCommand.cs
rename to Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
index 5d7806fb6c..de3e0d61ce 100644
--- a/Content.Server/Commands/Objectives/RemoveObjectiveCommand.cs
+++ b/Content.Server/Objectives/Commands/RemoveObjectiveCommand.cs
@@ -6,7 +6,7 @@ using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Objectives
+namespace Content.Server.Objectives.Commands
 {
     [AdminCommand(AdminFlags.Admin)]
     public class RemoveObjectiveCommand : IConsoleCommand
diff --git a/Content.Server/Objectives/Conditions/DieCondition.cs b/Content.Server/Objectives/Conditions/DieCondition.cs
index 7883f77557..6678f0991f 100644
--- a/Content.Server/Objectives/Conditions/DieCondition.cs
+++ b/Content.Server/Objectives/Conditions/DieCondition.cs
@@ -1,7 +1,5 @@
 #nullable enable
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
-using Content.Shared.GameObjects.Components.Mobs.State;
 using JetBrains.Annotations;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -13,9 +11,9 @@ namespace Content.Server.Objectives.Conditions
     [DataDefinition]
     public class DieCondition : IObjectiveCondition
     {
-        private Mind? _mind;
+        private Mind.Mind? _mind;
 
-        public IObjectiveCondition GetAssigned(Mind mind)
+        public IObjectiveCondition GetAssigned(Mind.Mind mind)
         {
             return new DieCondition {_mind = mind};
         }
diff --git a/Content.Server/Objectives/Conditions/KillPersonCondition.cs b/Content.Server/Objectives/Conditions/KillPersonCondition.cs
index fd2e76d5e4..6c0fbc4783 100644
--- a/Content.Server/Objectives/Conditions/KillPersonCondition.cs
+++ b/Content.Server/Objectives/Conditions/KillPersonCondition.cs
@@ -1,7 +1,5 @@
 #nullable enable
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
-using Content.Shared.GameObjects.Components.Mobs.State;
 using Robust.Shared.Localization;
 using Robust.Shared.Utility;
 
@@ -9,8 +7,8 @@ namespace Content.Server.Objectives.Conditions
 {
     public abstract class KillPersonCondition : IObjectiveCondition
     {
-        protected Mind? Target;
-        public abstract IObjectiveCondition GetAssigned(Mind mind);
+        protected Mind.Mind? Target;
+        public abstract IObjectiveCondition GetAssigned(Mind.Mind mind);
 
         public string Title => Loc.GetString("Kill {0}", Target?.OwnedEntity?.Name ?? "");
 
diff --git a/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs b/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs
index 07b7c14d32..9f731f69d6 100644
--- a/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs
+++ b/Content.Server/Objectives/Conditions/KillRandomPersonCondition.cs
@@ -1,8 +1,7 @@
 using System.Linq;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Mobs;
+using Content.Server.Mind.Components;
 using Content.Server.Objectives.Interfaces;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Shared.MobState;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -15,7 +14,7 @@ namespace Content.Server.Objectives.Conditions
     [DataDefinition]
     public class KillRandomPersonCondition : KillPersonCondition
     {
-        public override IObjectiveCondition GetAssigned(Mind mind)
+        public override IObjectiveCondition GetAssigned(Mind.Mind mind)
         {
             var entityMgr = IoCManager.Resolve<IEntityManager>();
             var allHumans = entityMgr.ComponentManager.EntityQuery<MindComponent>(true).Where(mc =>
diff --git a/Content.Server/Objectives/Conditions/StayAliveCondition.cs b/Content.Server/Objectives/Conditions/StayAliveCondition.cs
index 05be5ba368..69e35026b9 100644
--- a/Content.Server/Objectives/Conditions/StayAliveCondition.cs
+++ b/Content.Server/Objectives/Conditions/StayAliveCondition.cs
@@ -1,7 +1,5 @@
 #nullable enable
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
-using Content.Shared.GameObjects.Components.Mobs.State;
 using JetBrains.Annotations;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -13,9 +11,9 @@ namespace Content.Server.Objectives.Conditions
     [DataDefinition]
     public class StayAliveCondition : IObjectiveCondition
     {
-        private Mind? _mind;
+        private Mind.Mind? _mind;
 
-        public IObjectiveCondition GetAssigned(Mind mind)
+        public IObjectiveCondition GetAssigned(Mind.Mind mind)
         {
             return new StayAliveCondition {_mind = mind};
         }
diff --git a/Content.Server/Objectives/Conditions/StealCondition.cs b/Content.Server/Objectives/Conditions/StealCondition.cs
index a84b4f3bb6..f80761c8c9 100644
--- a/Content.Server/Objectives/Conditions/StealCondition.cs
+++ b/Content.Server/Objectives/Conditions/StealCondition.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
+using Content.Server.Containers;
 using Content.Server.GameObjects;
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
@@ -19,11 +19,11 @@ namespace Content.Server.Objectives.Conditions
     [DataDefinition]
     public class StealCondition : IObjectiveCondition, ISerializationHooks
     {
-        private Mind? _mind;
+        private Mind.Mind? _mind;
         [DataField("prototype")] private string _prototypeId = string.Empty;
         [DataField("amount")] private int _amount = 1;
 
-        public IObjectiveCondition GetAssigned(Mind mind)
+        public IObjectiveCondition GetAssigned(Mind.Mind mind)
         {
             return new StealCondition
             {
diff --git a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs
index 3af1087a0e..a7c2f46e39 100644
--- a/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs
+++ b/Content.Server/Objectives/Interfaces/IObjectiveCondition.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using System;
-using Content.Server.Mobs;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Objectives.Interfaces
@@ -12,7 +11,7 @@ namespace Content.Server.Objectives.Interfaces
         /// </summary>
         /// <param name="mind">Mind to assign to.</param>
         /// <returns>The new IObjectiveCondition.</returns>
-        IObjectiveCondition GetAssigned(Mind mind);
+        IObjectiveCondition GetAssigned(Mind.Mind mind);
 
         /// <summary>
         /// Returns the title of the condition.
diff --git a/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs b/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs
index 0f7b23a2bb..3024275f7b 100644
--- a/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs
+++ b/Content.Server/Objectives/Interfaces/IObjectiveRequirement.cs
@@ -1,6 +1,4 @@
-using Content.Server.Mobs;
-
-namespace Content.Server.Objectives.Interfaces
+namespace Content.Server.Objectives.Interfaces
 {
     public interface IObjectiveRequirement
     {
@@ -8,6 +6,6 @@ namespace Content.Server.Objectives.Interfaces
         /// Checks whether or not the entity & its surroundings are valid to be given the objective.
         /// </summary>
         /// <returns>Returns true if objective can be given.</returns>
-        bool CanBeAssigned(Mind mind);
+        bool CanBeAssigned(Mind.Mind mind);
     }
 }
diff --git a/Content.Server/Objectives/Interfaces/IObjectivesManager.cs b/Content.Server/Objectives/Interfaces/IObjectivesManager.cs
index ff17b1a432..e80fd090ec 100644
--- a/Content.Server/Objectives/Interfaces/IObjectivesManager.cs
+++ b/Content.Server/Objectives/Interfaces/IObjectivesManager.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Content.Server.Mobs;
 
 namespace Content.Server.Objectives.Interfaces
 {
@@ -8,11 +7,11 @@ namespace Content.Server.Objectives.Interfaces
         /// <summary>
         /// Returns all objectives the provided mind is valid for.
         /// </summary>
-        IEnumerable<ObjectivePrototype> GetAllPossibleObjectives(Mind mind);
+        IEnumerable<ObjectivePrototype> GetAllPossibleObjectives(Mind.Mind mind);
 
         /// <summary>
         /// Returns a randomly picked objective the provided mind is valid for.
         /// </summary>
-        ObjectivePrototype? GetRandomObjective(Mind mind);
+        ObjectivePrototype? GetRandomObjective(Mind.Mind mind);
     }
 }
diff --git a/Content.Server/Objectives/Objective.cs b/Content.Server/Objectives/Objective.cs
index a2ede4e756..ad576ac2bd 100644
--- a/Content.Server/Objectives/Objective.cs
+++ b/Content.Server/Objectives/Objective.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
 using Robust.Shared.ViewVariables;
 
@@ -9,14 +8,14 @@ namespace Content.Server.Objectives
     public class Objective : IEquatable<Objective>
     {
         [ViewVariables]
-        public readonly Mind Mind;
+        public readonly Mind.Mind Mind;
         [ViewVariables]
         public readonly ObjectivePrototype Prototype;
         private readonly List<IObjectiveCondition> _conditions = new();
         [ViewVariables]
         public IReadOnlyList<IObjectiveCondition> Conditions => _conditions;
 
-        public Objective(ObjectivePrototype prototype, Mind mind)
+        public Objective(ObjectivePrototype prototype, Mind.Mind mind)
         {
             Prototype = prototype;
             Mind = mind;
diff --git a/Content.Server/Objectives/ObjectivePrototype.cs b/Content.Server/Objectives/ObjectivePrototype.cs
index 7637b37d26..0215013b16 100644
--- a/Content.Server/Objectives/ObjectivePrototype.cs
+++ b/Content.Server/Objectives/ObjectivePrototype.cs
@@ -1,7 +1,6 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
@@ -39,7 +38,7 @@ namespace Content.Server.Objectives
         [DataField("difficultyOverride")]
         private float? _difficultyOverride = null;
 
-        public bool CanBeAssigned(Mind mind)
+        public bool CanBeAssigned(Mind.Mind mind)
         {
             foreach (var requirement in _requirements)
             {
@@ -57,7 +56,7 @@ namespace Content.Server.Objectives
             return true;
         }
 
-        public Objective GetObjective(Mind mind)
+        public Objective GetObjective(Mind.Mind mind)
         {
             return new(this, mind);
         }
diff --git a/Content.Server/Objectives/ObjectivesManager.cs b/Content.Server/Objectives/ObjectivesManager.cs
index 1a955b23d5..34857ec202 100644
--- a/Content.Server/Objectives/ObjectivesManager.cs
+++ b/Content.Server/Objectives/ObjectivesManager.cs
@@ -1,7 +1,6 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
@@ -14,12 +13,12 @@ namespace Content.Server.Objectives
         [Dependency] private IPrototypeManager _prototypeManager = default!;
         [Dependency] private IRobustRandom _random = default!;
 
-        public IEnumerable<ObjectivePrototype> GetAllPossibleObjectives(Mind mind)
+        public IEnumerable<ObjectivePrototype> GetAllPossibleObjectives(Mind.Mind mind)
         {
             return _prototypeManager.EnumeratePrototypes<ObjectivePrototype>().Where(objectivePrototype => objectivePrototype.CanBeAssigned(mind));
         }
 
-        public ObjectivePrototype? GetRandomObjective(Mind mind)
+        public ObjectivePrototype? GetRandomObjective(Mind.Mind mind)
         {
             var objectives = GetAllPossibleObjectives(mind).ToList();
             _random.Shuffle(objectives);
diff --git a/Content.Server/Objectives/Requirements/IncompatibleConditionsRequirement.cs b/Content.Server/Objectives/Requirements/IncompatibleConditionsRequirement.cs
index 89b6a2c0a8..a280f4a57b 100644
--- a/Content.Server/Objectives/Requirements/IncompatibleConditionsRequirement.cs
+++ b/Content.Server/Objectives/Requirements/IncompatibleConditionsRequirement.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
 using Robust.Shared.Serialization.Manager.Attributes;
 
@@ -11,7 +10,7 @@ namespace Content.Server.Objectives.Requirements
         [DataField("conditions")]
         private readonly List<string> _incompatibleConditions = new();
 
-        public bool CanBeAssigned(Mind mind)
+        public bool CanBeAssigned(Mind.Mind mind)
         {
             foreach (var objective in mind.AllObjectives)
             {
diff --git a/Content.Server/Objectives/Requirements/IncompatibleObjectivesRequirement.cs b/Content.Server/Objectives/Requirements/IncompatibleObjectivesRequirement.cs
index 0be82ef7c4..855c02be62 100644
--- a/Content.Server/Objectives/Requirements/IncompatibleObjectivesRequirement.cs
+++ b/Content.Server/Objectives/Requirements/IncompatibleObjectivesRequirement.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using Content.Server.Mobs;
 using Content.Server.Objectives.Interfaces;
 using Robust.Shared.Serialization.Manager.Attributes;
 
@@ -11,7 +10,7 @@ namespace Content.Server.Objectives.Requirements
         [DataField("objectives")]
         private readonly List<string> _incompatibleObjectives = new();
 
-        public bool CanBeAssigned(Mind mind)
+        public bool CanBeAssigned(Mind.Mind mind)
         {
             foreach (var objective in mind.AllObjectives)
             {
diff --git a/Content.Server/Objectives/Requirements/TraitorRequirement.cs b/Content.Server/Objectives/Requirements/TraitorRequirement.cs
index a8412040fb..178cf2e65b 100644
--- a/Content.Server/Objectives/Requirements/TraitorRequirement.cs
+++ b/Content.Server/Objectives/Requirements/TraitorRequirement.cs
@@ -1,6 +1,5 @@
-using Content.Server.Mobs;
-using Content.Server.Mobs.Roles.Traitor;
-using Content.Server.Objectives.Interfaces;
+using Content.Server.Objectives.Interfaces;
+using Content.Server.Traitor;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization.Manager.Attributes;
 
@@ -10,7 +9,7 @@ namespace Content.Server.Objectives.Requirements
     [DataDefinition]
     public class TraitorRequirement : IObjectiveRequirement
     {
-        public bool CanBeAssigned(Mind mind)
+        public bool CanBeAssigned(Mind.Mind mind)
         {
             return mind.HasRole<TraitorRole>();
         }
diff --git a/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs b/Content.Server/PDA/Managers/IPDAUplinkManager.cs
similarity index 87%
rename from Content.Server/Interfaces/PDA/IPDAUplinkManager.cs
rename to Content.Server/PDA/Managers/IPDAUplinkManager.cs
index 889d079381..4ecae0c6de 100644
--- a/Content.Server/Interfaces/PDA/IPDAUplinkManager.cs
+++ b/Content.Server/PDA/Managers/IPDAUplinkManager.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.GameObjects.Components.PDA;
+using Content.Shared.PDA;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Server.Interfaces.PDA
+namespace Content.Server.PDA.Managers
 {
     public interface IPDAUplinkManager
     {
diff --git a/Content.Server/PDA/PDAUplinkManager.cs b/Content.Server/PDA/Managers/PDAUplinkManager.cs
similarity index 93%
rename from Content.Server/PDA/PDAUplinkManager.cs
rename to Content.Server/PDA/Managers/PDAUplinkManager.cs
index 7a7f788fd4..2112ebf40c 100644
--- a/Content.Server/PDA/PDAUplinkManager.cs
+++ b/Content.Server/PDA/Managers/PDAUplinkManager.cs
@@ -1,16 +1,14 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.Interfaces.PDA;
-using Content.Shared.GameObjects.Components.PDA;
-using Content.Shared.Prototypes.PDA;
+using Content.Server.Mind.Components;
+using Content.Shared.PDA;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.PDA
+namespace Content.Server.PDA.Managers
 {
     public class PDAUplinkManager : IPDAUplinkManager
     {
diff --git a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs b/Content.Server/PDA/PDAComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/PDA/PDAComponent.cs
rename to Content.Server/PDA/PDAComponent.cs
index ee57d3d9bc..941078f034 100644
--- a/Content.Server/GameObjects/Components/PDA/PDAComponent.cs
+++ b/Content.Server/PDA/PDAComponent.cs
@@ -4,20 +4,17 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Paper;
-using Content.Server.Interfaces;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Interfaces.PDA;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.PDA;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Access.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.PDA.Managers;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.PDA;
+using Content.Shared.Tag;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -25,12 +22,10 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.PDA
+namespace Content.Server.PDA
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/PDA/PDAExtensions.cs b/Content.Server/PDA/PDAExtensions.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/PDA/PDAExtensions.cs
rename to Content.Server/PDA/PDAExtensions.cs
index 07c90a002d..13377fb1c6 100644
--- a/Content.Server/GameObjects/Components/PDA/PDAExtensions.cs
+++ b/Content.Server/PDA/PDAExtensions.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Server.Access.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Inventory.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.PDA
+namespace Content.Server.PDA
 {
     public static class PdaExtensions
     {
diff --git a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs b/Content.Server/Paper/PaperComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Paper/PaperComponent.cs
rename to Content.Server/Paper/PaperComponent.cs
index c2a071a8bc..c9705155f3 100644
--- a/Content.Server/GameObjects/Components/Paper/PaperComponent.cs
+++ b/Content.Server/Paper/PaperComponent.cs
@@ -1,18 +1,18 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Tag;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Paper;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
+using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
-using Robust.Shared.Localization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Paper
+namespace Content.Server.Paper
 {
     [RegisterComponent]
     public class PaperComponent : SharedPaperComponent, IExamine, IInteractUsing, IUse
diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs
rename to Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs
index 03fcf8100a..b4afe2ab34 100644
--- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorControlBoxComponent.cs
@@ -4,29 +4,27 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
-using Content.Server.GameObjects.Components.VendingMachines;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Notification;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Server.VendingMachines;
+using Content.Server.Wires.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Singularity.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameObjects.Components.PA
+namespace Content.Server.ParticleAccelerator.Components
 {
     // This component is in control of the PA's logic because it's the one to contain the wires for hacking.
     // And also it's the only PA component that meaningfully needs to work on its own.
diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorEmitterComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/PA/ParticleAcceleratorEmitterComponent.cs
rename to Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
index aa66c8d554..da09283cd0 100644
--- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorEmitterComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEmitterComponent.cs
@@ -1,11 +1,9 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Singularity.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.PA
+namespace Content.Server.ParticleAccelerator.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(ParticleAcceleratorPartComponent))]
diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorEndCapComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/PA/ParticleAcceleratorEndCapComponent.cs
rename to Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs
index e62bbde893..df0df96e6e 100644
--- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorEndCapComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorEndCapComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.PA
+namespace Content.Server.ParticleAccelerator.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(ParticleAcceleratorPartComponent))]
diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorFuelChamberComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/PA/ParticleAcceleratorFuelChamberComponent.cs
rename to Content.Server/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs
index ee3e18a348..1395d0cd00 100644
--- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorFuelChamberComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorFuelChamberComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.PA
+namespace Content.Server.ParticleAccelerator.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(ParticleAcceleratorPartComponent))]
diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs
rename to Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs
index 7d72c785b6..df401ad403 100644
--- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPartComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPartComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.PA
+namespace Content.Server.ParticleAccelerator.Components
 {
     public abstract class ParticleAcceleratorPartComponent : Component
     {
diff --git a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPowerBoxComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/PA/ParticleAcceleratorPowerBoxComponent.cs
rename to Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
index 6b9b52cb0c..6f4be1630a 100644
--- a/Content.Server/GameObjects/Components/PA/ParticleAcceleratorPowerBoxComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleAcceleratorPowerBoxComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Server.Power.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.PA
+namespace Content.Server.ParticleAccelerator.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(ParticleAcceleratorPartComponent))]
diff --git a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs
rename to Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
index 546a04022d..baf2ee7c02 100644
--- a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs
+++ b/Content.Server/ParticleAccelerator/Components/ParticleProjectileComponent.cs
@@ -1,17 +1,15 @@
-using Content.Server.GameObjects.Components.Projectiles;
-using Content.Server.GameObjects.Components.Singularity;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Physics;
+using Content.Server.Projectiles.Components;
+using Content.Server.Singularity.Components;
+using Content.Shared.Singularity.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.Components.PA
+namespace Content.Server.ParticleAccelerator.Components
 {
     [RegisterComponent]
     public class ParticleProjectileComponent : Component, IStartCollide
diff --git a/Content.Server/GameObjects/EntitySystems/ParticleAcceleratorPartSystem.cs b/Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs
similarity index 92%
rename from Content.Server/GameObjects/EntitySystems/ParticleAcceleratorPartSystem.cs
rename to Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs
index 0c3cc08ac1..ae61276bf1 100644
--- a/Content.Server/GameObjects/EntitySystems/ParticleAcceleratorPartSystem.cs
+++ b/Content.Server/ParticleAccelerator/ParticleAcceleratorPartSystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.PA;
+using Content.Server.ParticleAccelerator.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.ParticleAccelerator
 {
     [UsedImplicitly]
     public class ParticleAcceleratorPartSystem : EntitySystem
diff --git a/Content.Server/Physics/Controllers/ConveyorController.cs b/Content.Server/Physics/Controllers/ConveyorController.cs
index 1f11f270cc..3c65195aaa 100644
--- a/Content.Server/Physics/Controllers/ConveyorController.cs
+++ b/Content.Server/Physics/Controllers/ConveyorController.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Conveyor;
-using Content.Server.GameObjects.Components.Recycling;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Server.Conveyor;
+using Content.Server.Recycling.Components;
+using Content.Shared.Movement.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index 9982d9cb5c..f4c1e0b891 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -1,16 +1,16 @@
 #nullable enable
 using System.Collections.Generic;
 using Content.Server.Actions;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Movement;
-using Content.Server.GameObjects.Components.Sound;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.Movement.Components;
+using Content.Server.Shuttle;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Tag;
+using Content.Shared.Inventory;
 using Content.Shared.Maps;
+using Content.Shared.Movement.Components;
 using Content.Shared.Physics.Controllers;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
diff --git a/Content.Server/Physics/Controllers/PullController.cs b/Content.Server/Physics/Controllers/PullController.cs
index 27a5bbaaa0..5068405bbd 100644
--- a/Content.Server/Physics/Controllers/PullController.cs
+++ b/Content.Server/Physics/Controllers/PullController.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Pulling;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Controllers;
diff --git a/Content.Server/Physics/Controllers/SingularityController.cs b/Content.Server/Physics/Controllers/SingularityController.cs
index d4256f885f..4347a194be 100644
--- a/Content.Server/Physics/Controllers/SingularityController.cs
+++ b/Content.Server/Physics/Controllers/SingularityController.cs
@@ -1,6 +1,6 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.Components.Singularity;
+using Content.Server.Ghost.Components;
+using Content.Server.Singularity.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Server/Commands/Physics/TestbedCommand.cs b/Content.Server/Physics/TestbedCommand.cs
similarity index 99%
rename from Content.Server/Commands/Physics/TestbedCommand.cs
rename to Content.Server/Physics/TestbedCommand.cs
index 094964e51f..9dabbd0490 100644
--- a/Content.Server/Commands/Physics/TestbedCommand.cs
+++ b/Content.Server/Physics/TestbedCommand.cs
@@ -37,7 +37,7 @@ using Robust.Shared.Timing;
 
 #nullable enable
 
-namespace Content.Server.Commands.Physics
+namespace Content.Server.Physics
 {
     /*
      * I didn't use blueprints because this is way easier to iterate upon as I can shit out testbed upon testbed on new maps
diff --git a/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs b/Content.Server/Placeable/PlaceableSurfaceComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs
rename to Content.Server/Placeable/PlaceableSurfaceComponent.cs
index 3a36110f27..e1ab83f897 100644
--- a/Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs
+++ b/Content.Server/Placeable/PlaceableSurfaceComponent.cs
@@ -1,14 +1,14 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Placeable;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Placeable
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedPlaceableSurfaceComponent))]
diff --git a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs b/Content.Server/Plants/Components/PottedPlantHideComponent.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/PottedPlantHideComponent.cs
rename to Content.Server/Plants/Components/PottedPlantHideComponent.cs
index a53b48d1ef..3a75cbab75 100644
--- a/Content.Server/GameObjects/Components/PottedPlantHideComponent.cs
+++ b/Content.Server/Plants/Components/PottedPlantHideComponent.cs
@@ -1,16 +1,15 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Storage.Components;
 using Content.Shared.Audio;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Server.GameObjects;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Plants.Components
 {
     [RegisterComponent]
     public class PottedPlantHideComponent : Component, IInteractUsing, IInteractHand
diff --git a/Content.Server/GameObjects/Components/RandomPottedPlantComponent.cs b/Content.Server/Plants/Components/RandomPottedPlantComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/RandomPottedPlantComponent.cs
rename to Content.Server/Plants/Components/RandomPottedPlantComponent.cs
index b97b00196b..b5b830e432 100644
--- a/Content.Server/GameObjects/Components/RandomPottedPlantComponent.cs
+++ b/Content.Server/Plants/Components/RandomPottedPlantComponent.cs
@@ -6,7 +6,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Plants.Components
 {
     [RegisterComponent]
     public class RandomPottedPlantComponent : Component, IMapInit
diff --git a/Content.Server/GameObjects/EntitySystems/PlantSystem.cs b/Content.Server/Plants/PlantSystem.cs
similarity index 94%
rename from Content.Server/GameObjects/EntitySystems/PlantSystem.cs
rename to Content.Server/Plants/PlantSystem.cs
index 0604ae8ec1..541a606e51 100644
--- a/Content.Server/GameObjects/EntitySystems/PlantSystem.cs
+++ b/Content.Server/Plants/PlantSystem.cs
@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using Content.Server.Botany;
-using Content.Server.GameObjects.Components.Botany;
+using Content.Server.Botany.Components;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Plants
 {
     [UsedImplicitly]
     public class PlantSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/Players/PlayerData.cs b/Content.Server/Players/PlayerData.cs
index 5161ced028..cff16ce8e6 100644
--- a/Content.Server/Players/PlayerData.cs
+++ b/Content.Server/Players/PlayerData.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Content.Server.Mobs;
 using Robust.Server.Player;
 using Robust.Shared.Network;
 using Robust.Shared.ViewVariables;
@@ -23,7 +22,7 @@ namespace Content.Server.Players
         ///     DO NOT DIRECTLY SET THIS UNLESS YOU KNOW WHAT YOU'RE DOING.
         /// </summary>
         [ViewVariables]
-        public Mind? Mind { get; set; }
+        public Mind.Mind? Mind { get; set; }
 
         /// <summary>
         ///     If true, the player is an admin and they explicitly de-adminned mid-game,
diff --git a/Content.Server/Players/PlayerSessionExt.cs b/Content.Server/Players/PlayerSessionExt.cs
index feb3869836..35652f17b6 100644
--- a/Content.Server/Players/PlayerSessionExt.cs
+++ b/Content.Server/Players/PlayerSessionExt.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Network.NetMessages;
+using Content.Shared.GameWindow;
 using Robust.Server.Player;
 
 namespace Content.Server.Players
diff --git a/Content.Server/GameObjects/Components/Pointing/PointingArrowComponent.cs b/Content.Server/Pointing/Components/PointingArrowComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Pointing/PointingArrowComponent.cs
rename to Content.Server/Pointing/Components/PointingArrowComponent.cs
index 146c5c712a..ab39e8f226 100644
--- a/Content.Server/GameObjects/Components/Pointing/PointingArrowComponent.cs
+++ b/Content.Server/Pointing/Components/PointingArrowComponent.cs
@@ -1,14 +1,12 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Pointing;
+using Content.Shared.Pointing.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using DrawDepth = Content.Shared.GameObjects.DrawDepth;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
-namespace Content.Server.GameObjects.Components.Pointing
+namespace Content.Server.Pointing.Components
 {
     [RegisterComponent]
     public class PointingArrowComponent : SharedPointingArrowComponent
diff --git a/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs
rename to Content.Server/Pointing/Components/RoguePointingArrowComponent.cs
index 16544644a8..7ce21d39ea 100644
--- a/Content.Server/GameObjects/Components/Pointing/RoguePointingArrowComponent.cs
+++ b/Content.Server/Pointing/Components/RoguePointingArrowComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Linq;
-using Content.Server.Explosions;
-using Content.Shared.GameObjects.Components.Pointing;
+using Content.Server.Explosion;
+using Content.Shared.Pointing.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
@@ -9,14 +9,12 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using DrawDepth = Content.Shared.GameObjects.DrawDepth;
+using DrawDepth = Content.Shared.DrawDepth.DrawDepth;
 
-namespace Content.Server.GameObjects.Components.Pointing
+namespace Content.Server.Pointing.Components
 {
     [RegisterComponent]
     public class RoguePointingArrowComponent : SharedRoguePointingArrowComponent
diff --git a/Content.Server/GameObjects/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/PointingSystem.cs
rename to Content.Server/Pointing/EntitySystems/PointingSystem.cs
index ecf6598dda..51bf6994aa 100644
--- a/Content.Server/GameObjects/EntitySystems/PointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Observer;
-using Content.Server.GameObjects.Components.Pointing;
+using Content.Server.Ghost.Components;
 using Content.Server.Players;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Server.Pointing.Components;
+using Content.Server.Visible;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Input;
-using Content.Shared.Interfaces;
-using Content.Shared.Utility;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -21,7 +22,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Players;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Pointing.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class PointingSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
similarity index 79%
rename from Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs
rename to Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
index 63717ee514..11e9d0a554 100644
--- a/Content.Server/GameObjects/EntitySystems/RoguePointingSystem.cs
+++ b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Pointing;
+using Content.Server.Pointing.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Pointing.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class RoguePointingSystem : EntitySystem
diff --git a/Content.Server/GlobalVerbs/PointingVerb.cs b/Content.Server/Pointing/PointingVerb.cs
similarity index 88%
rename from Content.Server/GlobalVerbs/PointingVerb.cs
rename to Content.Server/Pointing/PointingVerb.cs
index db89cb23cd..bff6fb659e 100644
--- a/Content.Server/GlobalVerbs/PointingVerb.cs
+++ b/Content.Server/Pointing/PointingVerb.cs
@@ -1,11 +1,11 @@
-using Content.Server.GameObjects.Components.Pointing;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Verbs;
+using Content.Server.Pointing.Components;
+using Content.Server.Pointing.EntitySystems;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Pointing
 {
     /// <summary>
     ///     Global verb that points at an entity.
diff --git a/Content.Server/GameObjects/Components/Portal/PortalComponent.cs b/Content.Server/Portal/Components/PortalComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Portal/PortalComponent.cs
rename to Content.Server/Portal/Components/PortalComponent.cs
index 45592a48c0..1cf8a0eb39 100644
--- a/Content.Server/GameObjects/Components/Portal/PortalComponent.cs
+++ b/Content.Server/Portal/Components/PortalComponent.cs
@@ -1,20 +1,18 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Portal;
-using Content.Shared.GameObjects.Components.Tag;
+using Content.Shared.Portal.Components;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Player;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Portal
+namespace Content.Server.Portal.Components
 {
     [RegisterComponent]
     public class PortalComponent : SharedPortalComponent, IStartCollide
diff --git a/Content.Server/GameObjects/Components/Portal/TeleporterComponent.cs b/Content.Server/Portal/Components/TeleporterComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/Portal/TeleporterComponent.cs
rename to Content.Server/Portal/Components/TeleporterComponent.cs
index 1ac2fb9a1d..4d65d8c57c 100644
--- a/Content.Server/GameObjects/Components/Portal/TeleporterComponent.cs
+++ b/Content.Server/Portal/Components/TeleporterComponent.cs
@@ -2,8 +2,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Shared.GameObjects.Components.Portal;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Portal.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -16,7 +16,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Portal
+namespace Content.Server.Portal.Components
 {
     [RegisterComponent]
     public class TeleporterComponent : Component, IAfterInteract
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs b/Content.Server/Power/Components/BaseCharger.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs
rename to Content.Server/Power/Components/BaseCharger.cs
index 17562ce01a..156d158aee 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs
+++ b/Content.Server/Power/Components/BaseCharger.cs
@@ -1,24 +1,23 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Battery.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Weapon.Ranged.Barrels.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Power;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
+namespace Content.Server.Power.Components
 {
     [ComponentReference(typeof(IActivate))]
     [ComponentReference(typeof(IInteractUsing))]
diff --git a/Content.Server/GameObjects/Components/Power/BaseNetConnectorComponent.cs b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Power/BaseNetConnectorComponent.cs
rename to Content.Server/Power/Components/BaseNetConnectorComponent.cs
index 51df3419d0..25d998bdbc 100644
--- a/Content.Server/GameObjects/Components/Power/BaseNetConnectorComponent.cs
+++ b/Content.Server/Power/Components/BaseNetConnectorComponent.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Server.GameObjects.Components.NodeContainer;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer;
+using Content.Server.NodeContainer.NodeGroups;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power
+namespace Content.Server.Power.Components
 {
     public abstract class BaseNetConnectorComponent<TNetType> : Component
     {
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BasePowerNetComponent.cs b/Content.Server/Power/Components/BasePowerNetComponent.cs
similarity index 57%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/BasePowerNetComponent.cs
rename to Content.Server/Power/Components/BasePowerNetComponent.cs
index a80fc4ed9d..78e00cf9dd 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BasePowerNetComponent.cs
+++ b/Content.Server/Power/Components/BasePowerNetComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.NodeGroups;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Power.Components
 {
     public abstract class BasePowerNetComponent : BaseNetConnectorComponent<IPowerNet>
     {
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs b/Content.Server/Power/Components/BatteryDischargerComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs
rename to Content.Server/Power/Components/BatteryDischargerComponent.cs
index 72caf8f90a..a1d1b95b0f 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryDischargerComponent.cs
+++ b/Content.Server/Power/Components/BatteryDischargerComponent.cs
@@ -1,11 +1,10 @@
 #nullable enable
+using Content.Server.Battery.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Power.Components
 {
     /// <summary>
     ///     Uses charge from a <see cref="BatteryComponent"/> to supply power via a <see cref="PowerSupplierComponent"/>.
@@ -30,7 +29,6 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
         public override void Initialize()
         {
             base.Initialize();
-            Owner.EnsureComponentWarn<BatteryComponent>();
             Owner.EnsureComponentWarn<PowerSupplierComponent>();
             UpdateSupplyRate();
         }
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs b/Content.Server/Power/Components/BatteryStorageComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs
rename to Content.Server/Power/Components/BatteryStorageComponent.cs
index 5f13902aa2..df418efce3 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/BatteryStorageComponent.cs
+++ b/Content.Server/Power/Components/BatteryStorageComponent.cs
@@ -1,11 +1,10 @@
 #nullable enable
+using Content.Server.Battery.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Power.Components
 {
     /// <summary>
     ///     Takes power via a <see cref="PowerConsumerComponent"/> to charge a <see cref="BatteryComponent"/>.
@@ -31,7 +30,6 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
         public override void Initialize()
         {
             base.Initialize();
-            Owner.EnsureComponentWarn<BatteryComponent>();
             Owner.EnsureComponentWarn<PowerConsumerComponent>();
             UpdateDrawRate();
         }
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/IPowerNetManager.cs b/Content.Server/Power/Components/IPowerNetManager.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/IPowerNetManager.cs
rename to Content.Server/Power/Components/IPowerNetManager.cs
index 2f8b8230b2..51487f2297 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/IPowerNetManager.cs
+++ b/Content.Server/Power/Components/IPowerNetManager.cs
@@ -1,8 +1,8 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.NodeGroups;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Power.Components
 {
     /// <summary>
     ///     Maintains a set of <see cref="IPowerNet"/>s that need to be updated with <see cref="IPowerNet.UpdateConsumerReceivedPower"/>.
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerConsumerComponent.cs b/Content.Server/Power/Components/PowerConsumerComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerConsumerComponent.cs
rename to Content.Server/Power/Components/PowerConsumerComponent.cs
index ddf2e38078..94c3f2b064 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerConsumerComponent.cs
+++ b/Content.Server/Power/Components/PowerConsumerComponent.cs
@@ -1,14 +1,12 @@
 #nullable enable
 using System;
 using System.Diagnostics;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.NodeGroups;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Power.Components
 {
     [RegisterComponent]
     public class PowerConsumerComponent : BasePowerNetComponent
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs b/Content.Server/Power/Components/PowerProviderComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs
rename to Content.Server/Power/Components/PowerProviderComponent.cs
index 4933ed1d74..8d4a82dc6b 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerProviderComponent.cs
+++ b/Content.Server/Power/Components/PowerProviderComponent.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.APC;
+using Content.Server.APC.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
+namespace Content.Server.Power.Components
 {
     /// <summary>
     ///     Relays <see cref="PowerReceiverComponent"/>s in an area to a <see cref="IApcNet"/> so they can receive power.
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs b/Content.Server/Power/Components/PowerReceiverComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs
rename to Content.Server/Power/Components/PowerReceiverComponent.cs
index 71f8dc2289..705d585005 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverComponent.cs
+++ b/Content.Server/Power/Components/PowerReceiverComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.APC;
+using Content.Shared.Examine;
+using Content.Shared.Power;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -12,7 +12,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
+namespace Content.Server.Power.Components
 {
     /// <summary>
     ///     Attempts to link with a nearby <see cref="IPowerProvider"/>s so that it can receive power from a <see cref="IApcNet"/>.
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerSupplierComponent.cs b/Content.Server/Power/Components/PowerSupplierComponent.cs
similarity index 81%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerSupplierComponent.cs
rename to Content.Server/Power/Components/PowerSupplierComponent.cs
index 9c65240250..bbd8b658fd 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/PowerSupplierComponent.cs
+++ b/Content.Server/Power/Components/PowerSupplierComponent.cs
@@ -1,12 +1,10 @@
 #nullable enable
-using Content.Server.GameObjects.Components.NodeContainer.NodeGroups;
+using Content.Server.NodeContainer.NodeGroups;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Power.Components
 {
     [RegisterComponent]
     public class PowerSupplierComponent : BasePowerNetComponent
diff --git a/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs b/Content.Server/Power/EntitySystems/BaseChargerSystem.cs
similarity index 74%
rename from Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs
rename to Content.Server/Power/EntitySystems/BaseChargerSystem.cs
index 79eb632671..c758bf721f 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/BaseChargerSystem.cs
+++ b/Content.Server/Power/EntitySystems/BaseChargerSystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers;
+using Content.Server.Power.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Power.EntitySystems
 {
     [UsedImplicitly]
     internal sealed class BaseChargerSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerNetSystem.cs b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
similarity index 78%
rename from Content.Server/GameObjects/EntitySystems/Power/PowerNetSystem.cs
rename to Content.Server/Power/EntitySystems/PowerNetSystem.cs
index 4bb61a4c93..bcb8ec6926 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerNetSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerNetSystem.cs
@@ -1,10 +1,10 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Server.Power.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Power.EntitySystems
 {
     [UsedImplicitly]
     public class PowerNetSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
similarity index 85%
rename from Content.Server/GameObjects/EntitySystems/Power/PowerReceiverSystem.cs
rename to Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
index e71f011669..e755c4c9db 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerReceiverSystem.cs
+++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.Power.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Power.EntitySystems
 {
     public sealed class PowerReceiverSystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs b/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs
similarity index 81%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs
rename to Content.Server/PowerCell/Components/PowerCellChargerComponent.cs
index 38b324dc0a..8548ff020b 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/PowerCellChargerComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellChargerComponent.cs
@@ -1,8 +1,10 @@
 #nullable enable
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Battery.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
+namespace Content.Server.PowerCell.Components
 {
     /// <summary>
     /// Recharges an entity with a <see cref="BatteryComponent"/>.
diff --git a/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs b/Content.Server/PowerCell/Components/PowerCellComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Power/PowerCellComponent.cs
rename to Content.Server/PowerCell/Components/PowerCellComponent.cs
index 79d8a80ae5..b5ee6bf42f 100644
--- a/Content.Server/GameObjects/Components/Power/PowerCellComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellComponent.cs
@@ -1,20 +1,20 @@
 #nullable enable
 using System;
-using Content.Server.Explosions;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Utility;
+using Content.Server.Battery.Components;
+using Content.Server.Chemistry.Components;
+using Content.Server.Explosion;
+using Content.Shared.Chemistry;
+using Content.Shared.Examine;
+using Content.Shared.PowerCell;
+using Content.Shared.Rounding;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power
+namespace Content.Server.PowerCell.Components
 {
     /// <summary>
     /// Batteries that can update an <see cref="AppearanceComponent"/> based on their charge percent
diff --git a/Content.Server/GameObjects/Components/Power/PowerCellSlotComponent.cs b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Power/PowerCellSlotComponent.cs
rename to Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
index 5e0a728b41..8f0e8f16e0 100644
--- a/Content.Server/GameObjects/Components/Power/PowerCellSlotComponent.cs
+++ b/Content.Server/PowerCell/Components/PowerCellSlotComponent.cs
@@ -1,24 +1,21 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Robust.Server.GameObjects;
+using Content.Shared.Examine;
+using Content.Shared.Verbs;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power
+namespace Content.Server.PowerCell.Components
 {
     /// <summary>
     /// Provides a "battery compartment" that can contain a <see cref="PowerCellComponent"/> of the matching
diff --git a/Content.Server/Interfaces/IServerPreferencesManager.cs b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
similarity index 93%
rename from Content.Server/Interfaces/IServerPreferencesManager.cs
rename to Content.Server/Preferences/Managers/IServerPreferencesManager.cs
index 2a85600825..7b7ad17d37 100644
--- a/Content.Server/Interfaces/IServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
@@ -4,7 +4,7 @@ using Content.Shared.Preferences;
 using Robust.Server.Player;
 using Robust.Shared.Network;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.Preferences.Managers
 {
     public interface IServerPreferencesManager
     {
diff --git a/Content.Server/Preferences/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
similarity index 99%
rename from Content.Server/Preferences/ServerPreferencesManager.cs
rename to Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index a580e9d942..a089f01aba 100644
--- a/Content.Server/Preferences/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -3,9 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Database;
-using Content.Server.Interfaces;
 using Content.Shared;
-using Content.Shared.Network.NetMessages;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Robust.Server.Player;
@@ -18,7 +16,7 @@ using Robust.Shared.Prototypes;
 
 #nullable enable
 
-namespace Content.Server.Preferences
+namespace Content.Server.Preferences.Managers
 {
     /// <summary>
     /// Sends <see cref="MsgPreferencesAndSettings"/> before the client joins the lobby.
diff --git a/Content.Server/Interfaces/GameObjects/IPressureProtection.cs b/Content.Server/Pressure/IPressureProtection.cs
similarity index 76%
rename from Content.Server/Interfaces/GameObjects/IPressureProtection.cs
rename to Content.Server/Pressure/IPressureProtection.cs
index ed18e8f1d1..fb033b9f55 100644
--- a/Content.Server/Interfaces/GameObjects/IPressureProtection.cs
+++ b/Content.Server/Pressure/IPressureProtection.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Interfaces.GameObjects
+namespace Content.Server.Pressure
 {
     public interface IPressureProtection
     {
diff --git a/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs b/Content.Server/Projectiles/Components/HitscanComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs
rename to Content.Server/Projectiles/Components/HitscanComponent.cs
index aeccd9fe39..e4ebd554e6 100644
--- a/Content.Server/GameObjects/Components/Projectiles/HitscanComponent.cs
+++ b/Content.Server/Projectiles/Components/HitscanComponent.cs
@@ -7,11 +7,11 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Player;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.Components.Projectiles
+namespace Content.Server.Projectiles.Components
 {
     /// <summary>
     /// Lasers etc.
diff --git a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Server/Projectiles/Components/ProjectileComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs
rename to Content.Server/Projectiles/Components/ProjectileComponent.cs
index 291d3418ef..ef41b8b735 100644
--- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs
+++ b/Content.Server/Projectiles/Components/ProjectileComponent.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Camera;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Projectiles;
+using Content.Shared.Damage.Components;
+using Content.Shared.Projectiles;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics.Collision;
@@ -12,7 +12,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Projectiles
+namespace Content.Server.Projectiles.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedProjectileComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs b/Content.Server/Projectiles/ProjectileSystem.cs
similarity index 84%
rename from Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs
rename to Content.Server/Projectiles/ProjectileSystem.cs
index 8d196875e8..78e492cde5 100644
--- a/Content.Server/GameObjects/EntitySystems/ProjectileSystem.cs
+++ b/Content.Server/Projectiles/ProjectileSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Projectiles;
+using Content.Server.Projectiles.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Projectiles
 {
     [UsedImplicitly]
     internal sealed class ProjectileSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Pulling/PullableComponent.cs b/Content.Server/Pulling/PullableComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Pulling/PullableComponent.cs
rename to Content.Server/Pulling/PullableComponent.cs
index 0ff691c2e9..6d10d8d5e1 100644
--- a/Content.Server/GameObjects/Components/Pulling/PullableComponent.cs
+++ b/Content.Server/Pulling/PullableComponent.cs
@@ -1,13 +1,13 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Pulling;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Hands.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Pulling.Components;
+using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Physics;
 
-namespace Content.Server.GameObjects.Components.Pulling
+namespace Content.Server.Pulling
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedPullableComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/PullingSystem.cs b/Content.Server/Pulling/PullingSystem.cs
similarity index 77%
rename from Content.Server/GameObjects/EntitySystems/PullingSystem.cs
rename to Content.Server/Pulling/PullingSystem.cs
index 63a2c1d42c..4b29e234d3 100644
--- a/Content.Server/GameObjects/EntitySystems/PullingSystem.cs
+++ b/Content.Server/Pulling/PullingSystem.cs
@@ -1,10 +1,8 @@
-using Content.Server.GameObjects.Components.Pulling;
-using Content.Shared.GameObjects.EntitySystemMessages.Pulling;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Pulling;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Pulling
 {
     [UsedImplicitly]
     public class PullingSystem : SharedPullingSystem
diff --git a/Content.Server/GameObjects/Components/Items/RCD/RCDAmmoComponent.cs b/Content.Server/RCD/Components/RCDAmmoComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Items/RCD/RCDAmmoComponent.cs
rename to Content.Server/RCD/Components/RCDAmmoComponent.cs
index cfcb705e77..605cfe6bfa 100644
--- a/Content.Server/GameObjects/Components/Items/RCD/RCDAmmoComponent.cs
+++ b/Content.Server/RCD/Components/RCDAmmoComponent.cs
@@ -1,16 +1,16 @@
 using System;
 using System.Threading.Tasks;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Items.RCD
+namespace Content.Server.RCD.Components
 {
     [RegisterComponent]
     public class RCDAmmoComponent : Component, IAfterInteract, IExamine
diff --git a/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs b/Content.Server/RCD/Components/RCDComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
rename to Content.Server/RCD/Components/RCDComponent.cs
index 1fa834e16a..eae80da66b 100644
--- a/Content.Server/GameObjects/Components/Items/RCD/RCDComponent.cs
+++ b/Content.Server/RCD/Components/RCDComponent.cs
@@ -1,12 +1,13 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.DoAfter;
+using Content.Shared.Coordinates;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Content.Shared.Maps;
-using Content.Shared.Utility;
+using Content.Shared.Notification;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -19,7 +20,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Items.RCD
+namespace Content.Server.RCD.Components
 {
     [RegisterComponent]
     public class RCDComponent : Component, IAfterInteract, IUse, IExamine
@@ -127,13 +128,13 @@ namespace Content.Server.GameObjects.Components.Items.RCD
             {
                 //Floor mode just needs the tile to be a space tile (subFloor)
                 case RcdMode.Floors:
-                    mapGrid.SetTile(eventArgs.ClickLocation, new Tile(_tileDefinitionManager["floor_steel"].TileId));
+                    mapGrid.SetTile(eventArgs.ClickLocation, new Robust.Shared.Map.Tile(_tileDefinitionManager["floor_steel"].TileId));
                     break;
                 //We don't want to place a space tile on something that's already a space tile. Let's do the inverse of the last check.
                 case RcdMode.Deconstruct:
                     if (!tile.IsBlockedTurf(true)) //Delete the turf
                     {
-                        mapGrid.SetTile(snapPos, Tile.Empty);
+                        mapGrid.SetTile(snapPos, Robust.Shared.Map.Tile.Empty);
                     }
                     else //Delete what the user targeted
                     {
diff --git a/Content.Server/GameObjects/Components/Items/RCD/RCDDeconstructWhitelistComponent.cs b/Content.Server/RCD/Components/RCDDeconstructWhitelistComponent.cs
similarity index 77%
rename from Content.Server/GameObjects/Components/Items/RCD/RCDDeconstructWhitelistComponent.cs
rename to Content.Server/RCD/Components/RCDDeconstructWhitelistComponent.cs
index 7fb18a45cd..34e517f210 100644
--- a/Content.Server/GameObjects/Components/Items/RCD/RCDDeconstructWhitelistComponent.cs
+++ b/Content.Server/RCD/Components/RCDDeconstructWhitelistComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Items.RCD
+namespace Content.Server.RCD.Components
 {
     [RegisterComponent]
     public class RCDDeconstructWhitelist : Component
diff --git a/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs b/Content.Server/Radiation/RadiationPulseComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs
rename to Content.Server/Radiation/RadiationPulseComponent.cs
index 856d6c4c40..86c512b9c9 100644
--- a/Content.Server/GameObjects/Components/StationEvents/RadiationPulseComponent.cs
+++ b/Content.Server/Radiation/RadiationPulseComponent.cs
@@ -1,6 +1,5 @@
 using System;
-using Content.Shared.GameObjects.Components;
-using Robust.Server.GameObjects;
+using Content.Shared.Radiation;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -10,7 +9,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.Components.StationEvents
+namespace Content.Server.Radiation
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedRadiationPulseComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs b/Content.Server/Radiation/RadiationPulseSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs
rename to Content.Server/Radiation/RadiationPulseSystem.cs
index 0fff3db93d..781e96d7f9 100644
--- a/Content.Server/GameObjects/EntitySystems/StationEvents/RadiationPulseSystem.cs
+++ b/Content.Server/Radiation/RadiationPulseSystem.cs
@@ -1,11 +1,10 @@
-using Content.Server.GameObjects.Components.StationEvents;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Radiation;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Server.GameObjects.EntitySystems.StationEvents
+namespace Content.Server.Radiation
 {
     [UsedImplicitly]
     public sealed class RadiationPulseSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Radio/HandheldRadioComponent.cs b/Content.Server/Radio/Components/HandheldRadioComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Radio/HandheldRadioComponent.cs
rename to Content.Server/Radio/Components/HandheldRadioComponent.cs
index 23d37b7a1f..0c06afb81e 100644
--- a/Content.Server/GameObjects/Components/Radio/HandheldRadioComponent.cs
+++ b/Content.Server/Radio/Components/HandheldRadioComponent.cs
@@ -1,20 +1,17 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces;
-using Content.Server.Interfaces.Chat;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Chat.Managers;
+using Content.Server.Radio.EntitySystems;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Radio
+namespace Content.Server.Radio.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IRadio))]
diff --git a/Content.Server/Interfaces/IListen.cs b/Content.Server/Radio/Components/IListen.cs
similarity index 90%
rename from Content.Server/Interfaces/IListen.cs
rename to Content.Server/Radio/Components/IListen.cs
index ebc2c362e1..77ee15a8f2 100644
--- a/Content.Server/Interfaces/IListen.cs
+++ b/Content.Server/Radio/Components/IListen.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.Radio.Components
 {
     /// <summary>
     ///     Interface for objects such as radios meant to have an effect when speech is
diff --git a/Content.Server/Interfaces/IRadio.cs b/Content.Server/Radio/Components/IRadio.cs
similarity index 87%
rename from Content.Server/Interfaces/IRadio.cs
rename to Content.Server/Radio/Components/IRadio.cs
index a31a998622..f93bf4877b 100644
--- a/Content.Server/Interfaces/IRadio.cs
+++ b/Content.Server/Radio/Components/IRadio.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Interfaces
+namespace Content.Server.Radio.Components
 {
     public interface IRadio
     {
diff --git a/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs b/Content.Server/Radio/EntitySystems/ListeningSystem.cs
similarity index 86%
rename from Content.Server/GameObjects/EntitySystems/ListeningSystem.cs
rename to Content.Server/Radio/EntitySystems/ListeningSystem.cs
index 784ffc8c35..44370632c5 100644
--- a/Content.Server/GameObjects/EntitySystems/ListeningSystem.cs
+++ b/Content.Server/Radio/EntitySystems/ListeningSystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.Interfaces;
+using Content.Server.Radio.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Radio.EntitySystems
 {
     [UsedImplicitly]
     public class ListeningSystem : EntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/RadioSystem.cs
rename to Content.Server/Radio/EntitySystems/RadioSystem.cs
index 1465583dee..7d2df3f19e 100644
--- a/Content.Server/GameObjects/EntitySystems/RadioSystem.cs
+++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Interfaces;
+using Content.Server.Radio.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Radio.EntitySystems
 {
     [UsedImplicitly]
     public class RadioSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Recycling/RecyclableComponent.cs b/Content.Server/Recycling/Components/RecyclableComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Recycling/RecyclableComponent.cs
rename to Content.Server/Recycling/Components/RecyclableComponent.cs
index 8faeacd42b..8d86f40706 100644
--- a/Content.Server/GameObjects/Components/Recycling/RecyclableComponent.cs
+++ b/Content.Server/Recycling/Components/RecyclableComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Recycling
+namespace Content.Server.Recycling.Components
 {
     [RegisterComponent]
     public class RecyclableComponent : Component
diff --git a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs b/Content.Server/Recycling/Components/RecyclerComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs
rename to Content.Server/Recycling/Components/RecyclerComponent.cs
index d5eac07a18..55caa74127 100644
--- a/Content.Server/GameObjects/Components/Recycling/RecyclerComponent.cs
+++ b/Content.Server/Recycling/Components/RecyclerComponent.cs
@@ -1,16 +1,16 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Conveyor;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Act;
+using Content.Server.Chat.Managers;
+using Content.Server.Conveyor;
+using Content.Server.GameTicking;
+using Content.Server.Items;
+using Content.Server.Notification;
 using Content.Server.Players;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Recycling;
-using Content.Shared.Interfaces;
+using Content.Server.Power.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Notification;
+using Content.Shared.Recycling;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Containers;
@@ -23,7 +23,7 @@ using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Recycling
+namespace Content.Server.Recycling.Components
 {
     // TODO: Add sound and safe beep
     [RegisterComponent]
diff --git a/Content.Server/GameObjects/Components/RepairableComponent.cs b/Content.Server/Repairable/RepairableComponent.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/RepairableComponent.cs
rename to Content.Server/Repairable/RepairableComponent.cs
index f5aa891eeb..59befd3793 100644
--- a/Content.Server/GameObjects/Components/RepairableComponent.cs
+++ b/Content.Server/Repairable/RepairableComponent.cs
@@ -1,17 +1,16 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Shared.Interfaces;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.Tools.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Repairable
 {
     [RegisterComponent]
     public class RepairableComponent : Component, IInteractUsing
diff --git a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs b/Content.Server/Research/Components/ResearchClientComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs
rename to Content.Server/Research/Components/ResearchClientComponent.cs
index 7faaa900ce..23b8aa9b18 100644
--- a/Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs
+++ b/Content.Server/Research/Components/ResearchClientComponent.cs
@@ -1,15 +1,14 @@
 #nullable enable
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.UserInterface;
+using Content.Shared.Interaction;
+using Content.Shared.Research.Components;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Research.Components
 {
     [RegisterComponent]
     public class ResearchClientComponent : SharedResearchClientComponent, IActivate
diff --git a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs b/Content.Server/Research/Components/ResearchConsoleComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs
rename to Content.Server/Research/Components/ResearchConsoleComponent.cs
index df168e2cd5..1586cbb753 100644
--- a/Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs
+++ b/Content.Server/Research/Components/ResearchConsoleComponent.cs
@@ -1,10 +1,10 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Utility;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Research;
+using Content.Shared.Interaction;
+using Content.Shared.Research.Components;
+using Content.Shared.Research.Prototypes;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
@@ -15,7 +15,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Research.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs b/Content.Server/Research/Components/ResearchPointSourceComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs
rename to Content.Server/Research/Components/ResearchPointSourceComponent.cs
index d8a68c7443..12374d64f9 100644
--- a/Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs
+++ b/Content.Server/Research/Components/ResearchPointSourceComponent.cs
@@ -1,10 +1,10 @@
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Research.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs b/Content.Server/Research/Components/ResearchServerComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs
rename to Content.Server/Research/Components/ResearchServerComponent.cs
index a490b17bd2..3bb2eec75d 100644
--- a/Content.Server/GameObjects/Components/Research/ResearchServerComponent.cs
+++ b/Content.Server/Research/Components/ResearchServerComponent.cs
@@ -1,12 +1,11 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.Research;
+using Content.Server.Power.Components;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Research.Components
 {
     [RegisterComponent]
     public class ResearchServerComponent : Component
diff --git a/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs b/Content.Server/Research/Components/TechnologyDatabaseComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs
rename to Content.Server/Research/Components/TechnologyDatabaseComponent.cs
index 681e021b56..cc0bc9c11b 100644
--- a/Content.Server/GameObjects/Components/Research/TechnologyDatabaseComponent.cs
+++ b/Content.Server/Research/Components/TechnologyDatabaseComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Research;
-using Content.Shared.Research;
+using Content.Shared.Research.Components;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 
-namespace Content.Server.GameObjects.Components.Research
+namespace Content.Server.Research.Components
 {
     [RegisterComponent]
     public class  TechnologyDatabaseComponent : SharedTechnologyDatabaseComponent
diff --git a/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs b/Content.Server/Research/ResearchSystem.cs
similarity index 95%
rename from Content.Server/GameObjects/EntitySystems/ResearchSystem.cs
rename to Content.Server/Research/ResearchSystem.cs
index d29945d6f6..d43277ddb6 100644
--- a/Content.Server/GameObjects/EntitySystems/ResearchSystem.cs
+++ b/Content.Server/Research/ResearchSystem.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Research;
+using Content.Server.Research.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Research
 {
     [UsedImplicitly]
     public class ResearchSystem : EntitySystem
diff --git a/Content.Server/Commands/Mobs/AddRoleCommand.cs b/Content.Server/Roles/AddRoleCommand.cs
similarity index 95%
rename from Content.Server/Commands/Mobs/AddRoleCommand.cs
rename to Content.Server/Roles/AddRoleCommand.cs
index 9f846e9c22..dffb25154e 100644
--- a/Content.Server/Commands/Mobs/AddRoleCommand.cs
+++ b/Content.Server/Roles/AddRoleCommand.cs
@@ -1,5 +1,4 @@
 using Content.Server.Administration;
-using Content.Server.Mobs.Roles;
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Content.Shared.Roles;
@@ -8,7 +7,7 @@ using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Commands.Mobs
+namespace Content.Server.Roles
 {
     [AdminCommand(AdminFlags.Fun)]
     public class AddRoleCommand : IConsoleCommand
diff --git a/Content.Server/Mobs/Roles/Job.cs b/Content.Server/Roles/Job.cs
similarity index 83%
rename from Content.Server/Mobs/Roles/Job.cs
rename to Content.Server/Roles/Job.cs
index 700664caa2..7958bd26a3 100644
--- a/Content.Server/Mobs/Roles/Job.cs
+++ b/Content.Server/Roles/Job.cs
@@ -1,8 +1,8 @@
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Content.Shared.Roles;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Mobs.Roles
+namespace Content.Server.Roles
 {
     public class Job : Role
     {
@@ -13,7 +13,7 @@ namespace Content.Server.Mobs.Roles
 
         public string? StartingGear => Prototype.StartingGear;
 
-        public Job(Mind mind, JobPrototype jobPrototype) : base(mind)
+        public Job(Mind.Mind mind, JobPrototype jobPrototype) : base(mind)
         {
             Prototype = jobPrototype;
             Name = jobPrototype.Name;
diff --git a/Content.Server/Commands/Mobs/RemoveRoleCommand.cs b/Content.Server/Roles/RemoveRoleCommand.cs
similarity index 95%
rename from Content.Server/Commands/Mobs/RemoveRoleCommand.cs
rename to Content.Server/Roles/RemoveRoleCommand.cs
index 876bb16b54..baf0edb542 100644
--- a/Content.Server/Commands/Mobs/RemoveRoleCommand.cs
+++ b/Content.Server/Roles/RemoveRoleCommand.cs
@@ -1,5 +1,4 @@
 using Content.Server.Administration;
-using Content.Server.Mobs.Roles;
 using Content.Server.Players;
 using Content.Shared.Administration;
 using Content.Shared.Roles;
@@ -8,7 +7,7 @@ using Robust.Shared.Console;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Commands.Mobs
+namespace Content.Server.Roles
 {
     [AdminCommand(AdminFlags.Fun)]
     public class RemoveRoleCommand : IConsoleCommand
diff --git a/Content.Server/Mobs/Role.cs b/Content.Server/Roles/Role.cs
similarity index 89%
rename from Content.Server/Mobs/Role.cs
rename to Content.Server/Roles/Role.cs
index 56e78dcc44..8c0943272a 100644
--- a/Content.Server/Mobs/Role.cs
+++ b/Content.Server/Roles/Role.cs
@@ -1,7 +1,7 @@
 // Hey look,
 // Antag Datums.
 
-namespace Content.Server.Mobs
+namespace Content.Server.Roles
 {
     /// <summary>
     ///     The Role is a basic building block for,
@@ -13,7 +13,7 @@ namespace Content.Server.Mobs
         /// <summary>
         ///     The mind owning this role instance.
         /// </summary>
-        public Mind Mind { get; }
+        public Mind.Mind Mind { get; }
 
         /// <summary>
         ///     A friendly name for this role type.
@@ -25,7 +25,7 @@ namespace Content.Server.Mobs
         /// </summary>
         public abstract bool Antagonist { get; }
 
-        protected Role(Mind mind)
+        protected Role(Mind.Mind mind)
         {
             Mind = mind;
         }
diff --git a/Content.Server/Mobs/Roles/RoleAddedMessage.cs b/Content.Server/Roles/RoleAddedMessage.cs
similarity index 76%
rename from Content.Server/Mobs/Roles/RoleAddedMessage.cs
rename to Content.Server/Roles/RoleAddedMessage.cs
index c4de66e333..a0c1fe92ef 100644
--- a/Content.Server/Mobs/Roles/RoleAddedMessage.cs
+++ b/Content.Server/Roles/RoleAddedMessage.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Mobs.Roles
+namespace Content.Server.Roles
 {
     public class RoleAddedMessage : RoleMessage
     {
diff --git a/Content.Server/Mobs/Roles/RoleMessage.cs b/Content.Server/Roles/RoleMessage.cs
similarity index 85%
rename from Content.Server/Mobs/Roles/RoleMessage.cs
rename to Content.Server/Roles/RoleMessage.cs
index 1a4489ddc7..0ce6242a17 100644
--- a/Content.Server/Mobs/Roles/RoleMessage.cs
+++ b/Content.Server/Roles/RoleMessage.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Mobs.Roles
+namespace Content.Server.Roles
 {
     public class RoleMessage : ComponentMessage
     {
diff --git a/Content.Server/Mobs/Roles/RoleRemovedMessage.cs b/Content.Server/Roles/RoleRemovedMessage.cs
similarity index 76%
rename from Content.Server/Mobs/Roles/RoleRemovedMessage.cs
rename to Content.Server/Roles/RoleRemovedMessage.cs
index 0e8cd0ef85..4abc709d0c 100644
--- a/Content.Server/Mobs/Roles/RoleRemovedMessage.cs
+++ b/Content.Server/Roles/RoleRemovedMessage.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Mobs.Roles
+namespace Content.Server.Roles
 {
     public class RoleRemovedMessage : RoleMessage
     {
diff --git a/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs b/Content.Server/Rotation/Components/FlippableComponent.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs
rename to Content.Server/Rotation/Components/FlippableComponent.cs
index 44241dc85f..69a5f6a998 100644
--- a/Content.Server/GameObjects/Components/Rotatable/FlippableComponent.cs
+++ b/Content.Server/Rotation/Components/FlippableComponent.cs
@@ -1,15 +1,13 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Physics;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Rotatable
+namespace Content.Server.Rotation.Components
 {
     [RegisterComponent]
     public class FlippableComponent : Component
diff --git a/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs b/Content.Server/Rotation/Components/RotatableComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs
rename to Content.Server/Rotation/Components/RotatableComponent.cs
index 33aa7243e3..de94373d52 100644
--- a/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs
+++ b/Content.Server/Rotation/Components/RotatableComponent.cs
@@ -1,14 +1,14 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Rotatable;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Notification;
+using Content.Shared.Rotatable;
+using Content.Shared.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 
-namespace Content.Server.GameObjects.Components.Rotatable
+namespace Content.Server.Rotation.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedRotatableComponent))]
diff --git a/Content.Server/HardRotateVerbs.cs b/Content.Server/Rotation/HardRotateVerbs.cs
similarity index 89%
rename from Content.Server/HardRotateVerbs.cs
rename to Content.Server/Rotation/HardRotateVerbs.cs
index a9d7918db3..608e771b55 100644
--- a/Content.Server/HardRotateVerbs.cs
+++ b/Content.Server/Rotation/HardRotateVerbs.cs
@@ -1,9 +1,4 @@
-using System;
-using Content.Shared.GameObjects.Verbs;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Maths;
-
-namespace Content.Server
+namespace Content.Server.Rotation
 {
     // Mapping tools
     // Uncomment if you need them, I guess.
diff --git a/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs b/Content.Server/RoundEnd/RoundEndSystem.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs
rename to Content.Server/RoundEnd/RoundEndSystem.cs
index d756c58a26..242a14b79a 100644
--- a/Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs
+++ b/Content.Server/RoundEnd/RoundEndSystem.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking;
 using Content.Shared.GameTicking;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -11,7 +11,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Timing;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.RoundEnd
 {
     public class RoundEndSystem : EntitySystem, IResettingEntitySystem
     {
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs b/Content.Server/SMES/PowerSmesSystem.cs
similarity index 76%
rename from Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs
rename to Content.Server/SMES/PowerSmesSystem.cs
index 2097e1acf5..1bccbecbcf 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerSmesSystem.cs
+++ b/Content.Server/SMES/PowerSmesSystem.cs
@@ -1,9 +1,8 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.SMES
 {
     [UsedImplicitly]
     internal class PowerSmesSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs b/Content.Server/SMES/SmesComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs
rename to Content.Server/SMES/SmesComponent.cs
index c9e1dc9105..e6c988ef3b 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SmesComponent.cs
+++ b/Content.Server/SMES/SmesComponent.cs
@@ -1,13 +1,16 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.Utility;
+using Content.Server.Battery.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Power;
+using Content.Shared.Rounding;
+using Content.Shared.SMES;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.SMES
 {
     /// <summary>
     ///     Handles the "user-facing" side of the actual SMES object.
@@ -35,7 +38,6 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
         {
             base.Initialize();
 
-            Owner.EnsureComponent<BatteryComponent>();
             Owner.EnsureComponentWarn<AppearanceComponent>();
         }
 
diff --git a/Content.Server/Sandbox/SandboxManager.cs b/Content.Server/Sandbox/SandboxManager.cs
index b147f77f99..a3eabcd86b 100644
--- a/Content.Server/Sandbox/SandboxManager.cs
+++ b/Content.Server/Sandbox/SandboxManager.cs
@@ -1,10 +1,10 @@
 using System.Linq;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.PDA;
+using Content.Server.Access.Components;
 using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Hands.Components;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.PDA;
 using Content.Shared.Access;
 using Content.Shared.Sandbox;
 using Robust.Server.Console;
@@ -17,7 +17,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
 namespace Content.Server.Sandbox
 {
diff --git a/Content.Server/StatusShell.cs b/Content.Server/Shell/StatusShell.cs
similarity index 96%
rename from Content.Server/StatusShell.cs
rename to Content.Server/Shell/StatusShell.cs
index 33ac8473dc..73fbe2a4a5 100644
--- a/Content.Server/StatusShell.cs
+++ b/Content.Server/Shell/StatusShell.cs
@@ -1,13 +1,12 @@
 using System;
 using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Newtonsoft.Json.Linq;
 using Robust.Server;
 using Robust.Server.Player;
 using Robust.Server.ServerStatus;
 using Robust.Shared.IoC;
 
-namespace Content.Server
+namespace Content.Server.Shell
 {
     /// <summary>
     ///     Tiny helper class to handle status messages. Nothing too complicated.
diff --git a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs b/Content.Server/Shuttle/ShuttleControllerComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
rename to Content.Server/Shuttle/ShuttleControllerComponent.cs
index c76f6406a4..2ef4a61f22 100644
--- a/Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
+++ b/Content.Server/Shuttle/ShuttleControllerComponent.cs
@@ -1,23 +1,17 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Buckle;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Alert;
+using Content.Server.Buckle.Components;
+using Content.Server.Mind.Components;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Strap;
-using Content.Shared.Physics;
+using Content.Shared.Buckle.Components;
+using Content.Shared.Movement.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Physics;
-using Robust.Shared.Physics.Dynamics;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Movement
+namespace Content.Server.Shuttle
 {
     [RegisterComponent]
     [ComponentReference(typeof(IMoverComponent))]
diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs
rename to Content.Server/Singularity/Components/ContainmentFieldComponent.cs
index cf496c7b9e..0d15e6537f 100644
--- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs
+++ b/Content.Server/Singularity/Components/ContainmentFieldComponent.cs
@@ -1,10 +1,9 @@
 #nullable enable
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 
-namespace Content.Server.GameObjects.Components.Singularity
+namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
     public class ContainmentFieldComponent : Component, IStartCollide
diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs b/Content.Server/Singularity/Components/ContainmentFieldConnection.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs
rename to Content.Server/Singularity/Components/ContainmentFieldConnection.cs
index e061e1fa0d..b0770e1316 100644
--- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldConnection.cs
+++ b/Content.Server/Singularity/Components/ContainmentFieldConnection.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.GameObjects.Components.Singularity
+namespace Content.Server.Singularity.Components
 {
     public class ContainmentFieldConnection : IDisposable
     {
diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs
similarity index 98%
rename from Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs
rename to Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs
index 13b43a1833..6e07683744 100644
--- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldGeneratorComponent.cs
+++ b/Content.Server/Singularity/Components/ContainmentFieldGeneratorComponent.cs
@@ -2,19 +2,19 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Tag;
 using Content.Shared.Physics;
+using Content.Shared.Tag;
+using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Broadphase;
-using Robust.Shared.ViewVariables;
-using Robust.Server.GameObjects;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
+using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Singularity
+namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
     public class ContainmentFieldGeneratorComponent : Component, IStartCollide
diff --git a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs b/Content.Server/Singularity/Components/EmitterComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs
rename to Content.Server/Singularity/Components/EmitterComponent.cs
index 028f3c219b..be562c4d22 100644
--- a/Content.Server/GameObjects/Components/Singularity/EmitterComponent.cs
+++ b/Content.Server/Singularity/Components/EmitterComponent.cs
@@ -2,15 +2,13 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
-using Content.Server.GameObjects.Components.Projectiles;
-using Content.Server.Interfaces;
+using Content.Server.Access.Components;
+using Content.Server.Power.Components;
+using Content.Server.Projectiles.Components;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Singularity;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Physics;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Singularity.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -19,9 +17,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Physics;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
@@ -29,7 +25,7 @@ using Timer = Robust.Shared.Timing.Timer;
 
 #nullable enable
 
-namespace Content.Server.GameObjects.Components.Singularity
+namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/RadiationCollectorComponent.cs b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/RadiationCollectorComponent.cs
rename to Content.Server/Singularity/Components/RadiationCollectorComponent.cs
index 5b521110a3..90f7ca57e5 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/RadiationCollectorComponent.cs
+++ b/Content.Server/Singularity/Components/RadiationCollectorComponent.cs
@@ -1,19 +1,19 @@
 #nullable enable
 using System;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Singularity;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Battery.Components;
+using Content.Server.Power.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Radiation;
+using Content.Shared.Singularity.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Physics;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
     public class RadiationCollectorComponent : Component, IInteractHand, IRadiationAct
diff --git a/Content.Server/GameObjects/Components/Singularity/ServerSingularityComponent.cs b/Content.Server/Singularity/Components/ServerSingularityComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Singularity/ServerSingularityComponent.cs
rename to Content.Server/Singularity/Components/ServerSingularityComponent.cs
index ba111d282a..52e47a51cc 100644
--- a/Content.Server/GameObjects/Components/Singularity/ServerSingularityComponent.cs
+++ b/Content.Server/Singularity/Components/ServerSingularityComponent.cs
@@ -1,14 +1,13 @@
 #nullable enable
 using System.Linq;
-using Content.Server.GameObjects.Components.StationEvents;
-using Content.Shared.GameObjects.Components.Singularity;
+using Content.Server.Radiation;
+using Content.Shared.Singularity;
+using Content.Shared.Singularity.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Collision.Shapes;
 using Robust.Shared.Physics.Dynamics;
@@ -17,7 +16,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Singularity
+namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
     public class ServerSingularityComponent : SharedSingularityComponent, IStartCollide
@@ -150,7 +149,7 @@ namespace Content.Server.GameObjects.Components.Singularity
             {
                 foreach (var tile in mapGridComponent.Grid.GetTilesIntersecting(ourFixture.Body.GetWorldAABB()))
                 {
-                    mapGridComponent.Grid.SetTile(tile.GridIndices, Tile.Empty);
+                    mapGridComponent.Grid.SetTile(tile.GridIndices, Robust.Shared.Map.Tile.Empty);
                     Energy++;
                 }
                 return;
diff --git a/Content.Server/GameObjects/Components/Singularity/SingularityGenerator.cs b/Content.Server/Singularity/Components/SingularityGenerator.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Singularity/SingularityGenerator.cs
rename to Content.Server/Singularity/Components/SingularityGenerator.cs
index 25cb53a807..c9bf0bb192 100644
--- a/Content.Server/GameObjects/Components/Singularity/SingularityGenerator.cs
+++ b/Content.Server/Singularity/Components/SingularityGenerator.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Singularity
+namespace Content.Server.Singularity.Components
 {
     [RegisterComponent]
     public class SingularityGeneratorComponent : Component
diff --git a/Content.Server/GameObjects/Components/Singularity/SinguloFoodComponent.cs b/Content.Server/Singularity/Components/SinguloFoodComponent.cs
similarity index 69%
rename from Content.Server/GameObjects/Components/Singularity/SinguloFoodComponent.cs
rename to Content.Server/Singularity/Components/SinguloFoodComponent.cs
index e6f4ba2e56..0f84a9c486 100644
--- a/Content.Server/GameObjects/Components/Singularity/SinguloFoodComponent.cs
+++ b/Content.Server/Singularity/Components/SinguloFoodComponent.cs
@@ -1,13 +1,8 @@
-using Content.Shared.GameObjects.Components;
-using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Log;
-using Robust.Shared.Maths;
-using Robust.Shared.ViewVariables;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Singularity
+namespace Content.Server.Singularity.Components
 {
     /// <summary>
     /// Overrides exactly how much energy this object gives to a singularity.
diff --git a/Content.Server/GameObjects/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
similarity index 87%
rename from Content.Server/GameObjects/EntitySystems/ContainmentFieldGeneratorSystem.cs
rename to Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
index c817c69855..9ba63fa179 100644
--- a/Content.Server/GameObjects/EntitySystems/ContainmentFieldGeneratorSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs
@@ -1,7 +1,7 @@
-using Content.Server.GameObjects.Components.Singularity;
+using Content.Server.Singularity.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Singularity.EntitySystems
 {
     public sealed class ContainmentFieldGeneratorSystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
similarity index 86%
rename from Content.Server/GameObjects/EntitySystems/SingularitySystem.cs
rename to Content.Server/Singularity/EntitySystems/SingularitySystem.cs
index 9950fb9ff2..b2800bb181 100644
--- a/Content.Server/GameObjects/EntitySystems/SingularitySystem.cs
+++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs
@@ -1,8 +1,8 @@
-using Content.Server.GameObjects.Components.Singularity;
+using Content.Server.Singularity.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Singularity.EntitySystems
 {
     [UsedImplicitly]
     public class SingularitySystem : EntitySystem
diff --git a/Content.Server/Commands/StartSingularityEngineCommand.cs b/Content.Server/Singularity/StartSingularityEngineCommand.cs
similarity index 87%
rename from Content.Server/Commands/StartSingularityEngineCommand.cs
rename to Content.Server/Singularity/StartSingularityEngineCommand.cs
index dc826ff206..3b99e1e407 100644
--- a/Content.Server/Commands/StartSingularityEngineCommand.cs
+++ b/Content.Server/Singularity/StartSingularityEngineCommand.cs
@@ -1,15 +1,14 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Singularity;
-using Content.Server.GameObjects.Components.PA;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Server.ParticleAccelerator.Components;
+using Content.Server.Singularity.Components;
 using Content.Shared.Administration;
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Singularity.Components;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands
+namespace Content.Server.Singularity
 {
     [AdminCommand(AdminFlags.Admin)]
     public class StartSingularityEngineCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs b/Content.Server/Solar/Components/SolarControlConsoleComponent.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs
rename to Content.Server/Solar/Components/SolarControlConsoleComponent.cs
index 4c4452e4ad..48c9f6c2b4 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs
+++ b/Content.Server/Solar/Components/SolarControlConsoleComponent.cs
@@ -1,15 +1,15 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.Power;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Power.Components;
+using Content.Server.Solar.EntitySystems;
+using Content.Server.UserInterface;
+using Content.Shared.Interaction;
+using Content.Shared.Solar;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Solar.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs b/Content.Server/Solar/Components/SolarPanelComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs
rename to Content.Server/Solar/Components/SolarPanelComponent.cs
index bd71aeaffe..b55e815e10 100644
--- a/Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarPanelComponent.cs
+++ b/Content.Server/Solar/Components/SolarPanelComponent.cs
@@ -1,14 +1,15 @@
 #nullable enable
 using System;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.Power.Components;
+using Content.Server.Solar.EntitySystems;
+using Content.Shared.Acts;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
+namespace Content.Server.Solar.Components
 {
 
     /// <summary>
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs
similarity index 87%
rename from Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs
rename to Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs
index fb34cbb4f1..410821b3e9 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarControlConsoleSystem.cs
+++ b/Content.Server/Solar/EntitySystems/PowerSolarControlConsoleSystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Server.Solar.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Solar.EntitySystems
 {
     /// <summary>
     /// Responsible for updating solar control consoles.
diff --git a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
similarity index 98%
rename from Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs
rename to Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
index 862e9466af..19490c0928 100644
--- a/Content.Server/GameObjects/EntitySystems/Power/PowerSolarSystem.cs
+++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
 using System.Linq;
-using Content.Server.GameObjects.Components.Power.PowerNetComponents;
+using Content.Server.Solar.Components;
 using Content.Shared.Physics;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -12,7 +12,7 @@ using Robust.Shared.Physics.Broadphase;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Solar.EntitySystems
 {
     /// <summary>
     ///     Responsible for maintaining the solar-panel sun angle and updating <see cref='SolarPanelComponent'/> coverage.
diff --git a/Content.Server/GameObjects/Components/Sound/LoopingLoopingSoundComponent.cs b/Content.Server/Sound/LoopingLoopingSoundComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Sound/LoopingLoopingSoundComponent.cs
rename to Content.Server/Sound/LoopingLoopingSoundComponent.cs
index 949b2cc870..38796fe874 100644
--- a/Content.Server/GameObjects/Components/Sound/LoopingLoopingSoundComponent.cs
+++ b/Content.Server/Sound/LoopingLoopingSoundComponent.cs
@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Sound;
+using Content.Shared.Sound;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
 
-namespace Content.Server.GameObjects.Components.Sound
+namespace Content.Server.Sound
 {
     [RegisterComponent]
     public class LoopingLoopingSoundComponent : SharedLoopingSoundComponent
diff --git a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs
rename to Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
index 5a65ddfbce..5a84ca1db3 100644
--- a/Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/ConditionalSpawnerComponent.cs
@@ -1,15 +1,13 @@
 using System.Collections.Generic;
 using Content.Server.GameTicking;
-using Content.Server.Interfaces.GameTicking;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Random;
-using Robust.Shared.Reflection;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Markers
+namespace Content.Server.Spawners.Components
 {
     [RegisterComponent]
     public class ConditionalSpawnerComponent : Component, IMapInit
diff --git a/Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs
rename to Content.Server/Spawners/Components/RandomSpawnerComponent.cs
index 177a6f7291..8aba08a4f2 100644
--- a/Content.Server/GameObjects/Components/Markers/RandomSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/RandomSpawnerComponent.cs
@@ -3,12 +3,11 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Markers
+namespace Content.Server.Spawners.Components
 {
     [RegisterComponent]
     public class RandomSpawnerComponent : ConditionalSpawnerComponent
diff --git a/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs b/Content.Server/Spawners/Components/SpawnPointComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs
rename to Content.Server/Spawners/Components/SpawnPointComponent.cs
index f7135f22bd..6165ba0b33 100644
--- a/Content.Server/GameObjects/Components/Markers/SpawnPointComponent.cs
+++ b/Content.Server/Spawners/Components/SpawnPointComponent.cs
@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects.Components.Markers;
+using Content.Shared.Markers;
 using Content.Shared.Roles;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -6,7 +6,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Markers
+namespace Content.Server.Spawners.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedSpawnPointComponent))]
diff --git a/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs
rename to Content.Server/Spawners/Components/TimedSpawnerComponent.cs
index a0d28207de..168dd5f922 100644
--- a/Content.Server/GameObjects/Components/Markers/TimedSpawnerComponent.cs
+++ b/Content.Server/Spawners/Components/TimedSpawnerComponent.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Markers
+namespace Content.Server.Spawners.Components
 {
     [RegisterComponent]
     public class TimedSpawnerComponent : Component, ISerializationHooks
diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs b/Content.Server/Speech/AccentManager.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs
rename to Content.Server/Speech/AccentManager.cs
index d43cf149b1..99abd2c33c 100644
--- a/Content.Server/GameObjects/Components/Mobs/Speech/AccentManager.cs
+++ b/Content.Server/Speech/AccentManager.cs
@@ -1,9 +1,10 @@
 using System.Text.RegularExpressions;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
+using Content.Server.Speech.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.GameObjects.Components.Mobs.Speech
+namespace Content.Server.Speech
 {
     public interface IAccentManager
     {
diff --git a/Content.Server/Commands/Speech/AddAccent.cs b/Content.Server/Speech/AddAccent.cs
similarity index 96%
rename from Content.Server/Commands/Speech/AddAccent.cs
rename to Content.Server/Speech/AddAccent.cs
index e5fd9449fd..1afbe8e67a 100644
--- a/Content.Server/Commands/Speech/AddAccent.cs
+++ b/Content.Server/Speech/AddAccent.cs
@@ -2,14 +2,14 @@
 using System.Linq;
 using System.Text;
 using Content.Server.Administration;
-using Content.Server.GameObjects.Components.Mobs.Speech;
+using Content.Server.Speech.Components;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Commands.Speech
+namespace Content.Server.Speech
 {
     [AdminCommand(AdminFlags.Fun)]
     public class AddAccent : IConsoleCommand
diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/BackwardsAccentComponent.cs b/Content.Server/Speech/Components/BackwardsAccentComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Mobs/Speech/BackwardsAccentComponent.cs
rename to Content.Server/Speech/Components/BackwardsAccentComponent.cs
index 3b3c2c3980..1ce172e50d 100644
--- a/Content.Server/GameObjects/Components/Mobs/Speech/BackwardsAccentComponent.cs
+++ b/Content.Server/Speech/Components/BackwardsAccentComponent.cs
@@ -1,7 +1,7 @@
 using System;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Mobs.Speech
+namespace Content.Server.Speech.Components
 {
     [RegisterComponent]
     public class BackwardsAccentComponent : Component, IAccentComponent
diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/IAccentComponent.cs b/Content.Server/Speech/Components/IAccentComponent.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Mobs/Speech/IAccentComponent.cs
rename to Content.Server/Speech/Components/IAccentComponent.cs
index 71d0df287c..14b356c550 100644
--- a/Content.Server/GameObjects/Components/Mobs/Speech/IAccentComponent.cs
+++ b/Content.Server/Speech/Components/IAccentComponent.cs
@@ -1,5 +1,5 @@
 #nullable enable
-namespace Content.Server.GameObjects.Components.Mobs.Speech
+namespace Content.Server.Speech.Components
 {
     internal interface IAccentComponent
     {
diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/MouseAccentComponent.cs b/Content.Server/Speech/Components/MouseAccentComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Mobs/Speech/MouseAccentComponent.cs
rename to Content.Server/Speech/Components/MouseAccentComponent.cs
index 2862562014..03f4b8d915 100644
--- a/Content.Server/GameObjects/Components/Mobs/Speech/MouseAccentComponent.cs
+++ b/Content.Server/Speech/Components/MouseAccentComponent.cs
@@ -1,10 +1,9 @@
-using System;
-using Robust.Shared.GameObjects;
 using System.Collections.Generic;
-using Robust.Shared.Random;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
+using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.Components.Mobs.Speech
+namespace Content.Server.Speech.Components
 {
     [RegisterComponent]
     public class MouseAccentComponent : Component, IAccentComponent
diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs b/Content.Server/Speech/Components/OwOAccentComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs
rename to Content.Server/Speech/Components/OwOAccentComponent.cs
index f9a9a58a33..3c97c3ef18 100644
--- a/Content.Server/GameObjects/Components/Mobs/Speech/OwOAccentComponent.cs
+++ b/Content.Server/Speech/Components/OwOAccentComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.Components.Mobs.Speech
+namespace Content.Server.Speech.Components
 {
     [RegisterComponent]
     public class OwOAccentComponent : Component, IAccentComponent
diff --git a/Content.Server/GameObjects/Components/Mobs/Speech/SpanishAccentComponent.cs b/Content.Server/Speech/Components/SpanishAccentComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Mobs/Speech/SpanishAccentComponent.cs
rename to Content.Server/Speech/Components/SpanishAccentComponent.cs
index 3bb050cb1d..dec155f7fd 100644
--- a/Content.Server/GameObjects/Components/Mobs/Speech/SpanishAccentComponent.cs
+++ b/Content.Server/Speech/Components/SpanishAccentComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Mobs.Speech
+namespace Content.Server.Speech.Components
 {
     [RegisterComponent]
     public class SpanishAccentComponent : Component, IAccentComponent
diff --git a/Content.Server/GameObjects/Components/RandomSpriteColorComponent.cs b/Content.Server/Sprite/Components/RandomSpriteColorComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/RandomSpriteColorComponent.cs
rename to Content.Server/Sprite/Components/RandomSpriteColorComponent.cs
index c1b1f30806..13db3ca25c 100644
--- a/Content.Server/GameObjects/Components/RandomSpriteColorComponent.cs
+++ b/Content.Server/Sprite/Components/RandomSpriteColorComponent.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Sprite.Components
 {
     [RegisterComponent]
     public class RandomSpriteColorComponent : Component, IMapInit
diff --git a/Content.Server/GameObjects/Components/RandomSpriteStateComponent.cs b/Content.Server/Sprite/Components/RandomSpriteStateComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/RandomSpriteStateComponent.cs
rename to Content.Server/Sprite/Components/RandomSpriteStateComponent.cs
index fefef935a8..16eed265ca 100644
--- a/Content.Server/GameObjects/Components/RandomSpriteStateComponent.cs
+++ b/Content.Server/Sprite/Components/RandomSpriteStateComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Sprite.Components
 {
     [RegisterComponent]
     public class RandomSpriteStateComponent : Component
diff --git a/Content.Server/GameObjects/Components/Stack/StackComponent.cs b/Content.Server/Stack/StackComponent.cs
similarity index 80%
rename from Content.Server/GameObjects/Components/Stack/StackComponent.cs
rename to Content.Server/Stack/StackComponent.cs
index df8928af16..66889c55a5 100644
--- a/Content.Server/GameObjects/Components/Stack/StackComponent.cs
+++ b/Content.Server/Stack/StackComponent.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Stacks;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Stack
+namespace Content.Server.Stack
 {
     // TODO: Naming and presentation and such could use some improvement.
     [RegisterComponent]
diff --git a/Content.Server/GameObjects/EntitySystems/StackSystem.cs b/Content.Server/Stack/StackSystem.cs
similarity index 97%
rename from Content.Server/GameObjects/EntitySystems/StackSystem.cs
rename to Content.Server/Stack/StackSystem.cs
index 4dc085f1af..d32876ce39 100644
--- a/Content.Server/GameObjects/EntitySystems/StackSystem.cs
+++ b/Content.Server/Stack/StackSystem.cs
@@ -1,8 +1,6 @@
 using System;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
 using Content.Shared.Stacks;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -11,7 +9,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Stack
 {
     /// <summary>
     ///     Entity system that handles everything relating to stacks.
diff --git a/Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs b/Content.Server/Standing/StandingStateSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs
rename to Content.Server/Standing/StandingStateSystem.cs
index 21c7b4506d..b96a965abe 100644
--- a/Content.Server/GameObjects/EntitySystems/StandingStateSystem.cs
+++ b/Content.Server/Standing/StandingStateSystem.cs
@@ -1,16 +1,15 @@
 #nullable enable
-using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Server.Hands.Components;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Rotation;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Rotation;
+using Content.Shared.Standing;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Standing
 {
     [UsedImplicitly]
     public class StandingStateSystem : SharedStandingStateSystem
diff --git a/Content.Server/StationEvents/FalseAlarm.cs b/Content.Server/StationEvents/Events/FalseAlarm.cs
similarity index 88%
rename from Content.Server/StationEvents/FalseAlarm.cs
rename to Content.Server/StationEvents/Events/FalseAlarm.cs
index 3864af28a4..8cd30ed98d 100644
--- a/Content.Server/StationEvents/FalseAlarm.cs
+++ b/Content.Server/StationEvents/Events/FalseAlarm.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using JetBrains.Annotations;
-using Content.Server.GameObjects.EntitySystems.StationEvents;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.StationEvents
+namespace Content.Server.StationEvents.Events
 {
     [UsedImplicitly]
     public sealed class FalseAlarm : StationEvent
diff --git a/Content.Server/StationEvents/GasLeak.cs b/Content.Server/StationEvents/Events/GasLeak.cs
similarity index 98%
rename from Content.Server/StationEvents/GasLeak.cs
rename to Content.Server/StationEvents/Events/GasLeak.cs
index aae290fffd..92961431d0 100644
--- a/Content.Server/StationEvents/GasLeak.cs
+++ b/Content.Server/StationEvents/Events/GasLeak.cs
@@ -1,7 +1,6 @@
 using Content.Server.GameObjects.Components.Atmos;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.GameTicking;
 using Content.Shared.Atmos;
-using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -12,7 +11,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Random;
 
 #nullable enable
-namespace Content.Server.StationEvents
+namespace Content.Server.StationEvents.Events
 {
     internal sealed class GasLeak : StationEvent
     {
diff --git a/Content.Server/StationEvents/PowerGridCheck.cs b/Content.Server/StationEvents/Events/PowerGridCheck.cs
similarity index 96%
rename from Content.Server/StationEvents/PowerGridCheck.cs
rename to Content.Server/StationEvents/Events/PowerGridCheck.cs
index e66ded5587..c211dc941a 100644
--- a/Content.Server/StationEvents/PowerGridCheck.cs
+++ b/Content.Server/StationEvents/Events/PowerGridCheck.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Threading;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
+using Content.Server.Power.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -11,7 +11,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Timer = Robust.Shared.Timing.Timer;
 
-namespace Content.Server.StationEvents
+namespace Content.Server.StationEvents.Events
 {
     [UsedImplicitly]
     public sealed class PowerGridCheck : StationEvent
diff --git a/Content.Server/StationEvents/RadiationStorm.cs b/Content.Server/StationEvents/Events/RadiationStorm.cs
similarity index 95%
rename from Content.Server/StationEvents/RadiationStorm.cs
rename to Content.Server/StationEvents/Events/RadiationStorm.cs
index c1b24c13fd..eeef4c3973 100644
--- a/Content.Server/StationEvents/RadiationStorm.cs
+++ b/Content.Server/StationEvents/Events/RadiationStorm.cs
@@ -1,8 +1,8 @@
 #nullable enable
+using Content.Server.GameTicking;
+using Content.Server.Radiation;
+using Content.Shared.Coordinates;
 using JetBrains.Annotations;
-using Content.Server.GameObjects.Components.StationEvents;
-using Content.Server.Interfaces.GameTicking;
-using Content.Shared.Utility;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
@@ -10,7 +10,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 
-namespace Content.Server.StationEvents
+namespace Content.Server.StationEvents.Events
 {
     [UsedImplicitly]
     public sealed class RadiationStorm : StationEvent
diff --git a/Content.Server/StationEvents/StationEvent.cs b/Content.Server/StationEvents/Events/StationEvent.cs
similarity index 98%
rename from Content.Server/StationEvents/StationEvent.cs
rename to Content.Server/StationEvents/Events/StationEvent.cs
index 2a10161ffc..a092816cd1 100644
--- a/Content.Server/StationEvents/StationEvent.cs
+++ b/Content.Server/StationEvents/Events/StationEvent.cs
@@ -1,10 +1,10 @@
 #nullable enable
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Robust.Shared.Audio;
 using Robust.Shared.IoC;
 using Robust.Shared.Player;
 
-namespace Content.Server.StationEvents
+namespace Content.Server.StationEvents.Events
 {
     public abstract class StationEvent
     {
diff --git a/Content.Server/Commands/StationEvents/StationEventCommand.cs b/Content.Server/StationEvents/StationEventCommand.cs
similarity index 97%
rename from Content.Server/Commands/StationEvents/StationEventCommand.cs
rename to Content.Server/StationEvents/StationEventCommand.cs
index 0927cbc2be..336a36f6ec 100644
--- a/Content.Server/Commands/StationEvents/StationEventCommand.cs
+++ b/Content.Server/StationEvents/StationEventCommand.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using Content.Server.Administration;
-using Content.Server.GameObjects.EntitySystems.StationEvents;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Server.Commands.StationEvents
+namespace Content.Server.StationEvents
 {
     [AdminCommand(AdminFlags.Server)]
     public sealed class StationEventCommand : IConsoleCommand
diff --git a/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs b/Content.Server/StationEvents/StationEventSystem.cs
similarity index 98%
rename from Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs
rename to Content.Server/StationEvents/StationEventSystem.cs
index d5cbc2fdc4..535c45281f 100644
--- a/Content.Server/GameObjects/EntitySystems/StationEvents/StationEventSystem.cs
+++ b/Content.Server/StationEvents/StationEventSystem.cs
@@ -4,11 +4,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Content.Server.GameTicking;
-using Content.Server.StationEvents;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.StationEvents.Events;
 using Content.Shared;
 using Content.Shared.GameTicking;
-using Content.Shared.Network.NetMessages;
+using Content.Shared.StationEvents;
 using JetBrains.Annotations;
 using Robust.Server.Console;
 using Robust.Server.Player;
@@ -21,7 +20,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Reflection;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems.StationEvents
+namespace Content.Server.StationEvents
 {
     [UsedImplicitly]
     // Somewhat based off of TG's implementation of events
diff --git a/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs
rename to Content.Server/Storage/Components/CursedEntityStorageComponent.cs
index b68aac9f93..5753efd0c1 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/CursedEntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/CursedEntityStorageComponent.cs
@@ -1,14 +1,13 @@
 using System.Linq;
 using Content.Shared.Audio;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Server.GameObjects;
+using Content.Shared.Interaction;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Storage.Components
 {
     [ComponentReference(typeof(EntityStorageComponent))]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
rename to Content.Server/Storage/Components/EntityStorageComponent.cs
index 44bb4b4f50..09ea579722 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -2,17 +2,19 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Placeable;
+using Content.Server.Tools.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Acts;
+using Content.Shared.Body.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Item;
+using Content.Shared.Notification;
 using Content.Shared.Physics;
+using Content.Shared.Storage;
+using Content.Shared.Tool;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -20,14 +22,13 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Physics;
 using Robust.Shared.Player;
-using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Storage.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/Components/Items/Storage/IStorageComponent.cs b/Content.Server/Storage/Components/IStorageComponent.cs
similarity index 76%
rename from Content.Server/GameObjects/Components/Items/Storage/IStorageComponent.cs
rename to Content.Server/Storage/Components/IStorageComponent.cs
index 7a992ca82e..3f7f052d90 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/IStorageComponent.cs
+++ b/Content.Server/Storage/Components/IStorageComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Storage.Components
 {
     public interface IStorageComponent
     {
diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecretStashComponent.cs b/Content.Server/Storage/Components/SecretStashComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Items/Storage/SecretStashComponent.cs
rename to Content.Server/Storage/Components/SecretStashComponent.cs
index f53fa7669d..224fdbc7b6 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/SecretStashComponent.cs
+++ b/Content.Server/Storage/Components/SecretStashComponent.cs
@@ -1,16 +1,16 @@
 #nullable enable
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Shared.Acts;
+using Content.Shared.Item;
+using Content.Shared.Notification;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Storage.Components
 {
     /// <summary>
     /// Logic for secret single slot stash, like plant pot or toilet cistern
diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/Storage/Components/SecureEntityStorageComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs
rename to Content.Server/Storage/Components/SecureEntityStorageComponent.cs
index 065fa0eb91..e3e2333959 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/SecureEntityStorageComponent.cs
@@ -1,9 +1,9 @@
-using Content.Server.GameObjects.Components.Access;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Access.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Storage;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -12,7 +12,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Storage.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(EntityStorageComponent))]
diff --git a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs b/Content.Server/Storage/Components/ServerStorageComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
rename to Content.Server/Storage/Components/ServerStorageComponent.cs
index badc5a7385..b6689861b2 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
+++ b/Content.Server/Storage/Components/ServerStorageComponent.cs
@@ -4,15 +4,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Server.Interfaces.GameObjects.Components.Items;
+using Content.Server.DoAfter;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Placeable;
+using Content.Shared.Acts;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Item;
+using Content.Shared.Notification;
+using Content.Shared.Storage;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Audio;
@@ -28,7 +30,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Storage.Components
 {
     /// <summary>
     /// Storage component for containing entities within this one, matches a UI on the client which shows stored entities
diff --git a/Content.Server/GameObjects/Components/Items/Storage/StorageCounterComponent.cs b/Content.Server/Storage/Components/StorageCounterComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Items/Storage/StorageCounterComponent.cs
rename to Content.Server/Storage/Components/StorageCounterComponent.cs
index 554c0e9275..7cf8b41e41 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/StorageCounterComponent.cs
+++ b/Content.Server/Storage/Components/StorageCounterComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
 
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Tag;
+using Content.Shared.Stacks;
+using Content.Shared.Tag;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -10,7 +10,7 @@ using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Storage.Components
 {
     /// <summary>
     /// Storage that spawns and counts a single item.
diff --git a/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs b/Content.Server/Storage/Components/StorageFillComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs
rename to Content.Server/Storage/Components/StorageFillComponent.cs
index 2ab1fb6145..339d8ac5d8 100644
--- a/Content.Server/GameObjects/Components/Items/Storage/StorageFillComponent.cs
+++ b/Content.Server/Storage/Components/StorageFillComponent.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Serialization.Manager;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.GameObjects.Components.Items.Storage
+namespace Content.Server.Storage.Components
 {
     [RegisterComponent]
     public sealed class StorageFillComponent : Component, IMapInit
@@ -79,11 +79,11 @@ namespace Content.Server.GameObjects.Components.Items.Storage
             /// need to add it to the entities you want to choose between and
             /// add a prob field. In this example there is a 50% chance the storage
             /// spawns with Y or Z.
-            /// 
+            ///
             /// </para>
             /// <code>
             /// - type: StorageFill
-            ///   contents: 
+            ///   contents:
             ///     - name: X
             ///     - name: Y
             ///       prob: 0.50
@@ -91,7 +91,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
             ///     - name: Z
             ///       orGroup: YOrZ
             /// </code>
-            /// </example> 
+            /// </example>
             /// </summary>
             [DataField("amount")]
             public int Amount;
diff --git a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs b/Content.Server/Storage/StorageSystem.cs
similarity index 95%
rename from Content.Server/GameObjects/EntitySystems/StorageSystem.cs
rename to Content.Server/Storage/StorageSystem.cs
index 9455f6cc06..b31f43c6ca 100644
--- a/Content.Server/GameObjects/EntitySystems/StorageSystem.cs
+++ b/Content.Server/Storage/StorageSystem.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems.Click;
+using Content.Server.Interaction;
+using Content.Server.Storage.Components;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Storage
 {
     [UsedImplicitly]
     internal sealed class StorageSystem : EntitySystem
diff --git a/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs b/Content.Server/Strip/StrippableComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
rename to Content.Server/Strip/StrippableComponent.cs
index 2fde072b4c..c856061d19 100644
--- a/Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
+++ b/Content.Server/Strip/StrippableComponent.cs
@@ -1,23 +1,25 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Threading;
-using Content.Server.GameObjects.Components.ActionBlocking;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.GUI;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Cuffs.Components;
+using Content.Server.DoAfter;
+using Content.Server.Hands.Components;
+using Content.Server.Inventory.Components;
+using Content.Server.Items;
+using Content.Server.UserInterface;
+using Content.Shared.ActionBlocker;
+using Content.Shared.DragDrop;
+using Content.Shared.Notification;
+using Content.Shared.Strip.Components;
+using Content.Shared.Verbs;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Server.GameObjects.Components.GUI
+namespace Content.Server.Strip
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedStrippableComponent))]
diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/Stunnable/Components/StunbatonComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs
rename to Content.Server/Stunnable/Components/StunbatonComponent.cs
index 46a76d7d7f..1c1a754948 100644
--- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs
+++ b/Content.Server/Stunnable/Components/StunbatonComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Melee
+namespace Content.Server.Stunnable.Components
 {
     [RegisterComponent]
     public class StunbatonComponent : Component
diff --git a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs b/Content.Server/Stunnable/Components/StunnableComponent.cs
similarity index 85%
rename from Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
rename to Content.Server/Stunnable/Components/StunnableComponent.cs
index 81dc7838db..95a30f8ab6 100644
--- a/Content.Server/GameObjects/Components/Mobs/StunnableComponent.cs
+++ b/Content.Server/Stunnable/Components/StunnableComponent.cs
@@ -1,22 +1,19 @@
 #nullable enable
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Utility;
+using Content.Server.Act;
+using Content.Server.Notification;
+using Content.Server.Standing;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.Interfaces;
-using Robust.Server.GameObjects;
+using Content.Shared.MobState;
+using Content.Shared.Notification;
+using Content.Shared.Stunnable;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
-using Robust.Shared.Players;
 using Robust.Shared.Random;
-using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.Stunnable.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedStunnableComponent))]
diff --git a/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs b/Content.Server/Stunnable/Components/StunnableProjectileComponent.cs
similarity index 90%
rename from Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs
rename to Content.Server/Stunnable/Components/StunnableProjectileComponent.cs
index c0192750cd..d144d1ee50 100644
--- a/Content.Server/GameObjects/Components/Projectiles/StunnableProjectileComponent.cs
+++ b/Content.Server/Stunnable/Components/StunnableProjectileComponent.cs
@@ -1,11 +1,10 @@
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Projectiles.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Projectiles
+namespace Content.Server.Stunnable.Components
 {
     /// <summary>
     /// Adds stun when it collides with an entity
diff --git a/Content.Server/GameObjects/EntitySystems/Weapon/Melee/StunbatonSystem.cs b/Content.Server/Stunnable/StunbatonSystem.cs
similarity index 93%
rename from Content.Server/GameObjects/EntitySystems/Weapon/Melee/StunbatonSystem.cs
rename to Content.Server/Stunnable/StunbatonSystem.cs
index 9c0293961f..905b6e9f8b 100644
--- a/Content.Server/GameObjects/EntitySystems/Weapon/Melee/StunbatonSystem.cs
+++ b/Content.Server/Stunnable/StunbatonSystem.cs
@@ -1,13 +1,14 @@
 using System.Linq;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.Components.Weapon.Melee;
+using Content.Server.Items;
+using Content.Server.PowerCell.Components;
+using Content.Server.Stunnable.Components;
+using Content.Server.Weapon.Melee;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Throwing;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -16,7 +17,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 
-namespace Content.Server.GameObjects.EntitySystems.Weapon.Melee
+namespace Content.Server.Stunnable
 {
     public class StunbatonSystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs b/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs
rename to Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs
index 38393a64ab..a56d7791bd 100644
--- a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionEndTimerSystem.cs
+++ b/Content.Server/Suspicion/EntitySystems/SuspicionEndTimerSystem.cs
@@ -1,18 +1,16 @@
 using System;
 using System.Linq;
-using Content.Server.Interfaces.GameTicking;
-using Content.Shared.GameObjects.EntitySystemMessages;
 using Content.Shared.GameTicking;
+using Content.Shared.Suspicion;
 using JetBrains.Annotations;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Timing;
 
 #nullable enable
 
-namespace Content.Server.GameObjects.EntitySystems.GameMode
+namespace Content.Server.Suspicion.EntitySystems
 {
     [UsedImplicitly]
     public sealed class SuspicionEndTimerSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionRoleSystem.cs b/Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/GameMode/SuspicionRoleSystem.cs
rename to Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs
index 31c052eab9..2b923bc644 100644
--- a/Content.Server/GameObjects/EntitySystems/GameMode/SuspicionRoleSystem.cs
+++ b/Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs
@@ -1,10 +1,9 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Suspicion;
 using Content.Shared.GameTicking;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems.GameMode
+namespace Content.Server.Suspicion.EntitySystems
 {
     [UsedImplicitly]
     public class SuspicionRoleSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Server/Mobs/Roles/Suspicion/SuspicionInnocentRole.cs b/Content.Server/Suspicion/Roles/SuspicionInnocentRole.cs
similarity index 82%
rename from Content.Server/Mobs/Roles/Suspicion/SuspicionInnocentRole.cs
rename to Content.Server/Suspicion/Roles/SuspicionInnocentRole.cs
index 1fa9fe44aa..da2cea6794 100644
--- a/Content.Server/Mobs/Roles/Suspicion/SuspicionInnocentRole.cs
+++ b/Content.Server/Suspicion/Roles/SuspicionInnocentRole.cs
@@ -1,14 +1,14 @@
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Content.Shared.Roles;
 using Robust.Shared.IoC;
 
-namespace Content.Server.Mobs.Roles.Suspicion
+namespace Content.Server.Suspicion.Roles
 {
     public class SuspicionInnocentRole : SuspicionRole
     {
         public AntagPrototype Prototype { get; }
 
-        public SuspicionInnocentRole(Mind mind, AntagPrototype antagPrototype) : base(mind)
+        public SuspicionInnocentRole(Mind.Mind mind, AntagPrototype antagPrototype) : base(mind)
         {
             Prototype = antagPrototype;
             Name = antagPrototype.Name;
diff --git a/Content.Server/Suspicion/Roles/SuspicionRole.cs b/Content.Server/Suspicion/Roles/SuspicionRole.cs
new file mode 100644
index 0000000000..f63cacb6e2
--- /dev/null
+++ b/Content.Server/Suspicion/Roles/SuspicionRole.cs
@@ -0,0 +1,9 @@
+using Content.Server.Roles;
+
+namespace Content.Server.Suspicion.Roles
+{
+    public abstract class SuspicionRole : Role
+    {
+        protected SuspicionRole(Mind.Mind mind) : base(mind) { }
+    }
+}
diff --git a/Content.Server/Mobs/Roles/Suspicion/SuspicionTraitorRole.cs b/Content.Server/Suspicion/Roles/SuspicionTraitorRole.cs
similarity index 88%
rename from Content.Server/Mobs/Roles/Suspicion/SuspicionTraitorRole.cs
rename to Content.Server/Suspicion/Roles/SuspicionTraitorRole.cs
index f88ed3078b..dbb3bc39b9 100644
--- a/Content.Server/Mobs/Roles/Suspicion/SuspicionTraitorRole.cs
+++ b/Content.Server/Suspicion/Roles/SuspicionTraitorRole.cs
@@ -1,16 +1,16 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
 using Content.Shared.Roles;
 using Robust.Shared.Localization;
 
-namespace Content.Server.Mobs.Roles.Suspicion
+namespace Content.Server.Suspicion.Roles
 {
     public sealed class SuspicionTraitorRole : SuspicionRole
     {
         public AntagPrototype Prototype { get; }
 
-        public SuspicionTraitorRole(Mind mind, AntagPrototype antagPrototype) : base(mind)
+        public SuspicionTraitorRole(Mind.Mind mind, AntagPrototype antagPrototype) : base(mind)
         {
             Prototype = antagPrototype;
             Name = antagPrototype.Name;
diff --git a/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs b/Content.Server/Suspicion/SuspicionRoleComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs
rename to Content.Server/Suspicion/SuspicionRoleComponent.cs
index eecc0b3819..7181cc38e5 100644
--- a/Content.Server/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs
+++ b/Content.Server/Suspicion/SuspicionRoleComponent.cs
@@ -2,14 +2,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.EntitySystems.GameMode;
-using Content.Server.Mobs;
-using Content.Server.Mobs.Roles;
-using Content.Server.Mobs.Roles.Suspicion;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Suspicion;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Server.Mind.Components;
+using Content.Server.Roles;
+using Content.Server.Suspicion.EntitySystems;
+using Content.Server.Suspicion.Roles;
+using Content.Shared.Examine;
+using Content.Shared.MobState;
+using Content.Shared.Suspicion;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
@@ -17,7 +16,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Suspicion
+namespace Content.Server.Suspicion
 {
     [RegisterComponent]
     public class SuspicionRoleComponent : SharedSuspicionRoleComponent, IExamine
diff --git a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs b/Content.Server/Temperature/Components/HeatResistanceComponent.cs
similarity index 69%
rename from Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs
rename to Content.Server/Temperature/Components/HeatResistanceComponent.cs
index 9a86ff0699..e3df76566b 100644
--- a/Content.Server/GameObjects/Components/Mobs/HeatResistanceComponent.cs
+++ b/Content.Server/Temperature/Components/HeatResistanceComponent.cs
@@ -1,9 +1,9 @@
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Clothing;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Server.Clothing.Components;
+using Content.Server.Inventory.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Mobs
+namespace Content.Server.Temperature.Components
 {
     [RegisterComponent]
     public class HeatResistanceComponent : Component
diff --git a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs
rename to Content.Server/Temperature/Components/TemperatureComponent.cs
index 03ad5b4060..82cbcaa2e7 100644
--- a/Content.Server/GameObjects/Components/Temperature/TemperatureComponent.cs
+++ b/Content.Server/Temperature/Components/TemperatureComponent.cs
@@ -1,15 +1,15 @@
 using System;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Alert;
 using Content.Shared.Alert;
 using Content.Shared.Atmos;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Temperature
+namespace Content.Server.Temperature.Components
 {
     /// <summary>
     /// Handles changing temperature,
diff --git a/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs b/Content.Server/Throwing/EmitSoundOnThrowComponent.cs
similarity index 91%
rename from Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs
rename to Content.Server/Throwing/EmitSoundOnThrowComponent.cs
index 678b3c93e7..c5cfdb2a44 100644
--- a/Content.Server/GameObjects/Components/Sound/EmitSoundOnThrowComponent.cs
+++ b/Content.Server/Throwing/EmitSoundOnThrowComponent.cs
@@ -1,11 +1,11 @@
 using Content.Shared.Audio;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Throwing;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Sound
+namespace Content.Server.Throwing
 {
     /// <summary>
     /// Simple sound emitter that emits sound on use in hand
diff --git a/Content.Server/GameObjects/Components/Items/ThrowHelper.cs b/Content.Server/Throwing/ThrowHelper.cs
similarity index 88%
rename from Content.Server/GameObjects/Components/Items/ThrowHelper.cs
rename to Content.Server/Throwing/ThrowHelper.cs
index ebd2f127c5..c188b41aba 100644
--- a/Content.Server/GameObjects/Components/Items/ThrowHelper.cs
+++ b/Content.Server/Throwing/ThrowHelper.cs
@@ -1,14 +1,14 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems.Click;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Mobs.State;
+using Content.Server.Interaction;
+using Content.Server.Items;
+using Content.Shared.MobState;
+using Content.Shared.Throwing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 
-namespace Content.Server.GameObjects.Components.Items
+namespace Content.Server.Throwing
 {
     internal static class ThrowHelper
     {
diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/Tiles/FloorTileItemComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs
rename to Content.Server/Tiles/FloorTileItemComponent.cs
index 6fc113b1f4..786dc9730d 100644
--- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs
+++ b/Content.Server/Tiles/FloorTileItemComponent.cs
@@ -1,22 +1,20 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.Stack;
 using Content.Shared.Audio;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Content.Shared.Maps;
-using Content.Shared.Utility;
-using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Audio;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 
-namespace Content.Server.GameObjects.Components.Items
+namespace Content.Server.Tiles
 {
     [RegisterComponent]
     public class FloorTileItemComponent : Component, IAfterInteract
@@ -48,7 +46,7 @@ namespace Content.Server.GameObjects.Components.Items
 
         private void PlaceAt(IMapGrid mapGrid, EntityCoordinates location, ushort tileId, float offset = 0)
         {
-            mapGrid.SetTile(location.Offset(new Vector2(offset, offset)), new Tile(tileId));
+            mapGrid.SetTile(location.Offset(new Vector2(offset, offset)), new Robust.Shared.Map.Tile(tileId));
             SoundSystem.Play(Filter.Pvs(location), "/Audio/Items/genhit.ogg", location, AudioHelpers.WithVariation(0.125f));
         }
 
diff --git a/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs b/Content.Server/Timing/UseDelayComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs
rename to Content.Server/Timing/UseDelayComponent.cs
index 7af14c40c3..e43575948e 100644
--- a/Content.Server/GameObjects/Components/Timing/UseDelayComponent.cs
+++ b/Content.Server/Timing/UseDelayComponent.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Threading;
-using Content.Shared.GameObjects.Components.Items;
+using Content.Shared.Cooldown;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Timing
+namespace Content.Server.Timing
 {
     /// <summary>
     /// Timer that creates a cooldown each time an object is activated/used
diff --git a/Content.Server/GameObjects/Components/Watercloset/ToiletComponent.cs b/Content.Server/Toilet/ToiletComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Watercloset/ToiletComponent.cs
rename to Content.Server/Toilet/ToiletComponent.cs
index deb5cf3005..d1ea2dd99f 100644
--- a/Content.Server/GameObjects/Components/Watercloset/ToiletComponent.cs
+++ b/Content.Server/Toilet/ToiletComponent.cs
@@ -1,19 +1,19 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Strap;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Utility;
+using Content.Server.Act;
+using Content.Server.Buckle.Components;
+using Content.Server.Chat.Managers;
+using Content.Server.Notification;
+using Content.Server.Storage.Components;
+using Content.Server.Tools.Components;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.Components.Watercloset;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Toilet;
+using Content.Shared.Tool;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -24,7 +24,7 @@ using Robust.Shared.Random;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Watercloset
+namespace Content.Server.Toilet
 {
     [RegisterComponent]
     public class ToiletComponent : Component, IInteractUsing,
diff --git a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs b/Content.Server/Tools/Components/MultitoolComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs
rename to Content.Server/Tools/Components/MultitoolComponent.cs
index 45fc78fd0c..6c16e68574 100644
--- a/Content.Server/GameObjects/Components/Interactable/MultitoolComponent.cs
+++ b/Content.Server/Tools/Components/MultitoolComponent.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
+using Content.Shared.Tool;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -9,7 +9,7 @@ using Robust.Shared.Player;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.Tools.Components
 {
     /// <summary>
     ///     Not to be confused with Multitool (power)
diff --git a/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs b/Content.Server/Tools/Components/TilePryingComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
rename to Content.Server/Tools/Components/TilePryingComponent.cs
index e601547d52..d12b4c5c55 100644
--- a/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
+++ b/Content.Server/Tools/Components/TilePryingComponent.cs
@@ -1,16 +1,14 @@
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.Interfaces.GameObjects.Components;
+using System.Threading.Tasks;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Content.Shared.Maps;
-using Content.Shared.Utility;
+using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Serialization;
-using System.Threading.Tasks;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.Tools.Components
 {
     [RegisterComponent]
     public class TilePryingComponent : Component, IAfterInteract
diff --git a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs b/Content.Server/Tools/Components/ToolComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Interactable/ToolComponent.cs
rename to Content.Server/Tools/Components/ToolComponent.cs
index 96d327eab8..a224166199 100644
--- a/Content.Server/GameObjects/Components/Interactable/ToolComponent.cs
+++ b/Content.Server/Tools/Components/ToolComponent.cs
@@ -1,17 +1,16 @@
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems.DoAfter;
+using Content.Server.DoAfter;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Robust.Server.GameObjects;
+using Content.Shared.Tool;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.Tools.Components
 {
     public interface IToolComponent
     {
diff --git a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs b/Content.Server/Tools/Components/WelderComponent.cs
similarity index 94%
rename from Content.Server/GameObjects/Components/Interactable/WelderComponent.cs
rename to Content.Server/Tools/Components/WelderComponent.cs
index 0181c79294..3ad52d4619 100644
--- a/Content.Server/GameObjects/Components/Interactable/WelderComponent.cs
+++ b/Content.Server/Tools/Components/WelderComponent.cs
@@ -1,21 +1,22 @@
 #nullable enable
 using System;
 using System.Threading.Tasks;
+using Content.Server.Act;
 using Content.Server.Atmos;
-using Content.Server.Explosions;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameObjects;
-using Content.Server.Utility;
+using Content.Server.Chat.Managers;
+using Content.Server.Chemistry.Components;
+using Content.Server.Explosion;
+using Content.Server.Items;
+using Content.Server.Notification;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
+using Content.Shared.Notification;
+using Content.Shared.Temperature;
+using Content.Shared.Tool;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
@@ -27,7 +28,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Interactable
+namespace Content.Server.Tools.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(ToolComponent))]
diff --git a/Content.Server/GameObjects/EntitySystems/WelderSystem.cs b/Content.Server/Tools/WelderSystem.cs
similarity index 88%
rename from Content.Server/GameObjects/EntitySystems/WelderSystem.cs
rename to Content.Server/Tools/WelderSystem.cs
index 6e0be0bdec..cce97b7883 100644
--- a/Content.Server/GameObjects/EntitySystems/WelderSystem.cs
+++ b/Content.Server/Tools/WelderSystem.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Interactable;
+using Content.Server.Tools.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Tools
 {
     /// <summary>
     ///     Despite the name, it's only really used for the welder logic in tools. Go figure.
diff --git a/Content.Server/GameObjects/Components/Items/ToysComponent.cs b/Content.Server/Toys/ToysComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/Items/ToysComponent.cs
rename to Content.Server/Toys/ToysComponent.cs
index 4cb6c473f2..e8deeee074 100644
--- a/Content.Server/GameObjects/Components/Items/ToysComponent.cs
+++ b/Content.Server/Toys/ToysComponent.cs
@@ -1,17 +1,16 @@
 using Content.Shared.Audio;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Robust.Server.GameObjects;
+using Content.Shared.Interaction;
+using Content.Shared.Throwing;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Items
+namespace Content.Server.Toys
 {
     [RegisterComponent]
     public class ToysComponent : Component, IActivate, IUse, ILand
diff --git a/Content.Server/Mobs/Roles/Traitor/TraitorRole.cs b/Content.Server/Traitor/TraitorRole.cs
similarity index 81%
rename from Content.Server/Mobs/Roles/Traitor/TraitorRole.cs
rename to Content.Server/Traitor/TraitorRole.cs
index 9e79da38aa..e15687620f 100644
--- a/Content.Server/Mobs/Roles/Traitor/TraitorRole.cs
+++ b/Content.Server/Traitor/TraitorRole.cs
@@ -1,12 +1,13 @@
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
+using Content.Server.Roles;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.Mobs.Roles.Traitor
+namespace Content.Server.Traitor
 {
     public class TraitorRole : Role
     {
-        public TraitorRole(Mind mind) : base(mind)
+        public TraitorRole(Mind.Mind mind) : base(mind)
         {
         }
 
diff --git a/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchRedemptionComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchRedemptionComponent.cs
rename to Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs
index 400f5acc7f..4dd855db3b 100644
--- a/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchRedemptionComponent.cs
+++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchRedemptionComponent.cs
@@ -1,15 +1,15 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.PDA;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Inventory.Components;
+using Content.Server.Mind.Components;
+using Content.Server.PDA;
+using Content.Shared.Interaction;
+using Content.Shared.Inventory;
+using Content.Shared.Notification;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GameObjects.Components.TraitorDeathMatch
+namespace Content.Server.TraitorDeathMatch.Components
 {
     [RegisterComponent]
     public class TraitorDeathMatchRedemptionComponent : Component, IInteractUsing
diff --git a/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchReliableOwnerTagComponent.cs b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchReliableOwnerTagComponent.cs
rename to Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs
index 735dcecb6b..72f053ec2f 100644
--- a/Content.Server/GameObjects/Components/TraitorDeathMatch/TraitorDeathMatchReliableOwnerTagComponent.cs
+++ b/Content.Server/TraitorDeathMatch/Components/TraitorDeathMatchReliableOwnerTagComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Network;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.TraitorDeathMatch
+namespace Content.Server.TraitorDeathMatch.Components
 {
     [RegisterComponent]
     public class TraitorDeathMatchReliableOwnerTagComponent : Component
diff --git a/Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs b/Content.Server/Transform/Verbs/AttachToGrandparentVerb.cs
similarity index 93%
rename from Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs
rename to Content.Server/Transform/Verbs/AttachToGrandparentVerb.cs
index c0f72b8ea4..66f4d823a9 100644
--- a/Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs
+++ b/Content.Server/Transform/Verbs/AttachToGrandparentVerb.cs
@@ -1,12 +1,12 @@
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Utility;
+using Content.Shared.Transform;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Transform.Verbs
 {
     [GlobalVerb]
     public class AttachToGrandparentVerb : GlobalVerb
diff --git a/Content.Server/GlobalVerbs/AttachToGridVerb.cs b/Content.Server/Transform/Verbs/AttachToGridVerb.cs
similarity index 94%
rename from Content.Server/GlobalVerbs/AttachToGridVerb.cs
rename to Content.Server/Transform/Verbs/AttachToGridVerb.cs
index c50119e5f7..560007eb60 100644
--- a/Content.Server/GlobalVerbs/AttachToGridVerb.cs
+++ b/Content.Server/Transform/Verbs/AttachToGridVerb.cs
@@ -1,11 +1,11 @@
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Transform.Verbs
 {
     [GlobalVerb]
     public class AttachToGridVerb : GlobalVerb
diff --git a/Content.Server/GlobalVerbs/AttachToSelf.cs b/Content.Server/Transform/Verbs/AttachToSelf.cs
similarity index 94%
rename from Content.Server/GlobalVerbs/AttachToSelf.cs
rename to Content.Server/Transform/Verbs/AttachToSelf.cs
index f37c3a49fa..037b33a020 100644
--- a/Content.Server/GlobalVerbs/AttachToSelf.cs
+++ b/Content.Server/Transform/Verbs/AttachToSelf.cs
@@ -1,11 +1,11 @@
-using Content.Shared.GameObjects.Verbs;
+using Content.Shared.Verbs;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Server.GlobalVerbs
+namespace Content.Server.Transform.Verbs
 {
     [GlobalVerb]
     public class AttachToSelf : GlobalVerb
diff --git a/Content.Server/Utility/UserInterfaceHelpers.cs b/Content.Server/UserInterface/UserInterfaceHelpers.cs
similarity index 90%
rename from Content.Server/Utility/UserInterfaceHelpers.cs
rename to Content.Server/UserInterface/UserInterfaceHelpers.cs
index d3147f4fa9..c40d1ade3d 100644
--- a/Content.Server/Utility/UserInterfaceHelpers.cs
+++ b/Content.Server/UserInterface/UserInterfaceHelpers.cs
@@ -2,7 +2,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.Utility
+namespace Content.Server.UserInterface
 {
     public static class UserInterfaceHelpers
     {
diff --git a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs b/Content.Server/VendingMachines/VendingMachineComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs
rename to Content.Server/VendingMachines/VendingMachineComponent.cs
index ba26aecb12..05b24fea67 100644
--- a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs
+++ b/Content.Server/VendingMachines/VendingMachineComponent.cs
@@ -2,12 +2,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Access;
-using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components.VendingMachines;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Access.Components;
+using Content.Server.Advertise;
+using Content.Server.Notification;
+using Content.Server.Power.Components;
+using Content.Server.UserInterface;
+using Content.Server.Wires.Components;
+using Content.Shared.Acts;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
 using Content.Shared.VendingMachines;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
@@ -20,9 +23,9 @@ using Robust.Shared.Random;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent;
 
-namespace Content.Server.GameObjects.Components.VendingMachines
+namespace Content.Server.VendingMachines
 {
     [RegisterComponent]
     [ComponentReference(typeof(IActivate))]
diff --git a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs b/Content.Server/Verbs/VerbSystem.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/VerbSystem.cs
rename to Content.Server/Verbs/VerbSystem.cs
index 4e7cf8e3f1..fa88d65367 100644
--- a/Content.Server/GameObjects/EntitySystems/VerbSystem.cs
+++ b/Content.Server/Verbs/VerbSystem.cs
@@ -1,17 +1,16 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Reflection;
-using Content.Shared.GameObjects.EntitySystemMessages;
-using Content.Shared.GameObjects.Verbs;
 using Content.Shared.GameTicking;
+using Content.Shared.Verbs;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using static Content.Shared.GameObjects.EntitySystemMessages.VerbSystemMessages;
+using static Content.Shared.Verbs.VerbSystemMessages;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Verbs
 {
     public class VerbSystem : SharedVerbSystem, IResettingEntitySystem
     {
diff --git a/Content.Server/GameObjects/VisibilityFlags.cs b/Content.Server/Visible/VisibilityFlags.cs
similarity index 80%
rename from Content.Server/GameObjects/VisibilityFlags.cs
rename to Content.Server/Visible/VisibilityFlags.cs
index 5d51b1a23f..91643cbda9 100644
--- a/Content.Server/GameObjects/VisibilityFlags.cs
+++ b/Content.Server/Visible/VisibilityFlags.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Content.Server.GameObjects
+namespace Content.Server.Visible
 {
     [Flags]
     public enum VisibilityFlags : uint
diff --git a/Content.Server/Voting/IVoteManager.cs b/Content.Server/Voting/Managers/IVoteManager.cs
similarity index 93%
rename from Content.Server/Voting/IVoteManager.cs
rename to Content.Server/Voting/Managers/IVoteManager.cs
index 31d61ae470..b83f35eded 100644
--- a/Content.Server/Voting/IVoteManager.cs
+++ b/Content.Server/Voting/Managers/IVoteManager.cs
@@ -4,7 +4,7 @@ using Robust.Server.Player;
 
 #nullable enable
 
-namespace Content.Server.Voting
+namespace Content.Server.Voting.Managers
 {
     public interface IVoteManager
     {
diff --git a/Content.Server/Voting/VoteManager.DefaultVotes.cs b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
similarity index 98%
rename from Content.Server/Voting/VoteManager.DefaultVotes.cs
rename to Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
index eecf495cb8..a1a5582bab 100644
--- a/Content.Server/Voting/VoteManager.DefaultVotes.cs
+++ b/Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
@@ -7,7 +7,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Random;
 
-namespace Content.Server.Voting
+namespace Content.Server.Voting.Managers
 {
     public sealed partial class VoteManager
     {
diff --git a/Content.Server/Voting/VoteManager.cs b/Content.Server/Voting/Managers/VoteManager.cs
similarity index 98%
rename from Content.Server/Voting/VoteManager.cs
rename to Content.Server/Voting/Managers/VoteManager.cs
index 3f68b49bc3..5f0cd8eea3 100644
--- a/Content.Server/Voting/VoteManager.cs
+++ b/Content.Server/Voting/Managers/VoteManager.cs
@@ -5,11 +5,12 @@ using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Server.Administration;
-using Content.Server.Interfaces.Chat;
-using Content.Server.Interfaces.GameTicking;
+using Content.Server.Administration.Managers;
+using Content.Server.Chat.Managers;
+using Content.Server.GameTicking;
 using Content.Shared.Administration;
-using Content.Shared.Network.NetMessages;
-using Content.Shared.Utility;
+using Content.Shared.Collections;
+using Content.Shared.Voting;
 using Robust.Server.Player;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
@@ -21,7 +22,7 @@ using Robust.Shared.Utility;
 
 #nullable enable
 
-namespace Content.Server.Voting
+namespace Content.Server.Voting.Managers
 {
     public sealed partial class VoteManager : IVoteManager
     {
diff --git a/Content.Server/Voting/VoteCommands.cs b/Content.Server/Voting/VoteCommands.cs
index 40d30d4ff2..4dc629c679 100644
--- a/Content.Server/Voting/VoteCommands.cs
+++ b/Content.Server/Voting/VoteCommands.cs
@@ -2,7 +2,8 @@
 using System.Linq;
 using System.Text;
 using Content.Server.Administration;
-using Content.Server.Interfaces.Chat;
+using Content.Server.Chat.Managers;
+using Content.Server.Voting.Managers;
 using Content.Shared.Administration;
 using Robust.Server.Player;
 using Robust.Shared.Console;
diff --git a/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs b/Content.Server/Warps/WarpPointComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs
rename to Content.Server/Warps/WarpPointComponent.cs
index 78539dfe55..8dff88d66b 100644
--- a/Content.Server/GameObjects/Components/Markers/WarpPointComponent.cs
+++ b/Content.Server/Warps/WarpPointComponent.cs
@@ -1,11 +1,11 @@
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Markers
+namespace Content.Server.Warps
 {
     [RegisterComponent]
     public sealed class WarpPointComponent : Component, IExamine
diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
rename to Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs
index 6e82a94d2d..fcf2719638 100644
--- a/Content.Server/GameObjects/Components/Weapon/Melee/MeleeWeaponComponent.cs
+++ b/Content.Server/Weapon/Melee/Components/MeleeWeaponComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Melee
+namespace Content.Server.Weapon.Melee.Components
 {
     [RegisterComponent]
     public class MeleeWeaponComponent : Component
diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs b/Content.Server/Weapon/Melee/Components/UnarmedCombatComponent.cs
similarity index 83%
rename from Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs
rename to Content.Server/Weapon/Melee/Components/UnarmedCombatComponent.cs
index c17b580ac3..f4f1766515 100644
--- a/Content.Server/GameObjects/Components/Weapon/Melee/UnarmedCombatComponent.cs
+++ b/Content.Server/Weapon/Melee/Components/UnarmedCombatComponent.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Weapon.Melee
+namespace Content.Server.Weapon.Melee.Components
 {
     // TODO: Remove this, just use MeleeWeapon...
     [RegisterComponent]
diff --git a/Content.Server/GameObjects/EntitySystems/Weapon/Melee/MeleeWeaponSystem.cs b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
similarity index 96%
rename from Content.Server/GameObjects/EntitySystems/Weapon/Melee/MeleeWeaponSystem.cs
rename to Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
index a62661c7af..0c7a42785c 100644
--- a/Content.Server/GameObjects/EntitySystems/Weapon/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapon/Melee/MeleeWeaponSystem.cs
@@ -1,13 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Body.Circulatory;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.Weapon.Melee;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.EntitySystemMessages;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Body.Circulatory;
+using Content.Server.Chemistry.Components;
+using Content.Server.Cooldown;
+using Content.Server.Weapon.Melee.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Hands;
+using Content.Shared.Interaction;
 using Content.Shared.Physics;
+using Content.Shared.Weapons.Melee;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -18,7 +20,7 @@ using Robust.Shared.Physics.Broadphase;
 using Robust.Shared.Player;
 using Robust.Shared.Timing;
 
-namespace Content.Server.GameObjects.EntitySystems.Weapon.Melee
+namespace Content.Server.Weapon.Melee
 {
     public sealed class MeleeWeaponSystem : EntitySystem
     {
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs
rename to Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
index 5f994ecef9..42799c0a6b 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoBoxComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoBoxComponent.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Weapon.Ranged.Barrels.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -17,7 +17,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
+namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
     [RegisterComponent]
     public sealed class AmmoBoxComponent : Component, IInteractUsing, IUse, IInteractHand, IMapInit, IExamine
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs
rename to Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
index da1f9183ad..dadc676cb9 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponent.cs
@@ -1,6 +1,6 @@
 using System;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Examine;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -13,7 +13,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
+namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
     /// <summary>
     /// Allows this entity to be loaded into a ranged weapon (if the caliber matches)
diff --git a/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponentData.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponentData.cs
new file mode 100644
index 0000000000..ffeb48d9bd
--- /dev/null
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/AmmoComponentData.cs
@@ -0,0 +1,8 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Server.Weapon.Ranged.Ammunition.Components
+{
+    public partial class AmmoComponentData : ISerializationHooks
+    {
+    }
+}
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs
similarity index 87%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs
rename to Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs
index df7ec6ef76..5ee383baf3 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/ChemicalAmmoComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/ChemicalAmmoComponent.cs
@@ -1,11 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Server.GameObjects.Components.Chemistry;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
+using Content.Server.Chemistry.Components;
+using Content.Server.Weapon.Ranged.Barrels.Components;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
+namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
     [RegisterComponent]
     public class ChemicalAmmoComponent : Component
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs
rename to Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
index c6b10ece30..81da530c7c 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/RangedMagazineComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/RangedMagazineComponent.cs
@@ -1,13 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Weapon.Ranged.Barrels.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -15,7 +15,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
+namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
     [RegisterComponent]
     public class RangedMagazineComponent : Component, IMapInit, IInteractUsing, IUse, IExamine
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs
similarity index 93%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs
rename to Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs
index 365ed98ce0..a54422e5c1 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/SpeedLoaderComponent.cs
+++ b/Content.Server/Weapon/Ranged/Ammunition/Components/SpeedLoaderComponent.cs
@@ -1,18 +1,18 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Weapon.Ranged.Barrels.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Notification;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
+namespace Content.Server.Weapon.Ranged.Ammunition.Components
 {
     /// <summary>
     /// Used to load certain ranged weapons quickly
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs
rename to Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
index 6c5e9db8b5..76b0f2fbf2 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/BoltActionBarrelComponent.cs
@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Weapon.Ranged.Ammunition.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -20,7 +20,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
+namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     /// <summary>
     /// Shotguns mostly
@@ -69,7 +69,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
                 {
                     return;
                 }
-                
+
                 if (value)
                 {
                     TryEjectChamber();
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs
rename to Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
index a8f8ee95df..af8fa16f4e 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/PumpBarrelComponent.cs
@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Weapon.Ranged.Ammunition.Components;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
+using Content.Shared.Notification;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -18,7 +18,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
+namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     /// <summary>
     /// Bolt-action rifles
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs
rename to Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
index 4131db241c..b9ebb29884 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/RevolverBarrelComponent.cs
@@ -1,12 +1,12 @@
 using System;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Weapon.Ranged.Ammunition.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -21,7 +21,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
+namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     [RegisterComponent]
     public sealed class RevolverBarrelComponent : ServerRangedBarrelComponent, ISerializationHooks
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
similarity index 95%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs
rename to Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
index f926ea12e3..8e69d38b3e 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerBatteryBarrelComponent.cs
@@ -1,16 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Power;
-using Content.Server.GameObjects.Components.Projectiles;
+using Content.Server.Battery.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Projectiles.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -22,7 +22,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
+namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     [RegisterComponent]
     public sealed class ServerBatteryBarrelComponent : ServerRangedBarrelComponent
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs
rename to Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
index 001d455f8d..6266a8742d 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerMagazineBarrelComponent.cs
@@ -1,17 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Items.Storage;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
-using Content.Shared.GameObjects;
-using Content.Shared.GameObjects.Components.Weapons.Ranged;
-using Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.Verbs;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Hands.Components;
+using Content.Server.Items;
+using Content.Server.Weapon.Ranged.Ammunition.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
+using Content.Shared.Notification;
+using Content.Shared.Verbs;
+using Content.Shared.Weapons.Ranged;
+using Content.Shared.Weapons.Ranged.Barrels.Components;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
@@ -24,7 +24,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
+namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     [RegisterComponent]
     public sealed class ServerMagazineBarrelComponent : ServerRangedBarrelComponent, IExamine
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
similarity index 97%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs
rename to Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
index dc0feeabf2..d3a32f830a 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs
+++ b/Content.Server/Weapon/Ranged/Barrels/Components/ServerRangedBarrelComponent.cs
@@ -2,14 +2,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Projectiles;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition;
+using Content.Server.Camera;
+using Content.Server.Projectiles.Components;
+using Content.Server.Weapon.Ranged.Ammunition.Components;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Weapons.Ranged;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -27,7 +27,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
+namespace Content.Server.Weapon.Ranged.Barrels.Components
 {
     /// <summary>
     /// All of the ranged weapon components inherit from this to share mechanics like shooting etc.
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
similarity index 92%
rename from Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs
rename to Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
index 8d803969ef..9f8572c97e 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/ServerRangedWeaponComponent.cs
+++ b/Content.Server/Weapon/Ranged/ServerRangedWeaponComponent.cs
@@ -1,13 +1,16 @@
 using System;
-using Content.Server.GameObjects.Components.GUI;
-using Content.Server.GameObjects.Components.Mobs;
-using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
+using Content.Server.Atmos;
+using Content.Server.CombatMode;
+using Content.Server.Hands.Components;
+using Content.Server.Interaction.Components;
+using Content.Server.Stunnable.Components;
+using Content.Server.Weapon.Ranged.Barrels.Components;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Weapons.Ranged;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Damage.Components;
+using Content.Shared.Hands;
+using Content.Shared.Notification;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
@@ -21,9 +24,8 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
-using Content.Server.Atmos;
 
-namespace Content.Server.GameObjects.Components.Weapon.Ranged
+namespace Content.Server.Weapon.Ranged
 {
     [RegisterComponent]
     public sealed class ServerRangedWeaponComponent : SharedRangedWeaponComponent, IHandSelected
diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs b/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs
similarity index 84%
rename from Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs
rename to Content.Server/Weapon/WeaponCapacitorChargerComponent.cs
index c0f437fa9c..adcfdf029a 100644
--- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/WeaponCapacitorChargerComponent.cs
+++ b/Content.Server/Weapon/WeaponCapacitorChargerComponent.cs
@@ -1,9 +1,12 @@
 #nullable enable
-using Content.Server.GameObjects.Components.Weapon.Ranged.Barrels;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Battery.Components;
+using Content.Server.Power.Components;
+using Content.Server.PowerCell.Components;
+using Content.Server.Weapon.Ranged.Barrels.Components;
+using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 
-namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
+namespace Content.Server.Weapon
 {
     /// <summary>
     /// Recharges the battery in a <see cref="ServerBatteryBarrelComponent"/>.
diff --git a/Content.Server/GameObjects/Components/WindowComponent.cs b/Content.Server/Window/WindowComponent.cs
similarity index 89%
rename from Content.Server/GameObjects/Components/WindowComponent.cs
rename to Content.Server/Window/WindowComponent.cs
index c839e27cfd..1a200d65e7 100644
--- a/Content.Server/GameObjects/Components/WindowComponent.cs
+++ b/Content.Server/Window/WindowComponent.cs
@@ -1,28 +1,27 @@
 #nullable enable
 using System;
-using Content.Server.Utility;
+using Content.Server.Destructible;
+using Content.Server.Destructible.Thresholds.Triggers;
+using Content.Server.Notification;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Server.GameObjects.Components.Destructible;
-using Content.Server.GameObjects.Components.Destructible.Thresholds.Triggers;
-using Content.Shared.Utility;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Rounding;
+using Content.Shared.Window;
 using Robust.Server.GameObjects;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-using Robust.Shared.Timing;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Window
 {
     [RegisterComponent]
     [ComponentReference(typeof(SharedWindowComponent))]
diff --git a/Content.Server/GameObjects/Components/Power/WireComponent.cs b/Content.Server/Wires/Components/WireComponent.cs
similarity index 82%
rename from Content.Server/GameObjects/Components/Power/WireComponent.cs
rename to Content.Server/Wires/Components/WireComponent.cs
index ff8400fb82..afb2aae8aa 100644
--- a/Content.Server/GameObjects/Components/Power/WireComponent.cs
+++ b/Content.Server/Wires/Components/WireComponent.cs
@@ -1,17 +1,15 @@
 #nullable enable
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Server.Stack;
+using Content.Server.Tools.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Stacks;
+using Content.Shared.Tool;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power
+namespace Content.Server.Wires.Components
 {
     /// <summary>
     ///     Allows the attached entity to be destroyed by a cutting tool, dropping a piece of wire.
diff --git a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs b/Content.Server/Wires/Components/WirePlacerComponent.cs
similarity index 86%
rename from Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs
rename to Content.Server/Wires/Components/WirePlacerComponent.cs
index 747c4f9726..8642178b24 100644
--- a/Content.Server/GameObjects/Components/Power/WirePlacerComponent.cs
+++ b/Content.Server/Wires/Components/WirePlacerComponent.cs
@@ -1,19 +1,15 @@
 #nullable enable
-using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Stack;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using System.Threading.Tasks;
+using Content.Server.Stack;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Serialization;
-using Robust.Shared.ViewVariables;
-using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Map;
+using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components.Power
+namespace Content.Server.Wires.Components
 {
     [RegisterComponent]
     internal class WirePlacerComponent : Component, IAfterInteract
diff --git a/Content.Server/GameObjects/Components/WiresComponent.cs b/Content.Server/Wires/Components/WiresComponent.cs
similarity index 96%
rename from Content.Server/GameObjects/Components/WiresComponent.cs
rename to Content.Server/Wires/Components/WiresComponent.cs
index 4e94718a5f..d872e11deb 100644
--- a/Content.Server/GameObjects/Components/WiresComponent.cs
+++ b/Content.Server/Wires/Components/WiresComponent.cs
@@ -3,17 +3,16 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components.Interactable;
-using Content.Server.GameObjects.Components.VendingMachines;
-using Content.Server.GameObjects.EntitySystems;
-using Content.Server.Interfaces.GameObjects.Components.Items;
-using Content.Server.Utility;
-using Content.Shared.GameObjects.Components;
-using Content.Shared.GameObjects.Components.Interactable;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Server.Hands.Components;
+using Content.Server.Tools.Components;
+using Content.Server.UserInterface;
+using Content.Server.VendingMachines;
+using Content.Shared.Examine;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Notification;
+using Content.Shared.Tool;
+using Content.Shared.Wires;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -22,14 +21,12 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Player;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Server.GameObjects.Components
+namespace Content.Server.Wires.Components
 {
     [RegisterComponent]
     public class WiresComponent : SharedWiresComponent, IInteractUsing, IExamine, IMapInit
diff --git a/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs b/Content.Server/Wires/WireHackingSystem.cs
similarity index 91%
rename from Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs
rename to Content.Server/Wires/WireHackingSystem.cs
index 67fac62474..7155f331e8 100644
--- a/Content.Server/GameObjects/EntitySystems/WireHackingSystem.cs
+++ b/Content.Server/Wires/WireHackingSystem.cs
@@ -3,9 +3,9 @@ using System.Diagnostics.CodeAnalysis;
 using Content.Shared.GameTicking;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent;
 
-namespace Content.Server.GameObjects.EntitySystems
+namespace Content.Server.Wires
 {
     public class WireHackingSystem : EntitySystem, IResettingEntitySystem
     {
diff --git a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs b/Content.Shared/AME/SharedAMEControllerComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs
rename to Content.Shared/AME/SharedAMEControllerComponent.cs
index 4db2c4d4e0..aa65f151f6 100644
--- a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEControllerComponent.cs
+++ b/Content.Shared/AME/SharedAMEControllerComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power.AME
+namespace Content.Shared.AME
 {
     public class SharedAMEControllerComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEShieldComponent.cs b/Content.Shared/AME/SharedAMEShieldComponent.cs
similarity index 89%
rename from Content.Shared/GameObjects/Components/Power/AME/SharedAMEShieldComponent.cs
rename to Content.Shared/AME/SharedAMEShieldComponent.cs
index 3920320910..a2087c5b2e 100644
--- a/Content.Shared/GameObjects/Components/Power/AME/SharedAMEShieldComponent.cs
+++ b/Content.Shared/AME/SharedAMEShieldComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power.AME
+namespace Content.Shared.AME
 {
     public class SharedAMEShieldComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Power/SharedApc.cs b/Content.Shared/APC/SharedApc.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Power/SharedApc.cs
rename to Content.Shared/APC/SharedApc.cs
index aa022c791a..0e48b19768 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedApc.cs
+++ b/Content.Shared/APC/SharedApc.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power
+namespace Content.Shared.APC
 {
     [Serializable, NetSerializable]
     public enum ApcVisuals
diff --git a/Content.Shared/GameObjects/Components/Access/SharedIdCardConsoleComponent.cs b/Content.Shared/Access/SharedIdCardConsoleComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Access/SharedIdCardConsoleComponent.cs
rename to Content.Shared/Access/SharedIdCardConsoleComponent.cs
index 271b39e46f..ab33cfa054 100644
--- a/Content.Shared/GameObjects/Components/Access/SharedIdCardConsoleComponent.cs
+++ b/Content.Shared/Access/SharedIdCardConsoleComponent.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Access
+namespace Content.Shared.Access
 {
     public class SharedIdCardConsoleComponent : Component
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerExtensions.cs b/Content.Shared/ActionBlocker/ActionBlockerExtensions.cs
similarity index 96%
rename from Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerExtensions.cs
rename to Content.Shared/ActionBlocker/ActionBlockerExtensions.cs
index 830309b21e..53acf763ea 100644
--- a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerExtensions.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerExtensions.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
+namespace Content.Shared.ActionBlocker
 {
     public static class ActionBlockerExtensions
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
similarity index 96%
rename from Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerSystem.cs
rename to Content.Shared/ActionBlocker/ActionBlockerSystem.cs
index e94a71c7e7..9f01bc9234 100644
--- a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.GameObjects.Components.Mobs.Speech;
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
+using Content.Shared.EffectBlocker;
+using Content.Shared.Emoting;
+using Content.Shared.Speech;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
+namespace Content.Shared.ActionBlocker
 {
     /// <summary>
     /// Utility methods to check if a specific entity is allowed to perform an action.
diff --git a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/IActionBlocker.cs b/Content.Shared/ActionBlocker/IActionBlocker.cs
similarity index 85%
rename from Content.Shared/GameObjects/EntitySystems/ActionBlocker/IActionBlocker.cs
rename to Content.Shared/ActionBlocker/IActionBlocker.cs
index 99c227a7ae..6e69f3395b 100644
--- a/Content.Shared/GameObjects/EntitySystems/ActionBlocker/IActionBlocker.cs
+++ b/Content.Shared/ActionBlocker/IActionBlocker.cs
@@ -1,7 +1,7 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
+using Content.Shared.EffectBlocker;
 
-namespace Content.Shared.GameObjects.EntitySystems.ActionBlocker
+namespace Content.Shared.ActionBlocker
 {
     /// <summary>
     /// This interface gives components the ability to block certain actions from
diff --git a/Content.Shared/Actions/ActionManager.cs b/Content.Shared/Actions/ActionManager.cs
index fb03725407..a7575a4e41 100644
--- a/Content.Shared/Actions/ActionManager.cs
+++ b/Content.Shared/Actions/ActionManager.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared.Actions.Prototypes;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
diff --git a/Content.Shared/Actions/IActionBehavior.cs b/Content.Shared/Actions/Behaviors/IActionBehavior.cs
similarity index 94%
rename from Content.Shared/Actions/IActionBehavior.cs
rename to Content.Shared/Actions/Behaviors/IActionBehavior.cs
index a082fd5047..0486ac0e4e 100644
--- a/Content.Shared/Actions/IActionBehavior.cs
+++ b/Content.Shared/Actions/Behaviors/IActionBehavior.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Actions.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors
 {
     /// <summary>
     /// Currently just a marker interface delineating the different possible
diff --git a/Content.Shared/Actions/IInstantAction.cs b/Content.Shared/Actions/Behaviors/IInstantAction.cs
similarity index 94%
rename from Content.Shared/Actions/IInstantAction.cs
rename to Content.Shared/Actions/Behaviors/IInstantAction.cs
index fb8304a4c0..75922fa0ec 100644
--- a/Content.Shared/Actions/IInstantAction.cs
+++ b/Content.Shared/Actions/Behaviors/IInstantAction.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors
 {
     /// <summary>
     /// Action which does something immediately when used and has
diff --git a/Content.Shared/Actions/ITargetEntityAction.cs b/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs
similarity index 95%
rename from Content.Shared/Actions/ITargetEntityAction.cs
rename to Content.Shared/Actions/Behaviors/ITargetEntityAction.cs
index 728ad143c2..f1bdf76f89 100644
--- a/Content.Shared/Actions/ITargetEntityAction.cs
+++ b/Content.Shared/Actions/Behaviors/ITargetEntityAction.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors
 {
     /// <summary>
     /// Action which is used on a targeted entity.
diff --git a/Content.Shared/Actions/ITargetEntityItemAction.cs b/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs
similarity index 91%
rename from Content.Shared/Actions/ITargetEntityItemAction.cs
rename to Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs
index 079f863bca..28841d6ae3 100644
--- a/Content.Shared/Actions/ITargetEntityItemAction.cs
+++ b/Content.Shared/Actions/Behaviors/ITargetEntityItemAction.cs
@@ -1,7 +1,8 @@
 #nullable enable
+using Content.Shared.Actions.Behaviors.Item;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors
 {
     /// <summary>
     /// Item action which is used on a targeted entity.
diff --git a/Content.Shared/Actions/ITargetPointAction.cs b/Content.Shared/Actions/Behaviors/ITargetPointAction.cs
similarity index 95%
rename from Content.Shared/Actions/ITargetPointAction.cs
rename to Content.Shared/Actions/Behaviors/ITargetPointAction.cs
index 8d36f30f74..af0e24bfd4 100644
--- a/Content.Shared/Actions/ITargetPointAction.cs
+++ b/Content.Shared/Actions/Behaviors/ITargetPointAction.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors
 {
     /// <summary>
     /// Action which requires the user to select a target point, which
diff --git a/Content.Shared/Actions/ITargetPointItemAction.cs b/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs
similarity index 92%
rename from Content.Shared/Actions/ITargetPointItemAction.cs
rename to Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs
index 34e302434f..a44a84a741 100644
--- a/Content.Shared/Actions/ITargetPointItemAction.cs
+++ b/Content.Shared/Actions/Behaviors/ITargetPointItemAction.cs
@@ -1,8 +1,9 @@
 #nullable enable
+using Content.Shared.Actions.Behaviors.Item;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors
 {
     /// <summary>
     /// Item action which requires the user to select a target point, which
diff --git a/Content.Shared/Actions/IToggleAction.cs b/Content.Shared/Actions/Behaviors/IToggleAction.cs
similarity index 97%
rename from Content.Shared/Actions/IToggleAction.cs
rename to Content.Shared/Actions/Behaviors/IToggleAction.cs
index 89966990ce..3fa04b3946 100644
--- a/Content.Shared/Actions/IToggleAction.cs
+++ b/Content.Shared/Actions/Behaviors/IToggleAction.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors
 {
     /// <summary>
     /// Action which can be toggled on and off
diff --git a/Content.Shared/Actions/IInstantItemAction.cs b/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs
similarity index 94%
rename from Content.Shared/Actions/IInstantItemAction.cs
rename to Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs
index 616695fdf1..17891c2be4 100644
--- a/Content.Shared/Actions/IInstantItemAction.cs
+++ b/Content.Shared/Actions/Behaviors/Item/IInstantItemAction.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors.Item
 {
     /// <summary>
     /// Item action which does something immediately when used and has
diff --git a/Content.Shared/Actions/IItemActionBehavior.cs b/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs
similarity index 94%
rename from Content.Shared/Actions/IItemActionBehavior.cs
rename to Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs
index 15d892cf3c..853da9d4b7 100644
--- a/Content.Shared/Actions/IItemActionBehavior.cs
+++ b/Content.Shared/Actions/Behaviors/Item/IItemActionBehavior.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Actions.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors.Item
 {
     /// <summary>
     /// Currently just a marker interface delineating the different possible
diff --git a/Content.Shared/Actions/IToggleItemAction.cs b/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs
similarity index 97%
rename from Content.Shared/Actions/IToggleItemAction.cs
rename to Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs
index dbbd6b509f..259a998f1f 100644
--- a/Content.Shared/Actions/IToggleItemAction.cs
+++ b/Content.Shared/Actions/Behaviors/Item/IToggleItemAction.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Behaviors.Item
 {
     /// <summary>
     /// Item action which can be toggled on and off
diff --git a/Content.Shared/GameObjects/Components/Mobs/ItemActionsComponent.cs b/Content.Shared/Actions/Components/ItemActionsComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Mobs/ItemActionsComponent.cs
rename to Content.Shared/Actions/Components/ItemActionsComponent.cs
index c67e312593..d433248bff 100644
--- a/Content.Shared/GameObjects/Components/Mobs/ItemActionsComponent.cs
+++ b/Content.Shared/Actions/Components/ItemActionsComponent.cs
@@ -1,16 +1,15 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Actions;
-using Content.Shared.GameObjects.Components.Inventory;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Hands;
+using Content.Shared.Hands.Components;
+using Content.Shared.Inventory;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.Actions.Components
 {
     /// <summary>
     /// This should be used on items which provide actions. Defines which actions the item provides
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs b/Content.Shared/Actions/Components/SharedActionsComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs
rename to Content.Shared/Actions/Components/SharedActionsComponent.cs
index ab4153c3ae..fcb29abfb8 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedActionsComponent.cs
+++ b/Content.Shared/Actions/Components/SharedActionsComponent.cs
@@ -3,17 +3,18 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Shared.Actions;
+using Content.Shared.Actions.Prototypes;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
-using Robust.Shared.Timing;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.Actions.Components
 {
     /// <summary>
     /// Manages the actions available to an entity.
@@ -118,7 +119,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
             return false;
         }
 
-        /// <seealso cref="TryGetItemActionStates(Robust.Shared.GameObjects.EntityUid,out System.Collections.Generic.IReadOnlyDictionary{Content.Shared.Actions.ItemActionType,Content.Shared.GameObjects.Components.Mobs.ActionState}?)"/>
+        /// <seealso cref="TryGetItemActionStates(Robust.Shared.GameObjects.EntityUid,out System.Collections.Generic.IReadOnlyDictionary{Content.Shared.Actions.ItemActionType,Content.Shared.Actions.Components.ActionState}?)"/>
         public bool TryGetItemActionStates(IEntity item,
             [NotNullWhen((true))] out IReadOnlyDictionary<ItemActionType, ActionState>? itemActionStates)
         {
@@ -169,7 +170,7 @@ namespace Content.Shared.GameObjects.Components.Mobs
                 .Any(state => state.Key == actionType && state.Value.Enabled);
         }
 
-        /// <seealso cref="TryGetItemActionState(Content.Shared.Actions.ItemActionType,Robust.Shared.GameObjects.EntityUid,out Content.Shared.GameObjects.Components.Mobs.ActionState)"/>
+        /// <seealso cref="TryGetItemActionState(Content.Shared.Actions.ItemActionType,Robust.Shared.GameObjects.EntityUid,out Content.Shared.Actions.Components.ActionState)"/>
         public bool TryGetItemActionState(ItemActionType actionType, IEntity item, out ActionState actionState)
         {
             return TryGetItemActionState(actionType, item.Uid, out actionState);
diff --git a/Content.Shared/GameObjects/Components/Mobs/IActionAttempt.cs b/Content.Shared/Actions/IActionAttempt.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Mobs/IActionAttempt.cs
rename to Content.Shared/Actions/IActionAttempt.cs
index 73301862b3..f2cb365bb7 100644
--- a/Content.Shared/GameObjects/Components/Mobs/IActionAttempt.cs
+++ b/Content.Shared/Actions/IActionAttempt.cs
@@ -1,10 +1,13 @@
 #nullable enable
-using Content.Shared.Actions;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Actions.Components;
+using Content.Shared.Actions.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.Actions
 {
     /// <summary>
     /// An attempt to perform a specific action. Main purpose of this interface is to
diff --git a/Content.Shared/Actions/ActionPrototype.cs b/Content.Shared/Actions/Prototypes/ActionPrototype.cs
similarity index 97%
rename from Content.Shared/Actions/ActionPrototype.cs
rename to Content.Shared/Actions/Prototypes/ActionPrototype.cs
index fa710e3ebe..8d488b9249 100644
--- a/Content.Shared/Actions/ActionPrototype.cs
+++ b/Content.Shared/Actions/Prototypes/ActionPrototype.cs
@@ -1,12 +1,13 @@
 #nullable enable
-using Content.Shared.Interfaces;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Module;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Prototypes
 {
     /// <summary>
     /// An action which is granted directly to an entity (such as an innate ability
diff --git a/Content.Shared/Actions/BaseActionPrototype.cs b/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
similarity index 99%
rename from Content.Shared/Actions/BaseActionPrototype.cs
rename to Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
index 74648cb233..451dfb106e 100644
--- a/Content.Shared/Actions/BaseActionPrototype.cs
+++ b/Content.Shared/Actions/Prototypes/BaseActionPrototype.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Prototypes
 {
     /// <summary>
     /// Base class for action prototypes.
diff --git a/Content.Shared/Actions/ItemActionPrototype.cs b/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs
similarity index 97%
rename from Content.Shared/Actions/ItemActionPrototype.cs
rename to Content.Shared/Actions/Prototypes/ItemActionPrototype.cs
index 83a61ce8a4..24a66fc8c6 100644
--- a/Content.Shared/Actions/ItemActionPrototype.cs
+++ b/Content.Shared/Actions/Prototypes/ItemActionPrototype.cs
@@ -1,12 +1,14 @@
 #nullable enable
-using Content.Shared.Interfaces;
+using Content.Shared.Actions.Behaviors;
+using Content.Shared.Actions.Behaviors.Item;
+using Content.Shared.Module;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Actions
+namespace Content.Shared.Actions.Prototypes
 {
     /// <summary>
     /// An action which is granted to an entity via an item (such as toggling a flashlight).
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedActionSystem.cs b/Content.Shared/Actions/SharedActionSystem.cs
similarity index 88%
rename from Content.Shared/GameObjects/EntitySystems/SharedActionSystem.cs
rename to Content.Shared/Actions/SharedActionSystem.cs
index 5b66043695..acec005de7 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedActionSystem.cs
+++ b/Content.Shared/Actions/SharedActionSystem.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Actions.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Actions
 {
     /// <summary>
     /// Evicts action states with expired cooldowns.
diff --git a/Content.Shared/GameObjects/EntitySystems/ActSystem.cs b/Content.Shared/Acts/ActSystem.cs
similarity index 98%
rename from Content.Shared/GameObjects/EntitySystems/ActSystem.cs
rename to Content.Shared/Acts/ActSystem.cs
index 4d94a76a60..37d3fd009a 100644
--- a/Content.Shared/GameObjects/EntitySystems/ActSystem.cs
+++ b/Content.Shared/Acts/ActSystem.cs
@@ -5,7 +5,7 @@ using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Acts
 {
     /// <summary>
     /// This interface gives components behavior on getting destroyed.
diff --git a/Content.Shared/Administration/AdminAddReagentEuiState.cs b/Content.Shared/Administration/AdminAddReagentEuiState.cs
index b148819df2..800251f1a3 100644
--- a/Content.Shared/Administration/AdminAddReagentEuiState.cs
+++ b/Content.Shared/Administration/AdminAddReagentEuiState.cs
@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
diff --git a/Content.Shared/Administration/AdminMenu/AdminMenuPlayerListMessage.cs b/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs
similarity index 96%
rename from Content.Shared/Administration/AdminMenu/AdminMenuPlayerListMessage.cs
rename to Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs
index 42ec1b092f..2e5f2e4d74 100644
--- a/Content.Shared/Administration/AdminMenu/AdminMenuPlayerListMessage.cs
+++ b/Content.Shared/Administration/Menu/AdminMenuPlayerListMessage.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Administration.AdminMenu
+namespace Content.Shared.Administration.Menu
 {
     public class AdminMenuPlayerListMessage : NetMessage
     {
diff --git a/Content.Shared/Administration/AdminMenu/AdminMenuPlayerListRequest.cs b/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs
similarity index 92%
rename from Content.Shared/Administration/AdminMenu/AdminMenuPlayerListRequest.cs
rename to Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs
index 4669d3ba3e..6e730e3503 100644
--- a/Content.Shared/Administration/AdminMenu/AdminMenuPlayerListRequest.cs
+++ b/Content.Shared/Administration/Menu/AdminMenuPlayerListRequest.cs
@@ -2,7 +2,7 @@
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Administration.AdminMenu
+namespace Content.Shared.Administration.Menu
 {
     public class AdminMenuPlayerListRequest : NetMessage
     {
diff --git a/Content.Shared/Network/NetMessages/MsgUpdateAdminStatus.cs b/Content.Shared/Administration/MsgUpdateAdminStatus.cs
similarity index 95%
rename from Content.Shared/Network/NetMessages/MsgUpdateAdminStatus.cs
rename to Content.Shared/Administration/MsgUpdateAdminStatus.cs
index 45f860a70e..a8ac9813ae 100644
--- a/Content.Shared/Network/NetMessages/MsgUpdateAdminStatus.cs
+++ b/Content.Shared/Administration/MsgUpdateAdminStatus.cs
@@ -1,10 +1,9 @@
 #nullable enable
 using System;
-using Content.Shared.Administration;
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Administration
 {
     public sealed class MsgUpdateAdminStatus : NetMessage
     {
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedAlertsComponent.cs b/Content.Shared/Alert/SharedAlertsComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Mobs/SharedAlertsComponent.cs
rename to Content.Shared/Alert/SharedAlertsComponent.cs
index 295dbd0ce4..d4af917cd0 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedAlertsComponent.cs
+++ b/Content.Shared/Alert/SharedAlertsComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Alert;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -9,7 +9,7 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.Alert
 {
     /// <summary>
     /// Handles the icons on the right side of the screen.
diff --git a/Content.Shared/GameObjects/Components/Arcade/SharedSpaceVillainArcadeComponent.cs b/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Arcade/SharedSpaceVillainArcadeComponent.cs
rename to Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs
index 6b1b186284..7fb3d608db 100644
--- a/Content.Shared/GameObjects/Components/Arcade/SharedSpaceVillainArcadeComponent.cs
+++ b/Content.Shared/Arcade/SharedSpaceVillainArcadeComponent.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Arcade
+namespace Content.Shared.Arcade
 {
     public class SharedSpaceVillainArcadeComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Body/Behavior/IMechanismBehavior.cs b/Content.Shared/Body/Behavior/IMechanismBehavior.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Body/Behavior/IMechanismBehavior.cs
rename to Content.Shared/Body/Behavior/IMechanismBehavior.cs
index c150a41c9c..4fb0dcc98c 100644
--- a/Content.Shared/GameObjects/Components/Body/Behavior/IMechanismBehavior.cs
+++ b/Content.Shared/Body/Behavior/IMechanismBehavior.cs
@@ -1,10 +1,11 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Body.Behavior
+namespace Content.Shared.Body.Behavior
 {
     /// <summary>
     ///     Gives functionality to a <see cref="IMechanism"/> when added to it.
diff --git a/Content.Shared/GameObjects/Components/Body/IBody.cs b/Content.Shared/Body/Components/IBody.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Body/IBody.cs
rename to Content.Shared/Body/Components/IBody.cs
index 9e5ab1fcf0..d3a92cca83 100644
--- a/Content.Shared/GameObjects/Components/Body/IBody.cs
+++ b/Content.Shared/Body/Components/IBody.cs
@@ -2,14 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Body.Part.Property;
-using Content.Shared.GameObjects.Components.Body.Preset;
-using Content.Shared.GameObjects.Components.Body.Slot;
-using Content.Shared.GameObjects.Components.Body.Template;
+using Content.Shared.Body.Part;
+using Content.Shared.Body.Part.Property;
+using Content.Shared.Body.Preset;
+using Content.Shared.Body.Slot;
+using Content.Shared.Body.Template;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Body
+namespace Content.Shared.Body.Components
 {
     /// <summary>
     ///     Component representing a collection of <see cref="IBodyPart"/>s
diff --git a/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs b/Content.Shared/Body/Components/SharedBodyComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs
rename to Content.Shared/Body/Components/SharedBodyComponent.cs
index 6094061536..b1a5d9b6b1 100644
--- a/Content.Shared/GameObjects/Components/Body/SharedBodyComponent.cs
+++ b/Content.Shared/Body/Components/SharedBodyComponent.cs
@@ -3,15 +3,16 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared.Body.Part;
+using Content.Shared.Body.Part.Property;
+using Content.Shared.Body.Preset;
+using Content.Shared.Body.Slot;
+using Content.Shared.Body.Template;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Content.Shared.GameObjects.Components.Body.Part.Property;
-using Content.Shared.GameObjects.Components.Body.Preset;
-using Content.Shared.GameObjects.Components.Body.Slot;
-using Content.Shared.GameObjects.Components.Body.Template;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Damage.Components;
+using Content.Shared.Movement.Components;
+using Content.Shared.NetIDs;
+using Content.Shared.Standing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
@@ -21,7 +22,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Body
+namespace Content.Shared.Body.Components
 {
     // TODO BODY Damage methods for collections of IDamageableComponents
     public abstract class SharedBodyComponent : Component, IBody, ISerializationHooks
diff --git a/Content.Shared/GameObjects/Components/Body/Mechanism/IMechanism.cs b/Content.Shared/Body/Mechanism/IMechanism.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Body/Mechanism/IMechanism.cs
rename to Content.Shared/Body/Mechanism/IMechanism.cs
index 2496c9ae18..66a8f000e5 100644
--- a/Content.Shared/GameObjects/Components/Body/Mechanism/IMechanism.cs
+++ b/Content.Shared/Body/Mechanism/IMechanism.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Body.Behavior;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Behavior;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Body.Mechanism
+namespace Content.Shared.Body.Mechanism
 {
     public interface IMechanism : IComponent
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs b/Content.Shared/Body/Mechanism/MechanismSystem.cs
similarity index 79%
rename from Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs
rename to Content.Shared/Body/Mechanism/MechanismSystem.cs
index 0959196eed..29691228fe 100644
--- a/Content.Shared/GameObjects/EntitySystems/MechanismSystem.cs
+++ b/Content.Shared/Body/Mechanism/MechanismSystem.cs
@@ -1,9 +1,8 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Body.Mechanism;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Body.Mechanism
 {
     [UsedImplicitly]
     public class MechanismSystem : EntitySystem
diff --git a/Content.Shared/GameObjects/Components/Body/Mechanism/SharedMechanismComponent.cs b/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Body/Mechanism/SharedMechanismComponent.cs
rename to Content.Shared/Body/Mechanism/SharedMechanismComponent.cs
index a2f139a8ba..edaf42b92d 100644
--- a/Content.Shared/GameObjects/Components/Body/Mechanism/SharedMechanismComponent.cs
+++ b/Content.Shared/Body/Mechanism/SharedMechanismComponent.cs
@@ -2,8 +2,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Body.Behavior;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Behavior;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
@@ -11,7 +12,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.GameObjects.Components.Body.Mechanism
+namespace Content.Shared.Body.Mechanism
 {
     public abstract class SharedMechanismComponent : Component, IMechanism, ISerializationHooks
     {
diff --git a/Content.Shared/GameObjects/Components/Body/Networks/SharedBloodstreamComponent.cs b/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/Body/Networks/SharedBloodstreamComponent.cs
rename to Content.Shared/Body/Networks/SharedBloodstreamComponent.cs
index 82a6416c1e..0641403b73 100644
--- a/Content.Shared/GameObjects/Components/Body/Networks/SharedBloodstreamComponent.cs
+++ b/Content.Shared/Body/Networks/SharedBloodstreamComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Solution;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Body.Networks
+namespace Content.Shared.Body.Networks
 {
     public abstract class SharedBloodstreamComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Body/Part/BodyPartCompatibility.cs b/Content.Shared/Body/Part/BodyPartCompatibility.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/Body/Part/BodyPartCompatibility.cs
rename to Content.Shared/Body/Part/BodyPartCompatibility.cs
index 15ef7a73fa..9a822c7d75 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/BodyPartCompatibility.cs
+++ b/Content.Shared/Body/Part/BodyPartCompatibility.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     /// <summary>
     ///     Determines whether two <see cref="IBodyPart"/>s can connect.
diff --git a/Content.Shared/GameObjects/Components/Body/Part/BodyPartExtensions.cs b/Content.Shared/Body/Part/BodyPartExtensions.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Body/Part/BodyPartExtensions.cs
rename to Content.Shared/Body/Part/BodyPartExtensions.cs
index 2a52121001..7d9a8ef862 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/BodyPartExtensions.cs
+++ b/Content.Shared/Body/Part/BodyPartExtensions.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.GameObjects.Components.Body.Part.Property;
+using Content.Shared.Body.Part.Property;
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     public static class BodyPartExtensions
     {
diff --git a/Content.Shared/GameObjects/Components/Body/Part/BodyPartSymmetry.cs b/Content.Shared/Body/Part/BodyPartSymmetry.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/Body/Part/BodyPartSymmetry.cs
rename to Content.Shared/Body/Part/BodyPartSymmetry.cs
index 9bd24f3bf3..0404d338ae 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/BodyPartSymmetry.cs
+++ b/Content.Shared/Body/Part/BodyPartSymmetry.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     /// <summary>
     ///     Defines the symmetry of a <see cref="IBodyPart"/>.
diff --git a/Content.Shared/GameObjects/Components/Body/Part/BodyPartType.cs b/Content.Shared/Body/Part/BodyPartType.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/Body/Part/BodyPartType.cs
rename to Content.Shared/Body/Part/BodyPartType.cs
index 34716661fd..9855647493 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/BodyPartType.cs
+++ b/Content.Shared/Body/Part/BodyPartType.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     /// <summary>
     ///     Defines the type of a <see cref="IBodyPart"/>.
diff --git a/Content.Shared/GameObjects/Components/Body/Part/IBodyPart.cs b/Content.Shared/Body/Part/IBodyPart.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Body/Part/IBodyPart.cs
rename to Content.Shared/Body/Part/IBodyPart.cs
index ff5aa061c0..cbf4e1342e 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/IBodyPart.cs
+++ b/Content.Shared/Body/Part/IBodyPart.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Surgery;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Surgery;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     public interface IBodyPart : IComponent, IBodyPartContainer
     {
diff --git a/Content.Shared/GameObjects/Components/Body/Part/IBodyPartAdded.cs b/Content.Shared/Body/Part/IBodyPartAdded.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Body/Part/IBodyPartAdded.cs
rename to Content.Shared/Body/Part/IBodyPartAdded.cs
index 29dcba143b..42a06c6d53 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/IBodyPartAdded.cs
+++ b/Content.Shared/Body/Part/IBodyPartAdded.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     /// <summary>
     ///     This interface gives components behavior when a body part
diff --git a/Content.Shared/GameObjects/Components/Body/Part/IBodyPartContainer.cs b/Content.Shared/Body/Part/IBodyPartContainer.cs
similarity index 80%
rename from Content.Shared/GameObjects/Components/Body/Part/IBodyPartContainer.cs
rename to Content.Shared/Body/Part/IBodyPartContainer.cs
index 2cd129c4a8..35f49a6236 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/IBodyPartContainer.cs
+++ b/Content.Shared/Body/Part/IBodyPartContainer.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     /// <summary>
     ///     Defines a component as being capable of containing parts.
diff --git a/Content.Shared/GameObjects/Components/Body/Part/IBodyPartRemoved.cs b/Content.Shared/Body/Part/IBodyPartRemoved.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Body/Part/IBodyPartRemoved.cs
rename to Content.Shared/Body/Part/IBodyPartRemoved.cs
index 70173370c9..9d9328905b 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/IBodyPartRemoved.cs
+++ b/Content.Shared/Body/Part/IBodyPartRemoved.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     /// <summary>
     ///     This interface gives components behavior when a body part
diff --git a/Content.Shared/GameObjects/Components/Body/Part/Property/BodyPartPropertyComponent.cs b/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs
similarity index 91%
rename from Content.Shared/GameObjects/Components/Body/Part/Property/BodyPartPropertyComponent.cs
rename to Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs
index 8736228b25..29171369c6 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/Property/BodyPartPropertyComponent.cs
+++ b/Content.Shared/Body/Part/Property/BodyPartPropertyComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Body.Part.Property
+namespace Content.Shared.Body.Part.Property
 {
     /// <summary>
     ///     Property attachable to a <see cref="IBodyPart"/>.
diff --git a/Content.Shared/GameObjects/Components/Body/Part/Property/ExtensionComponent.cs b/Content.Shared/Body/Part/Property/ExtensionComponent.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/Body/Part/Property/ExtensionComponent.cs
rename to Content.Shared/Body/Part/Property/ExtensionComponent.cs
index e43554e103..229ea88831 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/Property/ExtensionComponent.cs
+++ b/Content.Shared/Body/Part/Property/ExtensionComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Body.Part.Property
+namespace Content.Shared.Body.Part.Property
 {
     /// <summary>
     ///     Defines the length of a <see cref="IBodyPart"/>.
diff --git a/Content.Shared/GameObjects/Components/Body/Part/Property/GraspComponent.cs b/Content.Shared/Body/Part/Property/GraspComponent.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/Body/Part/Property/GraspComponent.cs
rename to Content.Shared/Body/Part/Property/GraspComponent.cs
index 9bc5d233a4..cf6207b68c 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/Property/GraspComponent.cs
+++ b/Content.Shared/Body/Part/Property/GraspComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Body.Part.Property
+namespace Content.Shared.Body.Part.Property
 {
     /// <summary>
     ///     Defines a <see cref="IBodyPart"/> as being able to grasp around an entity,
diff --git a/Content.Shared/GameObjects/Components/Body/Part/Property/IBodyPartProperty.cs b/Content.Shared/Body/Part/Property/IBodyPartProperty.cs
similarity index 79%
rename from Content.Shared/GameObjects/Components/Body/Part/Property/IBodyPartProperty.cs
rename to Content.Shared/Body/Part/Property/IBodyPartProperty.cs
index 5f073dd091..599b3ae812 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/Property/IBodyPartProperty.cs
+++ b/Content.Shared/Body/Part/Property/IBodyPartProperty.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Body.Part.Property
+namespace Content.Shared.Body.Part.Property
 {
     /// <summary>
     ///     Defines a property for a <see cref="IBodyPart"/>.
diff --git a/Content.Shared/GameObjects/Components/Body/Part/Property/LegComponent.cs b/Content.Shared/Body/Part/Property/LegComponent.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/Body/Part/Property/LegComponent.cs
rename to Content.Shared/Body/Part/Property/LegComponent.cs
index 4e7213cdfd..51033dd93d 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/Property/LegComponent.cs
+++ b/Content.Shared/Body/Part/Property/LegComponent.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Body.Part.Property
+namespace Content.Shared.Body.Part.Property
 {
     /// <summary>
     ///     Defines the speed at which a <see cref="IBodyPart"/> can move.
diff --git a/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs b/Content.Shared/Body/Part/SharedBodyPartComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs
rename to Content.Shared/Body/Part/SharedBodyPartComponent.cs
index 0b8ae6f400..e0c72afd55 100644
--- a/Content.Shared/GameObjects/Components/Body/Part/SharedBodyPartComponent.cs
+++ b/Content.Shared/Body/Part/SharedBodyPartComponent.cs
@@ -2,8 +2,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Surgery;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Surgery;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
@@ -13,7 +15,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Body.Part
+namespace Content.Shared.Body.Part
 {
     public abstract class SharedBodyPartComponent : Component, IBodyPart
     {
diff --git a/Content.Shared/GameObjects/Components/Body/Preset/BodyPresetPrototype.cs b/Content.Shared/Body/Preset/BodyPresetPrototype.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/Body/Preset/BodyPresetPrototype.cs
rename to Content.Shared/Body/Preset/BodyPresetPrototype.cs
index 9658ada2c1..3cb5ef8736 100644
--- a/Content.Shared/GameObjects/Components/Body/Preset/BodyPresetPrototype.cs
+++ b/Content.Shared/Body/Preset/BodyPresetPrototype.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Body.Preset
+namespace Content.Shared.Body.Preset
 {
     /// <summary>
     ///     Defines the <see cref="IBodyPart"/>s used in a <see cref="IBody"/>.
diff --git a/Content.Shared/GameObjects/Components/Body/Scanner/SharedBodyScannerComponent.cs b/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs
similarity index 90%
rename from Content.Shared/GameObjects/Components/Body/Scanner/SharedBodyScannerComponent.cs
rename to Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs
index b1d0e19ebc..c8657fa68a 100644
--- a/Content.Shared/GameObjects/Components/Body/Scanner/SharedBodyScannerComponent.cs
+++ b/Content.Shared/Body/Scanner/SharedBodyScannerComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Body.Scanner
+namespace Content.Shared.Body.Scanner
 {
     public abstract class SharedBodyScannerComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Body/Slot/BodyPartSlot.cs b/Content.Shared/Body/Slot/BodyPartSlot.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Body/Slot/BodyPartSlot.cs
rename to Content.Shared/Body/Slot/BodyPartSlot.cs
index e4682365b7..f976fbb2d5 100644
--- a/Content.Shared/GameObjects/Components/Body/Slot/BodyPartSlot.cs
+++ b/Content.Shared/Body/Slot/BodyPartSlot.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Part;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Body.Slot
+namespace Content.Shared.Body.Slot
 {
     public class BodyPartSlot
     {
diff --git a/Content.Shared/GameObjects/Components/Body/Surgery/ISurgeon.cs b/Content.Shared/Body/Surgery/ISurgeon.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/Body/Surgery/ISurgeon.cs
rename to Content.Shared/Body/Surgery/ISurgeon.cs
index b329b52c2e..ec73351312 100644
--- a/Content.Shared/GameObjects/Components/Body/Surgery/ISurgeon.cs
+++ b/Content.Shared/Body/Surgery/ISurgeon.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Body.Surgery
+namespace Content.Shared.Body.Surgery
 {
     /// <summary>
     ///     Interface representing an entity capable of performing surgery,
diff --git a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryDataComponent.cs b/Content.Shared/Body/Surgery/SurgeryDataComponent.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Body/Surgery/SurgeryDataComponent.cs
rename to Content.Shared/Body/Surgery/SurgeryDataComponent.cs
index 9bd4c34a57..cc076e05d1 100644
--- a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryDataComponent.cs
+++ b/Content.Shared/Body/Surgery/SurgeryDataComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Body.Mechanism;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Mechanism;
+using Content.Shared.Body.Part;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Body.Surgery
+namespace Content.Shared.Body.Surgery
 {
     /// <summary>
     ///     Represents the current surgery state of a <see cref="IBodyPart"/>.
diff --git a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryType.cs b/Content.Shared/Body/Surgery/SurgeryType.cs
similarity index 87%
rename from Content.Shared/GameObjects/Components/Body/Surgery/SurgeryType.cs
rename to Content.Shared/Body/Surgery/SurgeryType.cs
index 5a5643dde0..446e067092 100644
--- a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryType.cs
+++ b/Content.Shared/Body/Surgery/SurgeryType.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Body.Surgery
+namespace Content.Shared.Body.Surgery
 {
     /// <summary>
     ///     Types of surgery operations that can be performed.
diff --git a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIKey.cs b/Content.Shared/Body/Surgery/SurgeryUIKey.cs
similarity index 72%
rename from Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIKey.cs
rename to Content.Shared/Body/Surgery/SurgeryUIKey.cs
index 5463ae2055..3213fc0899 100644
--- a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIKey.cs
+++ b/Content.Shared/Body/Surgery/SurgeryUIKey.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Body.Surgery
+namespace Content.Shared.Body.Surgery
 {
     [Serializable, NetSerializable]
     public enum SurgeryUIKey
diff --git a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIMessages.cs b/Content.Shared/Body/Surgery/SurgeryUIMessages.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIMessages.cs
rename to Content.Shared/Body/Surgery/SurgeryUIMessages.cs
index dea33f3336..85b9cded33 100644
--- a/Content.Shared/GameObjects/Components/Body/Surgery/SurgeryUIMessages.cs
+++ b/Content.Shared/Body/Surgery/SurgeryUIMessages.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Body.Surgery
+namespace Content.Shared.Body.Surgery
 {
     [Serializable, NetSerializable]
     public class RequestBodyPartSurgeryUIMessage : BoundUserInterfaceMessage
diff --git a/Content.Shared/GameObjects/Components/Body/Template/BodyTemplatePrototype.cs b/Content.Shared/Body/Template/BodyTemplatePrototype.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Body/Template/BodyTemplatePrototype.cs
rename to Content.Shared/Body/Template/BodyTemplatePrototype.cs
index 8a727f0b54..dff28eee33 100644
--- a/Content.Shared/GameObjects/Components/Body/Template/BodyTemplatePrototype.cs
+++ b/Content.Shared/Body/Template/BodyTemplatePrototype.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Body.Part;
+using Content.Shared.Body.Components;
+using Content.Shared.Body.Part;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Body.Template
+namespace Content.Shared.Body.Template
 {
     /// <summary>
     ///     Defines the layout of a <see cref="IBody"/>.
diff --git a/Content.Shared/Interfaces/Chemistry/IPlantMetabolizable.cs b/Content.Shared/Botany/IPlantMetabolizable.cs
similarity index 91%
rename from Content.Shared/Interfaces/Chemistry/IPlantMetabolizable.cs
rename to Content.Shared/Botany/IPlantMetabolizable.cs
index f85b95a1bb..1cf90b281e 100644
--- a/Content.Shared/Interfaces/Chemistry/IPlantMetabolizable.cs
+++ b/Content.Shared/Botany/IPlantMetabolizable.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.Chemistry
+namespace Content.Shared.Botany
 {
     public interface IPlantMetabolizable
     {
diff --git a/Content.Shared/GameObjects/Components/Botany/PlantHolderVisuals.cs b/Content.Shared/Botany/PlantHolderVisuals.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/Botany/PlantHolderVisuals.cs
rename to Content.Shared/Botany/PlantHolderVisuals.cs
index 368f1b63b1..03bde50d48 100644
--- a/Content.Shared/GameObjects/Components/Botany/PlantHolderVisuals.cs
+++ b/Content.Shared/Botany/PlantHolderVisuals.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Botany
+namespace Content.Shared.Botany
 {
     [Serializable, NetSerializable]
     public enum PlantHolderVisuals
diff --git a/Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs
similarity index 92%
rename from Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs
rename to Content.Shared/Buckle/Components/SharedBuckleComponent.cs
index 613e9e7aa8..6a9201f2fd 100644
--- a/Content.Shared/GameObjects/Components/Buckle/SharedBuckleComponent.cs
+++ b/Content.Shared/Buckle/Components/SharedBuckleComponent.cs
@@ -1,17 +1,16 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Strap;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.DragDrop;
+using Content.Shared.EffectBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Buckle
+namespace Content.Shared.Buckle.Components
 {
     public abstract class SharedBuckleComponent : Component, IActionBlocker, IEffectBlocker, IDraggable
     {
diff --git a/Content.Shared/GameObjects/Components/Strap/SharedStrapComponent.cs b/Content.Shared/Buckle/Components/SharedStrapComponent.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Strap/SharedStrapComponent.cs
rename to Content.Shared/Buckle/Components/SharedStrapComponent.cs
index 8c98376c31..b9d090ee31 100644
--- a/Content.Shared/GameObjects/Components/Strap/SharedStrapComponent.cs
+++ b/Content.Shared/Buckle/Components/SharedStrapComponent.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Buckle;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Strap
+namespace Content.Shared.Buckle.Components
 {
     public enum StrapPosition
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedBuckleSystem.cs b/Content.Shared/Buckle/SharedBuckleSystem.cs
similarity index 87%
rename from Content.Shared/GameObjects/EntitySystems/SharedBuckleSystem.cs
rename to Content.Shared/Buckle/SharedBuckleSystem.cs
index 1634ff79c0..a15cf2ce17 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedBuckleSystem.cs
+++ b/Content.Shared/Buckle/SharedBuckleSystem.cs
@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Buckle;
+using Content.Shared.Buckle.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics.Dynamics;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Buckle
 {
     public abstract class SharedBuckleSystem : EntitySystem
     {
diff --git a/Content.Shared/GameObjects/Components/ExtinguisherCabinet.cs b/Content.Shared/Cabinet/ExtinguisherCabinet.cs
similarity index 80%
rename from Content.Shared/GameObjects/Components/ExtinguisherCabinet.cs
rename to Content.Shared/Cabinet/ExtinguisherCabinet.cs
index 918d7dc5ed..49ab6ee9f5 100644
--- a/Content.Shared/GameObjects/Components/ExtinguisherCabinet.cs
+++ b/Content.Shared/Cabinet/ExtinguisherCabinet.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Cabinet
 {
     [Serializable, NetSerializable]
     public enum ItemCabinetVisuals : byte
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedCameraRecoilComponent.cs b/Content.Shared/Camera/SharedCameraRecoilComponent.cs
similarity index 92%
rename from Content.Shared/GameObjects/Components/Mobs/SharedCameraRecoilComponent.cs
rename to Content.Shared/Camera/SharedCameraRecoilComponent.cs
index f00ee816de..a19fb700dd 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedCameraRecoilComponent.cs
+++ b/Content.Shared/Camera/SharedCameraRecoilComponent.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.Camera
 {
     public abstract class SharedCameraRecoilComponent : Component
     {
diff --git a/Content.Shared/Prototypes/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs
similarity index 95%
rename from Content.Shared/Prototypes/Cargo/CargoOrderData.cs
rename to Content.Shared/Cargo/CargoOrderData.cs
index b25f75718d..ad784b6a7b 100644
--- a/Content.Shared/Prototypes/Cargo/CargoOrderData.cs
+++ b/Content.Shared/Cargo/CargoOrderData.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Prototypes.Cargo
+namespace Content.Shared.Cargo
 {
     [NetSerializable, Serializable]
     public class CargoOrderData
diff --git a/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs b/Content.Shared/Cargo/CargoProductPrototype.cs
similarity index 98%
rename from Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs
rename to Content.Shared/Cargo/CargoProductPrototype.cs
index 3d61201d80..a7f620ad78 100644
--- a/Content.Shared/Prototypes/Cargo/CargoProductPrototype.cs
+++ b/Content.Shared/Cargo/CargoProductPrototype.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Prototypes.Cargo
+namespace Content.Shared.Cargo
 {
     [NetSerializable, Serializable, Prototype("cargoProduct")]
     public class CargoProductPrototype : IPrototype
diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs
rename to Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
index 1c8f854aa1..4637785555 100644
--- a/Content.Shared/GameObjects/Components/Cargo/SharedCargoConsoleComponent.cs
+++ b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Cargo
+namespace Content.Shared.Cargo.Components
 {
     public class SharedCargoConsoleComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs
rename to Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
index a309ed23bb..c1331442f8 100644
--- a/Content.Shared/GameObjects/Components/Cargo/SharedCargoOrderDatabaseComponent.cs
+++ b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Prototypes.Cargo;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Cargo
+namespace Content.Shared.Cargo.Components
 {
     public class SharedCargoOrderDatabaseComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs b/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs
rename to Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs
index 2c9660984c..70383d0e8a 100644
--- a/Content.Shared/GameObjects/Components/Cargo/SharedGalacticMarketComponent.cs
+++ b/Content.Shared/Cargo/Components/SharedGalacticMarketComponent.cs
@@ -2,14 +2,14 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Content.Shared.Prototypes.Cargo;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Cargo
+namespace Content.Shared.Cargo.Components
 {
     public class SharedGalacticMarketComponent : Component, IEnumerable<CargoProductPrototype>, ISerializationHooks
     {
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs b/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs
rename to Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs
index 3cdcfd41d2..b77093c23e 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedHumanoidAppearanceComponent.cs
+++ b/Content.Shared/CharacterAppearance/Components/SharedHumanoidAppearanceComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Content.Shared.Preferences;
-using Content.Shared.Preferences.Appearance;
 using Robust.Shared.Enums;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.Localization;
@@ -10,7 +10,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.CharacterAppearance.Components
 {
     public abstract class SharedHumanoidAppearanceComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/SharedMagicMirrorComponent.cs b/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/SharedMagicMirrorComponent.cs
rename to Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs
index 8f57996d1e..ebf6ca6caf 100644
--- a/Content.Shared/GameObjects/Components/SharedMagicMirrorComponent.cs
+++ b/Content.Shared/CharacterAppearance/Components/SharedMagicMirrorComponent.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System;
-using Content.Shared.Preferences.Appearance;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.CharacterAppearance.Components
 {
     public class SharedMagicMirrorComponent : Component
     {
diff --git a/Content.Shared/Preferences/Appearance/HairStyles.cs b/Content.Shared/CharacterAppearance/HairStyles.cs
similarity index 95%
rename from Content.Shared/Preferences/Appearance/HairStyles.cs
rename to Content.Shared/CharacterAppearance/HairStyles.cs
index 9c88ddbea8..0bc7cd0c22 100644
--- a/Content.Shared/Preferences/Appearance/HairStyles.cs
+++ b/Content.Shared/CharacterAppearance/HairStyles.cs
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using Robust.Shared.Maths;
 
-namespace Content.Shared.Preferences.Appearance
+namespace Content.Shared.CharacterAppearance
 {
     public static class HairStyles
     {
diff --git a/Content.Shared/Preferences/HumanoidCharacterAppearance.cs b/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs
similarity index 98%
rename from Content.Shared/Preferences/HumanoidCharacterAppearance.cs
rename to Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs
index 2bf8c9834b..665adb3cf0 100644
--- a/Content.Shared/Preferences/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/CharacterAppearance/HumanoidCharacterAppearance.cs
@@ -1,12 +1,11 @@
-#nullable enable
+#nullable enable
 using System;
-using Content.Shared.Preferences.Appearance;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Preferences
+namespace Content.Shared.CharacterAppearance
 {
     [Serializable, NetSerializable]
     public class HumanoidCharacterAppearance : ICharacterAppearance
diff --git a/Content.Shared/CharacterAppearance/HumanoidVisualLayers.cs b/Content.Shared/CharacterAppearance/HumanoidVisualLayers.cs
new file mode 100644
index 0000000000..1b84dfad2b
--- /dev/null
+++ b/Content.Shared/CharacterAppearance/HumanoidVisualLayers.cs
@@ -0,0 +1,26 @@
+using System;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.CharacterAppearance
+{
+    [Serializable, NetSerializable]
+    public enum HumanoidVisualLayers
+    {
+        Hair,
+        FacialHair,
+        Chest,
+        Head,
+        Eyes,
+        RArm,
+        LArm,
+        RHand,
+        LHand,
+        RLeg,
+        LLeg,
+        RFoot,
+        LFoot,
+        Handcuffs,
+        StencilMask,
+        Fire,
+    }
+}
diff --git a/Content.Shared/Preferences/Appearance/HumanoidCharacterAppearance.cs b/Content.Shared/CharacterAppearance/HumanoidVisualLayersExtension.cs
similarity index 79%
rename from Content.Shared/Preferences/Appearance/HumanoidCharacterAppearance.cs
rename to Content.Shared/CharacterAppearance/HumanoidVisualLayersExtension.cs
index 9f44f915cb..3ebba4e824 100644
--- a/Content.Shared/Preferences/Appearance/HumanoidCharacterAppearance.cs
+++ b/Content.Shared/CharacterAppearance/HumanoidVisualLayersExtension.cs
@@ -1,31 +1,8 @@
-#nullable enable
-using System;
-using Content.Shared.GameObjects.Components.Body.Part;
-using Robust.Shared.Serialization;
+using System;
+using Content.Shared.Body.Part;
 
-namespace Content.Shared.Preferences.Appearance
+namespace Content.Shared.CharacterAppearance
 {
-    [Serializable, NetSerializable]
-    public enum HumanoidVisualLayers
-    {
-        Hair,
-        FacialHair,
-        Chest,
-        Head,
-        Eyes,
-        RArm,
-        LArm,
-        RHand,
-        LHand,
-        RLeg,
-        LLeg,
-        RFoot,
-        LFoot,
-        Handcuffs,
-        StencilMask,
-        Fire,
-    }
-
     public static class HumanoidVisualLayersExtension
     {
         public static HumanoidVisualLayers? ToHumanoidLayer(this IBodyPart part)
diff --git a/Content.Shared/Preferences/ICharacterAppearance.cs b/Content.Shared/CharacterAppearance/ICharacterAppearance.cs
similarity index 75%
rename from Content.Shared/Preferences/ICharacterAppearance.cs
rename to Content.Shared/CharacterAppearance/ICharacterAppearance.cs
index 4e75c49d29..41216e08c3 100644
--- a/Content.Shared/Preferences/ICharacterAppearance.cs
+++ b/Content.Shared/CharacterAppearance/ICharacterAppearance.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace Content.Shared.Preferences
+namespace Content.Shared.CharacterAppearance
 {
     public interface ICharacterAppearance
     {
diff --git a/Content.Shared/Preferences/Sex.cs b/Content.Shared/CharacterAppearance/Sex.cs
similarity index 91%
rename from Content.Shared/Preferences/Sex.cs
rename to Content.Shared/CharacterAppearance/Sex.cs
index d4c236bd70..d5f40bc50e 100644
--- a/Content.Shared/Preferences/Sex.cs
+++ b/Content.Shared/CharacterAppearance/Sex.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System;
-using Content.Shared.Prototypes;
+using Content.Shared.Dataset;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Preferences
+namespace Content.Shared.CharacterAppearance
 {
     public enum Sex
     {
diff --git a/Content.Shared/Preferences/Appearance/SpriteAccessoryCategories.cs b/Content.Shared/CharacterAppearance/SpriteAccessoryCategories.cs
similarity index 86%
rename from Content.Shared/Preferences/Appearance/SpriteAccessoryCategories.cs
rename to Content.Shared/CharacterAppearance/SpriteAccessoryCategories.cs
index 0609e54c9c..782894d5f8 100644
--- a/Content.Shared/Preferences/Appearance/SpriteAccessoryCategories.cs
+++ b/Content.Shared/CharacterAppearance/SpriteAccessoryCategories.cs
@@ -1,7 +1,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Preferences.Appearance
+namespace Content.Shared.CharacterAppearance
 {
     [Flags]
     [Serializable, NetSerializable]
diff --git a/Content.Shared/Preferences/Appearance/SpriteAccessoryManager.cs b/Content.Shared/CharacterAppearance/SpriteAccessoryManager.cs
similarity index 97%
rename from Content.Shared/Preferences/Appearance/SpriteAccessoryManager.cs
rename to Content.Shared/CharacterAppearance/SpriteAccessoryManager.cs
index 7fe8d11465..473539f484 100644
--- a/Content.Shared/Preferences/Appearance/SpriteAccessoryManager.cs
+++ b/Content.Shared/CharacterAppearance/SpriteAccessoryManager.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Preferences.Appearance
+namespace Content.Shared.CharacterAppearance
 {
     public sealed class SpriteAccessoryManager
     {
diff --git a/Content.Shared/Preferences/Appearance/SpriteAccessoryPrototype.cs b/Content.Shared/CharacterAppearance/SpriteAccessoryPrototype.cs
similarity index 83%
rename from Content.Shared/Preferences/Appearance/SpriteAccessoryPrototype.cs
rename to Content.Shared/CharacterAppearance/SpriteAccessoryPrototype.cs
index 17d8ff2b12..e6550c0dc8 100644
--- a/Content.Shared/Preferences/Appearance/SpriteAccessoryPrototype.cs
+++ b/Content.Shared/CharacterAppearance/SpriteAccessoryPrototype.cs
@@ -1,10 +1,9 @@
-using Robust.Shared.Localization;
-using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Preferences.Appearance
+namespace Content.Shared.CharacterAppearance
 {
     /// <summary>
     ///     Contains data for a single hair style
@@ -27,7 +26,7 @@ namespace Content.Shared.Preferences.Appearance
 
         void ISerializationHooks.AfterDeserialization()
         {
-            Name = Loc.GetString($"accessory-{ID}");
+            Name = Robust.Shared.Localization.Loc.GetString($"accessory-{ID}");
         }
     }
 }
diff --git a/Content.Shared/GameObjects/Components/Actor/SharedCharacterInfoComponent.cs b/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Actor/SharedCharacterInfoComponent.cs
rename to Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs
index acdf02d345..813720839c 100644
--- a/Content.Shared/GameObjects/Components/Actor/SharedCharacterInfoComponent.cs
+++ b/Content.Shared/CharacterInfo/SharedCharacterInfoComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.NetIDs;
 using Content.Shared.Objectives;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Actor
+namespace Content.Shared.CharacterInfo
 {
     public class SharedCharacterInfoComponent : Component
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/ChemistrySystem.cs b/Content.Shared/Chemistry/ChemistrySystem.cs
similarity index 89%
rename from Content.Shared/GameObjects/EntitySystems/ChemistrySystem.cs
rename to Content.Shared/Chemistry/ChemistrySystem.cs
index 54acad1e2e..5f5703d927 100644
--- a/Content.Shared/GameObjects/EntitySystems/ChemistrySystem.cs
+++ b/Content.Shared/Chemistry/ChemistrySystem.cs
@@ -1,15 +1,14 @@
 #nullable enable
 using System;
 using System.Linq;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Chemistry
 {
     /// <summary>
     /// This interface gives components behavior on whether entities solution (implying SolutionComponent is in place) is changed
@@ -49,13 +48,13 @@ namespace Content.Shared.GameObjects.EntitySystems
             }
         }
 
-        public void ReactionEntity(IEntity? entity, ReactionMethod method, string reagentId, ReagentUnit reactVolume, Solution? source)
+        public void ReactionEntity(IEntity? entity, ReactionMethod method, string reagentId, ReagentUnit reactVolume, Solution.Solution? source)
         {
             // We throw if the reagent specified doesn't exist.
             ReactionEntity(entity, method, _prototypeManager.Index<ReagentPrototype>(reagentId), reactVolume, source);
         }
 
-        public void ReactionEntity(IEntity? entity, ReactionMethod method, ReagentPrototype reagent, ReagentUnit reactVolume, Solution? source)
+        public void ReactionEntity(IEntity? entity, ReactionMethod method, ReagentPrototype reagent, ReagentUnit reactVolume, Solution.Solution? source)
         {
             if (entity == null || entity.Deleted || !entity.TryGetComponent(out ReactiveComponent? reactive))
                 return;
diff --git a/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs b/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs
similarity index 87%
rename from Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs
rename to Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs
index 0a1da4090a..d75488350a 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/ChemMaster/SharedChemMasterComponent.cs
+++ b/Content.Shared/Chemistry/Components/SharedChemMasterComponent.cs
@@ -1,12 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Observer;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Cloning;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Chemistry.ChemMaster
+namespace Content.Shared.Chemistry.Components
 {
 
     /// <summary>
@@ -28,11 +28,11 @@ namespace Content.Shared.GameObjects.Components.Chemistry.ChemMaster
             /// <summary>
             /// A list of the reagents and their amounts within the beaker/reagent container, if applicable.
             /// </summary>
-            public readonly IReadOnlyList<Solution.ReagentQuantity> ContainerReagents;
+            public readonly IReadOnlyList<Solution.Solution.ReagentQuantity> ContainerReagents;
             /// <summary>
             /// A list of the reagents and their amounts within the buffer, if applicable.
             /// </summary>
-            public readonly IReadOnlyList<Solution.ReagentQuantity> BufferReagents;
+            public readonly IReadOnlyList<Solution.Solution.ReagentQuantity> BufferReagents;
             public readonly string DispenserName;
 
             public readonly bool BufferModeTransfer;
@@ -40,7 +40,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry.ChemMaster
             public readonly ReagentUnit BufferCurrentVolume;
 
             public ChemMasterBoundUserInterfaceState(bool hasPower, bool hasBeaker, ReagentUnit beakerCurrentVolume, ReagentUnit beakerMaxVolume, string containerName,
-                string dispenserName, IReadOnlyList<Solution.ReagentQuantity> containerReagents, IReadOnlyList<Solution.ReagentQuantity> bufferReagents, bool bufferModeTransfer, ReagentUnit bufferCurrentVolume)
+                string dispenserName, IReadOnlyList<Solution.Solution.ReagentQuantity> containerReagents, IReadOnlyList<Solution.Solution.ReagentQuantity> bufferReagents, bool bufferModeTransfer, ReagentUnit bufferCurrentVolume)
             {
                 HasPower = hasPower;
                 HasBeaker = hasBeaker;
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedHyposprayComponent.cs b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs
similarity index 87%
rename from Content.Shared/GameObjects/Components/Chemistry/SharedHyposprayComponent.cs
rename to Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs
index 2acaae0923..5c6606eac5 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SharedHyposprayComponent.cs
+++ b/Content.Shared/Chemistry/Components/SharedHyposprayComponent.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Chemistry
+namespace Content.Shared.Chemistry.Components
 {
     public abstract class SharedHyposprayComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedInjectorComponent.cs b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
similarity index 91%
rename from Content.Shared/GameObjects/Components/Chemistry/SharedInjectorComponent.cs
rename to Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
index 4457c0b866..8c2ad4e365 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SharedInjectorComponent.cs
+++ b/Content.Shared/Chemistry/Components/SharedInjectorComponent.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Chemistry
+namespace Content.Shared.Chemistry.Components
 {
     /// <summary>
     /// Shared class for injectors & syringes
diff --git a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs b/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs
similarity index 92%
rename from Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs
rename to Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs
index ee4f75c33d..9ca8446944 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserInventoryPrototype.cs
+++ b/Content.Shared/Chemistry/Dispenser/ReagentDispenserInventoryPrototype.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser
+namespace Content.Shared.Chemistry.Dispenser
 {
     /// <summary>
     /// Is simply a list of reagents defined in yaml. This can then be set as a
diff --git a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs b/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs
rename to Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs
index eb9764be5f..a8f404e7cb 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/ReagentDispenser/SharedReagentDispenserComponent.cs
+++ b/Content.Shared/Chemistry/Dispenser/SharedReagentDispenserComponent.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser
+namespace Content.Shared.Chemistry.Dispenser
 {
 
     /// <summary>
@@ -37,12 +37,12 @@ namespace Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser
             /// <summary>
             /// A list of the reagents and their amounts within the beaker/reagent container, if applicable.
             /// </summary>
-            public readonly List<Solution.ReagentQuantity>? ContainerReagents;
+            public readonly List<Solution.Solution.ReagentQuantity>? ContainerReagents;
             public readonly string DispenserName;
             public readonly ReagentUnit SelectedDispenseAmount;
 
             public ReagentDispenserBoundUserInterfaceState(bool hasPower, bool hasBeaker, ReagentUnit beakerCurrentVolume, ReagentUnit beakerMaxVolume, string containerName,
-                List<ReagentDispenserInventoryEntry> inventory, string dispenserName, List<Solution.ReagentQuantity>? containerReagents, ReagentUnit selectedDispenseAmount)
+                List<ReagentDispenserInventoryEntry> inventory, string dispenserName, List<Solution.Solution.ReagentQuantity>? containerReagents, ReagentUnit selectedDispenseAmount)
             {
                 HasPower = hasPower;
                 HasBeaker = hasBeaker;
diff --git a/Content.Shared/Chemistry/DefaultMetabolizable.cs b/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs
similarity index 88%
rename from Content.Shared/Chemistry/DefaultMetabolizable.cs
rename to Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs
index 1498b2fa47..d69187e378 100644
--- a/Content.Shared/Chemistry/DefaultMetabolizable.cs
+++ b/Content.Shared/Chemistry/Metabolizable/DefaultMetabolizable.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry.Metabolizable
 {
     /// <summary>
     ///     Default metabolism for reagents. Metabolizes the reagent with no effects
diff --git a/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs b/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs
similarity index 91%
rename from Content.Shared/Interfaces/Chemistry/IMetabolizable.cs
rename to Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs
index 70f155bb4a..1c96f07e53 100644
--- a/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs
+++ b/Content.Shared/Chemistry/Metabolizable/IMetabolizable.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.Chemistry
+namespace Content.Shared.Chemistry.Metabolizable
 {
     /// <summary>
     /// Metabolism behavior for a reagent.
diff --git a/Content.Shared/Interfaces/Chemistry/IReactionEffect.cs b/Content.Shared/Chemistry/Reaction/IReactionEffect.cs
similarity index 86%
rename from Content.Shared/Interfaces/Chemistry/IReactionEffect.cs
rename to Content.Shared/Chemistry/Reaction/IReactionEffect.cs
index dd01e8b468..671c79b859 100644
--- a/Content.Shared/Interfaces/Chemistry/IReactionEffect.cs
+++ b/Content.Shared/Chemistry/Reaction/IReactionEffect.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.Chemistry
+namespace Content.Shared.Chemistry.Reaction
 {
     /// <summary>
     /// Chemical reaction effect on the world such as an explosion, EMP, or fire.
diff --git a/Content.Shared/Interfaces/Chemistry/ITileReaction.cs b/Content.Shared/Chemistry/Reaction/ITileReaction.cs
similarity index 69%
rename from Content.Shared/Interfaces/Chemistry/ITileReaction.cs
rename to Content.Shared/Chemistry/Reaction/ITileReaction.cs
index 2e1208c334..4e4acf45c9 100644
--- a/Content.Shared/Interfaces/Chemistry/ITileReaction.cs
+++ b/Content.Shared/Chemistry/Reaction/ITileReaction.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Interfaces.Chemistry
+namespace Content.Shared.Chemistry.Reaction
 {
     public interface ITileReaction
     {
diff --git a/Content.Shared/Chemistry/ReactionPrototype.cs b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
similarity index 96%
rename from Content.Shared/Chemistry/ReactionPrototype.cs
rename to Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
index 7cd517f612..c538ba8339 100644
--- a/Content.Shared/Chemistry/ReactionPrototype.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactionPrototype.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry.Reaction
 {
     /// <summary>
     /// Prototype for chemical reaction definitions
diff --git a/Content.Shared/GameObjects/Components/Chemistry/ReactiveComponent.cs b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
similarity index 81%
rename from Content.Shared/GameObjects/Components/Chemistry/ReactiveComponent.cs
rename to Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
index 3c1a80c0f6..c5c4830eb0 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/ReactiveComponent.cs
+++ b/Content.Shared/Chemistry/Reaction/ReactiveComponent.cs
@@ -1,9 +1,9 @@
 using System;
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Chemistry
+namespace Content.Shared.Chemistry.Reaction
 {
     [RegisterComponent]
     public class ReactiveComponent : Component
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedChemicalReactionSystem.cs b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
similarity index 82%
rename from Content.Shared/GameObjects/EntitySystems/SharedChemicalReactionSystem.cs
rename to Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
index 89e0e38870..daaa0d1003 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedChemicalReactionSystem.cs
+++ b/Content.Shared/Chemistry/Reaction/SharedChemicalReactionSystem.cs
@@ -1,12 +1,12 @@
 #nullable enable
-using Content.Shared.Chemistry;
+using System.Collections.Generic;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Prototypes;
-using System.Collections.Generic;
-using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Chemistry.Reaction
 {
     public abstract class SharedChemicalReactionSystem : EntitySystem
     {
@@ -29,7 +29,7 @@ namespace Content.Shared.GameObjects.EntitySystems
         /// <param name="reaction">The reaction to check.</param>
         /// <param name="lowestUnitReactions">How many times this reaction can occur.</param>
         /// <returns></returns>
-        private static bool CanReact(Solution solution, ReactionPrototype reaction, out ReagentUnit lowestUnitReactions)
+        private static bool CanReact(Solution.Solution solution, ReactionPrototype reaction, out ReagentUnit lowestUnitReactions)
         {
             lowestUnitReactions = ReagentUnit.MaxValue;
 
@@ -55,7 +55,7 @@ namespace Content.Shared.GameObjects.EntitySystems
         ///     Perform a reaction on a solution. This assumes all reaction criteria are met.
         ///     Removes the reactants from the solution, then returns a solution with all products.
         /// </summary>
-        private Solution PerformReaction(Solution solution, IEntity owner, ReactionPrototype reaction, ReagentUnit unitReactions)
+        private Solution.Solution PerformReaction(Solution.Solution solution, IEntity owner, ReactionPrototype reaction, ReagentUnit unitReactions)
         {
             //Remove reactants
             foreach (var reactant in reaction.Reactants)
@@ -68,7 +68,7 @@ namespace Content.Shared.GameObjects.EntitySystems
             }
 
             //Create products
-            var products = new Solution();
+            var products = new Solution.Solution();
             foreach (var product in reaction.Products)
             {
                 products.AddReagent(product.Key, product.Value * unitReactions);
@@ -93,10 +93,10 @@ namespace Content.Shared.GameObjects.EntitySystems
         ///     Removes the reactants from the solution, then returns a solution with all products.
         ///     WARNING: Does not trigger reactions between solution and new products.
         /// </summary>
-        private Solution ProcessReactions(Solution solution, IEntity owner)
+        private Solution.Solution ProcessReactions(Solution.Solution solution, IEntity owner)
         {
             //TODO: make a hashmap at startup and then look up reagents in the contents for a reaction
-            var overallProducts = new Solution();
+            var overallProducts = new Solution.Solution();
             foreach (var reaction in _reactions)
             {
                 if (CanReact(solution, reaction, out var unitReactions))
@@ -112,7 +112,7 @@ namespace Content.Shared.GameObjects.EntitySystems
         /// <summary>
         ///     Continually react a solution until no more reactions occur.
         /// </summary>
-        public void FullyReactSolution(Solution solution, IEntity owner)
+        public void FullyReactSolution(Solution.Solution solution, IEntity owner)
         {
             for (var i = 0; i < MaxReactionIterations; i++)
             {
@@ -123,14 +123,14 @@ namespace Content.Shared.GameObjects.EntitySystems
 
                 solution.AddSolution(products);
             }
-            Logger.Error($"{nameof(Solution)} on {owner} (Uid: {owner.Uid}) could not finish reacting in under {MaxReactionIterations} loops.");
+            Logger.Error($"{nameof(Solution.Solution)} on {owner} (Uid: {owner.Uid}) could not finish reacting in under {MaxReactionIterations} loops.");
         }
 
         /// <summary>
         ///     Continually react a solution until no more reactions occur, with a volume constraint.
         ///     If a reaction's products would exceed the max volume, some product is deleted.
         /// </summary>
-        public void FullyReactSolution(Solution solution, IEntity owner, ReagentUnit maxVolume)
+        public void FullyReactSolution(Solution.Solution solution, IEntity owner, ReagentUnit maxVolume)
         {
             for (var i = 0; i < MaxReactionIterations; i++)
             {
@@ -149,7 +149,7 @@ namespace Content.Shared.GameObjects.EntitySystems
 
                 solution.AddSolution(products);
             }
-            Logger.Error($"{nameof(Solution)} on {owner} (Uid: {owner.Uid}) could not finish reacting in under {MaxReactionIterations} loops.");
+            Logger.Error($"{nameof(Solution.Solution)} on {owner} (Uid: {owner.Uid}) could not finish reacting in under {MaxReactionIterations} loops.");
         }
     }
 }
diff --git a/Content.Shared/Chemistry/ReagentEntityReaction.cs b/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs
similarity index 88%
rename from Content.Shared/Chemistry/ReagentEntityReaction.cs
rename to Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs
index 62489953cb..59f931e871 100644
--- a/Content.Shared/Chemistry/ReagentEntityReaction.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentEntityReaction.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry.Reagent
 {
     public enum ReactionMethod
     {
@@ -27,7 +27,7 @@ namespace Content.Shared.Chemistry
         [DataField("ingestion")]
         public bool Ingestion { get; } = false;
 
-        public void React(ReactionMethod method, IEntity entity, ReagentPrototype reagent, ReagentUnit volume, Solution? source)
+        public void React(ReactionMethod method, IEntity entity, ReagentPrototype reagent, ReagentUnit volume, Solution.Solution? source)
         {
             switch (method)
             {
@@ -50,6 +50,6 @@ namespace Content.Shared.Chemistry
             React(entity, reagent, volume, source);
         }
 
-        protected abstract void React(IEntity entity, ReagentPrototype reagent, ReagentUnit volume, Solution? source);
+        protected abstract void React(IEntity entity, ReagentPrototype reagent, ReagentUnit volume, Solution.Solution? source);
     }
 }
diff --git a/Content.Shared/Chemistry/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
similarity index 95%
rename from Content.Shared/Chemistry/ReagentPrototype.cs
rename to Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
index 5d5dae984d..1fbf8dc8e6 100644
--- a/Content.Shared/Chemistry/ReagentPrototype.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs
@@ -1,7 +1,9 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Botany;
+using Content.Shared.Chemistry.Metabolizable;
+using Content.Shared.Chemistry.Reaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
@@ -9,7 +11,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry.Reagent
 {
     [Prototype("reagent")]
     [DataDefinition]
diff --git a/Content.Shared/Chemistry/ReagentUnit.cs b/Content.Shared/Chemistry/Reagent/ReagentUnit.cs
similarity index 99%
rename from Content.Shared/Chemistry/ReagentUnit.cs
rename to Content.Shared/Chemistry/Reagent/ReagentUnit.cs
index a8af2d1cdf..1a653b76c8 100644
--- a/Content.Shared/Chemistry/ReagentUnit.cs
+++ b/Content.Shared/Chemistry/Reagent/ReagentUnit.cs
@@ -4,7 +4,7 @@ using System.Globalization;
 using System.Linq;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry.Reagent
 {
     /// <summary>
     ///     Represents a quantity of reagent, to a precision of 0.01.
diff --git a/Content.Shared/GameObjects/Components/Chemistry/ISolutionInteractionsComponent.cs b/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Chemistry/ISolutionInteractionsComponent.cs
rename to Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs
index 4fbddea923..853629c38a 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/ISolutionInteractionsComponent.cs
+++ b/Content.Shared/Chemistry/Solution/Components/ISolutionInteractionsComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Chemistry
+namespace Content.Shared.Chemistry.Solution.Components
 {
     /// <summary>
     ///     High-level solution transferring operations like "what happens when a syringe tries to inject this entity."
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs b/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs
rename to Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs
index 7b5721bdb9..ec64402c0e 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SharedSolutionContainerComponent.cs
+++ b/Content.Shared/Chemistry/Solution/Components/SharedSolutionContainerComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Examine;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
@@ -15,7 +16,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Chemistry
+namespace Content.Shared.Chemistry.Solution.Components
 {
     /// <summary>
     ///     Holds a <see cref="Solution"/> with a limited volume.
@@ -194,7 +195,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
 
             if (ReagentList.Count == 0)
             {
-                message.AddText(Loc.GetString("Contains no chemicals."));
+                message.AddText(Robust.Shared.Localization.Loc.GetString("Contains no chemicals."));
                 return;
             }
 
@@ -208,7 +209,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
             var colorHex = Color.ToHexNoAlpha(); //TODO: If the chem has a dark color, the examine text becomes black on a black background, which is unreadable.
             var messageString = "It contains a [color={0}]{1}[/color] " + (ReagentList.Count == 1 ? "chemical." : "mixture of chemicals.");
 
-            message.AddMarkup(Loc.GetString(messageString, colorHex, Loc.GetString(proto.PhysicalDescription)));
+            message.AddMarkup(Robust.Shared.Localization.Loc.GetString(messageString, colorHex, Robust.Shared.Localization.Loc.GetString(proto.PhysicalDescription)));
         }
 
         ReagentUnit ISolutionInteractionsComponent.RefillSpaceAvailable => EmptyVolume;
diff --git a/Content.Shared/Chemistry/Solution.cs b/Content.Shared/Chemistry/Solution/Solution.cs
similarity index 98%
rename from Content.Shared/Chemistry/Solution.cs
rename to Content.Shared/Chemistry/Solution/Solution.cs
index a3450f166f..9b93c53fca 100644
--- a/Content.Shared/Chemistry/Solution.cs
+++ b/Content.Shared/Chemistry/Solution/Solution.cs
@@ -4,8 +4,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
@@ -16,7 +15,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry.Solution
 {
     /// <summary>
     ///     A solution of reagents.
diff --git a/Content.Shared/Chemistry/SolutionContainerCaps.cs b/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs
similarity index 95%
rename from Content.Shared/Chemistry/SolutionContainerCaps.cs
rename to Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs
index 6e6472b168..261625eb7d 100644
--- a/Content.Shared/Chemistry/SolutionContainerCaps.cs
+++ b/Content.Shared/Chemistry/Solution/SolutionContainerCaps.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.Chemistry.Solution.Components;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Chemistry
+namespace Content.Shared.Chemistry.Solution
 {
     /// <summary>
     ///     Define common interaction behaviors for <see cref="SharedSolutionContainerComponent"/>
diff --git a/Content.Shared/GameObjects/Components/Movement/SharedClimbableComponent.cs b/Content.Shared/Climbing/SharedClimbableComponent.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/Movement/SharedClimbableComponent.cs
rename to Content.Shared/Climbing/SharedClimbableComponent.cs
index eaf4e39f16..b5d61c4ca5 100644
--- a/Content.Shared/GameObjects/Components/Movement/SharedClimbableComponent.cs
+++ b/Content.Shared/Climbing/SharedClimbableComponent.cs
@@ -1,11 +1,11 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Climbing
 {
     public interface IClimbable { }
 
diff --git a/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs b/Content.Shared/Climbing/SharedClimbingComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs
rename to Content.Shared/Climbing/SharedClimbingComponent.cs
index bcd645bf12..c851593d3c 100644
--- a/Content.Shared/GameObjects/Components/Movement/SharedClimbingComponent.cs
+++ b/Content.Shared/Climbing/SharedClimbingComponent.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
+using Content.Shared.NetIDs;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Climbing
 {
     public abstract class SharedClimbingComponent : Component, IActionBlocker
     {
diff --git a/Content.Shared/GameObjects/Components/Observer/AcceptCloningEuiMessage.cs b/Content.Shared/Cloning/AcceptCloningEuiMessage.cs
similarity index 89%
rename from Content.Shared/GameObjects/Components/Observer/AcceptCloningEuiMessage.cs
rename to Content.Shared/Cloning/AcceptCloningEuiMessage.cs
index 3a8354cb0c..72fbfee8a1 100644
--- a/Content.Shared/GameObjects/Components/Observer/AcceptCloningEuiMessage.cs
+++ b/Content.Shared/Cloning/AcceptCloningEuiMessage.cs
@@ -3,7 +3,7 @@ using System;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Observer
+namespace Content.Shared.Cloning
 {
     [Serializable, NetSerializable]
     public enum AcceptCloningUiButton
diff --git a/Content.Shared/GameObjects/Components/Medical/SharedCloningPodComponent.cs b/Content.Shared/Cloning/SharedCloningPodComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Medical/SharedCloningPodComponent.cs
rename to Content.Shared/Cloning/SharedCloningPodComponent.cs
index 75d2b467d2..1dd0f852af 100644
--- a/Content.Shared/GameObjects/Components/Medical/SharedCloningPodComponent.cs
+++ b/Content.Shared/Cloning/SharedCloningPodComponent.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Medical
+namespace Content.Shared.Cloning
 {
     public class SharedCloningPodComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs b/Content.Shared/Clothing/ClothingComponentState.cs
similarity index 89%
rename from Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs
rename to Content.Shared/Clothing/ClothingComponentState.cs
index 701d36ae80..4427bf6cb5 100644
--- a/Content.Shared/GameObjects/Components/Items/ClothingComponentState.cs
+++ b/Content.Shared/Clothing/ClothingComponentState.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Items
+namespace Content.Shared.Clothing
 {
     [Serializable, NetSerializable]
     public class ClothingComponentState : ComponentState
diff --git a/Content.Shared/GameObjects/Components/SharedMagbootsComponent.cs b/Content.Shared/Clothing/SharedMagbootsComponent.cs
similarity index 89%
rename from Content.Shared/GameObjects/Components/SharedMagbootsComponent.cs
rename to Content.Shared/Clothing/SharedMagbootsComponent.cs
index ac28dd363f..df7bf7a279 100644
--- a/Content.Shared/GameObjects/Components/SharedMagbootsComponent.cs
+++ b/Content.Shared/Clothing/SharedMagbootsComponent.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Movement.Components;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Clothing
 {
     public abstract class SharedMagbootsComponent : Component, IMoveSpeedModifier
     {
diff --git a/Content.Shared/Utility/RemList.cs b/Content.Shared/Collections/RemList.cs
similarity index 97%
rename from Content.Shared/Utility/RemList.cs
rename to Content.Shared/Collections/RemList.cs
index 7b9a4694f3..57134921db 100644
--- a/Content.Shared/Utility/RemList.cs
+++ b/Content.Shared/Collections/RemList.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 
 #nullable enable
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Collections
 {
     // It's a Remie Queue now.
 
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/CombatModeSystemMessages.cs b/Content.Shared/CombatMode/CombatModeSystemMessages.cs
similarity index 87%
rename from Content.Shared/GameObjects/EntitySystemMessages/CombatModeSystemMessages.cs
rename to Content.Shared/CombatMode/CombatModeSystemMessages.cs
index a7d5fb275d..a621eac51c 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/CombatModeSystemMessages.cs
+++ b/Content.Shared/CombatMode/CombatModeSystemMessages.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Mobs;
+using Content.Shared.Targeting;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages
+namespace Content.Shared.CombatMode
 {
     public static class CombatModeSystemMessages
     {
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs b/Content.Shared/CombatMode/SharedCombatModeComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs
rename to Content.Shared/CombatMode/SharedCombatModeComponent.cs
index 5d4988f92d..11182e1680 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedCombatModeComponent.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeComponent.cs
@@ -1,11 +1,13 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
+using Content.Shared.Targeting;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.CombatMode
 {
     public abstract class SharedCombatModeComponent : Component
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
similarity index 85%
rename from Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs
rename to Content.Shared/CombatMode/SharedCombatModeSystem.cs
index 737db48b4d..65abb41027 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedCombatModeSystem.cs
+++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs
@@ -1,9 +1,7 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystemMessages;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.CombatMode
 {
     public abstract class SharedCombatModeSystem : EntitySystem
     {
diff --git a/Content.Shared/GameObjects/Components/Command/SharedCommunicationsConsoleComponent.cs b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Command/SharedCommunicationsConsoleComponent.cs
rename to Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
index 9c1c5c7086..78a8378b6d 100644
--- a/Content.Shared/GameObjects/Components/Command/SharedCommunicationsConsoleComponent.cs
+++ b/Content.Shared/Communications/SharedCommunicationsConsoleComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Command
+namespace Content.Shared.Communications
 {
     public class SharedCommunicationsConsoleComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/SharedComputerComponent.cs b/Content.Shared/Computer/SharedComputerComponent.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/SharedComputerComponent.cs
rename to Content.Shared/Computer/SharedComputerComponent.cs
index f469c46a0b..4f50e62b0b 100644
--- a/Content.Shared/GameObjects/Components/SharedComputerComponent.cs
+++ b/Content.Shared/Computer/SharedComputerComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Computer
 {
     public class SharedComputerComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/SharedConfigurationComponent.cs b/Content.Shared/Configurable/SharedConfigurationComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/SharedConfigurationComponent.cs
rename to Content.Shared/Configurable/SharedConfigurationComponent.cs
index 12a9786b71..d0b5610abc 100644
--- a/Content.Shared/GameObjects/Components/SharedConfigurationComponent.cs
+++ b/Content.Shared/Configurable/SharedConfigurationComponent.cs
@@ -1,10 +1,10 @@
 #nullable enable
-using Robust.Shared.GameObjects;
-using Robust.Shared.Serialization;
 using System;
 using System.Collections.Generic;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Configurable
 {
     public class SharedConfigurationComponent : Component
     {
diff --git a/Content.Shared/Construction/IConstructionCondition.cs b/Content.Shared/Construction/Conditions/IConstructionCondition.cs
similarity index 82%
rename from Content.Shared/Construction/IConstructionCondition.cs
rename to Content.Shared/Construction/Conditions/IConstructionCondition.cs
index 0541448024..7b632dc1b1 100644
--- a/Content.Shared/Construction/IConstructionCondition.cs
+++ b/Content.Shared/Construction/Conditions/IConstructionCondition.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Conditions
 {
     public interface IConstructionCondition
     {
diff --git a/Content.Shared/Construction/ConstructionConditions/LowWallInTile.cs b/Content.Shared/Construction/Conditions/LowWallInTile.cs
similarity index 89%
rename from Content.Shared/Construction/ConstructionConditions/LowWallInTile.cs
rename to Content.Shared/Construction/Conditions/LowWallInTile.cs
index 838128a078..62d1d9a0e1 100644
--- a/Content.Shared/Construction/ConstructionConditions/LowWallInTile.cs
+++ b/Content.Shared/Construction/Conditions/LowWallInTile.cs
@@ -1,13 +1,13 @@
 #nullable enable
-using Content.Shared.GameObjects.Components;
 using Content.Shared.Maps;
+using Content.Shared.Window;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Construction.ConstructionConditions
+namespace Content.Shared.Construction.Conditions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Shared/Construction/ConstructionConditions/NoWindowsInTile.cs b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
similarity index 86%
rename from Content.Shared/Construction/ConstructionConditions/NoWindowsInTile.cs
rename to Content.Shared/Construction/Conditions/NoWindowsInTile.cs
index ee4a0652f4..a13cf0558e 100644
--- a/Content.Shared/Construction/ConstructionConditions/NoWindowsInTile.cs
+++ b/Content.Shared/Construction/Conditions/NoWindowsInTile.cs
@@ -1,13 +1,13 @@
 #nullable enable
-using Content.Shared.GameObjects.Components;
 using Content.Shared.Maps;
+using Content.Shared.Window;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Construction.ConstructionConditions
+namespace Content.Shared.Construction.Conditions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Shared/Construction/ConstructionConditions/TileNotBlocked.cs b/Content.Shared/Construction/Conditions/TileNotBlocked.cs
similarity index 92%
rename from Content.Shared/Construction/ConstructionConditions/TileNotBlocked.cs
rename to Content.Shared/Construction/Conditions/TileNotBlocked.cs
index 53adc4985e..2167db08c9 100644
--- a/Content.Shared/Construction/ConstructionConditions/TileNotBlocked.cs
+++ b/Content.Shared/Construction/Conditions/TileNotBlocked.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Construction.ConstructionConditions
+namespace Content.Shared.Construction.Conditions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Shared/Construction/ConstructionConditions/TileType.cs b/Content.Shared/Construction/Conditions/TileType.cs
similarity index 94%
rename from Content.Shared/Construction/ConstructionConditions/TileType.cs
rename to Content.Shared/Construction/Conditions/TileType.cs
index 23fb030c89..82efb7793f 100644
--- a/Content.Shared/Construction/ConstructionConditions/TileType.cs
+++ b/Content.Shared/Construction/Conditions/TileType.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Construction.ConstructionConditions
+namespace Content.Shared.Construction.Conditions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Shared/Construction/ConstructionConditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs
similarity index 95%
rename from Content.Shared/Construction/ConstructionConditions/WallmountCondition.cs
rename to Content.Shared/Construction/Conditions/WallmountCondition.cs
index b26434c475..0391558f5e 100644
--- a/Content.Shared/Construction/ConstructionConditions/WallmountCondition.cs
+++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs
@@ -1,17 +1,17 @@
 #nullable enable
 using System.Linq;
-using Content.Shared.GameObjects.Components.Tag;
 using Content.Shared.Physics;
+using Content.Shared.Tag;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
-using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Physics.Broadphase;
+using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Construction.ConstructionConditions
+namespace Content.Shared.Construction.Conditions
 {
     [UsedImplicitly]
     [DataDefinition]
diff --git a/Content.Shared/Construction/ConstructionGraphEdge.cs b/Content.Shared/Construction/ConstructionGraphEdge.cs
index 87289a95fd..a84f1861bf 100644
--- a/Content.Shared/Construction/ConstructionGraphEdge.cs
+++ b/Content.Shared/Construction/ConstructionGraphEdge.cs
@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.Construction.Steps;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
diff --git a/Content.Shared/GameObjects/Components/Construction/MachineFrameVisuals.cs b/Content.Shared/Construction/MachineFrameVisuals.cs
similarity index 70%
rename from Content.Shared/GameObjects/Components/Construction/MachineFrameVisuals.cs
rename to Content.Shared/Construction/MachineFrameVisuals.cs
index 6136889dd3..99b2bc29d4 100644
--- a/Content.Shared/GameObjects/Components/Construction/MachineFrameVisuals.cs
+++ b/Content.Shared/Construction/MachineFrameVisuals.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Construction
+namespace Content.Shared.Construction
 {
     [NetSerializable]
     public enum MachineFrameVisuals
diff --git a/Content.Shared/Construction/ConstructionGraphPrototype.cs b/Content.Shared/Construction/Prototypes/ConstructionGraphPrototype.cs
similarity index 98%
rename from Content.Shared/Construction/ConstructionGraphPrototype.cs
rename to Content.Shared/Construction/Prototypes/ConstructionGraphPrototype.cs
index 403c765206..16b36e187b 100644
--- a/Content.Shared/Construction/ConstructionGraphPrototype.cs
+++ b/Content.Shared/Construction/Prototypes/ConstructionGraphPrototype.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Prototypes
 {
     [Prototype("constructionGraph")]
     public class ConstructionGraphPrototype : IPrototype, ISerializationHooks
diff --git a/Content.Shared/Construction/ConstructionPrototype.cs b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
similarity index 96%
rename from Content.Shared/Construction/ConstructionPrototype.cs
rename to Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
index ca7bf09053..b30fa5d39a 100644
--- a/Content.Shared/Construction/ConstructionPrototype.cs
+++ b/Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System.Collections.Generic;
+using Content.Shared.Construction.Conditions;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Prototypes
 {
     [Prototype("construction")]
     public class ConstructionPrototype : IPrototype
diff --git a/Content.Shared/GameObjects/Components/SharedCanBuildWindowOnTopComponent.cs b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
similarity index 82%
rename from Content.Shared/GameObjects/Components/SharedCanBuildWindowOnTopComponent.cs
rename to Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
index 073ee1d091..dd508764cd 100644
--- a/Content.Shared/GameObjects/Components/SharedCanBuildWindowOnTopComponent.cs
+++ b/Content.Shared/Construction/SharedCanBuildWindowOnTopComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Construction
 {
     [RegisterComponent]
     public class SharedCanBuildWindowOnTopComponent : Component
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs b/Content.Shared/Construction/SharedConstructionSystem.cs
similarity index 97%
rename from Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs
rename to Content.Shared/Construction/SharedConstructionSystem.cs
index 456ab29cc8..6d588e0412 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedConstructionSystem.cs
+++ b/Content.Shared/Construction/SharedConstructionSystem.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Construction
 {
     public class SharedConstructionSystem : EntitySystem
     {
diff --git a/Content.Shared/Construction/ArbitraryInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
similarity index 76%
rename from Content.Shared/Construction/ArbitraryInsertConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
index 5418b55cfb..962aa93a26 100644
--- a/Content.Shared/Construction/ArbitraryInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
@@ -1,9 +1,8 @@
 #nullable enable
-using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     public abstract class ArbitraryInsertConstructionGraphStep : EntityInsertConstructionGraphStep
     {
@@ -14,7 +13,7 @@ namespace Content.Shared.Construction
         public override void DoExamine(FormattedMessage message, bool inDetailsRange)
         {
             if (string.IsNullOrEmpty(Name)) return;
-            message.AddMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
+            message.AddMarkup(Robust.Shared.Localization.Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
         }
     }
 }
diff --git a/Content.Shared/Construction/ComponentConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
similarity index 86%
rename from Content.Shared/Construction/ComponentConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
index 647a008ec2..a79869c029 100644
--- a/Content.Shared/Construction/ComponentConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
@@ -1,10 +1,9 @@
 #nullable enable
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [DataDefinition]
     public class ComponentConstructionGraphStep : ArbitraryInsertConstructionGraphStep
@@ -25,10 +24,10 @@ namespace Content.Shared.Construction
         public override void DoExamine(FormattedMessage message, bool inDetailsRange)
         {
             message.AddMarkup(string.IsNullOrEmpty(Name)
-                ? Loc.GetString(
+                ? Robust.Shared.Localization.Loc.GetString(
                     "construction-insert-entity-with-component",
                     ("componentName", Component))// Terrible.
-                : Loc.GetString(
+                : Robust.Shared.Localization.Loc.GetString(
                     "construction-insert-exact-entity",
                     ("entityName", Name)));
         }
diff --git a/Content.Shared/Construction/ConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ConstructionGraphStep.cs
similarity index 93%
rename from Content.Shared/Construction/ConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/ConstructionGraphStep.cs
index 8d81406f33..2ddb0fec5d 100644
--- a/Content.Shared/Construction/ConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ConstructionGraphStep.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [Serializable]
     [ImplicitDataDefinitionForInheritors]
diff --git a/Content.Shared/Construction/ConstructionGraphStepTypeSerializer.cs b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
similarity index 98%
rename from Content.Shared/Construction/ConstructionGraphStepTypeSerializer.cs
rename to Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
index c555c34fa7..977a6677a2 100644
--- a/Content.Shared/Construction/ConstructionGraphStepTypeSerializer.cs
+++ b/Content.Shared/Construction/Steps/ConstructionGraphStepTypeSerializer.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Serialization.Markdown.Mapping;
 using Robust.Shared.Serialization.Markdown.Validation;
 using Robust.Shared.Serialization.TypeSerializers.Interfaces;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [TypeSerializer]
     public class ConstructionGraphStepTypeSerializer : ITypeReader<ConstructionGraphStep, MappingDataNode>
diff --git a/Content.Shared/Construction/EntityInsertConstructionGraphStep.cs b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
similarity index 89%
rename from Content.Shared/Construction/EntityInsertConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
index 6ba7cde5af..8c74e95c18 100644
--- a/Content.Shared/Construction/EntityInsertConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/EntityInsertConstructionGraphStep.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [ImplicitDataDefinitionForInheritors]
     public abstract class EntityInsertConstructionGraphStep : ConstructionGraphStep
diff --git a/Content.Shared/Construction/MaterialConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
similarity index 84%
rename from Content.Shared/Construction/MaterialConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
index 23d43b6f43..566f1f347b 100644
--- a/Content.Shared/Construction/MaterialConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
@@ -1,15 +1,13 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.GameObjects.Components;
 using Content.Shared.Stacks;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [DataDefinition]
     public class MaterialConstructionGraphStep : EntityInsertConstructionGraphStep
@@ -25,7 +23,7 @@ namespace Content.Shared.Construction
 
         public override void DoExamine(FormattedMessage message, bool inDetailsRange)
         {
-            message.AddMarkup(Loc.GetString("Next, add [color=yellow]{0}x[/color] [color=cyan]{1}[/color].", Amount, MaterialPrototype.Name));
+            message.AddMarkup(Robust.Shared.Localization.Loc.GetString("Next, add [color=yellow]{0}x[/color] [color=cyan]{1}[/color].", Amount, MaterialPrototype.Name));
         }
 
         public override bool EntityValid(IEntity entity)
diff --git a/Content.Shared/Construction/MultipleTagsConstructionGraphStep.cs b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
similarity index 92%
rename from Content.Shared/Construction/MultipleTagsConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
index a65f248ddf..de1f4b19b0 100644
--- a/Content.Shared/Construction/MultipleTagsConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/MultipleTagsConstructionGraphStep.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Tag;
+using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     public class MultipleTagsConstructionGraphStep : ArbitraryInsertConstructionGraphStep
     {
diff --git a/Content.Shared/Construction/NestedConstructionGraphStep.cs b/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs
similarity index 95%
rename from Content.Shared/Construction/NestedConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs
index 75018d9b7a..863a806c73 100644
--- a/Content.Shared/Construction/NestedConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/NestedConstructionGraphStep.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [DataDefinition]
     public class NestedConstructionGraphStep : ConstructionGraphStep, ISerializationHooks
diff --git a/Content.Shared/Construction/PrototypeConstructionGraphStep.cs b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
similarity index 84%
rename from Content.Shared/Construction/PrototypeConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
index be89428fb7..9b1886afc3 100644
--- a/Content.Shared/Construction/PrototypeConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
@@ -1,10 +1,9 @@
 #nullable enable
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [DataDefinition]
     public class PrototypeConstructionGraphStep : ArbitraryInsertConstructionGraphStep
@@ -19,11 +18,11 @@ namespace Content.Shared.Construction
         public override void DoExamine(FormattedMessage message, bool inDetailsRange)
         {
             message.AddMarkup(string.IsNullOrEmpty(Name)
-                ? Loc.GetString(
+                ? Robust.Shared.Localization.Loc.GetString(
                     "construction-insert-prototype-no-name",
                     ("prototypeName", Prototype) // Terrible.
                 )
-                : Loc.GetString(
+                : Robust.Shared.Localization.Loc.GetString(
                     "construction-insert-prototype",
                     ("entityName", Name)
                 ));
diff --git a/Content.Shared/Construction/TagConstructionGraphStep.cs b/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs
similarity index 83%
rename from Content.Shared/Construction/TagConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/TagConstructionGraphStep.cs
index 63d05a5b6b..19c94bcace 100644
--- a/Content.Shared/Construction/TagConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/TagConstructionGraphStep.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Tag;
+using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [DataDefinition]
     public class TagConstructionGraphStep : ArbitraryInsertConstructionGraphStep
diff --git a/Content.Shared/Construction/ToolConstructionGraphStep.cs b/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
similarity index 68%
rename from Content.Shared/Construction/ToolConstructionGraphStep.cs
rename to Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
index de6745b878..a80abde5b9 100644
--- a/Content.Shared/Construction/ToolConstructionGraphStep.cs
+++ b/Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
@@ -1,10 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Interactable;
-using Robust.Shared.Localization;
+using Content.Shared.Tool;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Construction
+namespace Content.Shared.Construction.Steps
 {
     [DataDefinition]
     public class ToolConstructionGraphStep : ConstructionGraphStep
@@ -19,11 +18,11 @@ namespace Content.Shared.Construction
         {
             if (!string.IsNullOrEmpty(ExamineOverride))
             {
-                message.AddMarkup(Loc.GetString(ExamineOverride));
+                message.AddMarkup(Robust.Shared.Localization.Loc.GetString(ExamineOverride));
                 return;
             }
 
-            message.AddMarkup(Loc.GetString($"Next, use a [color=cyan]{Tool.GetToolName()}[/color]."));
+            message.AddMarkup(Robust.Shared.Localization.Loc.GetString($"Next, use a [color=cyan]{Tool.GetToolName()}[/color]."));
         }
     }
 }
diff --git a/Content.Shared/Content.Shared.csproj b/Content.Shared/Content.Shared.csproj
index e7f2f39d3e..5b8149b8fd 100644
--- a/Content.Shared/Content.Shared.csproj
+++ b/Content.Shared/Content.Shared.csproj
@@ -28,7 +28,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="GameObjects\Components\Trigger\" />
     <EmbeddedResource Include="Text\Names\*.txt" />
   </ItemGroup>
   <Import Project="..\RobustToolbox\MSBuild\Robust.Analyzers.targets" />
diff --git a/Content.Shared/GameObjects/Components/Conveyor/SharedConveyorComponent.cs b/Content.Shared/Conveyor/SharedConveyorComponent.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/Conveyor/SharedConveyorComponent.cs
rename to Content.Shared/Conveyor/SharedConveyorComponent.cs
index ceab393ef9..6e98d5c21c 100644
--- a/Content.Shared/GameObjects/Components/Conveyor/SharedConveyorComponent.cs
+++ b/Content.Shared/Conveyor/SharedConveyorComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Conveyor
+namespace Content.Shared.Conveyor
 {
     [Serializable, NetSerializable]
     public enum ConveyorVisuals
diff --git a/Content.Shared/Utility/Cooldowns.cs b/Content.Shared/Cooldown/Cooldowns.cs
similarity index 96%
rename from Content.Shared/Utility/Cooldowns.cs
rename to Content.Shared/Cooldown/Cooldowns.cs
index 2faf89c861..7d45ac7adc 100644
--- a/Content.Shared/Utility/Cooldowns.cs
+++ b/Content.Shared/Cooldown/Cooldowns.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.IoC;
 using Robust.Shared.Timing;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Cooldown
 {
     /// <summary>
     /// Utilities for working with cooldowns.
diff --git a/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs b/Content.Shared/Cooldown/ItemCooldownComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs
rename to Content.Shared/Cooldown/ItemCooldownComponent.cs
index 5365418c74..10a4fe21ee 100644
--- a/Content.Shared/GameObjects/Components/Items/ItemCooldownComponent.cs
+++ b/Content.Shared/Cooldown/ItemCooldownComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Items
+namespace Content.Shared.Cooldown
 {
     /// <summary>
     ///     Stores a visual "cooldown" for items, that gets displayed in the hands GUI.
diff --git a/Content.Shared/Utility/EntityCoordinatesExtensions.cs b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
similarity index 97%
rename from Content.Shared/Utility/EntityCoordinatesExtensions.cs
rename to Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
index 996397d897..c1f7c17f6d 100644
--- a/Content.Shared/Utility/EntityCoordinatesExtensions.cs
+++ b/Content.Shared/Coordinates/EntityCoordinatesExtensions.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Coordinates
 {
     public static class EntityCoordinatesExtensions
     {
diff --git a/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs b/Content.Shared/Crayon/SharedCrayonComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/SharedCrayonComponent.cs
rename to Content.Shared/Crayon/SharedCrayonComponent.cs
index 2a21e55eb3..129e114fee 100644
--- a/Content.Shared/GameObjects/Components/SharedCrayonComponent.cs
+++ b/Content.Shared/Crayon/SharedCrayonComponent.cs
@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
@@ -8,7 +9,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Crayon
 {
     public class SharedCrayonComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs b/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs
similarity index 91%
rename from Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs
rename to Content.Shared/Cuffs/Components/SharedCuffableComponent.cs
index 07ce353206..7283b31e8e 100644
--- a/Content.Shared/GameObjects/Components/ActionBlocking/SharedCuffableComponent.cs
+++ b/Content.Shared/Cuffs/Components/SharedCuffableComponent.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Pulling;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
+using Content.Shared.NetIDs;
+using Content.Shared.Pulling.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.ActionBlocking
+namespace Content.Shared.Cuffs.Components
 {
     public class SharedCuffableComponent : Component, IActionBlocker
     {
diff --git a/Content.Shared/GameObjects/Components/ActionBlocking/SharedHandcuffComponent.cs b/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs
similarity index 90%
rename from Content.Shared/GameObjects/Components/ActionBlocking/SharedHandcuffComponent.cs
rename to Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs
index d30fa3f0fc..203871e44f 100644
--- a/Content.Shared/GameObjects/Components/ActionBlocking/SharedHandcuffComponent.cs
+++ b/Content.Shared/Cuffs/Components/SharedHandcuffComponent.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.ActionBlocking
+namespace Content.Shared.Cuffs.Components
 {
     public abstract class SharedHandcuffComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs b/Content.Shared/Damage/Components/DamageableComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
rename to Content.Shared/Damage/Components/DamageableComponent.cs
index ff60e6f26e..ec3d50c731 100644
--- a/Content.Shared/GameObjects/Components/Damage/DamageableComponent.cs
+++ b/Content.Shared/Damage/Components/DamageableComponent.cs
@@ -2,11 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.Damage;
-using Content.Shared.Damage.DamageContainer;
-using Content.Shared.Damage.ResistanceSet;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Acts;
+using Content.Shared.Damage.Container;
+using Content.Shared.Damage.Resistances;
+using Content.Shared.NetIDs;
+using Content.Shared.Radiation;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
@@ -15,7 +15,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Damage
+namespace Content.Shared.Damage.Components
 {
     /// <summary>
     ///     Component that allows attached entities to take damage.
diff --git a/Content.Shared/GameObjects/Components/Damage/IDamageableComponent.cs b/Content.Shared/Damage/Components/IDamageableComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Damage/IDamageableComponent.cs
rename to Content.Shared/Damage/Components/IDamageableComponent.cs
index 2bd516d399..54ed2cad35 100644
--- a/Content.Shared/GameObjects/Components/Damage/IDamageableComponent.cs
+++ b/Content.Shared/Damage/Components/IDamageableComponent.cs
@@ -1,10 +1,9 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.Damage;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Acts;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Damage
+namespace Content.Shared.Damage.Components
 {
     public interface IDamageableComponent : IComponent, IExAct
     {
diff --git a/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs b/Content.Shared/Damage/Container/DamageContainerPrototype.cs
similarity index 97%
rename from Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs
rename to Content.Shared/Damage/Container/DamageContainerPrototype.cs
index b3d4601b24..2cda46b225 100644
--- a/Content.Shared/Damage/DamageContainer/DamageContainerPrototype.cs
+++ b/Content.Shared/Damage/Container/DamageContainerPrototype.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Damage.DamageContainer
+namespace Content.Shared.Damage.Container
 {
     /// <summary>
     ///     Prototype for the DamageContainer class.
diff --git a/Content.Shared/GameObjects/Components/Damage/DamageChangeData.cs b/Content.Shared/Damage/DamageChangeData.cs
similarity index 90%
rename from Content.Shared/GameObjects/Components/Damage/DamageChangeData.cs
rename to Content.Shared/Damage/DamageChangeData.cs
index 5e673db33a..5d726232e1 100644
--- a/Content.Shared/GameObjects/Components/Damage/DamageChangeData.cs
+++ b/Content.Shared/Damage/DamageChangeData.cs
@@ -1,7 +1,5 @@
 #nullable enable
-using Content.Shared.Damage;
-
-namespace Content.Shared.GameObjects.Components.Damage
+namespace Content.Shared.Damage
 {
     /// <summary>
     ///     Data class with information on how the value of a
diff --git a/Content.Shared/GameObjects/Components/Damage/DamageChangeParams.cs b/Content.Shared/Damage/DamageChangeParams.cs
similarity index 80%
rename from Content.Shared/GameObjects/Components/Damage/DamageChangeParams.cs
rename to Content.Shared/Damage/DamageChangeParams.cs
index 96aa22528b..4bc7f0a3da 100644
--- a/Content.Shared/GameObjects/Components/Damage/DamageChangeParams.cs
+++ b/Content.Shared/Damage/DamageChangeParams.cs
@@ -1,8 +1,9 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.Body.Components;
+using Content.Shared.Damage.Components;
 
-namespace Content.Shared.GameObjects.Components.Damage
+namespace Content.Shared.Damage
 {
     /// <summary>
     ///     Data class with information on how to damage a
diff --git a/Content.Shared/GameObjects/Components/Damage/DamageChangedEventArgs.cs b/Content.Shared/Damage/DamageChangedEventArgs.cs
similarity index 92%
rename from Content.Shared/GameObjects/Components/Damage/DamageChangedEventArgs.cs
rename to Content.Shared/Damage/DamageChangedEventArgs.cs
index 3187dca772..3efddf777a 100644
--- a/Content.Shared/GameObjects/Components/Damage/DamageChangedEventArgs.cs
+++ b/Content.Shared/Damage/DamageChangedEventArgs.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
 
-namespace Content.Shared.GameObjects.Components.Damage
+namespace Content.Shared.Damage
 {
     public class DamageChangedEventArgs : EventArgs
     {
diff --git a/Content.Shared/GameObjects/Components/Damage/DamageChangedMessage.cs b/Content.Shared/Damage/DamageChangedMessage.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Damage/DamageChangedMessage.cs
rename to Content.Shared/Damage/DamageChangedMessage.cs
index 17b6261a55..cb6ceac546 100644
--- a/Content.Shared/GameObjects/Components/Damage/DamageChangedMessage.cs
+++ b/Content.Shared/Damage/DamageChangedMessage.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Damage
+namespace Content.Shared.Damage
 {
     public class DamageChangedMessage : ComponentMessage
     {
diff --git a/Content.Shared/GameObjects/Components/Damage/DamageFlag.cs b/Content.Shared/Damage/DamageFlag.cs
similarity index 79%
rename from Content.Shared/GameObjects/Components/Damage/DamageFlag.cs
rename to Content.Shared/Damage/DamageFlag.cs
index bea8a74fdc..c0d04ac348 100644
--- a/Content.Shared/GameObjects/Components/Damage/DamageFlag.cs
+++ b/Content.Shared/Damage/DamageFlag.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Damage
+namespace Content.Shared.Damage
 {
     [Flags]
     [Serializable, NetSerializable]
diff --git a/Content.Shared/GameObjects/EntitySystems/DamageSystem.cs b/Content.Shared/Damage/DamageSystem.cs
similarity index 96%
rename from Content.Shared/GameObjects/EntitySystems/DamageSystem.cs
rename to Content.Shared/Damage/DamageSystem.cs
index 9c65d0d3d3..6bdc6c821d 100644
--- a/Content.Shared/GameObjects/EntitySystems/DamageSystem.cs
+++ b/Content.Shared/Damage/DamageSystem.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using Content.Shared.Damage;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Damage
 {
     [UsedImplicitly]
     public class DamageSystem : EntitySystem
diff --git a/Content.Shared/Damage/ResistanceSet/ResistanceSet.cs b/Content.Shared/Damage/Resistances/ResistanceSet.cs
similarity index 98%
rename from Content.Shared/Damage/ResistanceSet/ResistanceSet.cs
rename to Content.Shared/Damage/Resistances/ResistanceSet.cs
index 3e625dcc75..1c3300a78c 100644
--- a/Content.Shared/Damage/ResistanceSet/ResistanceSet.cs
+++ b/Content.Shared/Damage/Resistances/ResistanceSet.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Damage.ResistanceSet
+namespace Content.Shared.Damage.Resistances
 {
     /// <summary>
     ///     Set of resistances used by damageable objects.
diff --git a/Content.Shared/Damage/ResistanceSet/ResistanceSetPrototype.cs b/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs
similarity index 96%
rename from Content.Shared/Damage/ResistanceSet/ResistanceSetPrototype.cs
rename to Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs
index e695017d8f..96b88b4850 100644
--- a/Content.Shared/Damage/ResistanceSet/ResistanceSetPrototype.cs
+++ b/Content.Shared/Damage/Resistances/ResistanceSetPrototype.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Damage.ResistanceSet
+namespace Content.Shared.Damage.Resistances
 {
     /// <summary>
     ///     Prototype for the BodyPart class.
diff --git a/Content.Shared/Prototypes/DatasetPrototype.cs b/Content.Shared/Dataset/DatasetPrototype.cs
similarity index 92%
rename from Content.Shared/Prototypes/DatasetPrototype.cs
rename to Content.Shared/Dataset/DatasetPrototype.cs
index 3d6127caea..b1aab3ab6c 100644
--- a/Content.Shared/Prototypes/DatasetPrototype.cs
+++ b/Content.Shared/Dataset/DatasetPrototype.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Prototypes
+namespace Content.Shared.Dataset
 {
     [Prototype("dataset")]
     public class DatasetPrototype : IPrototype
diff --git a/Content.Shared/Utility/SharedDirectionExtensions.cs b/Content.Shared/Directions/SharedDirectionExtensions.cs
similarity index 98%
rename from Content.Shared/Utility/SharedDirectionExtensions.cs
rename to Content.Shared/Directions/SharedDirectionExtensions.cs
index 5b6c612fac..61c056d479 100644
--- a/Content.Shared/Utility/SharedDirectionExtensions.cs
+++ b/Content.Shared/Directions/SharedDirectionExtensions.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Random;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Directions
 {
     public static class SharedDirectionExtensions
     {
diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalMailingUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Disposal/SharedDisposalMailingUnitComponent.cs
rename to Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs
index de0e8f4556..a0d79f628e 100644
--- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalMailingUnitComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalMailingUnitComponent.cs
@@ -5,7 +5,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.GameObjects.Components.Disposal
+namespace Content.Shared.Disposal.Components
 {
     public abstract class SharedDisposalMailingUnitComponent : SharedDisposalUnitComponent
     {
diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs
rename to Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs
index d8d96c3ce1..24d54b12db 100644
--- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalRouterComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalRouterComponent.cs
@@ -4,7 +4,7 @@ using System.Text.RegularExpressions;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Disposal
+namespace Content.Shared.Disposal.Components
 {
     public class SharedDisposalRouterComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs
rename to Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs
index 3981ebab86..45694f86c8 100644
--- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTaggerComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalTaggerComponent.cs
@@ -4,7 +4,7 @@ using System.Text.RegularExpressions;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Disposal
+namespace Content.Shared.Disposal.Components
 {
     public class SharedDisposalTaggerComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTubeComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/Disposal/SharedDisposalTubeComponent.cs
rename to Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs
index 773b8ae3e9..e2382f255d 100644
--- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalTubeComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalTubeComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Disposal
+namespace Content.Shared.Disposal.Components
 {
     [Serializable, NetSerializable]
     public enum DisposalTubeVisuals
diff --git a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalUnitComponent.cs b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Disposal/SharedDisposalUnitComponent.cs
rename to Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
index c3792ea86c..d4263c3f24 100644
--- a/Content.Shared/GameObjects/Components/Disposal/SharedDisposalUnitComponent.cs
+++ b/Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
@@ -1,15 +1,15 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Body.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Item;
+using Content.Shared.MobState;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Disposal
+namespace Content.Shared.Disposal.Components
 {
     public abstract class SharedDisposalUnitComponent : Component, IDragDropOn
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
similarity index 85%
rename from Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs
rename to Content.Shared/Disposal/SharedDisposalUnitSystem.cs
index fd77f0ca7c..9acb37a14a 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedDisposalUnitSystem.cs
+++ b/Content.Shared/Disposal/SharedDisposalUnitSystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Disposal;
+using Content.Shared.Disposal.Components;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Disposal
 {
     [UsedImplicitly]
     public sealed class SharedDisposalUnitSystem : EntitySystem
diff --git a/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs b/Content.Shared/DoAfter/SharedDoAfterComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs
rename to Content.Shared/DoAfter/SharedDoAfterComponent.cs
index ceac559c62..e128540463 100644
--- a/Content.Shared/GameObjects/Components/SharedDoAfterComponent.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.DoAfter
 {
     public abstract class SharedDoAfterComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Doors/AirlockWireStatus.cs b/Content.Shared/Doors/AirlockWireStatus.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/Doors/AirlockWireStatus.cs
rename to Content.Shared/Doors/AirlockWireStatus.cs
index e9d6a62167..9a5175aeff 100644
--- a/Content.Shared/GameObjects/Components/Doors/AirlockWireStatus.cs
+++ b/Content.Shared/Doors/AirlockWireStatus.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Doors
+namespace Content.Shared.Doors
 {
     [Serializable, NetSerializable]
     public enum AirlockWireStatus
diff --git a/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs b/Content.Shared/Doors/SharedDoorComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs
rename to Content.Shared/Doors/SharedDoorComponent.cs
index fcd8257514..14e584f317 100644
--- a/Content.Shared/GameObjects/Components/Doors/SharedDoorComponent.cs
+++ b/Content.Shared/Doors/SharedDoorComponent.cs
@@ -1,6 +1,7 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Physics;
@@ -9,7 +10,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Doors
+namespace Content.Shared.Doors
 {
     public abstract class SharedDoorComponent : Component
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedDoorSystem.cs b/Content.Shared/Doors/SharedDoorSystem.cs
similarity index 85%
rename from Content.Shared/GameObjects/EntitySystems/SharedDoorSystem.cs
rename to Content.Shared/Doors/SharedDoorSystem.cs
index 3fcd90dbee..91c3222664 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedDoorSystem.cs
+++ b/Content.Shared/Doors/SharedDoorSystem.cs
@@ -1,8 +1,7 @@
-using Content.Shared.GameObjects.Components.Doors;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics.Dynamics;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Doors
 {
     public abstract class SharedDoorSystem : EntitySystem
     {
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/DragDropRequestEvent.cs b/Content.Shared/DragDrop/DragDropRequestEvent.cs
similarity index 94%
rename from Content.Shared/GameObjects/EntitySystemMessages/DragDropRequestEvent.cs
rename to Content.Shared/DragDrop/DragDropRequestEvent.cs
index b20fc23458..8a4632c651 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/DragDropRequestEvent.cs
+++ b/Content.Shared/DragDrop/DragDropRequestEvent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages
+namespace Content.Shared.DragDrop
 {
     /// <summary>
     /// Requests a drag / drop interaction to be performed
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs b/Content.Shared/DragDrop/IDragDropOn.cs
similarity index 95%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs
rename to Content.Shared/DragDrop/IDragDropOn.cs
index 95ef0f43cd..fa8fb58a6f 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDragDropOn.cs
+++ b/Content.Shared/DragDrop/IDragDropOn.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.Analyzers;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.DragDrop
 {
     /// <summary>
     ///     This interface allows the component's entity to be dragged and dropped
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs b/Content.Shared/DragDrop/IDraggable.cs
similarity index 98%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs
rename to Content.Shared/DragDrop/IDraggable.cs
index c23126a618..735850e946 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDraggable.cs
+++ b/Content.Shared/DragDrop/IDraggable.cs
@@ -1,10 +1,9 @@
 #nullable enable
-using System;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.DragDrop
 {
     /// <summary>
     ///     This interface allows a local client to initiate dragging of the component's
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs b/Content.Shared/DragDrop/IDropped.cs
similarity index 96%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs
rename to Content.Shared/DragDrop/IDropped.cs
index cb161f594c..5848167a46 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IDropped.cs
+++ b/Content.Shared/DragDrop/IDropped.cs
@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.DragDrop
 {
     /// <summary>
     ///     This interface gives components behavior when they're dropped by a mob.
diff --git a/Content.Shared/GameObjects/DrawDepth.cs b/Content.Shared/DrawDepth/DrawDepth.cs
similarity index 96%
rename from Content.Shared/GameObjects/DrawDepth.cs
rename to Content.Shared/DrawDepth/DrawDepth.cs
index 5062fd87df..82a415d577 100644
--- a/Content.Shared/GameObjects/DrawDepth.cs
+++ b/Content.Shared/DrawDepth/DrawDepth.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.Serialization;
 using DrawDepthTag = Robust.Shared.GameObjects.DrawDepth;
 
-namespace Content.Shared.GameObjects
+namespace Content.Shared.DrawDepth
 {
     [ConstantsFor(typeof(DrawDepthTag))]
     public enum DrawDepth
diff --git a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerExtensions.cs b/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs
similarity index 85%
rename from Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerExtensions.cs
rename to Content.Shared/EffectBlocker/EffectBlockerExtensions.cs
index cb0574c188..e2cc0c8058 100644
--- a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerExtensions.cs
+++ b/Content.Shared/EffectBlocker/EffectBlockerExtensions.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems.EffectBlocker
+namespace Content.Shared.EffectBlocker
 {
     public static class EffectBlockerExtensions
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerSystem.cs b/Content.Shared/EffectBlocker/EffectBlockerSystem.cs
similarity index 88%
rename from Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerSystem.cs
rename to Content.Shared/EffectBlocker/EffectBlockerSystem.cs
index 2ad77e5785..2a03ee2834 100644
--- a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/EffectBlockerSystem.cs
+++ b/Content.Shared/EffectBlocker/EffectBlockerSystem.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems.EffectBlocker
+namespace Content.Shared.EffectBlocker
 {
     /// <summary>
     /// Utility methods to check if an effect is allowed to affect a specific entity.
diff --git a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/IEffectBlocker.cs b/Content.Shared/EffectBlocker/IEffectBlocker.cs
similarity index 72%
rename from Content.Shared/GameObjects/EntitySystems/EffectBlocker/IEffectBlocker.cs
rename to Content.Shared/EffectBlocker/IEffectBlocker.cs
index 55110c2341..4e3d9d9927 100644
--- a/Content.Shared/GameObjects/EntitySystems/EffectBlocker/IEffectBlocker.cs
+++ b/Content.Shared/EffectBlocker/IEffectBlocker.cs
@@ -1,7 +1,7 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
 
-namespace Content.Shared.GameObjects.EntitySystems.EffectBlocker
+namespace Content.Shared.EffectBlocker
 {
     /// <summary>
     /// This interface gives components the ability to block certain effects
diff --git a/Content.Shared/GameObjects/Components/Mobs/Speech/SharedEmotingComponent.cs b/Content.Shared/Emoting/SharedEmotingComponent.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/Mobs/Speech/SharedEmotingComponent.cs
rename to Content.Shared/Emoting/SharedEmotingComponent.cs
index d5160e11eb..47a277c1ad 100644
--- a/Content.Shared/GameObjects/Components/Mobs/Speech/SharedEmotingComponent.cs
+++ b/Content.Shared/Emoting/SharedEmotingComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Mobs.Speech
+namespace Content.Shared.Emoting
 {
     [RegisterComponent]
     public class SharedEmotingComponent : Component, IActionBlocker
diff --git a/Content.Shared/Prototypes/EntityList/EntityListPrototype.cs b/Content.Shared/EntityList/EntityListPrototype.cs
similarity index 95%
rename from Content.Shared/Prototypes/EntityList/EntityListPrototype.cs
rename to Content.Shared/EntityList/EntityListPrototype.cs
index bad73b0036..a785c265ac 100644
--- a/Content.Shared/Prototypes/EntityList/EntityListPrototype.cs
+++ b/Content.Shared/EntityList/EntityListPrototype.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Prototypes.EntityList
+namespace Content.Shared.EntityList
 {
     [Prototype("entityList")]
     public class EntityListPrototype : IPrototype
diff --git a/Content.Shared/EntryPoint.cs b/Content.Shared/EntryPoint.cs
index 7eb6c60ee0..1cedeedf4e 100644
--- a/Content.Shared/EntryPoint.cs
+++ b/Content.Shared/EntryPoint.cs
@@ -1,9 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.CharacterAppearance;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reaction;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Localizations;
 using Content.Shared.Maps;
-using Content.Shared.Preferences.Appearance;
 using Robust.Shared.ContentPack;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
diff --git a/Content.Shared/Network/NetMessages/MsgEuiCtl.cs b/Content.Shared/Eui/MsgEuiCtl.cs
similarity index 96%
rename from Content.Shared/Network/NetMessages/MsgEuiCtl.cs
rename to Content.Shared/Eui/MsgEuiCtl.cs
index 45748db7e4..b8f742ac55 100644
--- a/Content.Shared/Network/NetMessages/MsgEuiCtl.cs
+++ b/Content.Shared/Eui/MsgEuiCtl.cs
@@ -2,7 +2,7 @@
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Eui
 {
     /// <summary>
     ///     Sent server -> client to signal that the client should open an EUI.
diff --git a/Content.Shared/Network/NetMessages/MsgEuiMessage.cs b/Content.Shared/Eui/MsgEuiMessage.cs
similarity index 94%
rename from Content.Shared/Network/NetMessages/MsgEuiMessage.cs
rename to Content.Shared/Eui/MsgEuiMessage.cs
index 043bec86ff..8ba829fc79 100644
--- a/Content.Shared/Network/NetMessages/MsgEuiMessage.cs
+++ b/Content.Shared/Eui/MsgEuiMessage.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using System;
 using System.IO;
-using Content.Shared.Eui;
 using Lidgren.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Eui
 {
     public sealed class MsgEuiMessage : NetMessage
     {
diff --git a/Content.Shared/Network/NetMessages/MsgEuiState.cs b/Content.Shared/Eui/MsgEuiState.cs
similarity index 94%
rename from Content.Shared/Network/NetMessages/MsgEuiState.cs
rename to Content.Shared/Eui/MsgEuiState.cs
index 794d3d52a8..c8411f4b69 100644
--- a/Content.Shared/Network/NetMessages/MsgEuiState.cs
+++ b/Content.Shared/Eui/MsgEuiState.cs
@@ -1,13 +1,12 @@
 #nullable enable
 using System;
 using System.IO;
-using Content.Shared.Eui;
 using Lidgren.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Eui
 {
     public sealed class MsgEuiState : NetMessage
     {
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs b/Content.Shared/Examine/ExamineSystemMessages.cs
similarity index 94%
rename from Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs
rename to Content.Shared/Examine/ExamineSystemMessages.cs
index 875c0f6a7c..dc56a9134e 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/ExamineSystemMessages.cs
+++ b/Content.Shared/Examine/ExamineSystemMessages.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages
+namespace Content.Shared.Examine
 {
     public static class ExamineSystemMessages
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs
similarity index 97%
rename from Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs
rename to Content.Shared/Examine/ExamineSystemShared.cs
index 09e5bdf470..23694c18aa 100644
--- a/Content.Shared/GameObjects/EntitySystems/ExamineSystemShared.cs
+++ b/Content.Shared/Examine/ExamineSystemShared.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using Content.Shared.DragDrop;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -11,9 +11,9 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Utility;
-using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem;
+using static Content.Shared.Interaction.SharedInteractionSystem;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Examine
 {
     [Obsolete("Use ExaminedEvent instead.")]
     public interface IExamine
diff --git a/Content.Shared/GameObjects/Components/Mobs/ExaminerComponent.cs b/Content.Shared/Examine/ExaminerComponent.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/Mobs/ExaminerComponent.cs
rename to Content.Shared/Examine/ExaminerComponent.cs
index d2943f6aef..ebd91f02be 100644
--- a/Content.Shared/GameObjects/Components/Mobs/ExaminerComponent.cs
+++ b/Content.Shared/Examine/ExaminerComponent.cs
@@ -1,11 +1,9 @@
 #nullable enable
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.Examine
 {
     /// <summary>
     ///     Component required for a player to be able to examine things.
diff --git a/Content.Shared/GameObjects/Components/Explosion/SharedClusterFlashComponent.cs b/Content.Shared/Explosion/SharedClusterFlashComponent.cs
similarity index 76%
rename from Content.Shared/GameObjects/Components/Explosion/SharedClusterFlashComponent.cs
rename to Content.Shared/Explosion/SharedClusterFlashComponent.cs
index 9f00d560ba..ae838554f7 100644
--- a/Content.Shared/GameObjects/Components/Explosion/SharedClusterFlashComponent.cs
+++ b/Content.Shared/Explosion/SharedClusterFlashComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Explosion
+namespace Content.Shared.Explosion
 {
     [Serializable, NetSerializable]
     public enum ClusterFlashVisuals : byte
diff --git a/Content.Shared/GameObjects/Components/Weapons/SharedFlashableComponent.cs b/Content.Shared/Flash/SharedFlashableComponent.cs
similarity index 91%
rename from Content.Shared/GameObjects/Components/Weapons/SharedFlashableComponent.cs
rename to Content.Shared/Flash/SharedFlashableComponent.cs
index ccc2480d3f..76420f86dd 100644
--- a/Content.Shared/GameObjects/Components/Weapons/SharedFlashableComponent.cs
+++ b/Content.Shared/Flash/SharedFlashableComponent.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Weapons
+namespace Content.Shared.Flash
 {
     public class SharedFlashableComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Fluids/SharedSprayComponent.cs b/Content.Shared/Fluids/SharedSprayComponent.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/Fluids/SharedSprayComponent.cs
rename to Content.Shared/Fluids/SharedSprayComponent.cs
index fd291bb6eb..32c55a39cf 100644
--- a/Content.Shared/GameObjects/Components/Fluids/SharedSprayComponent.cs
+++ b/Content.Shared/Fluids/SharedSprayComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Fluids
+namespace Content.Shared.Fluids
 {
     public class SharedSprayComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Chemistry/FoamVisuals.cs b/Content.Shared/Foam/FoamVisuals.cs
similarity index 76%
rename from Content.Shared/GameObjects/Components/Chemistry/FoamVisuals.cs
rename to Content.Shared/Foam/FoamVisuals.cs
index 065ae3da7f..d6a7382c1e 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/FoamVisuals.cs
+++ b/Content.Shared/Foam/FoamVisuals.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Chemistry
+namespace Content.Shared.Foam
 {
     [Serializable, NetSerializable]
     public enum FoamVisuals : byte
diff --git a/Content.Shared/GameObjects/Components/Atmos/GasTank/SharedGasTankComponent.cs b/Content.Shared/GameObjects/Components/Atmos/GasTank/SharedGasTankComponent.cs
index 8e8c8f07c6..9ffd4361fb 100644
--- a/Content.Shared/GameObjects/Components/Atmos/GasTank/SharedGasTankComponent.cs
+++ b/Content.Shared/GameObjects/Components/Atmos/GasTank/SharedGasTankComponent.cs
@@ -1,4 +1,5 @@
 #nullable enable
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 
 namespace Content.Shared.GameObjects.Components.Atmos.GasTank
diff --git a/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs b/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs
index d7fa7f294e..cc52b4ff08 100644
--- a/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs
+++ b/Content.Shared/GameObjects/Components/SharedGasAnalyzerComponent.cs
@@ -1,4 +1,5 @@
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Serialization;
diff --git a/Content.Shared/Network/NetMessages/MsgRequestWindowAttention.cs b/Content.Shared/GameWindow/MsgRequestWindowAttention.cs
similarity index 93%
rename from Content.Shared/Network/NetMessages/MsgRequestWindowAttention.cs
rename to Content.Shared/GameWindow/MsgRequestWindowAttention.cs
index 8ff4df1f74..aa40d2be15 100644
--- a/Content.Shared/Network/NetMessages/MsgRequestWindowAttention.cs
+++ b/Content.Shared/GameWindow/MsgRequestWindowAttention.cs
@@ -2,7 +2,7 @@
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.GameWindow
 {
     public sealed class MsgRequestWindowAttention : NetMessage
     {
diff --git a/Content.Shared/GameObjects/Components/Observer/GhostWarpToLocationRequestMessage.cs b/Content.Shared/Ghost/GhostWarpToLocationRequestMessage.cs
similarity index 87%
rename from Content.Shared/GameObjects/Components/Observer/GhostWarpToLocationRequestMessage.cs
rename to Content.Shared/Ghost/GhostWarpToLocationRequestMessage.cs
index 55b84542b6..9e928547a6 100644
--- a/Content.Shared/GameObjects/Components/Observer/GhostWarpToLocationRequestMessage.cs
+++ b/Content.Shared/Ghost/GhostWarpToLocationRequestMessage.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Observer
+namespace Content.Shared.Ghost
 {
     [Serializable, NetSerializable]
     public class GhostWarpToLocationRequestMessage : ComponentMessage
diff --git a/Content.Shared/GameObjects/Components/Observer/GhostWarpToTargetRequestMessage.cs b/Content.Shared/Ghost/GhostWarpToTargetRequestMessage.cs
similarity index 87%
rename from Content.Shared/GameObjects/Components/Observer/GhostWarpToTargetRequestMessage.cs
rename to Content.Shared/Ghost/GhostWarpToTargetRequestMessage.cs
index d42dee0e4e..da0b161823 100644
--- a/Content.Shared/GameObjects/Components/Observer/GhostWarpToTargetRequestMessage.cs
+++ b/Content.Shared/Ghost/GhostWarpToTargetRequestMessage.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Observer
+namespace Content.Shared.Ghost
 {
     [Serializable, NetSerializable]
     public class GhostWarpToTargetRequestMessage : ComponentMessage
diff --git a/Content.Shared/GameObjects/Components/Observer/GhostRoles/GhostRolesEuiMessages.cs b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Observer/GhostRoles/GhostRolesEuiMessages.cs
rename to Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
index 485ed15aec..ea832d2bf9 100644
--- a/Content.Shared/GameObjects/Components/Observer/GhostRoles/GhostRolesEuiMessages.cs
+++ b/Content.Shared/Ghost/Roles/GhostRolesEuiMessages.cs
@@ -3,7 +3,7 @@ using System;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Observer.GhostRoles
+namespace Content.Shared.Ghost.Roles
 {
     [NetSerializable, Serializable]
     public struct GhostRoleInfo
diff --git a/Content.Shared/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEuiState.cs b/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEuiState.cs
rename to Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
index 1e6c1f44ca..6f7a648c5f 100644
--- a/Content.Shared/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleEuiState.cs
+++ b/Content.Shared/Ghost/Roles/MakeGhostRoleEuiState.cs
@@ -4,7 +4,7 @@ using Content.Shared.Eui;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Observer.GhostRoles
+namespace Content.Shared.Ghost.Roles
 {
     [Serializable, NetSerializable]
     public class MakeGhostRoleEuiState : EuiStateBase
diff --git a/Content.Shared/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindowClosedMessage.cs b/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs
similarity index 75%
rename from Content.Shared/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindowClosedMessage.cs
rename to Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs
index 31a606e7ea..7f5d933bdb 100644
--- a/Content.Shared/GameObjects/Components/Observer/GhostRoles/MakeGhostRoleWindowClosedMessage.cs
+++ b/Content.Shared/Ghost/Roles/MakeGhostRoleWindowClosedMessage.cs
@@ -3,7 +3,7 @@ using System;
 using Content.Shared.Eui;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Observer.GhostRoles
+namespace Content.Shared.Ghost.Roles
 {
     [Serializable, NetSerializable]
     public class MakeGhostRoleWindowClosedMessage : EuiMessageBase
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedGhostRoleSystem.cs b/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs
similarity index 88%
rename from Content.Shared/GameObjects/EntitySystems/SharedGhostRoleSystem.cs
rename to Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs
index 8416884705..4977d54870 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedGhostRoleSystem.cs
+++ b/Content.Shared/Ghost/Roles/SharedGhostRoleSystem.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Ghost.Roles
 {
     public abstract class SharedGhostRoleSystem : EntitySystem
     {
diff --git a/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs b/Content.Shared/Ghost/SharedGhostComponent.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs
rename to Content.Shared/Ghost/SharedGhostComponent.cs
index 87457790da..6195441b21 100644
--- a/Content.Shared/GameObjects/Components/Observer/SharedGhostComponent.cs
+++ b/Content.Shared/Ghost/SharedGhostComponent.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Observer
+namespace Content.Shared.Ghost
 {
     public class SharedGhostComponent : Component, IActionBlocker
     {
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/Gravity/GravityChangedMessage.cs b/Content.Shared/Gravity/GravityChangedMessage.cs
similarity index 83%
rename from Content.Shared/GameObjects/EntitySystemMessages/Gravity/GravityChangedMessage.cs
rename to Content.Shared/Gravity/GravityChangedMessage.cs
index f82a0cfa65..4433701c5b 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/Gravity/GravityChangedMessage.cs
+++ b/Content.Shared/Gravity/GravityChangedMessage.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages.Gravity
+namespace Content.Shared.Gravity
 {
     public class GravityChangedMessage : EntityEventArgs
     {
diff --git a/Content.Shared/GameObjects/Components/Gravity/SharedGravityGeneratorComponent.cs b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Gravity/SharedGravityGeneratorComponent.cs
rename to Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
index db4e28398b..7706182343 100644
--- a/Content.Shared/GameObjects/Components/Gravity/SharedGravityGeneratorComponent.cs
+++ b/Content.Shared/Gravity/SharedGravityGeneratorComponent.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Gravity
+namespace Content.Shared.Gravity
 {
     public class SharedGravityGeneratorComponent : Component
     {
diff --git a/Content.Shared/Prototypes/HUD/HudThemePrototype.cs b/Content.Shared/HUD/HudThemePrototype.cs
similarity index 92%
rename from Content.Shared/Prototypes/HUD/HudThemePrototype.cs
rename to Content.Shared/HUD/HudThemePrototype.cs
index 6b87ed1b37..3113166b7f 100644
--- a/Content.Shared/Prototypes/HUD/HudThemePrototype.cs
+++ b/Content.Shared/HUD/HudThemePrototype.cs
@@ -1,7 +1,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Prototypes.HUD
+namespace Content.Shared.HUD
 {
     [Prototype("hudTheme")]
     public class HudThemePrototype : IPrototype
diff --git a/Content.Shared/GameObjects/Components/Items/ISharedHandsComponent.cs b/Content.Shared/Hands/Components/ISharedHandsComponent.cs
similarity index 70%
rename from Content.Shared/GameObjects/Components/Items/ISharedHandsComponent.cs
rename to Content.Shared/Hands/Components/ISharedHandsComponent.cs
index eafcec0bd3..11ef111c20 100644
--- a/Content.Shared/GameObjects/Components/Items/ISharedHandsComponent.cs
+++ b/Content.Shared/Hands/Components/ISharedHandsComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Items
+namespace Content.Shared.Hands.Components
 {
     public interface ISharedHandsComponent : IComponent
     {
diff --git a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs b/Content.Shared/Hands/Components/SharedHandsComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs
rename to Content.Shared/Hands/Components/SharedHandsComponent.cs
index 649a062e91..d1b62de09a 100644
--- a/Content.Shared/GameObjects/Components/Items/SharedHandsComponent.cs
+++ b/Content.Shared/Hands/Components/SharedHandsComponent.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Items
+namespace Content.Shared.Hands.Components
 {
     public abstract class SharedHandsComponent : Component, ISharedHandsComponent
     {
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs b/Content.Shared/Hands/IEquippedHand.cs
similarity index 93%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs
rename to Content.Shared/Hands/IEquippedHand.cs
index 3cfb1bd7d6..3c9fc0043d 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquippedHand.cs
+++ b/Content.Shared/Hands/IEquippedHand.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Items;
+using Content.Shared.Hands.Components;
+using Content.Shared.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Hands
 {
     /// <summary>
     ///     This interface gives components behavior when their entity is put in a hand inventory slot,
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs b/Content.Shared/Hands/IHandDeselected.cs
similarity index 95%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs
rename to Content.Shared/Hands/IHandDeselected.cs
index 72a62b44ba..1399ccb2b2 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandDeselected.cs
+++ b/Content.Shared/Hands/IHandDeselected.cs
@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Hands
 {
     /// <summary>
     ///     This interface gives components behavior when they're held on a deselected hand.
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs b/Content.Shared/Hands/IHandSelected.cs
similarity index 95%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs
rename to Content.Shared/Hands/IHandSelected.cs
index d629859c28..f0709a1da0 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHandSelected.cs
+++ b/Content.Shared/Hands/IHandSelected.cs
@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Hands
 {
     /// <summary>
     ///     This interface gives components behavior when they're held on the selected hand.
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs b/Content.Shared/Hands/IUnequippedHand.cs
similarity index 94%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs
rename to Content.Shared/Hands/IUnequippedHand.cs
index c6aff9da2c..9e9bf36be2 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequippedHand.cs
+++ b/Content.Shared/Hands/IUnequippedHand.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Items;
+using Content.Shared.Hands.Components;
+using Content.Shared.Inventory;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Hands
 {
     /// <summary>
     ///     This interface gives components behavior when their entity is removed from a hand slot,
diff --git a/Content.Shared/GameObjects/Components/Instruments/SharedInstrumentComponent.cs b/Content.Shared/Instruments/SharedInstrumentComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Instruments/SharedInstrumentComponent.cs
rename to Content.Shared/Instruments/SharedInstrumentComponent.cs
index 4891f7937a..3f2064e16d 100644
--- a/Content.Shared/GameObjects/Components/Instruments/SharedInstrumentComponent.cs
+++ b/Content.Shared/Instruments/SharedInstrumentComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.Audio.Midi;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Instruments
+namespace Content.Shared.Instruments
 {
     public class SharedInstrumentComponent : Component
     {
diff --git a/Content.Shared/Utility/SharedUnobstructedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs
similarity index 98%
rename from Content.Shared/Utility/SharedUnobstructedExtensions.cs
rename to Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs
index 78b7e7553e..7c09cc36e6 100644
--- a/Content.Shared/Utility/SharedUnobstructedExtensions.cs
+++ b/Content.Shared/Interaction/Helpers/SharedUnobstructedExtensions.cs
@@ -1,16 +1,13 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
 using Content.Shared.Physics;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Map;
-using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem;
+using static Content.Shared.Interaction.SharedInteractionSystem;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Interaction.Helpers
 {
     public static class SharedUnobstructedExtensions
     {
diff --git a/Content.Shared/Utility/SharedUnoccludedExtensions.cs b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs
similarity index 97%
rename from Content.Shared/Utility/SharedUnoccludedExtensions.cs
rename to Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs
index 14390e8cfe..2e2b395330 100644
--- a/Content.Shared/Utility/SharedUnoccludedExtensions.cs
+++ b/Content.Shared/Interaction/Helpers/SharedUnoccludedExtensions.cs
@@ -1,14 +1,14 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Examine;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using static Content.Shared.GameObjects.EntitySystems.ExamineSystemShared;
-using static Content.Shared.GameObjects.EntitySystems.SharedInteractionSystem;
+using static Content.Shared.Examine.ExamineSystemShared;
+using static Content.Shared.Interaction.SharedInteractionSystem;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Interaction.Helpers
 {
     public static class SharedUnoccludedExtensions
     {
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs b/Content.Shared/Interaction/IActivate.cs
similarity index 96%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs
rename to Content.Shared/Interaction/IActivate.cs
index ceb75aefd9..3135b47697 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IActivate.cs
+++ b/Content.Shared/Interaction/IActivate.cs
@@ -3,7 +3,7 @@ using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Interaction
 {
     /// <summary>
     ///     This interface gives components behavior when being activated (by default,
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs b/Content.Shared/Interaction/IAfterInteract.cs
similarity index 98%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs
rename to Content.Shared/Interaction/IAfterInteract.cs
index ae851c2365..9fc7ddcde0 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IAfterInteract.cs
+++ b/Content.Shared/Interaction/IAfterInteract.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Map;
 
 #nullable enable
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Interaction
 {
     /// <summary>
     /// This interface gives components a behavior when their entity is in the active hand, when
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs b/Content.Shared/Interaction/IInteractHand.cs
similarity index 96%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs
rename to Content.Shared/Interaction/IInteractHand.cs
index 92c8e2b74d..511b015534 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractHand.cs
+++ b/Content.Shared/Interaction/IInteractHand.cs
@@ -3,7 +3,7 @@ using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Interaction
 {
     /// <summary>
     /// This interface gives components behavior when being clicked on by a user with an empty hand
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs b/Content.Shared/Interaction/IInteractUsing.cs
similarity index 97%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs
rename to Content.Shared/Interaction/IInteractUsing.cs
index 9c6ab56eb5..838039a8d6 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IInteractUsing.cs
+++ b/Content.Shared/Interaction/IInteractUsing.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Interaction
 {
     /// <summary>
     /// This interface gives components behavior when their entity is clicked on by a user with an object in their hand
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs b/Content.Shared/Interaction/IRangedInteract.cs
similarity index 97%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs
rename to Content.Shared/Interaction/IRangedInteract.cs
index 4a1d7f76e3..0e54a3ccbb 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRangedInteract.cs
+++ b/Content.Shared/Interaction/IRangedInteract.cs
@@ -4,7 +4,7 @@ using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Interaction
 {
     /// <summary>
     /// This interface gives components behavior when being clicked on by a user with an object
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs b/Content.Shared/Interaction/ITargetedInteractEventArgs.cs
similarity index 85%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs
rename to Content.Shared/Interaction/ITargetedInteractEventArgs.cs
index d19b854a30..cb0e51d73c 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ITargetedInteractEventArgs.cs
+++ b/Content.Shared/Interaction/ITargetedInteractEventArgs.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Interaction
 {
     public interface ITargetedInteractEventArgs
     {
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs b/Content.Shared/Interaction/IUse.cs
similarity index 96%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs
rename to Content.Shared/Interaction/IUse.cs
index 45a64dc792..02dc8ab8b3 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUse.cs
+++ b/Content.Shared/Interaction/IUse.cs
@@ -3,7 +3,7 @@ using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Interaction
 {
     /// <summary>
     /// This interface gives components behavior when using the entity in your active hand
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs
similarity index 98%
rename from Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs
rename to Content.Shared/Interaction/SharedInteractionSystem.cs
index 500f7906b0..9bb6595578 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedInteractionSystem.cs
+++ b/Content.Shared/Interaction/SharedInteractionSystem.cs
@@ -1,15 +1,13 @@
 using System.Linq;
-using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Notification;
 using Content.Shared.Physics;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Broadphase;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Interaction
 {
     /// <summary>
     /// Governs interactions during clicking on entities
@@ -328,7 +326,7 @@ namespace Content.Shared.GameObjects.EntitySystems
 
             if (!inRange && popup)
             {
-                var message = Loc.GetString("You can't reach there!");
+                var message = Robust.Shared.Localization.Loc.GetString("You can't reach there!");
                 origin.PopupMessage(message);
             }
 
diff --git a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs b/Content.Shared/Inventory/EquipmentSlotDefinitions.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs
rename to Content.Shared/Inventory/EquipmentSlotDefinitions.cs
index 95fb774244..578a74ac59 100644
--- a/Content.Shared/GameObjects/Components/Inventory/EquipmentSlotDefinitions.cs
+++ b/Content.Shared/Inventory/EquipmentSlotDefinitions.cs
@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using JetBrains.Annotations;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Inventory
+namespace Content.Shared.Inventory
 {
     public static class EquipmentSlotDefines
     {
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs b/Content.Shared/Inventory/IEquipped.cs
similarity index 94%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs
rename to Content.Shared/Inventory/IEquipped.cs
index b7fdc830b4..d27d4f4054 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IEquipped.cs
+++ b/Content.Shared/Inventory/IEquipped.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.Hands;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Inventory
 {
     /// <summary>
     ///     This interface gives components behavior when their entity is put in a non-hand inventory slot,
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs b/Content.Shared/Inventory/IUnequipped.cs
similarity index 94%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs
rename to Content.Shared/Inventory/IUnequipped.cs
index e87308ad6e..8699316513 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IUnequipped.cs
+++ b/Content.Shared/Inventory/IUnequipped.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.Hands;
 using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Inventory
 {
     /// <summary>
     ///     This interface gives components behavior when their entity is removed from a non-hand inventory slot,
diff --git a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs b/Content.Shared/Inventory/InventoryTemplates.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs
rename to Content.Shared/Inventory/InventoryTemplates.cs
index 26e52c2271..dab4b662b4 100644
--- a/Content.Shared/GameObjects/Components/Inventory/InventoryTemplates.cs
+++ b/Content.Shared/Inventory/InventoryTemplates.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using System.Collections.Generic;
 using JetBrains.Annotations;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Shared.GameObjects.Components.Inventory
+namespace Content.Shared.Inventory
 {
     public abstract class Inventory
     {
diff --git a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs b/Content.Shared/Inventory/SharedInventoryComponent.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
rename to Content.Shared/Inventory/SharedInventoryComponent.cs
index ca65aa7080..43ffa77157 100644
--- a/Content.Shared/GameObjects/Components/Inventory/SharedInventoryComponent.cs
+++ b/Content.Shared/Inventory/SharedInventoryComponent.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Movement.Components;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Reflection;
@@ -8,9 +9,9 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Shared.GameObjects.Components.Inventory
+namespace Content.Shared.Inventory
 {
     public abstract class SharedInventoryComponent : Component, IMoveSpeedModifier
     {
diff --git a/Content.Shared/GameObjects/Components/Storage/SharedItemComponent.cs b/Content.Shared/Item/SharedItemComponent.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Storage/SharedItemComponent.cs
rename to Content.Shared/Item/SharedItemComponent.cs
index 6cc6a433ea..9c17f8c711 100644
--- a/Content.Shared/GameObjects/Components/Storage/SharedItemComponent.cs
+++ b/Content.Shared/Item/SharedItemComponent.cs
@@ -1,8 +1,10 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
-using Content.Shared.Utility;
+using System;
+using Content.Shared.ActionBlocker;
+using Content.Shared.Interaction;
+using Content.Shared.Interaction.Helpers;
+using Content.Shared.Inventory;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
@@ -10,9 +12,8 @@ using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using System;
 
-namespace Content.Shared.GameObjects.Components.Storage
+namespace Content.Shared.Item
 {
     /// <summary>
     ///    Players can pick up, drop, and put items in bags, and they can be seen in player's hands.
diff --git a/Content.Shared/Kitchen/SharedKitchenSpikeComponent.cs b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs
similarity index 74%
rename from Content.Shared/Kitchen/SharedKitchenSpikeComponent.cs
rename to Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs
index 9a92adeb1f..020d4b23a5 100644
--- a/Content.Shared/Kitchen/SharedKitchenSpikeComponent.cs
+++ b/Content.Shared/Kitchen/Components/SharedKitchenSpikeComponent.cs
@@ -1,14 +1,11 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Nutrition;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
+using Content.Shared.Nutrition.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Kitchen
+namespace Content.Shared.Kitchen.Components
 {
     public abstract class SharedKitchenSpikeComponent : Component, IDragDropOn
     {
diff --git a/Content.Shared/Kitchen/SharedMicrowaveComponent.cs b/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs
similarity index 96%
rename from Content.Shared/Kitchen/SharedMicrowaveComponent.cs
rename to Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs
index 0388bad9d4..a378b15323 100644
--- a/Content.Shared/Kitchen/SharedMicrowaveComponent.cs
+++ b/Content.Shared/Kitchen/Components/SharedMicrowaveComponent.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Kitchen
+namespace Content.Shared.Kitchen.Components
 {
 
     public class SharedMicrowaveComponent : Component
diff --git a/Content.Shared/Kitchen/SharedReagentGrinderComponent.cs b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
similarity index 97%
rename from Content.Shared/Kitchen/SharedReagentGrinderComponent.cs
rename to Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
index 0cc595f767..be769407c4 100644
--- a/Content.Shared/Kitchen/SharedReagentGrinderComponent.cs
+++ b/Content.Shared/Kitchen/Components/SharedReagentGrinderComponent.cs
@@ -1,11 +1,11 @@
 #nullable enable
 using System;
-using Content.Shared.Chemistry;
-using Content.Shared.GameObjects;
+using Content.Shared.Chemistry.Solution;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Kitchen
+namespace Content.Shared.Kitchen.Components
 {
     public abstract class SharedReagentGrinderComponent : Component
     {
diff --git a/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
similarity index 89%
rename from Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs
rename to Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
index e0ac5483e4..06b78ca577 100644
--- a/Content.Shared/Prototypes/Kitchen/MicrowaveMealRecipePrototype.cs
+++ b/Content.Shared/Kitchen/MicrowaveMealRecipePrototype.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System.Collections.Generic;
-using Robust.Shared.Localization;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Prototypes.Kitchen
+namespace Content.Shared.Kitchen
 {
     /// <summary>
     ///    A recipe for space microwaves.
@@ -32,7 +31,7 @@ namespace Content.Shared.Prototypes.Kitchen
         [DataField("time")]
         public int CookTime { get; } = 5;
 
-        public string Name => Loc.GetString(_name);
+        public string Name => Robust.Shared.Localization.Loc.GetString(_name);
 
         public IReadOnlyDictionary<string, int> IngredientsReagents => _ingsReagents;
         public IReadOnlyDictionary<string, int> IngredientsSolids => _ingsSolids;
diff --git a/Content.Shared/Kitchen/RecipeManager.cs b/Content.Shared/Kitchen/RecipeManager.cs
index babd320669..bb5461def6 100644
--- a/Content.Shared/Kitchen/RecipeManager.cs
+++ b/Content.Shared/Kitchen/RecipeManager.cs
@@ -1,6 +1,5 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.Prototypes.Kitchen;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
diff --git a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs b/Content.Shared/Lathe/LatheVisualState.cs
similarity index 75%
rename from Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
rename to Content.Shared/Lathe/LatheVisualState.cs
index c3408d212a..1f2c7a5834 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedLatheComponent.cs
+++ b/Content.Shared/Lathe/LatheVisualState.cs
@@ -1,8 +1,7 @@
-#nullable enable
-using System;
+using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power
+namespace Content.Shared.Lathe
 {
     [Serializable, NetSerializable]
     public enum LatheVisualState
diff --git a/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs b/Content.Shared/Lathe/SharedLatheComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs
rename to Content.Shared/Lathe/SharedLatheComponent.cs
index 254d2702a1..1979048842 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedLatheComponent.cs
+++ b/Content.Shared/Lathe/SharedLatheComponent.cs
@@ -1,13 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Research;
+using Content.Shared.NetIDs;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Research
+namespace Content.Shared.Lathe
 {
     public class SharedLatheComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs
rename to Content.Shared/Lathe/SharedLatheDatabaseComponent.cs
index eb15371cae..d107c51bf3 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedLatheDatabaseComponent.cs
+++ b/Content.Shared/Lathe/SharedLatheDatabaseComponent.cs
@@ -2,14 +2,15 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Content.Shared.Research;
+using Content.Shared.NetIDs;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Research
+namespace Content.Shared.Lathe
 {
     public class SharedLatheDatabaseComponent : Component, IEnumerable<LatheRecipePrototype>, ISerializationHooks
     {
diff --git a/Content.Shared/GameObjects/Components/Research/SharedMaterialStorageComponent.cs b/Content.Shared/Lathe/SharedMaterialStorageComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Research/SharedMaterialStorageComponent.cs
rename to Content.Shared/Lathe/SharedMaterialStorageComponent.cs
index cd984485a0..fd74793f1d 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedMaterialStorageComponent.cs
+++ b/Content.Shared/Lathe/SharedMaterialStorageComponent.cs
@@ -3,11 +3,12 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using Content.Shared.Materials;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Research
+namespace Content.Shared.Lathe
 {
     public class SharedMaterialStorageComponent : Component, IEnumerable<KeyValuePair<string, int>>
     {
diff --git a/Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs
rename to Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs
index 80abf5c2fe..f6dc665d27 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedProtolatheDatabaseComponent.cs
+++ b/Content.Shared/Lathe/SharedProtolatheDatabaseComponent.cs
@@ -1,14 +1,15 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.Research;
+using Content.Shared.NetIDs;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Research
+namespace Content.Shared.Lathe
 {
     [ComponentReference(typeof(SharedLatheDatabaseComponent))]
     public class SharedProtolatheDatabaseComponent : SharedLatheDatabaseComponent, ISerializationHooks
diff --git a/Content.Shared/GameObjects/Components/SharedExpendableLightComponent.cs b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/SharedExpendableLightComponent.cs
rename to Content.Shared/Light/Component/SharedExpendableLightComponent.cs
index dd558ed0cf..618b0edfc1 100644
--- a/Content.Shared/GameObjects/Components/SharedExpendableLightComponent.cs
+++ b/Content.Shared/Light/Component/SharedExpendableLightComponent.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Light.Component
 {
     [Serializable, NetSerializable]
     public enum ExpendableLightVisuals
@@ -22,7 +21,7 @@ namespace Content.Shared.GameObjects.Components
         Dead
     }
 
-    public abstract class SharedExpendableLightComponent: Component
+    public abstract class SharedExpendableLightComponent: Robust.Shared.GameObjects.Component
     {
         public sealed override string Name => "ExpendableLight";
 
diff --git a/Content.Shared/GameObjects/Components/SharedHandheldLightComponent.cs b/Content.Shared/Light/Component/SharedHandheldLightComponent.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/SharedHandheldLightComponent.cs
rename to Content.Shared/Light/Component/SharedHandheldLightComponent.cs
index 00074a837f..b8e1393557 100644
--- a/Content.Shared/GameObjects/Components/SharedHandheldLightComponent.cs
+++ b/Content.Shared/Light/Component/SharedHandheldLightComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Light.Component
 {
-    public abstract class SharedHandheldLightComponent : Component
+    public abstract class SharedHandheldLightComponent : Robust.Shared.GameObjects.Component
     {
         public sealed override string Name => "HandheldLight";
         public sealed override uint? NetID => ContentNetIDs.HANDHELD_LIGHT;
diff --git a/Content.Shared/GameObjects/Components/SharedLightBehaviourComponent.cs b/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs
similarity index 61%
rename from Content.Shared/GameObjects/Components/SharedLightBehaviourComponent.cs
rename to Content.Shared/Light/Component/SharedLightBehaviourComponent.cs
index 92fd719cc1..789279bc3e 100644
--- a/Content.Shared/GameObjects/Components/SharedLightBehaviourComponent.cs
+++ b/Content.Shared/Light/Component/SharedLightBehaviourComponent.cs
@@ -1,12 +1,10 @@
 #nullable enable
-using Robust.Shared.GameObjects;
-
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Light.Component
 {
     /// <summary>
     /// A component which applies a specific behaviour to a PointLightComponent on its owner.
     /// </summary>
-    public class SharedLightBehaviourComponent : Component
+    public class SharedLightBehaviourComponent : Robust.Shared.GameObjects.Component
     {
         public override string Name => "LightBehaviour";
     }
diff --git a/Content.Shared/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/SharedPoweredLightVisuals.cs b/Content.Shared/Light/SharedPoweredLightVisuals.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/SharedPoweredLightVisuals.cs
rename to Content.Shared/Light/SharedPoweredLightVisuals.cs
index 6fdd3a5b3d..1f9aa3ba6a 100644
--- a/Content.Shared/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/SharedPoweredLightVisuals.cs
+++ b/Content.Shared/Light/SharedPoweredLightVisuals.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Robust.Shared.Serialization;
 using System;
+using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power.ApcNetComponents.PowerReceiverUsers
+namespace Content.Shared.Light
 {
     [Serializable, NetSerializable]
     public enum PoweredLightVisuals : byte
diff --git a/Content.Shared/Localization.cs b/Content.Shared/Localizations/Localization.cs
similarity index 89%
rename from Content.Shared/Localization.cs
rename to Content.Shared/Localizations/Localization.cs
index 72dcf9cd15..221fca6ac1 100644
--- a/Content.Shared/Localization.cs
+++ b/Content.Shared/Localizations/Localization.cs
@@ -4,7 +4,7 @@ using Robust.Shared.ContentPack;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Shared
+namespace Content.Shared.Localizations
 {
     public static class Localization
     {
@@ -47,7 +47,7 @@ namespace Content.Shared
                 places += 1;
             }
 
-            return new LocValueString(Loc.GetString("zzzz-fmt-pressure", ("divided", pressure), ("places", places)));
+            return new LocValueString(Robust.Shared.Localization.Loc.GetString("zzzz-fmt-pressure", ("divided", pressure), ("places", places)));
         }
     }
 }
diff --git a/Content.Shared/GameObjects/Components/MachineLinking/SignalSwitchVisuals.cs b/Content.Shared/MachineLinking/SignalSwitchVisuals.cs
similarity index 70%
rename from Content.Shared/GameObjects/Components/MachineLinking/SignalSwitchVisuals.cs
rename to Content.Shared/MachineLinking/SignalSwitchVisuals.cs
index 3e975f52d8..7d1dbac983 100644
--- a/Content.Shared/GameObjects/Components/MachineLinking/SignalSwitchVisuals.cs
+++ b/Content.Shared/MachineLinking/SignalSwitchVisuals.cs
@@ -1,7 +1,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.MachineLinking
+namespace Content.Shared.MachineLinking
 {
     [Serializable, NetSerializable]
     public enum SignalSwitchVisuals
diff --git a/Content.Shared/GameObjects/Components/MachineLinking/TwoWayLeverSignal.cs b/Content.Shared/MachineLinking/TwoWayLeverSignal.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/MachineLinking/TwoWayLeverSignal.cs
rename to Content.Shared/MachineLinking/TwoWayLeverSignal.cs
index fb054e281a..ed6394acb7 100644
--- a/Content.Shared/GameObjects/Components/MachineLinking/TwoWayLeverSignal.cs
+++ b/Content.Shared/MachineLinking/TwoWayLeverSignal.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.MachineLinking
+namespace Content.Shared.MachineLinking
 {
     [Serializable, NetSerializable]
     public enum TwoWayLeverVisuals : byte
diff --git a/Content.Shared/Maps/TurfHelpers.cs b/Content.Shared/Maps/TurfHelpers.cs
index d736eb9f86..91350454de 100644
--- a/Content.Shared/Maps/TurfHelpers.cs
+++ b/Content.Shared/Maps/TurfHelpers.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Physics;
-using Content.Shared.Utility;
+using Content.Shared.Random.Helpers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
diff --git a/Content.Shared/GameObjects/Components/Markers/SharedSpawnPointComponent.cs b/Content.Shared/Markers/SharedSpawnPointComponent.cs
similarity index 76%
rename from Content.Shared/GameObjects/Components/Markers/SharedSpawnPointComponent.cs
rename to Content.Shared/Markers/SharedSpawnPointComponent.cs
index 4227667f7c..7bac08dbf1 100644
--- a/Content.Shared/GameObjects/Components/Markers/SharedSpawnPointComponent.cs
+++ b/Content.Shared/Markers/SharedSpawnPointComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Markers
+namespace Content.Shared.Markers
 {
     public class SharedSpawnPointComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Medical/SharedMedicalScannerComponent.cs b/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Medical/SharedMedicalScannerComponent.cs
rename to Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs
index b507a205f7..77d05f7a62 100644
--- a/Content.Shared/GameObjects/Components/Medical/SharedMedicalScannerComponent.cs
+++ b/Content.Shared/MedicalScanner/SharedMedicalScannerComponent.cs
@@ -1,13 +1,13 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.Body.Components;
 using Content.Shared.Damage;
-using Content.Shared.GameObjects.Components.Body;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Medical
+namespace Content.Shared.MedicalScanner
 {
     public abstract class SharedMedicalScannerComponent : Component, IDragDropOn
     {
diff --git a/Content.Shared/GameObjects/Components/Mining/AsteroidRockVisuals.cs b/Content.Shared/Mining/AsteroidRockVisuals.cs
similarity index 73%
rename from Content.Shared/GameObjects/Components/Mining/AsteroidRockVisuals.cs
rename to Content.Shared/Mining/AsteroidRockVisuals.cs
index 1c0dff20a3..d5dc741911 100644
--- a/Content.Shared/GameObjects/Components/Mining/AsteroidRockVisuals.cs
+++ b/Content.Shared/Mining/AsteroidRockVisuals.cs
@@ -1,7 +1,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Mining
+namespace Content.Shared.Mining
 {
     [Serializable, NetSerializable]
     public enum AsteroidRockVisuals
diff --git a/Content.Shared/GameObjects/Components/Mobs/DamageStateHelpers.cs b/Content.Shared/MobState/DamageStateHelpers.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Mobs/DamageStateHelpers.cs
rename to Content.Shared/MobState/DamageStateHelpers.cs
index ca0bfb3cd4..d5bb97be1c 100644
--- a/Content.Shared/GameObjects/Components/Mobs/DamageStateHelpers.cs
+++ b/Content.Shared/MobState/DamageStateHelpers.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.MobState
 {
     public static class DamageStateHelpers
     {
diff --git a/Content.Shared/GameObjects/Components/Mobs/DamageStateVisuals.cs b/Content.Shared/MobState/DamageStateVisuals.cs
similarity index 92%
rename from Content.Shared/GameObjects/Components/Mobs/DamageStateVisuals.cs
rename to Content.Shared/MobState/DamageStateVisuals.cs
index fcd96dc466..30c8de65da 100644
--- a/Content.Shared/GameObjects/Components/Mobs/DamageStateVisuals.cs
+++ b/Content.Shared/MobState/DamageStateVisuals.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.MobState
 {
     [Serializable, NetSerializable]
     public enum DamageStateVisuals
diff --git a/Content.Shared/GameObjects/Components/Mobs/State/IMobStateComponent.cs b/Content.Shared/MobState/IMobStateComponent.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Mobs/State/IMobStateComponent.cs
rename to Content.Shared/MobState/IMobStateComponent.cs
index 1077b6d39e..ab29c8ac1e 100644
--- a/Content.Shared/GameObjects/Components/Mobs/State/IMobStateComponent.cs
+++ b/Content.Shared/MobState/IMobStateComponent.cs
@@ -1,8 +1,9 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
+using Content.Shared.MobState.State;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Mobs.State
+namespace Content.Shared.MobState
 {
     public interface IMobStateComponent : IComponent
     {
diff --git a/Content.Shared/GameObjects/Components/Mobs/State/MobStateChangedMessage.cs b/Content.Shared/MobState/MobStateChangedMessage.cs
similarity index 89%
rename from Content.Shared/GameObjects/Components/Mobs/State/MobStateChangedMessage.cs
rename to Content.Shared/MobState/MobStateChangedMessage.cs
index 2a7afe6f88..39513a3751 100644
--- a/Content.Shared/GameObjects/Components/Mobs/State/MobStateChangedMessage.cs
+++ b/Content.Shared/MobState/MobStateChangedMessage.cs
@@ -1,7 +1,8 @@
 #nullable enable
+using Content.Shared.MobState.State;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Mobs.State
+namespace Content.Shared.MobState
 {
     public class MobStateChangedMessage : ComponentMessage
     {
diff --git a/Content.Shared/GameObjects/Components/Mobs/State/BaseMobState.cs b/Content.Shared/MobState/State/BaseMobState.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Mobs/State/BaseMobState.cs
rename to Content.Shared/MobState/State/BaseMobState.cs
index c6b9889ea3..a159c2d347 100644
--- a/Content.Shared/GameObjects/Components/Mobs/State/BaseMobState.cs
+++ b/Content.Shared/MobState/State/BaseMobState.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Mobs.State
+namespace Content.Shared.MobState.State
 {
     [ImplicitDataDefinitionForInheritors]
     public abstract class BaseMobState : IMobState
diff --git a/Content.Shared/GameObjects/Components/Mobs/State/IMobState.cs b/Content.Shared/MobState/State/IMobState.cs
similarity index 90%
rename from Content.Shared/GameObjects/Components/Mobs/State/IMobState.cs
rename to Content.Shared/MobState/State/IMobState.cs
index 45390c3d8f..b2d3c636d4 100644
--- a/Content.Shared/GameObjects/Components/Mobs/State/IMobState.cs
+++ b/Content.Shared/MobState/State/IMobState.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Mobs.State
+namespace Content.Shared.MobState.State
 {
     /// <summary>
     ///     Defines the blocking effects of an associated <see cref="DamageState"/>
diff --git a/Content.Shared/GameObjects/Components/Mobs/State/SharedCriticalMobState.cs b/Content.Shared/MobState/State/SharedCriticalMobState.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Mobs/State/SharedCriticalMobState.cs
rename to Content.Shared/MobState/State/SharedCriticalMobState.cs
index 595c2dff67..663cb2e4ab 100644
--- a/Content.Shared/GameObjects/Components/Mobs/State/SharedCriticalMobState.cs
+++ b/Content.Shared/MobState/State/SharedCriticalMobState.cs
@@ -1,9 +1,9 @@
 #nullable enable
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Standing;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Mobs.State
+namespace Content.Shared.MobState.State
 {
     /// <summary>
     ///     A state in which an entity is disabled from acting due to sufficient damage (considered unconscious).
diff --git a/Content.Shared/GameObjects/Components/Mobs/State/SharedDeadMobState.cs b/Content.Shared/MobState/State/SharedDeadMobState.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Mobs/State/SharedDeadMobState.cs
rename to Content.Shared/MobState/State/SharedDeadMobState.cs
index 0201e4c124..81534db826 100644
--- a/Content.Shared/GameObjects/Components/Mobs/State/SharedDeadMobState.cs
+++ b/Content.Shared/MobState/State/SharedDeadMobState.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Mobs.State
+namespace Content.Shared.MobState.State
 {
     public abstract class SharedDeadMobState : BaseMobState
     {
diff --git a/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs b/Content.Shared/MobState/State/SharedMobStateComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs
rename to Content.Shared/MobState/State/SharedMobStateComponent.cs
index 790d481467..3066bf5b73 100644
--- a/Content.Shared/GameObjects/Components/Mobs/State/SharedMobStateComponent.cs
+++ b/Content.Shared/MobState/State/SharedMobStateComponent.cs
@@ -3,16 +3,18 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Damage;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.Damage;
+using Content.Shared.Damage.Components;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Mobs.State
+namespace Content.Shared.MobState.State
 {
     /// <summary>
     ///     When attached to an <see cref="IDamageableComponent"/>,
diff --git a/Content.Shared/GameObjects/Components/Mobs/State/SharedNormalMobState.cs b/Content.Shared/MobState/State/SharedNormalMobState.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Mobs/State/SharedNormalMobState.cs
rename to Content.Shared/MobState/State/SharedNormalMobState.cs
index d8fb838250..eb5b069c8f 100644
--- a/Content.Shared/GameObjects/Components/Mobs/State/SharedNormalMobState.cs
+++ b/Content.Shared/MobState/State/SharedNormalMobState.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace Content.Shared.GameObjects.Components.Mobs.State
+namespace Content.Shared.MobState.State
 {
     /// <summary>
     ///     The standard state an entity is in; no negative effects.
diff --git a/Content.Shared/Interfaces/IModuleManager.cs b/Content.Shared/Module/IModuleManager.cs
similarity index 95%
rename from Content.Shared/Interfaces/IModuleManager.cs
rename to Content.Shared/Module/IModuleManager.cs
index a0724e9d07..57833b008a 100644
--- a/Content.Shared/Interfaces/IModuleManager.cs
+++ b/Content.Shared/Module/IModuleManager.cs
@@ -1,5 +1,5 @@
 #nullable enable
-namespace Content.Shared.Interfaces
+namespace Content.Shared.Module
 {
     /// <summary>
     /// Provides a simple way to check whether calling code is being run by
diff --git a/Content.Shared/GameObjects/Components/Storage/SharedMorgue.cs b/Content.Shared/Morgue/SharedMorgue.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/Storage/SharedMorgue.cs
rename to Content.Shared/Morgue/SharedMorgue.cs
index 23bf44f188..bc66ad1c01 100644
--- a/Content.Shared/GameObjects/Components/Storage/SharedMorgue.cs
+++ b/Content.Shared/Morgue/SharedMorgue.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Morgue
+namespace Content.Shared.Morgue
 {
     [Serializable, NetSerializable]
     public enum MorgueVisuals
diff --git a/Content.Shared/GameObjects/Components/Movement/IMobMoverComponent.cs b/Content.Shared/Movement/Components/IMobMoverComponent.cs
similarity index 89%
rename from Content.Shared/GameObjects/Components/Movement/IMobMoverComponent.cs
rename to Content.Shared/Movement/Components/IMobMoverComponent.cs
index 9220ac72a2..e2bd7a1414 100644
--- a/Content.Shared/GameObjects/Components/Movement/IMobMoverComponent.cs
+++ b/Content.Shared/Movement/Components/IMobMoverComponent.cs
@@ -1,8 +1,7 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     public interface IMobMoverComponent : IComponent
     {
diff --git a/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs b/Content.Shared/Movement/Components/IMoverComponent.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs
rename to Content.Shared/Movement/Components/IMoverComponent.cs
index c0ecc99c9b..184afa9a26 100644
--- a/Content.Shared/GameObjects/Components/Movement/IMoverComponent.cs
+++ b/Content.Shared/Movement/Components/IMoverComponent.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     // Does nothing except ensure uniqueness between mover components.
     // There can only be one.
diff --git a/Content.Shared/GameObjects/Components/Movement/IRelayMoveInput.cs b/Content.Shared/Movement/Components/IRelayMoveInput.cs
similarity index 73%
rename from Content.Shared/GameObjects/Components/Movement/IRelayMoveInput.cs
rename to Content.Shared/Movement/Components/IRelayMoveInput.cs
index 586b4b3641..86f8e9f0ab 100644
--- a/Content.Shared/GameObjects/Components/Movement/IRelayMoveInput.cs
+++ b/Content.Shared/Movement/Components/IRelayMoveInput.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.Players;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     public interface IRelayMoveInput
     {
diff --git a/Content.Shared/GameObjects/Components/Movement/MovementIgnoreGravityComponent.cs b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Movement/MovementIgnoreGravityComponent.cs
rename to Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
index 8b38832dc7..b444e43543 100644
--- a/Content.Shared/GameObjects/Components/Movement/MovementIgnoreGravityComponent.cs
+++ b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     [RegisterComponent]
     public sealed class MovementIgnoreGravityComponent : Component
diff --git a/Content.Shared/GameObjects/Components/Movement/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Movement/MovementSpeedModifierComponent.cs
rename to Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
index f5c3a6d312..2300b1d2a5 100644
--- a/Content.Shared/GameObjects/Components/Movement/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -1,12 +1,10 @@
 #nullable enable
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     [RegisterComponent]
     public class MovementSpeedModifierComponent : Component
diff --git a/Content.Shared/GameObjects/Components/Movement/SharedDummyInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs
similarity index 90%
rename from Content.Shared/GameObjects/Components/Movement/SharedDummyInputMoverComponent.cs
rename to Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs
index 45f377b322..2e9412f898 100644
--- a/Content.Shared/GameObjects/Components/Movement/SharedDummyInputMoverComponent.cs
+++ b/Content.Shared/Movement/Components/SharedDummyInputMoverComponent.cs
@@ -1,9 +1,8 @@
 #nullable enable
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IMoverComponent))]
diff --git a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs
rename to Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs
index 963a79ff57..c3c4d66c5d 100644
--- a/Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs
+++ b/Content.Shared/Movement/Components/SharedPlayerInputMoverComponent.cs
@@ -1,18 +1,16 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.NetIDs;
 using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     [RegisterComponent]
     [ComponentReference(typeof(IMoverComponent))]
diff --git a/Content.Shared/GameObjects/Components/Movement/SharedPlayerMobMoverComponent.cs b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Movement/SharedPlayerMobMoverComponent.cs
rename to Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs
index adc244d5f5..4188b70580 100644
--- a/Content.Shared/GameObjects/Components/Movement/SharedPlayerMobMoverComponent.cs
+++ b/Content.Shared/Movement/Components/SharedPlayerMobMoverComponent.cs
@@ -1,17 +1,15 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Body;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     /// <summary>
     ///     The basic player mover with footsteps and grabbing
diff --git a/Content.Shared/GameObjects/Components/Movement/TileFrictionModifier.cs b/Content.Shared/Movement/Components/TileFrictionModifier.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Movement/TileFrictionModifier.cs
rename to Content.Shared/Movement/Components/TileFrictionModifier.cs
index 45cc3a9a8c..ad6affe8ac 100644
--- a/Content.Shared/GameObjects/Components/Movement/TileFrictionModifier.cs
+++ b/Content.Shared/Movement/Components/TileFrictionModifier.cs
@@ -1,5 +1,6 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Players;
@@ -7,7 +8,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Movement.Components
 {
     [RegisterComponent]
     public class SharedTileFrictionModifier : Component
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedMobMoverSystem.cs b/Content.Shared/Movement/SharedMobMoverSystem.cs
similarity index 92%
rename from Content.Shared/GameObjects/EntitySystems/SharedMobMoverSystem.cs
rename to Content.Shared/Movement/SharedMobMoverSystem.cs
index e0b2363a8a..11293b3005 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedMobMoverSystem.cs
+++ b/Content.Shared/Movement/SharedMobMoverSystem.cs
@@ -1,12 +1,12 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Movement.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Collision;
 using Robust.Shared.Physics.Dynamics;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Movement
 {
     public sealed class SharedMobMoverSystem : EntitySystem
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs b/Content.Shared/Movement/SharedMoverSystem.cs
similarity index 91%
rename from Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
rename to Content.Shared/Movement/SharedMoverSystem.cs
index 3ea051c940..1ecf252ea1 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedMoverSystem.cs
+++ b/Content.Shared/Movement/SharedMoverSystem.cs
@@ -1,21 +1,15 @@
 #nullable enable
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Storage;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Physics;
-using Content.Shared.Physics.Pull;
+using Content.Shared.MobState;
+using Content.Shared.Movement.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
-using Robust.Shared.IoC;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Players;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Movement
 {
     /// <summary>
     ///     Handles converting inputs into movement.
diff --git a/Content.Shared/GameObjects/ContentNetIDs.cs b/Content.Shared/NetIDs/ContentNetIDs.cs
similarity index 99%
rename from Content.Shared/GameObjects/ContentNetIDs.cs
rename to Content.Shared/NetIDs/ContentNetIDs.cs
index 6b4168f17a..658c6252de 100644
--- a/Content.Shared/GameObjects/ContentNetIDs.cs
+++ b/Content.Shared/NetIDs/ContentNetIDs.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace Content.Shared.GameObjects
+namespace Content.Shared.NetIDs
 {
     // Starting from 1000 to avoid crossover with engine.
     public static class ContentNetIDs
diff --git a/Content.Shared/Interfaces/ISharedNotifyManager.cs b/Content.Shared/Notification/ISharedNotifyManager.cs
similarity index 99%
rename from Content.Shared/Interfaces/ISharedNotifyManager.cs
rename to Content.Shared/Notification/ISharedNotifyManager.cs
index 91537098bd..330df93ed8 100644
--- a/Content.Shared/Interfaces/ISharedNotifyManager.cs
+++ b/Content.Shared/Notification/ISharedNotifyManager.cs
@@ -2,7 +2,7 @@
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Interfaces
+namespace Content.Shared.Notification
 {
     /// <summary>
     /// Allows the ability to create floating text messages at locations in the world.
diff --git a/Content.Shared/GameObjects/Components/Nutrition/SharedButcherableComponent.cs b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs
similarity index 79%
rename from Content.Shared/GameObjects/Components/Nutrition/SharedButcherableComponent.cs
rename to Content.Shared/Nutrition/Components/SharedButcherableComponent.cs
index 3578678675..d9b2a0ec50 100644
--- a/Content.Shared/GameObjects/Components/Nutrition/SharedButcherableComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedButcherableComponent.cs
@@ -1,12 +1,10 @@
 #nullable enable
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Nutrition
+namespace Content.Shared.Nutrition.Components
 {
     /// <summary>
     /// Indicates that the entity can be thrown on a kitchen spike for butchering.
diff --git a/Content.Shared/GameObjects/Components/Nutrition/SharedCreamPiedComponent.cs b/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/Nutrition/SharedCreamPiedComponent.cs
rename to Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs
index ae69dcf4c0..38ad6fb9d2 100644
--- a/Content.Shared/GameObjects/Components/Nutrition/SharedCreamPiedComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedCreamPiedComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Nutrition
+namespace Content.Shared.Nutrition.Components
 {
     public class SharedCreamPiedComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Nutrition/SharedDrinkFoodContainerComponent.cs b/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs
similarity index 91%
rename from Content.Shared/GameObjects/Components/Nutrition/SharedDrinkFoodContainerComponent.cs
rename to Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs
index 5b57dbea79..3a15366656 100644
--- a/Content.Shared/GameObjects/Components/Nutrition/SharedDrinkFoodContainerComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedDrinkFoodContainerComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Nutrition
+namespace Content.Shared.Nutrition.Components
 {
     public abstract class SharedFoodContainerComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Nutrition/SharedFoodComponent.cs b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/Nutrition/SharedFoodComponent.cs
rename to Content.Shared/Nutrition/Components/SharedFoodComponent.cs
index 10d1394f07..3f61d1f47d 100644
--- a/Content.Shared/GameObjects/Components/Nutrition/SharedFoodComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedFoodComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Nutrition
+namespace Content.Shared.Nutrition.Components
 {
     public class SharedFoodComponent
     {
diff --git a/Content.Shared/GameObjects/Components/Nutrition/SharedHungerComponent.cs b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Nutrition/SharedHungerComponent.cs
rename to Content.Shared/Nutrition/Components/SharedHungerComponent.cs
index 136dda302c..9fddc5aae2 100644
--- a/Content.Shared/GameObjects/Components/Nutrition/SharedHungerComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedHungerComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Movement.Components;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Nutrition
+namespace Content.Shared.Nutrition.Components
 {
     public abstract class SharedHungerComponent : Component, IMoveSpeedModifier
     {
diff --git a/Content.Shared/GameObjects/Components/Nutrition/SharedThirstComponent.cs b/Content.Shared/Nutrition/Components/SharedThirstComponent.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Nutrition/SharedThirstComponent.cs
rename to Content.Shared/Nutrition/Components/SharedThirstComponent.cs
index 40b84da219..e3eb0b6382 100644
--- a/Content.Shared/GameObjects/Components/Nutrition/SharedThirstComponent.cs
+++ b/Content.Shared/Nutrition/Components/SharedThirstComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Components.Movement;
+using Content.Shared.Movement.Components;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Nutrition
+namespace Content.Shared.Nutrition.Components
 {
     public abstract class SharedThirstComponent : Component, IMoveSpeedModifier
     {
diff --git a/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs b/Content.Shared/PDA/SharedPDAComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs
rename to Content.Shared/PDA/SharedPDAComponent.cs
index 8020fe2ece..a9ceb07df1 100644
--- a/Content.Shared/GameObjects/Components/PDA/SharedPDAComponent.cs
+++ b/Content.Shared/PDA/SharedPDAComponent.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.PDA
+namespace Content.Shared.PDA
 {
     public class SharedPDAComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/PDA/UplinkCategory.cs b/Content.Shared/PDA/UplinkCategory.cs
similarity index 80%
rename from Content.Shared/GameObjects/Components/PDA/UplinkCategory.cs
rename to Content.Shared/PDA/UplinkCategory.cs
index 0eb7ed1372..a094652188 100644
--- a/Content.Shared/GameObjects/Components/PDA/UplinkCategory.cs
+++ b/Content.Shared/PDA/UplinkCategory.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace Content.Shared.GameObjects.Components.PDA
+namespace Content.Shared.PDA
 {
     public enum UplinkCategory
     {
diff --git a/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs b/Content.Shared/PDA/UplinkStoreListingPrototype.cs
similarity index 90%
rename from Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs
rename to Content.Shared/PDA/UplinkStoreListingPrototype.cs
index 6f617cda4b..e79ba8f0d6 100644
--- a/Content.Shared/Prototypes/PDA/UplinkStoreListingPrototype.cs
+++ b/Content.Shared/PDA/UplinkStoreListingPrototype.cs
@@ -1,10 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.PDA;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Prototypes.PDA
+namespace Content.Shared.PDA
 {
     [Prototype("uplinkListing")]
     public class UplinkStoreListingPrototype : IPrototype
diff --git a/Content.Shared/GameObjects/Components/SharedPaperComponent.cs b/Content.Shared/Paper/SharedPaperComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/SharedPaperComponent.cs
rename to Content.Shared/Paper/SharedPaperComponent.cs
index 91a90754c1..8444845815 100644
--- a/Content.Shared/GameObjects/Components/SharedPaperComponent.cs
+++ b/Content.Shared/Paper/SharedPaperComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Paper
 {
     public class SharedPaperComponent : Component
     {
diff --git a/Content.Shared/Physics/Controllers/SharedMoverController.cs b/Content.Shared/Physics/Controllers/SharedMoverController.cs
index 32a346555e..179c1c8351 100644
--- a/Content.Shared/Physics/Controllers/SharedMoverController.cs
+++ b/Content.Shared/Physics/Controllers/SharedMoverController.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.Components.Pulling;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
+using Content.Shared.MobState;
+using Content.Shared.Movement.Components;
+using Content.Shared.Pulling.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
diff --git a/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs b/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs
index ec53ab45f4..46adc9f773 100644
--- a/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs
+++ b/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs
@@ -1,7 +1,5 @@
 using System;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.Movement.Components;
 using JetBrains.Annotations;
 using Robust.Shared;
 using Robust.Shared.Configuration;
diff --git a/Content.Shared/GameObjects/Components/SharedPlaceableSurfaceComponent.cs b/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs
similarity index 94%
rename from Content.Shared/GameObjects/Components/SharedPlaceableSurfaceComponent.cs
rename to Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs
index 9bffabf4a7..58e7d68629 100644
--- a/Content.Shared/GameObjects/Components/SharedPlaceableSurfaceComponent.cs
+++ b/Content.Shared/Placeable/SharedPlaceableSurfaceComponent.cs
@@ -1,10 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Placeable
 {
     public abstract class SharedPlaceableSurfaceComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs
similarity index 77%
rename from Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs
rename to Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs
index f514209e24..a1b2810809 100644
--- a/Content.Shared/GameObjects/Components/Pointing/SharedPointingArrowComponent.cs
+++ b/Content.Shared/Pointing/Components/SharedPointingArrowComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Pointing
+namespace Content.Shared.Pointing.Components
 {
     public class SharedPointingArrowComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Pointing/SharedRoguePointingArrowComponent.cs b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/Pointing/SharedRoguePointingArrowComponent.cs
rename to Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
index 8bdb0bbfa2..856a531dcd 100644
--- a/Content.Shared/GameObjects/Components/Pointing/SharedRoguePointingArrowComponent.cs
+++ b/Content.Shared/Pointing/Components/SharedRoguePointingArrowComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Pointing
+namespace Content.Shared.Pointing.Components
 {
     public class SharedRoguePointingArrowComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Portal/SharedPortalComponent.cs b/Content.Shared/Portal/Components/SharedPortalComponent.cs
similarity index 92%
rename from Content.Shared/GameObjects/Components/Portal/SharedPortalComponent.cs
rename to Content.Shared/Portal/Components/SharedPortalComponent.cs
index bd6ae67bd6..88f167f735 100644
--- a/Content.Shared/GameObjects/Components/Portal/SharedPortalComponent.cs
+++ b/Content.Shared/Portal/Components/SharedPortalComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Portal
+namespace Content.Shared.Portal.Components
 {
     public abstract class SharedPortalComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Portal/SharedTeleporterComponent.cs b/Content.Shared/Portal/Components/SharedTeleporterComponent.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Portal/SharedTeleporterComponent.cs
rename to Content.Shared/Portal/Components/SharedTeleporterComponent.cs
index fc64aa3178..ba9f079bf8 100644
--- a/Content.Shared/GameObjects/Components/Portal/SharedTeleporterComponent.cs
+++ b/Content.Shared/Portal/Components/SharedTeleporterComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Portal
+namespace Content.Shared.Portal.Components
 {
     public enum ItemTeleporterState
     {
diff --git a/Content.Shared/GameObjects/Components/Power/SharedPower.cs b/Content.Shared/Power/SharedPower.cs
similarity index 79%
rename from Content.Shared/GameObjects/Components/Power/SharedPower.cs
rename to Content.Shared/Power/SharedPower.cs
index 36387595b4..82b89d3b75 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedPower.cs
+++ b/Content.Shared/Power/SharedPower.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power
+namespace Content.Shared.Power
 {
     [Serializable, NetSerializable]
     public enum ChargeState
diff --git a/Content.Shared/GameObjects/Components/Power/SharedPowerDevice.cs b/Content.Shared/Power/SharedPowerDevice.cs
similarity index 77%
rename from Content.Shared/GameObjects/Components/Power/SharedPowerDevice.cs
rename to Content.Shared/Power/SharedPowerDevice.cs
index 485b55ec6c..d80d7e01e2 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedPowerDevice.cs
+++ b/Content.Shared/Power/SharedPowerDevice.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power
+namespace Content.Shared.Power
 {
     [Serializable, NetSerializable]
     public enum PowerDeviceVisuals
diff --git a/Content.Shared/GameObjects/Components/Power/SharedPowerItemCharger.cs b/Content.Shared/Power/SharedPowerItemCharger.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/Power/SharedPowerItemCharger.cs
rename to Content.Shared/Power/SharedPowerItemCharger.cs
index a0a52d1ebd..cd2d2ade00 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedPowerItemCharger.cs
+++ b/Content.Shared/Power/SharedPowerItemCharger.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power
+namespace Content.Shared.Power
 {
     [Serializable, NetSerializable]
     public enum CellChargerStatus
diff --git a/Content.Shared/GameObjects/Components/Power/SharedPowerCell.cs b/Content.Shared/PowerCell/SharedPowerCell.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/Power/SharedPowerCell.cs
rename to Content.Shared/PowerCell/SharedPowerCell.cs
index 9ef4e81afe..e7a6797233 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedPowerCell.cs
+++ b/Content.Shared/PowerCell/SharedPowerCell.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power
+namespace Content.Shared.PowerCell
 {
     public static class SharedPowerCell
     {
diff --git a/Content.Shared/Preferences/HumanoidCharacterProfile.cs b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
index 6f5832f349..22ca05e337 100644
--- a/Content.Shared/Preferences/HumanoidCharacterProfile.cs
+++ b/Content.Shared/Preferences/HumanoidCharacterProfile.cs
@@ -2,10 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Content.Shared.CharacterAppearance;
+using Content.Shared.Dataset;
 using Content.Shared.GameTicking;
-using Content.Shared.Prototypes;
+using Content.Shared.Random.Helpers;
 using Content.Shared.Roles;
-using Content.Shared.Utility;
 using Robust.Shared.Enums;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
diff --git a/Content.Shared/Preferences/ICharacterProfile.cs b/Content.Shared/Preferences/ICharacterProfile.cs
index 222d69af14..80e94ebf98 100644
--- a/Content.Shared/Preferences/ICharacterProfile.cs
+++ b/Content.Shared/Preferences/ICharacterProfile.cs
@@ -1,3 +1,5 @@
+using Content.Shared.CharacterAppearance;
+
 #nullable enable
 
 namespace Content.Shared.Preferences
diff --git a/Content.Shared/Network/NetMessages/MsgDeleteCharacter.cs b/Content.Shared/Preferences/MsgDeleteCharacter.cs
similarity index 94%
rename from Content.Shared/Network/NetMessages/MsgDeleteCharacter.cs
rename to Content.Shared/Preferences/MsgDeleteCharacter.cs
index d798eb6291..49247287ee 100644
--- a/Content.Shared/Network/NetMessages/MsgDeleteCharacter.cs
+++ b/Content.Shared/Preferences/MsgDeleteCharacter.cs
@@ -2,7 +2,7 @@
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Preferences
 {
     /// <summary>
     /// The client sends this to delete a character profile.
diff --git a/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs
similarity index 96%
rename from Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs
rename to Content.Shared/Preferences/MsgPreferencesAndSettings.cs
index 9238b79af3..110bde6dc0 100644
--- a/Content.Shared/Network/NetMessages/MsgPreferencesAndSettings.cs
+++ b/Content.Shared/Preferences/MsgPreferencesAndSettings.cs
@@ -1,12 +1,11 @@
 #nullable enable
 using System.IO;
-using Content.Shared.Preferences;
 using Lidgren.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Preferences
 {
     /// <summary>
     /// The server sends this before the client joins the lobby.
diff --git a/Content.Shared/Network/NetMessages/MsgSelectCharacter.cs b/Content.Shared/Preferences/MsgSelectCharacter.cs
similarity index 94%
rename from Content.Shared/Network/NetMessages/MsgSelectCharacter.cs
rename to Content.Shared/Preferences/MsgSelectCharacter.cs
index 63763c43ff..8d6ef00427 100644
--- a/Content.Shared/Network/NetMessages/MsgSelectCharacter.cs
+++ b/Content.Shared/Preferences/MsgSelectCharacter.cs
@@ -2,7 +2,7 @@
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Preferences
 {
     /// <summary>
     /// The client sends this to select a character slot.
diff --git a/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs b/Content.Shared/Preferences/MsgUpdateCharacter.cs
similarity index 95%
rename from Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs
rename to Content.Shared/Preferences/MsgUpdateCharacter.cs
index f4e2279cc1..df3b5afafc 100644
--- a/Content.Shared/Network/NetMessages/MsgUpdateCharacter.cs
+++ b/Content.Shared/Preferences/MsgUpdateCharacter.cs
@@ -1,12 +1,11 @@
 #nullable enable
 using System.IO;
-using Content.Shared.Preferences;
 using Lidgren.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Preferences
 {
     /// <summary>
     /// The client sends this to update a character profile.
diff --git a/Content.Shared/GameObjects/EntitySystems/ProjectileSystem.cs b/Content.Shared/Projectiles/ProjectileSystem.cs
similarity index 85%
rename from Content.Shared/GameObjects/EntitySystems/ProjectileSystem.cs
rename to Content.Shared/Projectiles/ProjectileSystem.cs
index d7f3fa49c7..fe2284e87f 100644
--- a/Content.Shared/GameObjects/EntitySystems/ProjectileSystem.cs
+++ b/Content.Shared/Projectiles/ProjectileSystem.cs
@@ -1,8 +1,7 @@
-using Content.Shared.GameObjects.Components.Projectiles;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Physics.Dynamics;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Projectiles
 {
     public sealed class ProjectileSystem : EntitySystem
     {
diff --git a/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs b/Content.Shared/Projectiles/SharedProjectileComponent.cs
similarity index 92%
rename from Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs
rename to Content.Shared/Projectiles/SharedProjectileComponent.cs
index a2539c6b8e..85f1167242 100644
--- a/Content.Shared/GameObjects/Components/Projectiles/SharedProjectileComponent.cs
+++ b/Content.Shared/Projectiles/SharedProjectileComponent.cs
@@ -1,10 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Physics;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Projectiles
+namespace Content.Shared.Projectiles
 {
     public abstract class SharedProjectileComponent : Component
     {
diff --git a/Content.Shared/Utility/EntityPrototypeHelpers.cs b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
similarity index 97%
rename from Content.Shared/Utility/EntityPrototypeHelpers.cs
rename to Content.Shared/Prototypes/EntityPrototypeHelpers.cs
index 4957e91633..dceb11c6e3 100644
--- a/Content.Shared/Utility/EntityPrototypeHelpers.cs
+++ b/Content.Shared/Prototypes/EntityPrototypeHelpers.cs
@@ -5,7 +5,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Prototypes
 {
     [UsedImplicitly]
     public static class EntityPrototypeHelpers
diff --git a/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs
rename to Content.Shared/Pulling/Components/SharedPullableComponent.cs
index b0cc4b0bb5..f966c16942 100644
--- a/Content.Shared/GameObjects/Components/Pulling/SharedPullableComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullableComponent.cs
@@ -1,11 +1,9 @@
 #nullable enable
 using System;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystemMessages.Pulling;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Physics;
+using Content.Shared.Movement.Components;
+using Content.Shared.NetIDs;
 using Content.Shared.Physics.Pull;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -16,7 +14,7 @@ using Robust.Shared.Physics.Dynamics.Joints;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Pulling
+namespace Content.Shared.Pulling.Components
 {
     public abstract class SharedPullableComponent : Component, IRelayMoveInput
     {
diff --git a/Content.Shared/GameObjects/Components/Pulling/SharedPullerComponent.cs b/Content.Shared/Pulling/Components/SharedPullerComponent.cs
similarity index 90%
rename from Content.Shared/GameObjects/Components/Pulling/SharedPullerComponent.cs
rename to Content.Shared/Pulling/Components/SharedPullerComponent.cs
index 54a086c493..a006e1706e 100644
--- a/Content.Shared/GameObjects/Components/Pulling/SharedPullerComponent.cs
+++ b/Content.Shared/Pulling/Components/SharedPullerComponent.cs
@@ -1,13 +1,11 @@
 #nullable enable
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems;
+using Content.Shared.Movement.Components;
 using Content.Shared.Physics.Pull;
 using Robust.Shared.GameObjects;
 using Component = Robust.Shared.GameObjects.Component;
 
-namespace Content.Shared.GameObjects.Components.Pulling
+namespace Content.Shared.Pulling.Components
 {
     [RegisterComponent]
     public class SharedPullerComponent : Component, IMoveSpeedModifier
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/Pulling/PullableMoveMessage.cs b/Content.Shared/Pulling/PullableMoveMessage.cs
similarity index 62%
rename from Content.Shared/GameObjects/EntitySystemMessages/Pulling/PullableMoveMessage.cs
rename to Content.Shared/Pulling/PullableMoveMessage.cs
index 40588bc23a..fb37dee134 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/Pulling/PullableMoveMessage.cs
+++ b/Content.Shared/Pulling/PullableMoveMessage.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages.Pulling
+namespace Content.Shared.Pulling
 {
     public class PullableMoveMessage : EntityEventArgs
     {
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/Pulling/PullableStopMovingMessage.cs b/Content.Shared/Pulling/PullableStopMovingMessage.cs
similarity index 63%
rename from Content.Shared/GameObjects/EntitySystemMessages/Pulling/PullableStopMovingMessage.cs
rename to Content.Shared/Pulling/PullableStopMovingMessage.cs
index 562fc7f8c2..77b9465140 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/Pulling/PullableStopMovingMessage.cs
+++ b/Content.Shared/Pulling/PullableStopMovingMessage.cs
@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages.Pulling
+namespace Content.Shared.Pulling
 {
     public class PullableStopMovingMessage : EntityEventArgs
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedPullingSystem.cs b/Content.Shared/Pulling/SharedPullingSystem.cs
similarity index 96%
rename from Content.Shared/GameObjects/EntitySystems/SharedPullingSystem.cs
rename to Content.Shared/Pulling/SharedPullingSystem.cs
index 1e4aa4328c..40374f3756 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedPullingSystem.cs
+++ b/Content.Shared/Pulling/SharedPullingSystem.cs
@@ -2,12 +2,11 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.GameObjects.Components.Pulling;
-using Content.Shared.GameObjects.Components.Rotatable;
-using Content.Shared.GameObjects.EntitySystemMessages.Pulling;
 using Content.Shared.GameTicking;
 using Content.Shared.Input;
 using Content.Shared.Physics.Pull;
+using Content.Shared.Pulling.Components;
+using Content.Shared.Rotatable;
 using JetBrains.Annotations;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -15,10 +14,9 @@ using Robust.Shared.Input.Binding;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Physics;
-using Robust.Shared.Physics.Dynamics.Joints;
 using Robust.Shared.Players;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Pulling
 {
     [UsedImplicitly]
     public abstract class SharedPullingSystem : EntitySystem, IResettingEntitySystem
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs b/Content.Shared/Radiation/IRadiationAct.cs
similarity index 72%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs
rename to Content.Shared/Radiation/IRadiationAct.cs
index ee44989bbe..a0378f9d6c 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IRadiationAct.cs
+++ b/Content.Shared/Radiation/IRadiationAct.cs
@@ -1,9 +1,8 @@
 #nullable enable
-using Content.Shared.GameObjects.Components;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Radiation
 {
     [RequiresExplicitImplementation]
     public interface IRadiationAct : IComponent
diff --git a/Content.Shared/GameObjects/Components/SharedRadiationStorm.cs b/Content.Shared/Radiation/SharedRadiationStorm.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/SharedRadiationStorm.cs
rename to Content.Shared/Radiation/SharedRadiationStorm.cs
index c2dcb33444..9c308bdd09 100644
--- a/Content.Shared/GameObjects/Components/SharedRadiationStorm.cs
+++ b/Content.Shared/Radiation/SharedRadiationStorm.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Radiation
 {
     public abstract class SharedRadiationPulseComponent : Component
     {
diff --git a/Content.Shared/Utility/SharedEntityExtensions.cs b/Content.Shared/Random/Helpers/SharedEntityExtensions.cs
similarity index 97%
rename from Content.Shared/Utility/SharedEntityExtensions.cs
rename to Content.Shared/Random/Helpers/SharedEntityExtensions.cs
index 22488af5b9..ed13ef5b73 100644
--- a/Content.Shared/Utility/SharedEntityExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedEntityExtensions.cs
@@ -6,7 +6,7 @@ using Robust.Shared.Maths;
 using Robust.Shared.Random;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Random.Helpers
 {
     public static class SharedEntityExtensions
     {
diff --git a/Content.Shared/Utility/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
similarity index 77%
rename from Content.Shared/Utility/SharedRandomExtensions.cs
rename to Content.Shared/Random/Helpers/SharedRandomExtensions.cs
index 2adfdb69f7..307e324ca0 100644
--- a/Content.Shared/Utility/SharedRandomExtensions.cs
+++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs
@@ -1,7 +1,7 @@
-using Content.Shared.Prototypes;
+using Content.Shared.Dataset;
 using Robust.Shared.Random;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Random.Helpers
 {
     public static class SharedRandomExtensions
     {
diff --git a/Content.Shared/GameObjects/Components/Recycling/SharedRecyclerComponent.cs b/Content.Shared/Recycling/SharedRecyclerComponent.cs
similarity index 74%
rename from Content.Shared/GameObjects/Components/Recycling/SharedRecyclerComponent.cs
rename to Content.Shared/Recycling/SharedRecyclerComponent.cs
index 85043ae55f..385513320e 100644
--- a/Content.Shared/GameObjects/Components/Recycling/SharedRecyclerComponent.cs
+++ b/Content.Shared/Recycling/SharedRecyclerComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Recycling
+namespace Content.Shared.Recycling
 {
     [NetSerializable, Serializable]
     public enum RecyclerVisuals
diff --git a/Content.Shared/GameObjects/Components/Research/SharedResearchClientComponent.cs b/Content.Shared/Research/Components/SharedResearchClientComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Research/SharedResearchClientComponent.cs
rename to Content.Shared/Research/Components/SharedResearchClientComponent.cs
index bd95026ec7..f0460f6e63 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedResearchClientComponent.cs
+++ b/Content.Shared/Research/Components/SharedResearchClientComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Research
+namespace Content.Shared.Research.Components
 {
     public class SharedResearchClientComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Research/SharedResearchConsoleComponent.cs b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Research/SharedResearchConsoleComponent.cs
rename to Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
index 6633d327dd..5600a6e36a 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedResearchConsoleComponent.cs
+++ b/Content.Shared/Research/Components/SharedResearchConsoleComponent.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Research
+namespace Content.Shared.Research.Components
 {
     public class SharedResearchConsoleComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs b/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs
rename to Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs
index e1705d4e77..2b860eddb9 100644
--- a/Content.Shared/GameObjects/Components/Research/SharedTechnologyDatabaseComponent.cs
+++ b/Content.Shared/Research/Components/SharedTechnologyDatabaseComponent.cs
@@ -2,14 +2,15 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Content.Shared.Research;
+using Content.Shared.NetIDs;
+using Content.Shared.Research.Prototypes;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Research
+namespace Content.Shared.Research.Components
 {
     public class SharedTechnologyDatabaseComponent : Component, IEnumerable<TechnologyPrototype>, ISerializationHooks
     {
diff --git a/Content.Shared/Research/LatheRecipePrototype.cs b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
similarity index 98%
rename from Content.Shared/Research/LatheRecipePrototype.cs
rename to Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
index f51b6fb902..07246f4a37 100644
--- a/Content.Shared/Research/LatheRecipePrototype.cs
+++ b/Content.Shared/Research/Prototypes/LatheRecipePrototype.cs
@@ -10,7 +10,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Research
+namespace Content.Shared.Research.Prototypes
 {
     [NetSerializable, Serializable, Prototype("latheRecipe")]
     public class LatheRecipePrototype : IPrototype
diff --git a/Content.Shared/Research/TechnologyPrototype.cs b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs
similarity index 97%
rename from Content.Shared/Research/TechnologyPrototype.cs
rename to Content.Shared/Research/Prototypes/TechnologyPrototype.cs
index cedb80347b..b4cba7d5cf 100644
--- a/Content.Shared/Research/TechnologyPrototype.cs
+++ b/Content.Shared/Research/Prototypes/TechnologyPrototype.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Research
+namespace Content.Shared.Research.Prototypes
 {
     [NetSerializable, Serializable, Prototype("technology")]
     public class TechnologyPrototype : IPrototype
diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs
index ce6edce0fc..e64c89467e 100644
--- a/Content.Shared/Roles/StartingGearPrototype.cs
+++ b/Content.Shared/Roles/StartingGearPrototype.cs
@@ -4,7 +4,7 @@ using Content.Shared.Preferences;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
 namespace Content.Shared.Roles
 {
diff --git a/Content.Shared/GameObjects/Components/Rotatable/SharedRotatableComponent.cs b/Content.Shared/Rotatable/SharedRotatableComponent.cs
similarity index 93%
rename from Content.Shared/GameObjects/Components/Rotatable/SharedRotatableComponent.cs
rename to Content.Shared/Rotatable/SharedRotatableComponent.cs
index cad3c89985..9ea50ccc00 100644
--- a/Content.Shared/GameObjects/Components/Rotatable/SharedRotatableComponent.cs
+++ b/Content.Shared/Rotatable/SharedRotatableComponent.cs
@@ -3,7 +3,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Rotatable
+namespace Content.Shared.Rotatable
 {
     public abstract class SharedRotatableComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Rotation/SharedRotationComponent.cs b/Content.Shared/Rotation/SharedRotationComponent.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/Rotation/SharedRotationComponent.cs
rename to Content.Shared/Rotation/SharedRotationComponent.cs
index d21f30603f..688dc74b26 100644
--- a/Content.Shared/GameObjects/Components/Rotation/SharedRotationComponent.cs
+++ b/Content.Shared/Rotation/SharedRotationComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Rotation
+namespace Content.Shared.Rotation
 {
     [Serializable, NetSerializable]
     public enum RotationVisuals
diff --git a/Content.Shared/Utility/ContentHelpers.cs b/Content.Shared/Rounding/ContentHelpers.cs
similarity index 98%
rename from Content.Shared/Utility/ContentHelpers.cs
rename to Content.Shared/Rounding/ContentHelpers.cs
index dad2e39768..d81e2ebe93 100644
--- a/Content.Shared/Utility/ContentHelpers.cs
+++ b/Content.Shared/Rounding/ContentHelpers.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using System;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Rounding
 {
     public static class ContentHelpers
     {
@@ -104,7 +104,7 @@ namespace Content.Shared.Utility
         /// percentage does actual/max takes.
         /// Example:
         /// We have a stack of 30 <paramref name="max"/> elements.
-        /// When <paramref name="actual"/> is: 
+        /// When <paramref name="actual"/> is:
         /// - 0..9 we return 0.
         /// - 10..19 we return 1.
         /// - 20..30 we return 2.
diff --git a/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs b/Content.Shared/SMES/SharedSmesComponent.cs
similarity index 78%
rename from Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs
rename to Content.Shared/SMES/SharedSmesComponent.cs
index 85b12c6159..2d7fd5ede2 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedSmesComponent.cs
+++ b/Content.Shared/SMES/SharedSmesComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power
+namespace Content.Shared.SMES
 {
     [Serializable, NetSerializable]
     public enum SmesVisuals
diff --git a/Content.Shared/SharedContentIoC.cs b/Content.Shared/SharedContentIoC.cs
index db275a8789..abfac4b07d 100644
--- a/Content.Shared/SharedContentIoC.cs
+++ b/Content.Shared/SharedContentIoC.cs
@@ -1,4 +1,4 @@
-using Content.Shared.Preferences.Appearance;
+using Content.Shared.CharacterAppearance;
 using Robust.Shared.IoC;
 
 namespace Content.Shared
diff --git a/Content.Shared/SharedNotifyManager.cs b/Content.Shared/SharedNotifyManager.cs
index e70a01fccf..9964f18caf 100644
--- a/Content.Shared/SharedNotifyManager.cs
+++ b/Content.Shared/SharedNotifyManager.cs
@@ -1,5 +1,5 @@
 #nullable enable
-using Content.Shared.Interfaces;
+using Content.Shared.Notification;
 using Lidgren.Network;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
diff --git a/Content.Shared/GameObjects/Components/Singularity/SharedEmitterComponent.cs b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/Singularity/SharedEmitterComponent.cs
rename to Content.Shared/Singularity/Components/SharedEmitterComponent.cs
index 013451f462..e82e5d7c5b 100644
--- a/Content.Shared/GameObjects/Components/Singularity/SharedEmitterComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedEmitterComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Singularity
+namespace Content.Shared.Singularity.Components
 {
     [NetSerializable, Serializable]
     public enum EmitterVisuals
diff --git a/Content.Shared/GameObjects/Components/Singularity/SharedParticleAcceleratorComponent.cs b/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Singularity/SharedParticleAcceleratorComponent.cs
rename to Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
index 00c33f0cef..0ef9a1482a 100644
--- a/Content.Shared/GameObjects/Components/Singularity/SharedParticleAcceleratorComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedParticleAcceleratorComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Singularity.Components
 {
     [NetSerializable, Serializable]
     public enum ParticleAcceleratorVisuals
diff --git a/Content.Shared/GameObjects/Components/Singularity/SharedRadiationCollectorComponent.cs b/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/Singularity/SharedRadiationCollectorComponent.cs
rename to Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs
index 492cd7ee01..dd347381bf 100644
--- a/Content.Shared/GameObjects/Components/Singularity/SharedRadiationCollectorComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedRadiationCollectorComponent.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Singularity
+namespace Content.Shared.Singularity.Components
 {
     [NetSerializable, Serializable]
     public enum RadiationCollectorVisuals
diff --git a/Content.Shared/GameObjects/Components/Singularity/SharedSingularityComponent.cs b/Content.Shared/Singularity/Components/SharedSingularityComponent.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/Singularity/SharedSingularityComponent.cs
rename to Content.Shared/Singularity/Components/SharedSingularityComponent.cs
index 0d16c407b0..742a088bc7 100644
--- a/Content.Shared/GameObjects/Components/Singularity/SharedSingularityComponent.cs
+++ b/Content.Shared/Singularity/Components/SharedSingularityComponent.cs
@@ -1,10 +1,11 @@
+using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
-using System;
 
-namespace Content.Shared.GameObjects.Components.Singularity
+namespace Content.Shared.Singularity.Components
 {
-    
+
     public abstract class SharedSingularityComponent : Component
     {
         public override string Name => "Singularity";
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/SingularitySoundMessage.cs b/Content.Shared/Singularity/SingularitySoundMessage.cs
similarity index 86%
rename from Content.Shared/GameObjects/EntitySystemMessages/SingularitySoundMessage.cs
rename to Content.Shared/Singularity/SingularitySoundMessage.cs
index 5aa379ea65..ef736d01bb 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/SingularitySoundMessage.cs
+++ b/Content.Shared/Singularity/SingularitySoundMessage.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages
+namespace Content.Shared.Singularity
 {
     [Serializable, NetSerializable]
     public class SingularitySoundMessage : ComponentMessage
diff --git a/Content.Shared/GameObjects/Components/Singularity/SingularityVisuals.cs b/Content.Shared/Singularity/SingularityVisuals.cs
similarity index 71%
rename from Content.Shared/GameObjects/Components/Singularity/SingularityVisuals.cs
rename to Content.Shared/Singularity/SingularityVisuals.cs
index 139f14b58b..b54e9d385a 100644
--- a/Content.Shared/GameObjects/Components/Singularity/SingularityVisuals.cs
+++ b/Content.Shared/Singularity/SingularityVisuals.cs
@@ -1,7 +1,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Singularity
+namespace Content.Shared.Singularity
 {
     [Serializable, NetSerializable]
     public enum SingularityVisuals
diff --git a/Content.Shared/GameObjects/Components/Movement/NoSlipComponent.cs b/Content.Shared/Slippery/NoSlipComponent.cs
similarity index 66%
rename from Content.Shared/GameObjects/Components/Movement/NoSlipComponent.cs
rename to Content.Shared/Slippery/NoSlipComponent.cs
index d9ac35e5d8..1c924f1873 100644
--- a/Content.Shared/GameObjects/Components/Movement/NoSlipComponent.cs
+++ b/Content.Shared/Slippery/NoSlipComponent.cs
@@ -1,7 +1,7 @@
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
+using Content.Shared.EffectBlocker;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Slippery
 {
     [RegisterComponent]
     public class NoSlipComponent : Component, IEffectBlocker
diff --git a/Content.Shared/GameObjects/Components/Movement/SlipperyComponent.cs b/Content.Shared/Slippery/SlipperyComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Movement/SlipperyComponent.cs
rename to Content.Shared/Slippery/SlipperyComponent.cs
index f99761e599..12053612ae 100644
--- a/Content.Shared/GameObjects/Components/Movement/SlipperyComponent.cs
+++ b/Content.Shared/Slippery/SlipperyComponent.cs
@@ -3,9 +3,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.Audio;
-using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
-using Content.Shared.Interfaces;
+using Content.Shared.EffectBlocker;
+using Content.Shared.Module;
+using Content.Shared.NetIDs;
+using Content.Shared.Stunnable;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
 using Robust.Shared.GameObjects;
@@ -20,7 +21,7 @@ using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Movement
+namespace Content.Shared.Slippery
 {
     [RegisterComponent]
     public class SlipperyComponent : Component, IStartCollide
diff --git a/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs b/Content.Shared/Slippery/SlipperySystem.cs
similarity index 81%
rename from Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs
rename to Content.Shared/Slippery/SlipperySystem.cs
index 9d95806eda..8eb6b67ac6 100644
--- a/Content.Shared/GameObjects/EntitySystems/SlipperySystem.cs
+++ b/Content.Shared/Slippery/SlipperySystem.cs
@@ -1,10 +1,9 @@
 #nullable enable
 using System.Linq;
-using Content.Shared.GameObjects.Components.Movement;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Slippery
 {
     [UsedImplicitly]
     public class SlipperySystem : EntitySystem
diff --git a/Content.Shared/GameObjects/Components/SharedBurningStates.cs b/Content.Shared/Smoking/SharedBurningStates.cs
similarity index 81%
rename from Content.Shared/GameObjects/Components/SharedBurningStates.cs
rename to Content.Shared/Smoking/SharedBurningStates.cs
index 150d6cb517..30473b4b96 100644
--- a/Content.Shared/GameObjects/Components/SharedBurningStates.cs
+++ b/Content.Shared/Smoking/SharedBurningStates.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Smoking
 {
     [Serializable, NetSerializable]
     public enum SharedBurningStates : byte
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SmokeVisuals.cs b/Content.Shared/Smoking/SmokeVisuals.cs
similarity index 74%
rename from Content.Shared/GameObjects/Components/Chemistry/SmokeVisuals.cs
rename to Content.Shared/Smoking/SmokeVisuals.cs
index 0ded6dd5c0..41621e3c72 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SmokeVisuals.cs
+++ b/Content.Shared/Smoking/SmokeVisuals.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Chemistry
+namespace Content.Shared.Smoking
 {
     [Serializable, NetSerializable]
     public enum SmokeVisuals : byte
diff --git a/Content.Shared/GameObjects/Components/SmokingVisuals.cs b/Content.Shared/Smoking/SmokingVisuals.cs
similarity index 78%
rename from Content.Shared/GameObjects/Components/SmokingVisuals.cs
rename to Content.Shared/Smoking/SmokingVisuals.cs
index cdc2516bd8..bea1705a7d 100644
--- a/Content.Shared/GameObjects/Components/SmokingVisuals.cs
+++ b/Content.Shared/Smoking/SmokingVisuals.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Smoking
 {
     [Serializable, NetSerializable]
     public enum SmokingVisuals : byte
diff --git a/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs b/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs
rename to Content.Shared/Solar/SharedSolarControlConsoleComponent.cs
index 9dcf47d5ec..dd00fdb1f4 100644
--- a/Content.Shared/GameObjects/Components/Power/SharedSolarControlConsoleComponent.cs
+++ b/Content.Shared/Solar/SharedSolarControlConsoleComponent.cs
@@ -4,7 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Power
+namespace Content.Shared.Solar
 {
     public class SharedSolarControlConsoleComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs b/Content.Shared/Sound/SharedLoopingSoundComponent.cs
similarity index 98%
rename from Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs
rename to Content.Shared/Sound/SharedLoopingSoundComponent.cs
index d18a2be12e..71eb6dccfe 100644
--- a/Content.Shared/GameObjects/Components/Sound/SharedLoopingSoundComponent.cs
+++ b/Content.Shared/Sound/SharedLoopingSoundComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.Audio;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Sound
+namespace Content.Shared.Sound
 {
     public class SharedLoopingSoundComponent : Component
     {
diff --git a/Content.Shared/Utility/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs
similarity index 97%
rename from Content.Shared/Utility/EntitySystemExtensions.cs
rename to Content.Shared/Spawning/EntitySystemExtensions.cs
index 6757021388..c7ab1ac712 100644
--- a/Content.Shared/Utility/EntitySystemExtensions.cs
+++ b/Content.Shared/Spawning/EntitySystemExtensions.cs
@@ -2,13 +2,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Content.Shared.Physics;
 using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Physics;
 using Robust.Shared.Physics.Broadphase;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Spawning
 {
     public static class EntitySystemExtensions
     {
diff --git a/Content.Shared/GameObjects/Components/Mobs/Speech/SharedSpeechComponent.cs b/Content.Shared/Speech/SharedSpeechComponent.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/Mobs/Speech/SharedSpeechComponent.cs
rename to Content.Shared/Speech/SharedSpeechComponent.cs
index a828d93c4b..c783b0b17c 100644
--- a/Content.Shared/GameObjects/Components/Mobs/Speech/SharedSpeechComponent.cs
+++ b/Content.Shared/Speech/SharedSpeechComponent.cs
@@ -1,9 +1,9 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
+using Content.Shared.ActionBlocker;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.GameObjects.Components.Mobs.Speech
+namespace Content.Shared.Speech
 {
     /// <summary>
     ///     Component required for entities to be able to speak.
diff --git a/Content.Shared/GameObjects/Components/SharedStackComponent.cs b/Content.Shared/Stacks/SharedStackComponent.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/SharedStackComponent.cs
rename to Content.Shared/Stacks/SharedStackComponent.cs
index 4c263bd894..d0ef839dd0 100644
--- a/Content.Shared/GameObjects/Components/SharedStackComponent.cs
+++ b/Content.Shared/Stacks/SharedStackComponent.cs
@@ -1,6 +1,5 @@
 using System;
-using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Stacks;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
@@ -8,7 +7,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Stacks
 {
     public abstract class SharedStackComponent : Component, ISerializationHooks
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedStackSystem.cs b/Content.Shared/Stacks/SharedStackSystem.cs
similarity index 95%
rename from Content.Shared/GameObjects/EntitySystems/SharedStackSystem.cs
rename to Content.Shared/Stacks/SharedStackSystem.cs
index 6f6f7e2da0..4c6fbc0909 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedStackSystem.cs
+++ b/Content.Shared/Stacks/SharedStackSystem.cs
@@ -1,9 +1,8 @@
-using Content.Shared.GameObjects.Components;
+using Content.Shared.Examine;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Stacks
 {
     [UsedImplicitly]
     public abstract class SharedStackSystem : EntitySystem
@@ -67,7 +66,7 @@ namespace Content.Shared.GameObjects.EntitySystems
 
             args.Message.AddText("\n");
             args.Message.AddMarkup(
-                Loc.GetString("comp-stack-examine-detail-count",
+                Robust.Shared.Localization.Loc.GetString("comp-stack-examine-detail-count",
                     ("count", component.Count),
                     ("markupCountColor", "lightgray")
                 )
diff --git a/Content.Shared/GameObjects/Components/StackVisuals.cs b/Content.Shared/Stacks/StackVisuals.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/StackVisuals.cs
rename to Content.Shared/Stacks/StackVisuals.cs
index 30d9d3ae44..e942efd2ad 100644
--- a/Content.Shared/GameObjects/Components/StackVisuals.cs
+++ b/Content.Shared/Stacks/StackVisuals.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Stacks
 {
     [Serializable, NetSerializable]
     public enum StackVisuals : byte
@@ -13,7 +13,7 @@ namespace Content.Shared.GameObjects.Components
         Actual,
         /// <summary>
         /// The total amount of elements in the stack. If unspecified, the visualizer assumes
-        /// its 
+        /// its
         /// </summary>
         MaxCount,
         Hide
diff --git a/Content.Shared/GameObjects/EntitySystems/SharedStandingStateSystem.cs b/Content.Shared/Standing/SharedStandingStateSystem.cs
similarity index 93%
rename from Content.Shared/GameObjects/EntitySystems/SharedStandingStateSystem.cs
rename to Content.Shared/Standing/SharedStandingStateSystem.cs
index dfd24a4321..e03d302232 100644
--- a/Content.Shared/GameObjects/EntitySystems/SharedStandingStateSystem.cs
+++ b/Content.Shared/Standing/SharedStandingStateSystem.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems.EffectBlocker;
+using Content.Shared.EffectBlocker;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Standing
 {
     public abstract class SharedStandingStateSystem : EntitySystem
     {
diff --git a/Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs b/Content.Shared/StationEvents/MsgRequestStationEvents.cs
similarity index 92%
rename from Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs
rename to Content.Shared/StationEvents/MsgRequestStationEvents.cs
index 100db9ce85..0619a417c6 100644
--- a/Content.Shared/Network/NetMessages/MsgRequestStationEvents.cs
+++ b/Content.Shared/StationEvents/MsgRequestStationEvents.cs
@@ -2,7 +2,7 @@
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.StationEvents
 {
     public class MsgRequestStationEvents : NetMessage
     {
diff --git a/Content.Shared/Network/NetMessages/MsgStationEvents.cs b/Content.Shared/StationEvents/MsgStationEvents.cs
similarity index 96%
rename from Content.Shared/Network/NetMessages/MsgStationEvents.cs
rename to Content.Shared/StationEvents/MsgStationEvents.cs
index 1011de1969..3925707b6b 100644
--- a/Content.Shared/Network/NetMessages/MsgStationEvents.cs
+++ b/Content.Shared/StationEvents/MsgStationEvents.cs
@@ -6,7 +6,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Network;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.StationEvents
 {
         public class MsgStationEvents : NetMessage
         {
diff --git a/Content.Shared/GameObjects/Components/SharedBagOpenVisuals.cs b/Content.Shared/Storage/SharedBagOpenVisuals.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/SharedBagOpenVisuals.cs
rename to Content.Shared/Storage/SharedBagOpenVisuals.cs
index 3b2178900a..f894452e8f 100644
--- a/Content.Shared/GameObjects/Components/SharedBagOpenVisuals.cs
+++ b/Content.Shared/Storage/SharedBagOpenVisuals.cs
@@ -2,14 +2,14 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Storage
 {
     [Serializable, NetSerializable]
     public enum SharedBagOpenVisuals : byte
     {
         BagState,
     }
-    
+
     [Serializable, NetSerializable]
     public enum SharedBagState : byte
     {
diff --git a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs b/Content.Shared/Storage/SharedStorageComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs
rename to Content.Shared/Storage/SharedStorageComponent.cs
index b870b7032d..b6d8ba66b5 100644
--- a/Content.Shared/GameObjects/Components/Storage/SharedStorageComponent.cs
+++ b/Content.Shared/Storage/SharedStorageComponent.cs
@@ -2,13 +2,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.DragDrop;
+using Content.Shared.NetIDs;
+using Content.Shared.Placeable;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Storage
+namespace Content.Shared.Storage
 {
     public abstract class SharedStorageComponent : Component, IDraggable
     {
diff --git a/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs b/Content.Shared/Strip/Components/SharedStrippableComponent.cs
similarity index 88%
rename from Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs
rename to Content.Shared/Strip/Components/SharedStrippableComponent.cs
index 301fe0e3cb..354b7539fd 100644
--- a/Content.Shared/GameObjects/Components/GUI/SharedStrippableComponent.cs
+++ b/Content.Shared/Strip/Components/SharedStrippableComponent.cs
@@ -1,14 +1,14 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.ActionBlocker;
+using Content.Shared.DragDrop;
+using Content.Shared.Hands.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
-namespace Content.Shared.GameObjects.Components.GUI
+namespace Content.Shared.Strip.Components
 {
     public abstract class SharedStrippableComponent : Component, IDraggable
     {
diff --git a/Content.Shared/GameObjects/Components/GUI/SharedStrippingComponent.cs b/Content.Shared/Strip/Components/SharedStrippingComponent.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/GUI/SharedStrippingComponent.cs
rename to Content.Shared/Strip/Components/SharedStrippingComponent.cs
index bc3ec75328..32145088eb 100644
--- a/Content.Shared/GameObjects/Components/GUI/SharedStrippingComponent.cs
+++ b/Content.Shared/Strip/Components/SharedStrippingComponent.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.DragDrop;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.GUI
+namespace Content.Shared.Strip.Components
 {
     /// <summary>
     ///     Give to an entity to say they can strip another entity.
diff --git a/Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs b/Content.Shared/Stunnable/SharedStunnableComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs
rename to Content.Shared/Stunnable/SharedStunnableComponent.cs
index 44ddbc7086..5228d27db8 100644
--- a/Content.Shared/GameObjects/Components/Mobs/SharedStunnableComponent.cs
+++ b/Content.Shared/Stunnable/SharedStunnableComponent.cs
@@ -1,22 +1,20 @@
 #nullable enable
 using System;
-using System.Collections.Generic;
 using System.Threading;
+using Content.Shared.ActionBlocker;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs.State;
-using Content.Shared.GameObjects.Components.Movement;
-using Content.Shared.GameObjects.EntitySystems.ActionBlocker;
-using Content.Shared.Interfaces.GameObjects.Components;
+using Content.Shared.Interaction;
+using Content.Shared.Movement.Components;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
-using Robust.Shared.Timing;
 using Robust.Shared.Serialization.Manager.Attributes;
+using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.Stunnable
 {
     public abstract class SharedStunnableComponent : Component, IMoveSpeedModifier, IActionBlocker, IInteractHand
     {
diff --git a/Content.Shared/GameObjects/EntitySystems/StunSystem.cs b/Content.Shared/Stunnable/StunSystem.cs
similarity index 81%
rename from Content.Shared/GameObjects/EntitySystems/StunSystem.cs
rename to Content.Shared/Stunnable/StunSystem.cs
index c610538d4f..7f83eca61f 100644
--- a/Content.Shared/GameObjects/EntitySystems/StunSystem.cs
+++ b/Content.Shared/Stunnable/StunSystem.cs
@@ -1,8 +1,7 @@
-using Content.Shared.GameObjects.Components.Mobs;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Stunnable
 {
     [UsedImplicitly]
     internal sealed class StunSystem : EntitySystem
diff --git a/Content.Shared/GameObjects/Components/SubFloorHideComponent.cs b/Content.Shared/SubFloor/SubFloorHideComponent.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/SubFloorHideComponent.cs
rename to Content.Shared/SubFloor/SubFloorHideComponent.cs
index 24dd54ac39..9a3c8f71dd 100644
--- a/Content.Shared/GameObjects/Components/SubFloorHideComponent.cs
+++ b/Content.Shared/SubFloor/SubFloorHideComponent.cs
@@ -1,8 +1,7 @@
 #nullable enable
-using Content.Shared.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.SubFloor
 {
     /// <summary>
     /// Simple component that automatically hides the sibling
diff --git a/Content.Shared/GameObjects/EntitySystems/SubFloorHideSystem.cs b/Content.Shared/SubFloor/SubFloorHideSystem.cs
similarity index 97%
rename from Content.Shared/GameObjects/EntitySystems/SubFloorHideSystem.cs
rename to Content.Shared/SubFloor/SubFloorHideSystem.cs
index 22682f901a..a3c4342c54 100644
--- a/Content.Shared/GameObjects/EntitySystems/SubFloorHideSystem.cs
+++ b/Content.Shared/SubFloor/SubFloorHideSystem.cs
@@ -1,5 +1,4 @@
 #nullable enable
-using Content.Shared.GameObjects.Components;
 using Content.Shared.Maps;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
@@ -8,7 +7,7 @@ using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.SubFloor
 {
     /// <summary>
     ///     Entity system backing <see cref="SubFloorHideComponent"/>.
diff --git a/Content.Shared/GameObjects/Components/Suspicion/SharedSuspicionRoleComponent.cs b/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs
similarity index 92%
rename from Content.Shared/GameObjects/Components/Suspicion/SharedSuspicionRoleComponent.cs
rename to Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs
index 9796cdde9d..07c9a3897f 100644
--- a/Content.Shared/GameObjects/Components/Suspicion/SharedSuspicionRoleComponent.cs
+++ b/Content.Shared/Suspicion/SharedSuspicionRoleComponent.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Suspicion
+namespace Content.Shared.Suspicion
 {
     public abstract class SharedSuspicionRoleComponent : Component
     {
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/SuspicionMessages.cs b/Content.Shared/Suspicion/SuspicionMessages.cs
similarity index 85%
rename from Content.Shared/GameObjects/EntitySystemMessages/SuspicionMessages.cs
rename to Content.Shared/Suspicion/SuspicionMessages.cs
index 1305110395..2b1220f123 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/SuspicionMessages.cs
+++ b/Content.Shared/Suspicion/SuspicionMessages.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages
+namespace Content.Shared.Suspicion
 {
     public static class SuspicionMessages
     {
diff --git a/Content.Shared/GameObjects/Components/Tag/TagComponent.cs b/Content.Shared/Tag/TagComponent.cs
similarity index 99%
rename from Content.Shared/GameObjects/Components/Tag/TagComponent.cs
rename to Content.Shared/Tag/TagComponent.cs
index 03f1c9cecc..b1b0dcae73 100644
--- a/Content.Shared/GameObjects/Components/Tag/TagComponent.cs
+++ b/Content.Shared/Tag/TagComponent.cs
@@ -1,7 +1,6 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.Prototypes.Tag;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
@@ -11,7 +10,7 @@ using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Set;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Tag
+namespace Content.Shared.Tag
 {
     [RegisterComponent]
     public class TagComponent : Component, ISerializationHooks
diff --git a/Content.Shared/GameObjects/Components/Tag/TagComponentExtensions.cs b/Content.Shared/Tag/TagComponentExtensions.cs
similarity index 99%
rename from Content.Shared/GameObjects/Components/Tag/TagComponentExtensions.cs
rename to Content.Shared/Tag/TagComponentExtensions.cs
index b93a7a767f..d8fb85d428 100644
--- a/Content.Shared/GameObjects/Components/Tag/TagComponentExtensions.cs
+++ b/Content.Shared/Tag/TagComponentExtensions.cs
@@ -1,10 +1,9 @@
 #nullable enable
 using System.Collections.Generic;
-using Content.Shared.Prototypes.Tag;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.GameObjects.Components.Tag
+namespace Content.Shared.Tag
 {
     public static class TagComponentExtensions
     {
diff --git a/Content.Shared/GameObjects/Components/Tag/TagComponentState.cs b/Content.Shared/Tag/TagComponentState.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/Tag/TagComponentState.cs
rename to Content.Shared/Tag/TagComponentState.cs
index 813ff7abfa..d97e1f7d36 100644
--- a/Content.Shared/GameObjects/Components/Tag/TagComponentState.cs
+++ b/Content.Shared/Tag/TagComponentState.cs
@@ -1,9 +1,10 @@
 #nullable enable
-using Robust.Shared.GameObjects;
 using System;
+using Content.Shared.NetIDs;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Tag
+namespace Content.Shared.Tag
 {
     [Serializable, NetSerializable]
     public class TagComponentState : ComponentState
diff --git a/Content.Shared/Prototypes/Tag/TagPrototype.cs b/Content.Shared/Tag/TagPrototype.cs
similarity index 93%
rename from Content.Shared/Prototypes/Tag/TagPrototype.cs
rename to Content.Shared/Tag/TagPrototype.cs
index c615048bdd..212bbf900f 100644
--- a/Content.Shared/Prototypes/Tag/TagPrototype.cs
+++ b/Content.Shared/Tag/TagPrototype.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.Prototypes.Tag
+namespace Content.Shared.Tag
 {
     /// <summary>
     ///     Prototype representing a tag in YAML.
diff --git a/Content.Shared/GameObjects/Components/Mobs/TargetingZone.cs b/Content.Shared/Targeting/TargetingZone.cs
similarity index 90%
rename from Content.Shared/GameObjects/Components/Mobs/TargetingZone.cs
rename to Content.Shared/Targeting/TargetingZone.cs
index 0294dc1a46..269a401afe 100644
--- a/Content.Shared/GameObjects/Components/Mobs/TargetingZone.cs
+++ b/Content.Shared/Targeting/TargetingZone.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Mobs
+namespace Content.Shared.Targeting
 {
     /// <summary>
     ///     Zones the player can target for attacks.
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHotItem.cs b/Content.Shared/Temperature/IHotItem.cs
similarity index 89%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IHotItem.cs
rename to Content.Shared/Temperature/IHotItem.cs
index 7bbbcb2a80..5f7d952642 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IHotItem.cs
+++ b/Content.Shared/Temperature/IHotItem.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.Analyzers;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Temperature
 {
     /// <summary>
     /// This interface gives components hot quality when they are used.
diff --git a/Content.Shared/Utility/TemperatureHelpers.cs b/Content.Shared/Temperature/TemperatureHelpers.cs
similarity index 96%
rename from Content.Shared/Utility/TemperatureHelpers.cs
rename to Content.Shared/Temperature/TemperatureHelpers.cs
index 8ec26f78d3..62f7c0c00b 100644
--- a/Content.Shared/Utility/TemperatureHelpers.cs
+++ b/Content.Shared/Temperature/TemperatureHelpers.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Content.Shared.Maths;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Temperature
 {
     public static class TemperatureHelpers
     {
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs b/Content.Shared/Throwing/ILand.cs
similarity index 96%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs
rename to Content.Shared/Throwing/ILand.cs
index bb99d85f4c..96d0aa4a4d 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/ILand.cs
+++ b/Content.Shared/Throwing/ILand.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Throwing
 {
     /// <summary>
     ///     This interface gives components behavior when landing after being thrown.
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs b/Content.Shared/Throwing/IThrowCollide.cs
similarity index 95%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs
rename to Content.Shared/Throwing/IThrowCollide.cs
index 52206e9699..4969d231f6 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrowCollide.cs
+++ b/Content.Shared/Throwing/IThrowCollide.cs
@@ -2,9 +2,8 @@
 using System;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Map;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Throwing
 {
     [RequiresExplicitImplementation]
     public interface IThrowCollide
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs b/Content.Shared/Throwing/IThrown.cs
similarity index 95%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs
rename to Content.Shared/Throwing/IThrown.cs
index 06ab13284c..f3e7de048f 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/IThrown.cs
+++ b/Content.Shared/Throwing/IThrown.cs
@@ -4,7 +4,7 @@ using JetBrains.Annotations;
 using Robust.Shared.Analyzers;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Throwing
 {
     /// <summary>
     ///     This interface gives components behavior when thrown.
diff --git a/Content.Shared/GameObjects/Components/Items/ThrownItemComponent.cs b/Content.Shared/Throwing/ThrownItemComponent.cs
similarity index 81%
rename from Content.Shared/GameObjects/Components/Items/ThrownItemComponent.cs
rename to Content.Shared/Throwing/ThrownItemComponent.cs
index e28276f9ff..041911be05 100644
--- a/Content.Shared/GameObjects/Components/Items/ThrownItemComponent.cs
+++ b/Content.Shared/Throwing/ThrownItemComponent.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Items
+namespace Content.Shared.Throwing
 {
     [RegisterComponent]
     public class ThrownItemComponent : Component
diff --git a/Content.Shared/GameObjects/EntitySystems/ThrownItemSystem.cs b/Content.Shared/Throwing/ThrownItemSystem.cs
similarity index 97%
rename from Content.Shared/GameObjects/EntitySystems/ThrownItemSystem.cs
rename to Content.Shared/Throwing/ThrownItemSystem.cs
index 656c583044..8c743b93ab 100644
--- a/Content.Shared/GameObjects/EntitySystems/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -1,16 +1,14 @@
 #nullable enable
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Items;
-using Content.Shared.Physics.Pull;
-using Content.Shared.Interfaces.GameObjects.Components;
 using Content.Shared.Physics;
+using Content.Shared.Physics.Pull;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Log;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Dynamics;
 
-namespace Content.Shared.GameObjects.EntitySystems
+namespace Content.Shared.Throwing
 {
     /// <summary>
     ///     Handles throwing landing and collisions.
diff --git a/Content.Shared/GameObjects/Components/Watercloset/SharedWaterclosetVisuals.cs b/Content.Shared/Toilet/SharedWaterclosetVisuals.cs
similarity index 75%
rename from Content.Shared/GameObjects/Components/Watercloset/SharedWaterclosetVisuals.cs
rename to Content.Shared/Toilet/SharedWaterclosetVisuals.cs
index 0ee66dd2c9..d933c61b77 100644
--- a/Content.Shared/GameObjects/Components/Watercloset/SharedWaterclosetVisuals.cs
+++ b/Content.Shared/Toilet/SharedWaterclosetVisuals.cs
@@ -1,8 +1,8 @@
 #nullable enable
-using Robust.Shared.Serialization;
 using System;
+using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Watercloset
+namespace Content.Shared.Toilet
 {
     [Serializable, NetSerializable]
     public enum ToiletVisuals
diff --git a/Content.Shared/GameObjects/Components/Interactable/SharedToolComponent.cs b/Content.Shared/Tool/SharedToolComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Interactable/SharedToolComponent.cs
rename to Content.Shared/Tool/SharedToolComponent.cs
index 630d9923bb..4025c5ea91 100644
--- a/Content.Shared/GameObjects/Components/Interactable/SharedToolComponent.cs
+++ b/Content.Shared/Tool/SharedToolComponent.cs
@@ -1,9 +1,10 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Interactable
+namespace Content.Shared.Tool
 {
     [Flags]
     public enum ToolQuality : byte
diff --git a/Content.Shared/Utility/TransformExtensions.cs b/Content.Shared/Transform/TransformExtensions.cs
similarity index 94%
rename from Content.Shared/Utility/TransformExtensions.cs
rename to Content.Shared/Transform/TransformExtensions.cs
index 5990de103c..3358d9e5da 100644
--- a/Content.Shared/Utility/TransformExtensions.cs
+++ b/Content.Shared/Transform/TransformExtensions.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Transform
 {
     public static class TransformExtensions
     {
diff --git a/Content.Shared/GameObjects/Components/Trigger/TriggerVisuals.cs b/Content.Shared/Trigger/TriggerVisuals.cs
similarity index 84%
rename from Content.Shared/GameObjects/Components/Trigger/TriggerVisuals.cs
rename to Content.Shared/Trigger/TriggerVisuals.cs
index 4952fafc2a..61b6664edf 100644
--- a/Content.Shared/GameObjects/Components/Trigger/TriggerVisuals.cs
+++ b/Content.Shared/Trigger/TriggerVisuals.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Trigger
+namespace Content.Shared.Trigger
 {
     [NetSerializable]
     [Serializable]
diff --git a/Content.Shared/GameObjects/Components/SharedVaporComponent.cs b/Content.Shared/Vapor/SharedVaporComponent.cs
similarity index 87%
rename from Content.Shared/GameObjects/Components/SharedVaporComponent.cs
rename to Content.Shared/Vapor/SharedVaporComponent.cs
index 6923617ffc..1746fbb4c1 100644
--- a/Content.Shared/GameObjects/Components/SharedVaporComponent.cs
+++ b/Content.Shared/Vapor/SharedVaporComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Vapor
 {
     public class SharedVaporComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs
rename to Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
index 37c47a4ec6..564957a9b9 100644
--- a/Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs
+++ b/Content.Shared/VendingMachines/SharedVendingMachineComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.VendingMachines
+namespace Content.Shared.VendingMachines
 {
     public class SharedVendingMachineComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs b/Content.Shared/Verbs/GlobalVerb.cs
similarity index 98%
rename from Content.Shared/GameObjects/Verbs/GlobalVerb.cs
rename to Content.Shared/Verbs/GlobalVerb.cs
index 40bcecc424..32f4ac1857 100644
--- a/Content.Shared/GameObjects/Verbs/GlobalVerb.cs
+++ b/Content.Shared/Verbs/GlobalVerb.cs
@@ -3,7 +3,7 @@ using System;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     /// <summary>
     ///     A verb is an action in the right click menu of an entity.
diff --git a/Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs b/Content.Shared/Verbs/HideContextMenuComponent.cs
similarity index 77%
rename from Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs
rename to Content.Shared/Verbs/HideContextMenuComponent.cs
index e1adb8fce8..8600ae066f 100644
--- a/Content.Shared/GameObjects/Components/Context/HideContextMenuComponent.cs
+++ b/Content.Shared/Verbs/HideContextMenuComponent.cs
@@ -1,8 +1,7 @@
 #nullable enable
-using Content.Shared.GameObjects.Verbs;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Components.Context
+namespace Content.Shared.Verbs
 {
     [RegisterComponent]
     public class HideContextMenuComponent : Component, IShowContextMenu
diff --git a/Content.Shared/GameObjects/Verbs/IShowContextMenu.cs b/Content.Shared/Verbs/IShowContextMenu.cs
similarity index 79%
rename from Content.Shared/GameObjects/Verbs/IShowContextMenu.cs
rename to Content.Shared/Verbs/IShowContextMenu.cs
index fb2cd48d85..bcd65229ec 100644
--- a/Content.Shared/GameObjects/Verbs/IShowContextMenu.cs
+++ b/Content.Shared/Verbs/IShowContextMenu.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     public interface IShowContextMenu : IComponent
     {
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/PlayerContainerVisibilityMessage.cs b/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs
similarity index 87%
rename from Content.Shared/GameObjects/EntitySystemMessages/PlayerContainerVisibilityMessage.cs
rename to Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs
index 4816a054d5..dafd3de76f 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/PlayerContainerVisibilityMessage.cs
+++ b/Content.Shared/Verbs/PlayerContainerVisibilityMessage.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages
+namespace Content.Shared.Verbs
 {
     [Serializable, NetSerializable]
     public class PlayerContainerVisibilityMessage : EntityEventArgs
diff --git a/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs b/Content.Shared/Verbs/SharedVerbSystem.cs
similarity index 96%
rename from Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs
rename to Content.Shared/Verbs/SharedVerbSystem.cs
index 7800ff9c27..84589a7811 100644
--- a/Content.Shared/GameObjects/Verbs/SharedVerbSystem.cs
+++ b/Content.Shared/Verbs/SharedVerbSystem.cs
@@ -2,14 +2,14 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Content.Shared.Interaction.Helpers;
 using Content.Shared.Physics;
-using Content.Shared.Utility;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     public class SharedVerbSystem : EntitySystem
     {
diff --git a/Content.Shared/GameObjects/Verbs/Verb.cs b/Content.Shared/Verbs/Verb.cs
similarity index 95%
rename from Content.Shared/GameObjects/Verbs/Verb.cs
rename to Content.Shared/Verbs/Verb.cs
index 2b4560cc2d..76ab513335 100644
--- a/Content.Shared/GameObjects/Verbs/Verb.cs
+++ b/Content.Shared/Verbs/Verb.cs
@@ -3,7 +3,7 @@ using System;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     /// <summary>
     ///     A verb is an action in the right click menu of an entity.
@@ -43,7 +43,7 @@ namespace Content.Shared.GameObjects.Verbs
 
     /// <inheritdoc />
     /// <summary>
-    ///     Sub class of <see cref="T:Content.Shared.GameObjects.Verbs.Verb" /> that works on a specific type of component,
+    ///     Sub class of <see cref="T:Content.Shared.Verbs.Verb" /> that works on a specific type of component,
     ///     to reduce casting boiler plate for implementations.
     /// </summary>
     /// <typeparam name="T">The type of component that this verb will run on.</typeparam>
diff --git a/Content.Shared/GameObjects/Verbs/VerbBase.cs b/Content.Shared/Verbs/VerbBase.cs
similarity index 94%
rename from Content.Shared/GameObjects/Verbs/VerbBase.cs
rename to Content.Shared/Verbs/VerbBase.cs
index f409e5db98..1a18a83f9d 100644
--- a/Content.Shared/GameObjects/Verbs/VerbBase.cs
+++ b/Content.Shared/Verbs/VerbBase.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     public abstract class VerbBase
     {
diff --git a/Content.Shared/GameObjects/Verbs/VerbCategories.cs b/Content.Shared/Verbs/VerbCategories.cs
similarity index 91%
rename from Content.Shared/GameObjects/Verbs/VerbCategories.cs
rename to Content.Shared/Verbs/VerbCategories.cs
index 04cca69c8a..bcc1fadb13 100644
--- a/Content.Shared/GameObjects/Verbs/VerbCategories.cs
+++ b/Content.Shared/Verbs/VerbCategories.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     /// <summary>
     ///     Standard verb categories.
diff --git a/Content.Shared/GameObjects/Verbs/VerbCategoryData.cs b/Content.Shared/Verbs/VerbCategoryData.cs
similarity index 94%
rename from Content.Shared/GameObjects/Verbs/VerbCategoryData.cs
rename to Content.Shared/Verbs/VerbCategoryData.cs
index 7b72edb9cf..f5a1f1c7f9 100644
--- a/Content.Shared/GameObjects/Verbs/VerbCategoryData.cs
+++ b/Content.Shared/Verbs/VerbCategoryData.cs
@@ -1,7 +1,7 @@
 #nullable enable
 using Robust.Shared.Utility;
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     /// <summary>
     /// Contains combined name and icon information for a verb category.
diff --git a/Content.Shared/GameObjects/Verbs/VerbData.cs b/Content.Shared/Verbs/VerbData.cs
similarity index 98%
rename from Content.Shared/GameObjects/Verbs/VerbData.cs
rename to Content.Shared/Verbs/VerbData.cs
index ea68fceaf2..09f0ea5a53 100644
--- a/Content.Shared/GameObjects/Verbs/VerbData.cs
+++ b/Content.Shared/Verbs/VerbData.cs
@@ -3,7 +3,7 @@ using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     /// <summary>
     ///     Stores visual data for a verb.
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs b/Content.Shared/Verbs/VerbSystemMessages.cs
similarity index 95%
rename from Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs
rename to Content.Shared/Verbs/VerbSystemMessages.cs
index 51934cc65e..bbc2eb3728 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/VerbSystemMessages.cs
+++ b/Content.Shared/Verbs/VerbSystemMessages.cs
@@ -1,11 +1,10 @@
 #nullable enable
 using System;
-using Content.Shared.GameObjects.Verbs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages
+namespace Content.Shared.Verbs
 {
     public static class VerbSystemMessages
     {
diff --git a/Content.Shared/GameObjects/Verbs/VerbUtility.cs b/Content.Shared/Verbs/VerbUtility.cs
similarity index 98%
rename from Content.Shared/GameObjects/Verbs/VerbUtility.cs
rename to Content.Shared/Verbs/VerbUtility.cs
index 4b0670d7ba..289181fc91 100644
--- a/Content.Shared/GameObjects/Verbs/VerbUtility.cs
+++ b/Content.Shared/Verbs/VerbUtility.cs
@@ -7,7 +7,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Utility;
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     public static class VerbUtility
     {
diff --git a/Content.Shared/GameObjects/Verbs/VerbVisibility.cs b/Content.Shared/Verbs/VerbVisibility.cs
similarity index 93%
rename from Content.Shared/GameObjects/Verbs/VerbVisibility.cs
rename to Content.Shared/Verbs/VerbVisibility.cs
index 51e7c3480f..b1fd22495e 100644
--- a/Content.Shared/GameObjects/Verbs/VerbVisibility.cs
+++ b/Content.Shared/Verbs/VerbVisibility.cs
@@ -1,6 +1,6 @@
 #nullable enable
 
-namespace Content.Shared.GameObjects.Verbs
+namespace Content.Shared.Verbs
 {
     /// <summary>
     /// Possible states of visibility for the verb in the right click menu.
diff --git a/Content.Shared/Network/NetMessages/MsgVoteCanCall.cs b/Content.Shared/Voting/MsgVoteCanCall.cs
similarity index 94%
rename from Content.Shared/Network/NetMessages/MsgVoteCanCall.cs
rename to Content.Shared/Voting/MsgVoteCanCall.cs
index a6303c176a..926a9f24d5 100644
--- a/Content.Shared/Network/NetMessages/MsgVoteCanCall.cs
+++ b/Content.Shared/Voting/MsgVoteCanCall.cs
@@ -2,7 +2,7 @@
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Voting
 {
     /// <summary>
     ///     Used to tell clients whether they are able to currently call votes.
diff --git a/Content.Shared/Network/NetMessages/MsgVoteData.cs b/Content.Shared/Voting/MsgVoteData.cs
similarity index 98%
rename from Content.Shared/Network/NetMessages/MsgVoteData.cs
rename to Content.Shared/Voting/MsgVoteData.cs
index 526ccf0624..531e8eb401 100644
--- a/Content.Shared/Network/NetMessages/MsgVoteData.cs
+++ b/Content.Shared/Voting/MsgVoteData.cs
@@ -3,7 +3,7 @@ using System;
 using Lidgren.Network;
 using Robust.Shared.Network;
 
-namespace Content.Shared.Network.NetMessages
+namespace Content.Shared.Voting
 {
     public sealed class MsgVoteData : NetMessage
     {
diff --git a/Content.Shared/GameObjects/Components/ReinforcedWallVisuals.cs b/Content.Shared/Wall/ReinforcedWallVisuals.cs
similarity index 79%
rename from Content.Shared/GameObjects/Components/ReinforcedWallVisuals.cs
rename to Content.Shared/Wall/ReinforcedWallVisuals.cs
index 55031ca418..eba46accbb 100644
--- a/Content.Shared/GameObjects/Components/ReinforcedWallVisuals.cs
+++ b/Content.Shared/Wall/ReinforcedWallVisuals.cs
@@ -2,7 +2,7 @@
 using System;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Wall
 {
     [Serializable, NetSerializable]
     public enum ReinforcedWallVisuals
diff --git a/Content.Shared/Interfaces/GameObjects/Components/Interaction/AttackEvent.cs b/Content.Shared/Weapons/Melee/AttackEvent.cs
similarity index 97%
rename from Content.Shared/Interfaces/GameObjects/Components/Interaction/AttackEvent.cs
rename to Content.Shared/Weapons/Melee/AttackEvent.cs
index 239300c70c..fb5d1a638d 100644
--- a/Content.Shared/Interfaces/GameObjects/Components/Interaction/AttackEvent.cs
+++ b/Content.Shared/Weapons/Melee/AttackEvent.cs
@@ -2,7 +2,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 
-namespace Content.Shared.Interfaces.GameObjects.Components
+namespace Content.Shared.Weapons.Melee
 {
     /// <summary>
     ///     Raised directed on the used entity when a target entity is click attacked by a user.
diff --git a/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs b/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
similarity index 95%
rename from Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
rename to Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
index 188233db5d..c617968dcb 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
@@ -5,7 +5,7 @@ using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.Manager.Attributes;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Melee
+namespace Content.Shared.Weapons.Melee
 {
     [Prototype("MeleeWeaponAnimation")]
     public sealed class MeleeWeaponAnimationPrototype : IPrototype
diff --git a/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs b/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs
similarity index 96%
rename from Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs
rename to Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs
index 6ebba44440..4321051f6e 100644
--- a/Content.Shared/GameObjects/EntitySystemMessages/MeleeWeaponSystemMessages.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponSystemMessages.cs
@@ -5,7 +5,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.EntitySystemMessages
+namespace Content.Shared.Weapons.Melee
 {
     public static class MeleeWeaponSystemMessages
     {
diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBatteryBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs
similarity index 81%
rename from Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBatteryBarrelComponent.cs
rename to Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs
index 06590a92a8..e59d53f8f3 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBatteryBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBatteryBarrelComponent.cs
@@ -1,9 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Shared.Weapons.Ranged.Barrels.Components
 {
     [Serializable, NetSerializable]
     public class BatteryBarrelComponentState : ComponentState
diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBoltActionBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBoltActionBarrelComponent.cs
rename to Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs
index 96c4c4729e..979e6ede4e 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedBoltActionBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedBoltActionBarrelComponent.cs
@@ -1,9 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Shared.Weapons.Ranged.Barrels.Components
 {
     [Serializable, NetSerializable]
     public class BoltActionBarrelComponentState : ComponentState
diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedMagazineBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs
similarity index 89%
rename from Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedMagazineBarrelComponent.cs
rename to Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs
index c4ace6ed47..d337a4e4df 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedMagazineBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedMagazineBarrelComponent.cs
@@ -1,9 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Shared.Weapons.Ranged.Barrels.Components
 {
     [Serializable, NetSerializable]
     public enum AmmoVisuals
diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedPumpBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedPumpBarrelComponent.cs
rename to Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs
index 073a317cb1..8789661af8 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedPumpBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedPumpBarrelComponent.cs
@@ -1,9 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Shared.Weapons.Ranged.Barrels.Components
 {
     [Serializable, NetSerializable]
     public class PumpBarrelComponentState : ComponentState
diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedRevolverBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs
similarity index 85%
rename from Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedRevolverBarrelComponent.cs
rename to Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs
index bb8921458b..97ff37ead4 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Ranged/Barrels/SharedRevolverBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Barrels/Components/SharedRevolverBarrelComponent.cs
@@ -1,9 +1,11 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
+using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Ranged.Barrels
+namespace Content.Shared.Weapons.Ranged.Barrels.Components
 {
     [Serializable, NetSerializable]
     public class RevolverBarrelComponentState : ComponentState
diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs
similarity index 91%
rename from Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs
rename to Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs
index dbb3010b10..7436dd11bc 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/SharedRangedBarrelComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.ViewVariables;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Ranged
+namespace Content.Shared.Weapons.Ranged.Components
 {
     public abstract class SharedRangedBarrelComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs
similarity index 96%
rename from Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs
rename to Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs
index a727e59910..4a09320ccc 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedWeaponComponent.cs
+++ b/Content.Shared/Weapons/Ranged/Components/SharedRangedWeaponComponent.cs
@@ -1,11 +1,12 @@
 #nullable enable
 using System;
+using Content.Shared.NetIDs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Ranged
+namespace Content.Shared.Weapons.Ranged.Components
 {
     public abstract class SharedRangedWeaponComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/Weapons/Ranged/MagazineAutoEjectMessage.cs b/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs
similarity index 83%
rename from Content.Shared/GameObjects/Components/Weapons/Ranged/MagazineAutoEjectMessage.cs
rename to Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs
index bebda8dfb4..632e905f6a 100644
--- a/Content.Shared/GameObjects/Components/Weapons/Ranged/MagazineAutoEjectMessage.cs
+++ b/Content.Shared/Weapons/Ranged/MagazineAutoEjectMessage.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components.Weapons.Ranged
+namespace Content.Shared.Weapons.Ranged
 {
     /// <summary>
     /// This is sent if the MagazineBarrel AutoEjects the magazine
diff --git a/Content.Shared/Utility/EntityWhitelist.cs b/Content.Shared/Whitelist/EntityWhitelist.cs
similarity index 96%
rename from Content.Shared/Utility/EntityWhitelist.cs
rename to Content.Shared/Whitelist/EntityWhitelist.cs
index 80697d5a2b..adfe5e1f78 100644
--- a/Content.Shared/Utility/EntityWhitelist.cs
+++ b/Content.Shared/Whitelist/EntityWhitelist.cs
@@ -1,12 +1,12 @@
 using System.Collections.Generic;
-using Content.Shared.GameObjects.Components.Tag;
+using Content.Shared.Tag;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.Serialization.Manager.Attributes;
 
-namespace Content.Shared.Utility
+namespace Content.Shared.Whitelist
 {
     /// <summary>
     ///     Used to determine whether an entity fits a certain whitelist.
diff --git a/Content.Shared/GameObjects/Components/SharedWindowComponent.cs b/Content.Shared/Window/SharedWindowComponent.cs
similarity index 86%
rename from Content.Shared/GameObjects/Components/SharedWindowComponent.cs
rename to Content.Shared/Window/SharedWindowComponent.cs
index 522bfb5f99..c4dbc9e027 100644
--- a/Content.Shared/GameObjects/Components/SharedWindowComponent.cs
+++ b/Content.Shared/Window/SharedWindowComponent.cs
@@ -3,7 +3,7 @@ using System;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Window
 {
     public class SharedWindowComponent : Component
     {
diff --git a/Content.Shared/GameObjects/Components/SharedWiresComponent.cs b/Content.Shared/Wires/SharedWiresComponent.cs
similarity index 97%
rename from Content.Shared/GameObjects/Components/SharedWiresComponent.cs
rename to Content.Shared/Wires/SharedWiresComponent.cs
index 9bdf24a5a1..0bf4eb855e 100644
--- a/Content.Shared/GameObjects/Components/SharedWiresComponent.cs
+++ b/Content.Shared/Wires/SharedWiresComponent.cs
@@ -3,12 +3,11 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Serialization;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent;
 
-namespace Content.Shared.GameObjects.Components
+namespace Content.Shared.Wires
 {
     public class SharedWiresComponent : Component
     {
@@ -185,7 +184,7 @@ namespace Content.Shared.GameObjects.Components
     {
         public static string Name(this WireColor color)
         {
-            return Loc.GetString(color switch
+            return Robust.Shared.Localization.Loc.GetString(color switch
             {
                 WireColor.Red => "Red",
                 WireColor.Blue => "Blue",
@@ -225,7 +224,7 @@ namespace Content.Shared.GameObjects.Components
 
         public static string Name(this WireLetter letter)
         {
-            return Loc.GetString(letter switch
+            return Robust.Shared.Localization.Loc.GetString(letter switch
             {
                 WireLetter.α => "Alpha",
                 WireLetter.β => "Beta",
diff --git a/Content.Tests/Client/ClickMapTest.cs b/Content.Tests/Client/ClickMapTest.cs
index f3c6286c37..30ba7b1e8d 100644
--- a/Content.Tests/Client/ClickMapTest.cs
+++ b/Content.Tests/Client/ClickMapTest.cs
@@ -1,4 +1,5 @@
 using Content.Client;
+using Content.Client.Clickable;
 using NUnit.Framework;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
diff --git a/Content.Tests/ContentUnitTest.cs b/Content.Tests/ContentUnitTest.cs
index 0287cfd9bd..0a3b1b58d8 100644
--- a/Content.Tests/ContentUnitTest.cs
+++ b/Content.Tests/ContentUnitTest.cs
@@ -1,9 +1,12 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Content.Client;
+using Content.Client.IoC;
 using Content.Server;
+using Content.Server.IoC;
 using Content.Shared;
 using Robust.UnitTesting;
+using EntryPoint = Content.Server.EntryPoint.EntryPoint;
 
 namespace Content.Tests
 {
@@ -34,11 +37,11 @@ namespace Content.Tests
 
             if (Project == UnitTestProject.Server)
             {
-                l.Add(typeof(Content.Server.EntryPoint).Assembly);
+                l.Add(typeof(EntryPoint).Assembly);
             }
             else if (Project == UnitTestProject.Client)
             {
-                l.Add(typeof(Content.Client.EntryPoint).Assembly);
+                l.Add(typeof(Content.Client.EntryPoint.EntryPoint).Assembly);
             }
 
             l.Add(typeof(ContentUnitTest).Assembly);
diff --git a/Content.Tests/Server/GameObjects/Components/Access/AccessReaderTest.cs b/Content.Tests/Server/GameObjects/Components/Access/AccessReaderTest.cs
index 724e1e5c37..fef352109b 100644
--- a/Content.Tests/Server/GameObjects/Components/Access/AccessReaderTest.cs
+++ b/Content.Tests/Server/GameObjects/Components/Access/AccessReaderTest.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Server.GameObjects.Components.Access;
+using Content.Server.Access.Components;
 using NUnit.Framework;
 
 namespace Content.Tests.Server.GameObjects.Components.Access
diff --git a/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs b/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs
index 969e687e68..09c2fa63a6 100644
--- a/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs
+++ b/Content.Tests/Server/GameObjects/Components/Mobs/ServerAlertsComponentTests.cs
@@ -1,7 +1,6 @@
 using System.IO;
-using Content.Server.GameObjects.Components.Mobs;
+using Content.Server.Alert;
 using Content.Shared.Alert;
-using Content.Shared.GameObjects.Components.Mobs;
 using NUnit.Framework;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
diff --git a/Content.Tests/Server/Jobs/JobQueueTest.cs b/Content.Tests/Server/Jobs/JobQueueTest.cs
index 02bc5c3aba..b75d58af89 100644
--- a/Content.Tests/Server/Jobs/JobQueueTest.cs
+++ b/Content.Tests/Server/Jobs/JobQueueTest.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.EntitySystems.JobQueues;
-using Content.Server.GameObjects.EntitySystems.JobQueues.Queues;
+using Content.Server.CPUJob.JobQueues;
+using Content.Server.CPUJob.JobQueues.Queues;
 using NUnit.Framework;
 using Robust.Shared.Timing;
 using Robust.UnitTesting;
diff --git a/Content.Tests/Server/Preferences/ServerDbSqliteTests.cs b/Content.Tests/Server/Preferences/ServerDbSqliteTests.cs
index cb439563d4..9fd5906a1f 100644
--- a/Content.Tests/Server/Preferences/ServerDbSqliteTests.cs
+++ b/Content.Tests/Server/Preferences/ServerDbSqliteTests.cs
@@ -4,6 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Content.Server.Database;
+using Content.Shared.CharacterAppearance;
 using Content.Shared.GameTicking;
 using Content.Shared.Preferences;
 using Microsoft.Data.Sqlite;
diff --git a/Content.Tests/Server/Utility/IPAddressExtTest.cs b/Content.Tests/Server/Utility/IPAddressExtTest.cs
index 5d6d41b207..49c17032e2 100644
--- a/Content.Tests/Server/Utility/IPAddressExtTest.cs
+++ b/Content.Tests/Server/Utility/IPAddressExtTest.cs
@@ -1,5 +1,5 @@
 using System.Net;
-using Content.Server.Utility;
+using Content.Server.IP;
 using NUnit.Framework;
 
 namespace Content.Tests.Server.Utility
diff --git a/Content.Tests/Shared/Chemistry/ReagentPrototype_Tests.cs b/Content.Tests/Shared/Chemistry/ReagentPrototype_Tests.cs
index ddafce193b..f7a5d1a478 100644
--- a/Content.Tests/Shared/Chemistry/ReagentPrototype_Tests.cs
+++ b/Content.Tests/Shared/Chemistry/ReagentPrototype_Tests.cs
@@ -1,5 +1,6 @@
 using System.IO;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using NUnit.Framework;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
diff --git a/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs b/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs
index 8e6e6ab591..c61cac87cb 100644
--- a/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs
+++ b/Content.Tests/Shared/Chemistry/ReagentUnit_Tests.cs
@@ -1,5 +1,6 @@
 using System;
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
 using NUnit.Framework;
 
 namespace Content.Tests.Shared.Chemistry
diff --git a/Content.Tests/Shared/Chemistry/Solution_Tests.cs b/Content.Tests/Shared/Chemistry/Solution_Tests.cs
index 6ecd893b88..b3dab60fda 100644
--- a/Content.Tests/Shared/Chemistry/Solution_Tests.cs
+++ b/Content.Tests/Shared/Chemistry/Solution_Tests.cs
@@ -1,4 +1,6 @@
 using Content.Shared.Chemistry;
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.Chemistry.Solution;
 using NUnit.Framework;
 
 namespace Content.Tests.Shared.Chemistry
diff --git a/Content.Tests/Shared/EquipmentSlotDefinesTest.cs b/Content.Tests/Shared/EquipmentSlotDefinesTest.cs
index 59431b568e..544ccaeb70 100644
--- a/Content.Tests/Shared/EquipmentSlotDefinesTest.cs
+++ b/Content.Tests/Shared/EquipmentSlotDefinesTest.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Inventory;
+using Content.Shared.Inventory;
 using NUnit.Framework;
-using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
+using static Content.Shared.Inventory.EquipmentSlotDefines;
 
 namespace Content.Tests.Shared
 {
diff --git a/Content.Tests/Shared/Utility/ContentHelpers_Test.cs b/Content.Tests/Shared/Utility/ContentHelpers_Test.cs
index 206e18eca6..04e621c111 100644
--- a/Content.Tests/Shared/Utility/ContentHelpers_Test.cs
+++ b/Content.Tests/Shared/Utility/ContentHelpers_Test.cs
@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Content.Shared.Utility;
+using Content.Shared.Rounding;
 using NUnit.Framework;
 
 namespace Content.Tests.Shared.Utility
diff --git a/Content.Tests/Shared/Utility/RandomExtensionsTests.cs b/Content.Tests/Shared/Utility/RandomExtensionsTests.cs
index 6db9a23bbd..6dff935a15 100644
--- a/Content.Tests/Shared/Utility/RandomExtensionsTests.cs
+++ b/Content.Tests/Shared/Utility/RandomExtensionsTests.cs
@@ -1,6 +1,6 @@
 using System.IO;
-using Content.Shared.Prototypes;
-using Content.Shared.Utility;
+using Content.Shared.Dataset;
+using Content.Shared.Random.Helpers;
 using NUnit.Framework;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
diff --git a/Content.Tests/Shared/WireHackingTest.cs b/Content.Tests/Shared/WireHackingTest.cs
index cbb37fbe30..ea4bdefb9c 100644
--- a/Content.Tests/Shared/WireHackingTest.cs
+++ b/Content.Tests/Shared/WireHackingTest.cs
@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
 using Content.Shared.GameObjects.Components;
+using Content.Shared.Wires;
 using NUnit.Framework;
 using Robust.UnitTesting;
-using static Content.Shared.GameObjects.Components.SharedWiresComponent;
+using static Content.Shared.Wires.SharedWiresComponent;
 
 namespace Content.Tests.Shared
 {