Re-organize all projects (#4166)

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

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

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

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
     {

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

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

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

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
     {

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
     {

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
     {

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

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>
     {

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.

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]

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.

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

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.

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

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.

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
     {

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
     {

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.

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

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>

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

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
     {

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

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
     {

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

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

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

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>

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

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]

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>

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]

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>

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]

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>

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

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]

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]

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]

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>

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

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]

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]

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

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>

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

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>

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

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]

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
     {

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.

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

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;

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;

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
     {

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
     {

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

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))]

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))]

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))]

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

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
     {

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.
 

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
     {

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

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))]

Content.Client/Buckle/BuckleSystem.cs

@@ -0,0 +1,9 @@
+using Content.Shared.Buckle;
+
+namespace Content.Client.Buckle
+{
+    internal sealed class BuckleSystem : SharedBuckleSystem
+    {
+
+    }
+}

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

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))]

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

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))]

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

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
     {

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

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

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
     {

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
     {

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
     {

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;

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" />

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;

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

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

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

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

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
     {

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!;