diff --git a/Content.Client/Administration/QuickDialogSystem.cs b/Content.Client/Administration/QuickDialogSystem.cs
index fcd439d986..69a9218267 100644
--- a/Content.Client/Administration/QuickDialogSystem.cs
+++ b/Content.Client/Administration/QuickDialogSystem.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Administration;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs
index 8c4d790230..0008353172 100644
--- a/Content.Client/Alerts/ClientAlertsSystem.cs
+++ b/Content.Client/Alerts/ClientAlertsSystem.cs
@@ -9,7 +9,7 @@ using Robust.Shared.Prototypes;
 namespace Content.Client.Alerts;
 
 [UsedImplicitly]
-internal sealed class ClientAlertsSystem : AlertsSystem
+public sealed class ClientAlertsSystem : AlertsSystem
 {
     public AlertOrderPrototype? AlertOrder { get; set; }
 
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index ad29b2f80f..dd7a9f110c 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -1,6 +1,6 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
                            xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                            SetSize="600 600"
                            MinSize="600 600">
     <BoxContainer Orientation="Vertical" Margin="5 0 5 0">
@@ -65,4 +65,4 @@
         </PanelContainer>
         <TextureButton VerticalExpand="True" />
     </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index 9b4442dc95..7fb090d9a8 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml
index 5d5d0cbf88..f789197fa8 100644
--- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml
@@ -1,6 +1,6 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
-            xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             SetSize="600 600"
             MinSize="600 600">
     <BoxContainer Orientation="Vertical">
@@ -38,10 +38,9 @@
                 <BoxContainer Name="Orders"
                               Orientation="Vertical"
                               StyleClasses="transparentItemList"
-                              VerticalExpand="True">
-                </BoxContainer>
+                              VerticalExpand="True"/>
             </ScrollContainer>
         </PanelContainer>
         <TextureButton VerticalExpand="True" />
     </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
index 0319d1b03b..658520d26c 100644
--- a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Prototypes;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml b/Content.Client/Changelog/ChangelogWindow.xaml
index 41ac1c70ee..5bb830c6d2 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml
+++ b/Content.Client/Changelog/ChangelogWindow.xaml
@@ -1,6 +1,6 @@
 <changelog:ChangelogWindow xmlns="https://spacestation14.io"
                            xmlns:changelog="clr-namespace:Content.Client.Changelog"
-                           xmlns:ui="clr-namespace:Content.Client.HUD.UI"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                            MinSize="500 400" MouseFilter="Stop">
     <PanelContainer StyleClasses="AngleRect" />
     <BoxContainer Orientation="Vertical">
@@ -10,7 +10,7 @@
             <TextureButton Margin="0 0 8 0" Name="CloseButton" StyleClasses="windowCloseButton"
                            VerticalAlignment="Center" />
         </BoxContainer>
-        <ui:HighDivider />
+        <controls:HighDivider />
 
         <ScrollContainer VerticalExpand="True" HScrollEnabled="False">
             <BoxContainer Orientation="Vertical" Name="ChangelogBody" />
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
index 2b789f3be7..853f437a2b 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml
@@ -1,5 +1,5 @@
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 Title="{Loc 'gravity-generator-window-title'}"
                 MinSize="270 130"
                 SetSize="360 180">
@@ -32,4 +32,4 @@
         </PanelContainer>
     </BoxContainer>
 
-</ui:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
index 269bb32ae7..5b04c4eaf4 100644
--- a/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
+++ b/Content.Client/Gravity/UI/GravityGeneratorWindow.xaml.cs
@@ -1,6 +1,6 @@
 using System;
 using Content.Client.Message;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Gravity;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
diff --git a/Content.Client/Hands/HandsComponent.cs b/Content.Client/Hands/HandsComponent.cs
index 1e0b923046..7214b098de 100644
--- a/Content.Client/Hands/HandsComponent.cs
+++ b/Content.Client/Hands/HandsComponent.cs
@@ -1,3 +1,5 @@
+using Content.Client.Hands.Systems;
+using Content.Client.Hands.UI;
 using Content.Shared.Hands.Components;
 
 namespace Content.Client.Hands
diff --git a/Content.Client/Hands/ShowHandItemOverlay.cs b/Content.Client/Hands/ShowHandItemOverlay.cs
index 01bae5802d..6bd62f9379 100644
--- a/Content.Client/Hands/ShowHandItemOverlay.cs
+++ b/Content.Client/Hands/ShowHandItemOverlay.cs
@@ -1,3 +1,4 @@
+using Content.Client.Hands.Systems;
 using Content.Shared.CCVar;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
diff --git a/Content.Client/Hands/Systems/HandVirtualItemSystem.cs b/Content.Client/Hands/Systems/HandVirtualItemSystem.cs
index 7c06bbc1c8..496b8cea1f 100644
--- a/Content.Client/Hands/Systems/HandVirtualItemSystem.cs
+++ b/Content.Client/Hands/Systems/HandVirtualItemSystem.cs
@@ -1,4 +1,5 @@
-using Content.Client.Items;
+using Content.Client.Hands.UI;
+using Content.Client.Items;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
 using JetBrains.Annotations;
diff --git a/Content.Client/Hands/Systems/HandsSystem.cs b/Content.Client/Hands/Systems/HandsSystem.cs
index ffaf2814a3..97557d27b5 100644
--- a/Content.Client/Hands/Systems/HandsSystem.cs
+++ b/Content.Client/Hands/Systems/HandsSystem.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Content.Client.Animations;
+using Content.Client.Hands.UI;
 using Content.Client.HUD;
 using Content.Shared.Hands;
 using Content.Shared.Hands.Components;
@@ -14,7 +15,7 @@ using Robust.Shared.GameStates;
 using Robust.Shared.Map;
 using Robust.Shared.Timing;
 
-namespace Content.Client.Hands
+namespace Content.Client.Hands.Systems
 {
     [UsedImplicitly]
     public sealed class HandsSystem : SharedHandsSystem
diff --git a/Content.Client/Hands/HandVirtualItemStatus.xaml b/Content.Client/Hands/UI/HandVirtualItemStatus.xaml
similarity index 100%
rename from Content.Client/Hands/HandVirtualItemStatus.xaml
rename to Content.Client/Hands/UI/HandVirtualItemStatus.xaml
diff --git a/Content.Client/Hands/HandVirtualItemStatus.xaml.cs b/Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
similarity index 88%
rename from Content.Client/Hands/HandVirtualItemStatus.xaml.cs
rename to Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
index 8fb8519261..2ecdbb070c 100644
--- a/Content.Client/Hands/HandVirtualItemStatus.xaml.cs
+++ b/Content.Client/Hands/UI/HandVirtualItemStatus.xaml.cs
@@ -1,7 +1,7 @@
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Hands
+namespace Content.Client.Hands.UI
 {
     public sealed class HandVirtualItemStatus : Control
     {
diff --git a/Content.Client/Hands/HandsGui.xaml b/Content.Client/Hands/UI/HandsGui.xaml
similarity index 100%
rename from Content.Client/Hands/HandsGui.xaml
rename to Content.Client/Hands/UI/HandsGui.xaml
diff --git a/Content.Client/Hands/HandsGui.xaml.cs b/Content.Client/Hands/UI/HandsGui.xaml.cs
similarity index 97%
rename from Content.Client/Hands/HandsGui.xaml.cs
rename to Content.Client/Hands/UI/HandsGui.xaml.cs
index 2a6ec3f913..52e67a18b1 100644
--- a/Content.Client/Hands/HandsGui.xaml.cs
+++ b/Content.Client/Hands/UI/HandsGui.xaml.cs
@@ -1,6 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using Content.Client.Hands.Systems;
 using Content.Client.HUD;
 using Content.Client.Inventory;
 using Content.Client.Items.Managers;
@@ -14,13 +13,10 @@ using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Configuration;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Input;
-using Robust.Shared.IoC;
 using Robust.Shared.Timing;
-using Robust.Shared.ViewVariables;
 
-namespace Content.Client.Hands
+namespace Content.Client.Hands.UI
 {
     [GenerateTypedNameReferences]
     public sealed partial class HandsGui : Control
diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml
index 787d35a754..3dc79ca43d 100644
--- a/Content.Client/Launcher/LauncherConnectingGui.xaml
+++ b/Content.Client/Launcher/LauncherConnectingGui.xaml
@@ -2,7 +2,7 @@
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
          xmlns:parallax="clr-namespace:Content.Client.Parallax"
-         xmlns:ui="clr-namespace:Content.Client.HUD.UI">
+         xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls">
     <parallax:ParallaxControl />
     <Control HorizontalAlignment="Center" VerticalAlignment="Center">
         <PanelContainer StyleClasses="AngleRect" />
@@ -13,7 +13,7 @@
                 <Button Name="ExitButton" Text="{Loc 'connecting-exit'}"
                         HorizontalAlignment="Right" HorizontalExpand="True" />
             </BoxContainer>
-            <ui:HighDivider />
+            <controls:HighDivider />
             <BoxContainer Orientation="Vertical" VerticalExpand="True" Margin="4 4 4 0">
                 <Control VerticalExpand="True" Margin="0 0 0 8">
                     <BoxContainer Orientation="Vertical" Name="ConnectingStatus">
diff --git a/Content.Client/NPC/NPCWindow.xaml b/Content.Client/NPC/NPCWindow.xaml
index 377826ac19..9094893bc0 100644
--- a/Content.Client/NPC/NPCWindow.xaml
+++ b/Content.Client/NPC/NPCWindow.xaml
@@ -1,7 +1,7 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
+<controls:FancyWindow xmlns="https://spacestation14.io"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:ui="clr-namespace:Content.Client.HUD.UI"
-            xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+            xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
             Title="NPC debug"
             MinSize="200 200">
     <BoxContainer Name="Options" Orientation="Vertical">
@@ -21,4 +21,4 @@
             <CheckBox Name="PathRegions" Text="Regions"/>
         </BoxContainer>
     </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/NPC/NPCWindow.xaml.cs b/Content.Client/NPC/NPCWindow.xaml.cs
index 35c97bd07a..9802ebc91b 100644
--- a/Content.Client/NPC/NPCWindow.xaml.cs
+++ b/Content.Client/NPC/NPCWindow.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Console;
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
index 950bb14604..ac6174c7dd 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml
@@ -1,5 +1,5 @@
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
                 Title="Network Configurator" MinSize="350 100">
     <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True">
@@ -17,4 +17,4 @@
         </BoxContainer>
         <Label Name="Count" HorizontalAlignment="Right" />
     </BoxContainer>
-</ui:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
index 68c82b355f..98bb0d2dfb 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorConfigurationMenu.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Stylesheets;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
index d00a90a2e7..437d7055c9 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml
@@ -1,5 +1,5 @@
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                 xmlns:networkConfigurator="clr-namespace:Content.Client.NetworkConfigurator"
                 Title="Network Configurator" MinSize="220 400">
     <BoxContainer Orientation="Vertical" VerticalExpand="True">
@@ -10,4 +10,4 @@
             <Button Name="ClearButton" Access="Public" Text="{Loc 'network-configurator-ui-clear-button'}"></Button>
         </BoxContainer>
     </BoxContainer>
-</ui:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
index 644deeea1b..fb4aec1974 100644
--- a/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
+++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorListMenu.xaml.cs
@@ -1,4 +1,4 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.DeviceNetwork;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
diff --git a/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml b/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
index 6aaf07ef35..a35d5a95ca 100644
--- a/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml
@@ -1,5 +1,5 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                            Title="{Loc 'emergency-shuttle-console-window-title'}"
                            MinSize="400 400">
 <BoxContainer Orientation="Vertical"
@@ -38,4 +38,4 @@
     <BoxContainer Name="AuthorizationsContainer" Orientation="Vertical">
     </BoxContainer>
 </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml.cs
index 8d8bd19b74..87103084b4 100644
--- a/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/EmergencyConsoleWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Computer;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Events;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
index aa57bc587c..6ed20de6bd 100644
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml
@@ -1,5 +1,5 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                           xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                            Title="{Loc 'iff-console-window-title'}"
                            MinSize="200 200">
     <BoxContainer Orientation="Vertical" HorizontalExpand="True">
@@ -17,4 +17,4 @@
             </BoxContainer>
         </GridContainer>
     </BoxContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
index 99a4b71d36..f14ef22c3c 100644
--- a/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/IFFConsoleWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Computer;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Robust.Client.AutoGenerated;
diff --git a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
index 7591034b92..9bbfbef342 100644
--- a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml
@@ -1,6 +1,6 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+<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'}">
     <ui:RadarControl Name="RadarScreen"/>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
index 4a297a2a88..1a6f216e8b 100644
--- a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Computer;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
index fe80948aa8..0ef4fbc6a0 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml
@@ -1,5 +1,5 @@
-<userInterface:FancyWindow xmlns="https://spacestation14.io"
-                           xmlns:userInterface="clr-namespace:Content.Client.UserInterface"
+<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'}">
@@ -97,4 +97,4 @@
                     Disabled="True"/>
         </BoxContainer>
     </GridContainer>
-</userInterface:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
index 168dbdae41..c467d2780e 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -1,5 +1,5 @@
 using Content.Client.Computer;
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Controls;
 using Content.Shared.Shuttles.BUIStates;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Shuttles.Systems;
diff --git a/Content.Client/UserInterface/FancyWindow.xaml b/Content.Client/UserInterface/Controls/FancyWindow.xaml
similarity index 74%
rename from Content.Client/UserInterface/FancyWindow.xaml
rename to Content.Client/UserInterface/Controls/FancyWindow.xaml
index bde9cb8884..f7224eb9c2 100644
--- a/Content.Client/UserInterface/FancyWindow.xaml
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml
@@ -1,8 +1,8 @@
 
-<ui:FancyWindow xmlns="https://spacestation14.io"
-                xmlns:ui="clr-namespace:Content.Client.UserInterface"
-                MouseFilter="Stop"
-                MinWidth="200" MinHeight="150">
+<controls:FancyWindow xmlns="https://spacestation14.io"
+                      xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
+                      MouseFilter="Stop"
+                      MinWidth="200" MinHeight="150">
     <PanelContainer StyleClasses="AngleRect" />
 
     <BoxContainer Orientation="Vertical">
@@ -18,4 +18,4 @@
         <PanelContainer StyleClasses="LowDivider" />
         <Control Access="Public" Name="ContentsContainer" Margin="0 2" RectClipContent="True" VerticalExpand="true" />
     </BoxContainer>
-</ui:FancyWindow>
+</controls:FancyWindow>
diff --git a/Content.Client/UserInterface/FancyWindow.xaml.cs b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
similarity index 93%
rename from Content.Client/UserInterface/FancyWindow.xaml.cs
rename to Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
index 55334e719c..7028a63e98 100644
--- a/Content.Client/UserInterface/FancyWindow.xaml.cs
+++ b/Content.Client/UserInterface/Controls/FancyWindow.xaml.cs
@@ -3,7 +3,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Maths;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.UserInterface.Controls
 {
     [GenerateTypedNameReferences]
     [Virtual]
diff --git a/Content.Client/HUD/UI/HighDivider.cs b/Content.Client/UserInterface/Controls/HighDivider.cs
similarity index 86%
rename from Content.Client/HUD/UI/HighDivider.cs
rename to Content.Client/UserInterface/Controls/HighDivider.cs
index 96b6df3524..c71dba31b1 100644
--- a/Content.Client/HUD/UI/HighDivider.cs
+++ b/Content.Client/UserInterface/Controls/HighDivider.cs
@@ -2,7 +2,7 @@ using Content.Client.Stylesheets;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 
-namespace Content.Client.HUD.UI
+namespace Content.Client.UserInterface.Controls
 {
     public sealed class HighDivider : Control
     {
diff --git a/Content.Client/Voting/UI/VoteCallMenu.xaml b/Content.Client/Voting/UI/VoteCallMenu.xaml
index a5e1204521..cb03dd6bb8 100644
--- a/Content.Client/Voting/UI/VoteCallMenu.xaml
+++ b/Content.Client/Voting/UI/VoteCallMenu.xaml
@@ -1,6 +1,6 @@
 <ui:VoteCallMenu xmlns="https://spacestation14.io"
                  xmlns:ui="clr-namespace:Content.Client.Voting.UI"
-                 xmlns:hudUi="clr-namespace:Content.Client.HUD.UI"
+                 xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
                  MouseFilter="Stop" MinSize="350 150">
     <PanelContainer StyleClasses="AngleRect" />
     <BoxContainer Orientation="Vertical">
@@ -10,7 +10,7 @@
             <TextureButton Name="CloseButton" StyleClasses="windowCloseButton"
                            VerticalAlignment="Center" />
         </BoxContainer>
-        <hudUi:HighDivider />
+        <controls:HighDivider />
 
         <BoxContainer Orientation="Vertical" Margin="8 2 8 0" VerticalExpand="True" VerticalAlignment="Top">
             <BoxContainer Orientation="Horizontal">