diff --git a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
index 653a9c2a98..4fcf8f7ed3 100644
--- a/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
+++ b/Content.Client/Administration/UI/AdminAnnounceWindow.xaml.cs
@@ -1,11 +1,8 @@
-using Content.Client.HUD;
 using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 
 namespace Content.Client.Administration.UI
 {
diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
index 761cd66140..b1c812f1d9 100644
--- a/Content.Client/Audio/BackgroundAudioSystem.cs
+++ b/Content.Client/Audio/BackgroundAudioSystem.cs
@@ -1,6 +1,7 @@
 using Content.Client.GameTicking.Managers;
+using System.Threading;
+using Content.Client.Gameplay;
 using Content.Client.Lobby;
-using Content.Client.Viewport;
 using Content.Shared.CCVar;
 using JetBrains.Annotations;
 using Robust.Client;
@@ -8,13 +9,10 @@ using Robust.Client.Player;
 using Robust.Client.State;
 using Robust.Shared.Audio;
 using Robust.Shared.Configuration;
-using Robust.Shared.Map;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
-using System.Threading;
-using Content.Client.Gameplay;
 using Robust.Client.GameObjects;
 using Robust.Client.ResourceManagement;
 using Timer = Robust.Shared.Timing.Timer;
diff --git a/Content.Client/CharacterInfo/Components/CharacterInfoSystem.cs b/Content.Client/CharacterInfo/Components/CharacterInfoSystem.cs
index f778383488..6589bf72f3 100644
--- a/Content.Client/CharacterInfo/Components/CharacterInfoSystem.cs
+++ b/Content.Client/CharacterInfo/Components/CharacterInfoSystem.cs
@@ -1,12 +1,10 @@
-using System.Collections.Generic;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.CharacterInfo;
 using Content.Shared.Objectives;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.Utility;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Maths;
 
 namespace Content.Client.CharacterInfo.Components;
 
diff --git a/Content.Client/Chemistry/EntitySystems/ReagentDispenserSystem.cs b/Content.Client/Chemistry/EntitySystems/ReagentDispenserSystem.cs
index 25c09b4603..c0ac6c4bc3 100644
--- a/Content.Client/Chemistry/EntitySystems/ReagentDispenserSystem.cs
+++ b/Content.Client/Chemistry/EntitySystems/ReagentDispenserSystem.cs
@@ -1,5 +1,5 @@
-using JetBrains.Annotations;
 using Content.Shared.Chemistry.EntitySystems;
+using JetBrains.Annotations;
 
 namespace Content.Client.Chemistry.EntitySystems
 {
@@ -7,5 +7,6 @@ namespace Content.Client.Chemistry.EntitySystems
     public sealed class ReagentDispenserSystem : SharedReagentDispenserSystem
     {
         // hello there.
+        // General Kenobi
     }
 }
diff --git a/Content.Client/CrewManifest/CrewManifestUi.xaml b/Content.Client/CrewManifest/CrewManifestUi.xaml
index 6c29664335..c49ecf2069 100644
--- a/Content.Client/CrewManifest/CrewManifestUi.xaml
+++ b/Content.Client/CrewManifest/CrewManifestUi.xaml
@@ -1,13 +1,13 @@
 <DefaultWindow xmlns="https://spacestation14.io"
-               xmlns:ui="clr-namespace:Content.Client.HUD.UI"
+               xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                Title="{Loc 'crew-manifest-window-title'}"
                MinSize="450 750">
     <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
-        <ui:StripeBack Name="StationNameContainer">
+        <controls:StripeBack Name="StationNameContainer">
             <PanelContainer>
                 <Label Name="StationName" Align="Center" />
             </PanelContainer>
-        </ui:StripeBack>
+        </controls:StripeBack>
         <BoxContainer HorizontalExpand="True" VerticalExpand="True">
             <ScrollContainer HorizontalExpand="True" VerticalExpand="True">
                 <!-- this MIGHT have race conditions -->
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index cf6bb073e2..b2e011e01a 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -2,7 +2,7 @@ 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.Options;
 using Content.Client.Eui;
 using Content.Client.Flash;
 using Content.Client.GhostKick;
diff --git a/Content.Client/Gameplay/GameplayState.cs b/Content.Client/Gameplay/GameplayState.cs
index c4fb1cefe4..68e99bed0d 100644
--- a/Content.Client/Gameplay/GameplayState.cs
+++ b/Content.Client/Gameplay/GameplayState.cs
@@ -5,7 +5,7 @@ using Content.Client.Chat.UI;
 using Content.Client.Construction.UI;
 using Content.Client.Hands;
 using Content.Client.HUD;
-using Content.Client.HUD.UI;
+using Content.Client.UserInterface.Controls;
 using Content.Client.Viewport;
 using Content.Client.Voting;
 using Content.Shared.Chat;
diff --git a/Content.Client/Ghost/GhostComponent.cs b/Content.Client/Ghost/GhostComponent.cs
index 4499834b7b..57f7b7753a 100644
--- a/Content.Client/Ghost/GhostComponent.cs
+++ b/Content.Client/Ghost/GhostComponent.cs
@@ -1,8 +1,6 @@
-using Content.Client.Ghost.UI;
+using Content.Client.UserInterface.Systems.Ghost;
 using Content.Shared.Ghost;
 using Robust.Client.Player;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 
 namespace Content.Client.Ghost
 {
diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs
index ecac981f59..f44ba7b31a 100644
--- a/Content.Client/Ghost/GhostSystem.cs
+++ b/Content.Client/Ghost/GhostSystem.cs
@@ -1,11 +1,9 @@
-using Content.Client.Ghost.UI;
 using Content.Client.HUD;
+using Content.Client.UserInterface.Systems.Ghost;
 using Content.Shared.Ghost;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
 
 namespace Content.Client.Ghost
 {
diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs
index acb797828c..60351247a3 100644
--- a/Content.Client/Info/RulesAndInfoWindow.cs
+++ b/Content.Client/Info/RulesAndInfoWindow.cs
@@ -1,5 +1,4 @@
-using Content.Client.EscapeMenu.UI;
-using Content.Shared.CCVar;
+using Content.Client.Options.UI;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Info/RulesManager.cs b/Content.Client/Info/RulesManager.cs
index aa976b3b89..366b98d465 100644
--- a/Content.Client/Info/RulesManager.cs
+++ b/Content.Client/Info/RulesManager.cs
@@ -1,6 +1,5 @@
-using Content.Client.Gameplay;
 using Content.Client.Lobby;
-using Content.Client.Viewport;
+using Content.Client.Gameplay;
 using Content.Shared.CCVar;
 using Content.Shared.Info;
 using Robust.Client.Console;
diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs
index c66a5603e1..e8ee8389a0 100644
--- a/Content.Client/IoC/ClientContentIoC.cs
+++ b/Content.Client/IoC/ClientContentIoC.cs
@@ -2,7 +2,7 @@
 using Content.Client.Changelog;
 using Content.Client.Chat.Managers;
 using Content.Client.Clickable;
-using Content.Client.EscapeMenu;
+using Content.Client.Options;
 using Content.Client.Eui;
 using Content.Client.GhostKick;
 using Content.Client.HUD;
diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs
index f38a983355..ad6b8ac582 100644
--- a/Content.Client/LateJoin/LateJoinGui.cs
+++ b/Content.Client/LateJoin/LateJoinGui.cs
@@ -1,11 +1,8 @@
-using System.Linq;
 using Content.Client.CrewManifest;
-using Content.Client.Eui;
 using Content.Client.GameTicking.Managers;
-using Content.Client.HUD.UI;
 using Content.Client.Players.PlayTimeTracking;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.CCVar;
-using Content.Shared.CrewManifest;
 using Content.Shared.Roles;
 using Robust.Client.Console;
 using Robust.Client.UserInterface;
diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 88f940ff28..47c0a69993 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -2,7 +2,7 @@ using System;
 using System.Linq;
 using Content.Client.Chat;
 using Content.Client.Chat.Managers;
-using Content.Client.EscapeMenu.UI;
+using Content.Client.Options.UI;
 using Content.Client.GameTicking.Managers;
 using Content.Client.LateJoin;
 using Content.Client.Lobby.UI;
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
index 7370a43546..22c2148c39 100644
--- a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
+++ b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
@@ -1,22 +1,16 @@
 using System.Linq;
-using Content.Client.HUD.UI;
 using Content.Client.Inventory;
 using Content.Client.Preferences;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.CharacterAppearance.Systems;
 using Content.Shared.GameTicking;
-using Content.Shared.Inventory;
 using Content.Shared.Preferences;
 using Content.Shared.Roles;
 using Content.Shared.Species;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 12a24bb472..1c885dc281 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -1,12 +1,10 @@
-<Control xmlns="https://spacestation14.io"
+<Control xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:maths="clr-namespace:Robust.Shared.Maths;assembly=Robust.Shared.Maths"
          xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
-         xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
-         xmlns:parallax="clr-namespace:Content.Client.Parallax"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
          xmlns:vote="clr-namespace:Content.Client.Voting.UI"
          xmlns:style="clr-namespace:Content.Client.Stylesheets"
-         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
          xmlns:chatUi="clr-namespace:Content.Client.Chat.UI"
          xmlns:lobbyUi="clr-namespace:Content.Client.Lobby.UI"
          xmlns:info="clr-namespace:Content.Client.Info">
@@ -20,7 +18,7 @@
                 <PanelContainer StyleClasses="AngleRect" HorizontalAlignment="Left" Name = "LeftSideTop" VerticalAlignment="Top" >
                     <BoxContainer Orientation="Vertical" HorizontalAlignment="Center" MaxWidth="620">
                         <info:LinkBanner Name="LinkBanner" VerticalExpand="false" HorizontalAlignment="Center" Margin="3 3 3 3"/>
-                        <hudUi:StripeBack>
+                        <controls:StripeBack>
                             <BoxContainer Orientation="Horizontal" SeparationOverride="6" Margin="3 3 3 3">
                                 <cc:UICommandButton Command="observe" Name="ObserveButton" Access="Public" Text="{Loc 'ui-lobby-observe-button'}" StyleClasses="ButtonBig"  WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/>
                                 <Label Name="StartTime"
@@ -31,7 +29,7 @@
                                 <Button Name="ReadyButton" Access="Public" ToggleMode="True" Text="{Loc 'ui-lobby-ready-up-button'}"
                                         StyleClasses="ButtonBig" />
                             </BoxContainer>
-                        </hudUi:StripeBack>
+                        </controls:StripeBack>
                     </BoxContainer>
                 </PanelContainer>
                 <!-- Voting Popups -->
@@ -52,8 +50,8 @@
                         <Label Name="ServerName" Access="Public" StyleClasses="LabelHeadingBigger" VAlign="Center" />
                     </BoxContainer>
                     <!-- Gold line -->
-                    <ui:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="2"/>
-                    <ui:HSpacer Spacing="10"/>
+                    <controls:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="2"/>
+                    <controls:HSpacer Spacing="10"/>
                     <!-- Voting & misc button bar -->
                     <BoxContainer Orientation="Horizontal" MinSize="0 40" HorizontalAlignment="Right">
                         <cc:CommandButton Name = "AHelpButton" Command="openahelp" Access="Public" Text = "{Loc 'ui-lobby-ahelp-button'}" StyleClasses="ButtonBig"/>
@@ -61,18 +59,18 @@
                         <Button Name="OptionsButton" Access="Public" StyleClasses="ButtonBig" Text="{Loc 'ui-lobby-options-button'}" />
                         <Button Name="LeaveButton" Access="Public" StyleClasses="ButtonBig" Text="{Loc 'ui-lobby-leave-button'}" />
                     </BoxContainer>
-                    <ui:HSpacer Spacing="10"/>
+                    <controls:HSpacer Spacing="10"/>
                     <!-- Server info -->
-                    <hudUi:NanoHeading Text="{Loc 'ui-lobby-server-info-block'}" />
+                    <controls:NanoHeading Text="{Loc 'ui-lobby-server-info-block'}" />
                     <info:ServerInfo Name="ServerInfo" Access="Public" MinSize="0 30" VerticalExpand="false" Margin="3 3 3 3" MaxWidth="400"  HorizontalAlignment="Left"/>
                     <Label Name="StationTime" Access="Public" FontColorOverride="{x:Static maths:Color.LightGray}" Margin="3 3 3 3" HorizontalAlignment="Left"/>
-                    <ui:HSpacer Spacing="5"/>
+                    <controls:HSpacer Spacing="5"/>
                     <lobbyUi:LobbyCharacterPreviewPanel Name="CharacterPreview" Access="Public"></lobbyUi:LobbyCharacterPreviewPanel>
-                    <ui:HSpacer Spacing="5"/>
+                    <controls:HSpacer Spacing="5"/>
                     <BoxContainer MinHeight="10"/>
                     <!-- Gold line -->
-                    <ui:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="2" Access="Public"/>
-                    <ui:HSpacer Spacing="10"/>
+                    <controls:HLine Color="{x:Static style:StyleNano.NanoGold}" Thickness="2" Access="Public"/>
+                    <controls:HSpacer Spacing="10"/>
                     <chatUi:ChatBox Name="Chat" Access="Public" VerticalExpand="True" Margin="3 3 3 3" MinHeight="50"/>
                 </BoxContainer>
             </PanelContainer>
diff --git a/Content.Client/MainMenu/MainMenu.cs b/Content.Client/MainMenu/MainMenu.cs
index 0cb2c48791..47bc8a4910 100644
--- a/Content.Client/MainMenu/MainMenu.cs
+++ b/Content.Client/MainMenu/MainMenu.cs
@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using Content.Client.EscapeMenu.UI;
+using Content.Client.Options.UI;
 using Content.Client.MainMenu.UI;
 using Robust.Client;
 using Robust.Client.ResourceManagement;
diff --git a/Content.Client/Mapping/MappingSystem.cs b/Content.Client/Mapping/MappingSystem.cs
index e82474a7c2..0e08fcd70f 100644
--- a/Content.Client/Mapping/MappingSystem.cs
+++ b/Content.Client/Mapping/MappingSystem.cs
@@ -1,10 +1,10 @@
-using Robust.Shared.Utility;
+using Content.Client.Actions;
+using Content.Shared.Actions;
+using Content.Shared.Actions.ActionTypes;
+using Content.Shared.Maps;
 using Robust.Client.Placement;
 using Robust.Shared.Map;
-using Content.Shared.Actions.ActionTypes;
-using Content.Shared.Actions;
-using Content.Client.Actions;
-using Content.Shared.Maps;
+using Robust.Shared.Utility;
 
 namespace Content.Client.Mapping;
 
diff --git a/Content.Client/NPC/NPCWindow.xaml b/Content.Client/NPC/NPCWindow.xaml
index 9094893bc0..29a2a75737 100644
--- a/Content.Client/NPC/NPCWindow.xaml
+++ b/Content.Client/NPC/NPCWindow.xaml
@@ -1,20 +1,19 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:ui="clr-namespace:Content.Client.HUD.UI"
             xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             Title="NPC debug"
             MinSize="200 200">
     <BoxContainer Name="Options" Orientation="Vertical">
-        <ui:StripeBack>
+        <controls:StripeBack>
             <Label Text="NPC" HorizontalAlignment="Center"/>
-        </ui:StripeBack>
+        </controls:StripeBack>
         <BoxContainer Name="NPCBox" Orientation="Vertical">
             <CheckBox Name="NPCPath" Text="Path"/>
             <CheckBox Name="NPCThonk" Text="Thonk"/>
         </BoxContainer>
-        <ui:StripeBack>
+        <controls:StripeBack>
             <Label Text="Pathfinder" HorizontalAlignment="Center"/>
-        </ui:StripeBack>
+        </controls:StripeBack>
         <BoxContainer Name="PathfinderBox" Orientation="Vertical">
             <CheckBox Name="PathNodes" Text="Nodes"/>
             <CheckBox Name="PathRoutes" Text="Routes"/>
diff --git a/Content.Client/NPC/NPCWindow.xaml.cs b/Content.Client/NPC/NPCWindow.xaml.cs
index 9802ebc91b..772da9c377 100644
--- a/Content.Client/NPC/NPCWindow.xaml.cs
+++ b/Content.Client/NPC/NPCWindow.xaml.cs
@@ -1,7 +1,6 @@
 using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Console;
 
 namespace Content.Client.NPC;
 
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
index 98bb0d2dfb..19d04cd346 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
@@ -2,10 +2,7 @@
 using Content.Client.UserInterface.Controls;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Client.Graphics;
 
 namespace Content.Client.NetworkConfigurator;
 
diff --git a/Content.Client/EscapeMenu/EscapeMenuOwner.cs b/Content.Client/Options/EscapeMenuOwner.cs
similarity index 98%
rename from Content.Client/EscapeMenu/EscapeMenuOwner.cs
rename to Content.Client/Options/EscapeMenuOwner.cs
index 22ee84128d..426921c759 100644
--- a/Content.Client/EscapeMenu/EscapeMenuOwner.cs
+++ b/Content.Client/Options/EscapeMenuOwner.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 
-namespace Content.Client.EscapeMenu
+namespace Content.Client.Options
 {
     internal sealed class EscapeMenuOwner : IEscapeMenuOwner
     {
diff --git a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml b/Content.Client/Options/UI/EscapeMenu.xaml
similarity index 100%
rename from Content.Client/EscapeMenu/UI/EscapeMenu.xaml
rename to Content.Client/Options/UI/EscapeMenu.xaml
diff --git a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs b/Content.Client/Options/UI/EscapeMenu.xaml.cs
similarity index 98%
rename from Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
rename to Content.Client/Options/UI/EscapeMenu.xaml.cs
index c9efcd6e72..dfae0498dc 100644
--- a/Content.Client/EscapeMenu/UI/EscapeMenu.xaml.cs
+++ b/Content.Client/Options/UI/EscapeMenu.xaml.cs
@@ -9,7 +9,7 @@ using Robust.Client.UserInterface;
 using Content.Client.Links;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.EscapeMenu.UI
+namespace Content.Client.Options.UI
 {
     [GenerateTypedNameReferences]
     internal sealed partial class EscapeMenu : DefaultWindow
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml b/Content.Client/Options/UI/OptionsMenu.xaml
similarity index 80%
rename from Content.Client/EscapeMenu/UI/OptionsMenu.xaml
rename to Content.Client/Options/UI/OptionsMenu.xaml
index 2057182430..540633aaa9 100644
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml
+++ b/Content.Client/Options/UI/OptionsMenu.xaml
@@ -1,5 +1,5 @@
 <DefaultWindow xmlns="https://spacestation14.io"
-            xmlns:tabs="clr-namespace:Content.Client.EscapeMenu.UI.Tabs"
+            xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
             Title="{Loc 'ui-options-title'}"
             MinSize="800 450">
     <TabContainer Name="Tabs">
diff --git a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs b/Content.Client/Options/UI/OptionsMenu.xaml.cs
similarity index 94%
rename from Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs
rename to Content.Client/Options/UI/OptionsMenu.xaml.cs
index 9c9ae3270e..da271025a0 100644
--- a/Content.Client/EscapeMenu/UI/OptionsMenu.xaml.cs
+++ b/Content.Client/Options/UI/OptionsMenu.xaml.cs
@@ -4,7 +4,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 
-namespace Content.Client.EscapeMenu.UI
+namespace Content.Client.Options.UI
 {
     [GenerateTypedNameReferences]
     public sealed partial class OptionsMenu : DefaultWindow
diff --git a/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml b/Content.Client/Options/UI/Tabs/AudioTab.xaml
similarity index 96%
rename from Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml
rename to Content.Client/Options/UI/Tabs/AudioTab.xaml
index 24bc81aed0..d6da27f63e 100644
--- a/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml
@@ -1,7 +1,7 @@
 <Control xmlns="https://spacestation14.io"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:s="clr-namespace:Content.Client.Stylesheets"
-         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI">
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
             <Label Text="{Loc 'ui-options-volume-label'}"
@@ -70,7 +70,7 @@
                 <CheckBox Name="SpaceAmbienceCheckBox" Text="{Loc 'ui-options-space-ambience'}" />
             </BoxContainer>
         </BoxContainer>
-        <hudUi:StripeBack HasBottomEdge="False" HasMargins="False">
+        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
             <BoxContainer Orientation="Horizontal"
                           Align="End"
                           HorizontalExpand="True"
@@ -86,6 +86,6 @@
                         TextAlign="Center"
                         HorizontalAlignment="Right" />
             </BoxContainer>
-        </hudUi:StripeBack>
+        </controls:StripeBack>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml.cs b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
similarity index 99%
rename from Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml.cs
rename to Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
index 97b9bf640e..6bc2113915 100644
--- a/Content.Client/EscapeMenu/UI/Tabs/AudioTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Shared;
 using Robust.Shared.Configuration;
 using Range = Robust.Client.UserInterface.Controls.Range;
 
-namespace Content.Client.EscapeMenu.UI.Tabs
+namespace Content.Client.Options.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public sealed partial class AudioTab : Control
diff --git a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
similarity index 93%
rename from Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml
rename to Content.Client/Options/UI/Tabs/GraphicsTab.xaml
index 7790a7da92..9d60846efa 100644
--- a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml
@@ -1,5 +1,5 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI">
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
             <CheckBox Name="VSyncCheckBox" Text="{Loc 'ui-options-vsync'}" />
@@ -38,11 +38,11 @@
             <CheckBox Name="ParallaxLowQualityCheckBox" Text="{Loc 'ui-options-parallax-low-quality'}" />
             <CheckBox Name="FpsCounterCheckBox" Text="{Loc 'ui-options-fps-counter'}" />
         </BoxContainer>
-        <hudUi:StripeBack HasBottomEdge="False" HasMargins="False">
+        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
             <Button Name="ApplyButton"
                     Text="{Loc 'ui-options-apply'}"
                     TextAlign="Center"
                     HorizontalAlignment="Right" />
-        </hudUi:StripeBack>
+        </controls:StripeBack>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
similarity index 99%
rename from Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs
rename to Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
index 4d8540b8a9..b5ebcb064c 100644
--- a/Content.Client/EscapeMenu/UI/Tabs/GraphicsTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/GraphicsTab.xaml.cs
@@ -12,7 +12,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Content.Client.EscapeMenu.UI.Tabs
+namespace Content.Client.Options.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public sealed partial class GraphicsTab : Control
diff --git a/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml
similarity index 81%
rename from Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml
rename to Content.Client/Options/UI/Tabs/KeyRebindTab.xaml
index 0769aa9c0c..08dafbbbab 100644
--- a/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml
@@ -1,5 +1,5 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI">
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <BoxContainer Orientation="Vertical">
         <ScrollContainer VerticalExpand="True">
             <BoxContainer Name="KeybindsContainer" Orientation="Vertical" Margin="8 8 8 8">
@@ -8,7 +8,7 @@
 
             </BoxContainer>
         </ScrollContainer>
-        <hudUi:StripeBack HasBottomEdge="False" HasMargins="False">
+        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
             <BoxContainer Orientation="Horizontal">
                 <Control MinSize="8 0" />
                 <Label Text="{Loc 'ui-options-binds-explanation'}" StyleClasses="LabelSubText" />
@@ -17,6 +17,6 @@
                         HorizontalExpand="True"
                         HorizontalAlignment="Right" />
             </BoxContainer>
-        </hudUi:StripeBack>
+        </controls:StripeBack>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
similarity index 99%
rename from Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs
rename to Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
index d983f09024..6073877f58 100644
--- a/Content.Client/EscapeMenu/UI/Tabs/KeyRebindTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/KeyRebindTab.xaml.cs
@@ -19,7 +19,7 @@ using Robust.Shared.Log;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 using Robust.Client.UserInterface.CustomControls;
 
-namespace Content.Client.EscapeMenu.UI.Tabs
+namespace Content.Client.Options.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public sealed partial class KeyRebindTab : Control
diff --git a/Content.Client/EscapeMenu/UI/Tabs/NetworkTab.xaml b/Content.Client/Options/UI/Tabs/NetworkTab.xaml
similarity index 94%
rename from Content.Client/EscapeMenu/UI/Tabs/NetworkTab.xaml
rename to Content.Client/Options/UI/Tabs/NetworkTab.xaml
index b698035800..09ee2584f2 100644
--- a/Content.Client/EscapeMenu/UI/Tabs/NetworkTab.xaml
+++ b/Content.Client/Options/UI/Tabs/NetworkTab.xaml
@@ -1,7 +1,7 @@
 <Control xmlns="https://spacestation14.io"
-         xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-         x:Class="Content.Client.EscapeMenu.UI.Tabs.NetworkTab">
+         x:Class="Content.Client.Options.UI.Tabs.NetworkTab">
     <BoxContainer Orientation="Vertical" >
         <BoxContainer Orientation="Vertical" Margin="8 8 8 8" VerticalExpand="True">
             <BoxContainer Orientation="Horizontal" Margin="4 10 4 0">
@@ -60,7 +60,7 @@
                 <Control MinSize="4 0"/>
             </BoxContainer>
         </BoxContainer>
-        <hudUi:StripeBack HasBottomEdge="False" HasMargins="False">
+        <controls:StripeBack HasBottomEdge="False" HasMargins="False">
             <BoxContainer Orientation="Horizontal"
                           Align="End"
                           HorizontalExpand="True"
@@ -80,6 +80,6 @@
                         TextAlign="Center"
                         HorizontalAlignment="Right" />
             </BoxContainer>
-        </hudUi:StripeBack>
+        </controls:StripeBack>
     </BoxContainer>
 </Control>
diff --git a/Content.Client/EscapeMenu/UI/Tabs/NetworkTab.xaml.cs b/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs
similarity index 99%
rename from Content.Client/EscapeMenu/UI/Tabs/NetworkTab.xaml.cs
rename to Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs
index a49bd9bfc1..99a6d73d5d 100644
--- a/Content.Client/EscapeMenu/UI/Tabs/NetworkTab.xaml.cs
+++ b/Content.Client/Options/UI/Tabs/NetworkTab.xaml.cs
@@ -7,7 +7,7 @@ using Robust.Shared.Configuration;
 using Robust.Client.GameStates;
 using Content.Client.Entry;
 
-namespace Content.Client.EscapeMenu.UI.Tabs
+namespace Content.Client.Options.UI.Tabs
 {
     [GenerateTypedNameReferences]
     public sealed partial class NetworkTab : Control
diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
index ab870380ce..4ec64cc372 100644
--- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
+++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.cs
@@ -1,7 +1,6 @@
-using System;
-using Content.Client.HUD.UI;
 using Content.Client.Resources;
 using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Singularity.Components;
 using Robust.Client.Animations;
 using Robust.Client.Graphics;
@@ -9,9 +8,6 @@ using Robust.Client.ResourceManagement;
 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.Noise;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
index dbde7d4a9d..a077345460 100644
--- a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
+++ b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
 using Content.Client.CharacterAppearance;
-using Content.Client.HUD.UI;
 using Content.Client.Lobby.UI;
 using Content.Client.Message;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.CCVar;
 using Content.Shared.CharacterAppearance;
 using Content.Shared.CharacterAppearance.Systems;
@@ -25,17 +23,12 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Client.Utility;
 using Robust.Shared.Configuration;
 using Robust.Shared.Enums;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
-using Range = Robust.Client.UserInterface.Controls.Range;
 
 namespace Content.Client.Preferences.UI
 {
diff --git a/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml b/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
index a35d5a95ca..0865b1bba9 100644
--- a/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
@@ -35,7 +35,6 @@
                HorizontalExpand="True"/>
     </BoxContainer>
     <!-- Spacer -->
-    <BoxContainer Name="AuthorizationsContainer" Orientation="Vertical">
-    </BoxContainer>
+    <BoxContainer Name="AuthorizationsContainer" Orientation="Vertical"/>
 </BoxContainer>
 </controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
index 9bbfbef342..9d29f77d47 100644
--- a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
@@ -1,6 +1,6 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-                           xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
-               Title="{Loc 'radar-console-window-title'}">
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
+                      Title="{Loc 'radar-console-window-title'}">
     <ui:RadarControl Name="RadarScreen"/>
 </controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
index 0ef4fbc6a0..c0c0bba05f 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
@@ -1,7 +1,6 @@
 <controls:FancyWindow xmlns="https://spacestation14.io"
                            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                            xmlns:ui="clr-namespace:Content.Client.Shuttles.UI"
-                           xmlns:ui1="clr-namespace:Content.Client.HUD.UI"
                            Title="{Loc 'shuttle-console-window-title'}">
     <GridContainer Columns="3"
                   HorizontalAlignment="Stretch"
@@ -13,20 +12,19 @@
                       Align="Center"
                       Orientation="Vertical">
             <BoxContainer Orientation="Vertical">
-                <ui1:StripeBack>
+                <controls:StripeBack>
                     <Label Name="DockingPortsLabel" Text="{Loc 'shuttle-console-dock-label'}" HorizontalAlignment="Center"/>
-                </ui1:StripeBack>
+                </controls:StripeBack>
                 <BoxContainer Name="DockPorts"
                               Orientation="Vertical">
                 </BoxContainer>
             </BoxContainer>
             <BoxContainer Orientation="Vertical">
-                <ui1:StripeBack>
+                <controls:StripeBack>
                     <Label Name="HyperspaceLabel" Text="{Loc 'shuttle-console-hyperspace-label'}" HorizontalAlignment="Center"/>
-                </ui1:StripeBack>
+                </controls:StripeBack>
                 <BoxContainer Name="HyperspaceDestinations"
-                              Orientation="Vertical">
-                </BoxContainer>
+                              Orientation="Vertical"/>
             </BoxContainer>
         </BoxContainer>
         <PanelContainer>
@@ -42,9 +40,9 @@
                       MinWidth="256"
                       Align="Center"
                       Orientation="Vertical">
-            <ui1:StripeBack>
+            <controls:StripeBack>
                 <Label Name="DisplayLabel" Text="{Loc 'shuttle-console-display-label'}" HorizontalAlignment="Center"/>
-            </ui1:StripeBack>
+            </controls:StripeBack>
             <BoxContainer Name="ReadonlyDisplay">
                 <GridContainer Columns="2"
                                HorizontalAlignment="Stretch"
diff --git a/Content.Client/Storage/StorageBoundUserInterface.cs b/Content.Client/Storage/StorageBoundUserInterface.cs
index adfc82fbb0..0c1c1c3cac 100644
--- a/Content.Client/Storage/StorageBoundUserInterface.cs
+++ b/Content.Client/Storage/StorageBoundUserInterface.cs
@@ -1,9 +1,9 @@
 using Content.Client.Storage.UI;
+using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.Input;
 using Content.Client.Items.Managers;
-using JetBrains.Annotations;
 using static Content.Shared.Storage.SharedStorageComponent;
 
 namespace Content.Client.Storage
diff --git a/Content.Client/HUD/UI/MainViewport.cs b/Content.Client/UserInterface/Controls/MainViewport.cs
similarity index 98%
rename from Content.Client/HUD/UI/MainViewport.cs
rename to Content.Client/UserInterface/Controls/MainViewport.cs
index 0a596550a8..373a33db60 100644
--- a/Content.Client/HUD/UI/MainViewport.cs
+++ b/Content.Client/UserInterface/Controls/MainViewport.cs
@@ -1,12 +1,9 @@
 using Content.Client.Viewport;
-using Content.Shared;
 using Content.Shared.CCVar;
 using Robust.Client.UserInterface;
 using Robust.Shared.Configuration;
-using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 
-namespace Content.Client.HUD.UI
+namespace Content.Client.UserInterface.Controls
 {
     /// <summary>
     ///     Wrapper for <see cref="ScalingViewport"/> that listens to configuration variables.
diff --git a/Content.Client/HUD/UI/NanoHeading.cs b/Content.Client/UserInterface/Controls/NanoHeading.cs
similarity index 93%
rename from Content.Client/HUD/UI/NanoHeading.cs
rename to Content.Client/UserInterface/Controls/NanoHeading.cs
index d9a798015c..a02ac0835d 100644
--- a/Content.Client/HUD/UI/NanoHeading.cs
+++ b/Content.Client/UserInterface/Controls/NanoHeading.cs
@@ -1,7 +1,7 @@
 using Content.Client.Stylesheets;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.HUD.UI
+namespace Content.Client.UserInterface.Controls
 {
     public sealed class NanoHeading : Container
     {
diff --git a/Content.Client/CharacterInfo/ProgressTextureRect.cs b/Content.Client/UserInterface/Controls/ProgressTextureRect.cs
similarity index 92%
rename from Content.Client/CharacterInfo/ProgressTextureRect.cs
rename to Content.Client/UserInterface/Controls/ProgressTextureRect.cs
index 4f178f3856..d6930b4738 100644
--- a/Content.Client/CharacterInfo/ProgressTextureRect.cs
+++ b/Content.Client/UserInterface/Controls/ProgressTextureRect.cs
@@ -2,7 +2,7 @@
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.CharacterInfo
+namespace Content.Client.UserInterface.Controls
 {
     public sealed class ProgressTextureRect : TextureRect
     {
diff --git a/Content.Client/HUD/UI/StripeBack.cs b/Content.Client/UserInterface/Controls/StripeBack.cs
similarity index 98%
rename from Content.Client/HUD/UI/StripeBack.cs
rename to Content.Client/UserInterface/Controls/StripeBack.cs
index 53f4f9029a..8d1df84bc8 100644
--- a/Content.Client/HUD/UI/StripeBack.cs
+++ b/Content.Client/UserInterface/Controls/StripeBack.cs
@@ -1,8 +1,7 @@
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Maths;
 
-namespace Content.Client.HUD.UI
+namespace Content.Client.UserInterface.Controls
 {
     public sealed class StripeBack : Container
     {
diff --git a/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
similarity index 93%
rename from Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs
rename to Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
index 2740deff27..577187b053 100644
--- a/Content.Client/UserInterface/Atmos/GasTank/GasTankBoundUserInterface.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankBoundUserInterface.cs
@@ -1,9 +1,8 @@
 using Content.Shared.Atmos.Components;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
 
-namespace Content.Client.UserInterface.Atmos.GasTank
+namespace Content.Client.UserInterface.Systems.Atmos.GasTank
 {
     [UsedImplicitly]
     public sealed class GasTankBoundUserInterface
diff --git a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
similarity index 98%
rename from Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
rename to Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
index 05f450ae0c..794aaed754 100644
--- a/Content.Client/UserInterface/Atmos/GasTank/GasTankWindow.cs
+++ b/Content.Client/UserInterface/Systems/Atmos/GasTank/GasTankWindow.cs
@@ -7,12 +7,9 @@ using Robust.Client.ResourceManagement;
 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 static Robust.Client.UserInterface.Controls.BoxContainer;
 
-namespace Content.Client.UserInterface.Atmos.GasTank
+namespace Content.Client.UserInterface.Systems.Atmos.GasTank
 {
     public sealed class GasTankWindow
         : BaseWindow
diff --git a/Content.Client/Ghost/UI/GhostTargetWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml
similarity index 100%
rename from Content.Client/Ghost/UI/GhostTargetWindow.xaml
rename to Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml
diff --git a/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs
similarity index 97%
rename from Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs
index 65d438a34f..6a4f304c11 100644
--- a/Content.Client/Ghost/UI/GhostTargetWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/GhostTargetWindow.xaml.cs
@@ -5,7 +5,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Ghost.UI
+namespace Content.Client.UserInterface.Systems.Ghost.Controls
 {
     [GenerateTypedNameReferences]
     public sealed partial class GhostTargetWindow : DefaultWindow
diff --git a/Content.Client/Ghost/Roles/UI/GhostRoleEntryButtons.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
similarity index 100%
rename from Content.Client/Ghost/Roles/UI/GhostRoleEntryButtons.xaml
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml
diff --git a/Content.Client/Ghost/Roles/UI/GhostRoleEntryButtons.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
similarity index 72%
rename from Content.Client/Ghost/Roles/UI/GhostRoleEntryButtons.xaml.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
index 4d7c26cfe8..68bd39a141 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRoleEntryButtons.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleEntryButtons.xaml.cs
@@ -1,7 +1,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.Ghost.Roles.UI;
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles;
 
 [GenerateTypedNameReferences]
 public sealed partial class GhostRoleEntryButtons : BoxContainer
diff --git a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml
similarity index 100%
rename from Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml
diff --git a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs
similarity index 96%
rename from Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs
index cd11f03b93..1c36ed5dfa 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRoleRulesWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRoleRulesWindow.xaml.cs
@@ -8,7 +8,7 @@ using Robust.Shared.Utility;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
 
-namespace Content.Client.Ghost.Roles.UI
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
     [GenerateTypedNameReferences]
     public sealed partial class GhostRoleRulesWindow : DefaultWindow
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml
similarity index 100%
rename from Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs
similarity index 93%
rename from Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs
index bd17a8f0d1..77bd8dcfd6 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesEntry.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEntry.xaml.cs
@@ -4,7 +4,7 @@ using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Ghost.Roles.UI
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
     [GenerateTypedNameReferences]
     public sealed partial class GhostRolesEntry : BoxContainer
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
similarity index 97%
rename from Content.Client/Ghost/Roles/UI/GhostRolesEui.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
index 49619aa0d0..a41a2b42fd 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs
@@ -4,7 +4,7 @@ using Content.Shared.Eui;
 using Content.Shared.Ghost.Roles;
 using JetBrains.Annotations;
 
-namespace Content.Client.Ghost.Roles.UI
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
     [UsedImplicitly]
     public sealed class GhostRolesEui : BaseEui
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml
similarity index 100%
rename from Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml
diff --git a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
similarity index 92%
rename from Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
index 4b9bc35850..44554b5273 100644
--- a/Content.Client/Ghost/Roles/UI/GhostRolesWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesWindow.xaml.cs
@@ -3,7 +3,7 @@ using Content.Shared.Ghost.Roles;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.CustomControls;
 
-namespace Content.Client.Ghost.Roles.UI
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
     [GenerateTypedNameReferences]
     public sealed partial class GhostRolesWindow : DefaultWindow
diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
similarity index 97%
rename from Content.Client/Ghost/Roles/UI/MakeGhostRoleEui.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
index 4e368d7420..5ad1a145a5 100644
--- a/Content.Client/Ghost/Roles/UI/MakeGhostRoleEui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleEui.cs
@@ -8,7 +8,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Ghost.Roles.UI
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
     [UsedImplicitly]
     public sealed class MakeGhostRoleEui : BaseEui
diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
similarity index 100%
rename from Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml
diff --git a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
similarity index 96%
rename from Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
rename to Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
index 8767793aee..0dc2509be1 100644
--- a/Content.Client/Ghost/Roles/UI/MakeGhostRoleWindow.xaml.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/MakeGhostRoleWindow.xaml.cs
@@ -4,7 +4,7 @@ using Robust.Client.UserInterface.XAML;
 using Robust.Shared.GameObjects;
 using static Robust.Client.UserInterface.Controls.BaseButton;
 
-namespace Content.Client.Ghost.Roles.UI
+namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles
 {
     [GenerateTypedNameReferences]
     public sealed partial class MakeGhostRoleWindow : DefaultWindow
diff --git a/Content.Client/Ghost/UI/GhostGui.cs b/Content.Client/UserInterface/Systems/Ghost/GhostGui.cs
similarity index 95%
rename from Content.Client/Ghost/UI/GhostGui.cs
rename to Content.Client/UserInterface/Systems/Ghost/GhostGui.cs
index a7c9e771a7..4a28ab4814 100644
--- a/Content.Client/Ghost/UI/GhostGui.cs
+++ b/Content.Client/UserInterface/Systems/Ghost/GhostGui.cs
@@ -1,14 +1,13 @@
+using Content.Client.Ghost;
 using Content.Client.Stylesheets;
+using Content.Client.UserInterface.Systems.Ghost.Controls;
 using Content.Shared.Ghost;
 using Robust.Client.Console;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
 using static Robust.Client.UserInterface.Controls.BoxContainer;
 
-namespace Content.Client.Ghost.UI
+namespace Content.Client.UserInterface.Systems.Ghost
 {
     public sealed class GhostGui : Control
     {
diff --git a/Content.Client/Viewport/IMainViewport.cs b/Content.Client/Viewport/IMainViewport.cs
index d6d18063d2..01abbd4137 100644
--- a/Content.Client/Viewport/IMainViewport.cs
+++ b/Content.Client/Viewport/IMainViewport.cs
@@ -1,4 +1,4 @@
-using Content.Client.HUD.UI;
+using Content.Client.UserInterface.Controls;
 
 namespace Content.Client.Viewport
 {
diff --git a/Content.Client/Viewport/ViewportManager.cs b/Content.Client/Viewport/ViewportManager.cs
index ddcab69799..733528c0db 100644
--- a/Content.Client/Viewport/ViewportManager.cs
+++ b/Content.Client/Viewport/ViewportManager.cs
@@ -1,9 +1,6 @@
-using System.Collections.Generic;
-using Content.Client.HUD.UI;
-using Content.Shared;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.CCVar;
 using Robust.Shared.Configuration;
-using Robust.Shared.IoC;
 
 namespace Content.Client.Viewport
 {