Fix namespaces and optimize imports (#1651)

* Fix namespaces and optimize imports

* Cleanup fixes

* Merge conflict fixes

* Merge conflict fixes

* Merge conflict fixes

Content.Benchmarks/ComponentManagerGetAllComponents.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
 using Moq;
 using Robust.Shared.Exceptions;

Content.Client/Atmos/GasTileOverlay.cs

@@ -1,25 +1,13 @@
-using System;
+using Content.Client.GameObjects.EntitySystems;
-using System.Collections.Generic;
-using System.Linq;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Client.Utility;
-using JetBrains.Annotations;
-using Robust.Client.Graphics;
 using Robust.Client.Graphics.ClientEye;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Graphics.Overlays;
 using Robust.Client.Interfaces.Graphics;
 using Robust.Client.Interfaces.Graphics.ClientEye;
-using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Interfaces.Resources;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
-using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Timing;
-using Robust.Shared.Utility;
 
 namespace Content.Client.Atmos
 {

Content.Client/Chat/ChatBox.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
+using Content.Shared.Chat;
-using Content.Shared.Chat;
 using Robust.Client.Console;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;

Content.Client/ClientContentIoC.cs

@@ -8,9 +8,7 @@ using Content.Client.Sandbox;
 using Content.Client.UserInterface;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
-using Content.Shared.Chemistry;
 using Content.Shared.Interfaces;
-using Content.Shared.Interfaces.Chemistry;
 using Robust.Shared.IoC;
 
 namespace Content.Client

Content.Client/Command/CommunicationsConsoleMenu.cs

@@ -5,7 +5,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Timer = Robust.Shared.Timers.Timer;
 

Content.Client/Commands/DebugAiCommand.cs

@@ -1,10 +1,7 @@
 using Content.Client.GameObjects.EntitySystems.AI;
 using JetBrains.Annotations;
 using Robust.Client.Interfaces.Console;
-using Robust.Client.Player;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
 
 namespace Content.Client.Commands
 {

Content.Client/Commands/DebugCommands.cs

@@ -1,15 +1,12 @@
 using Content.Client.GameObjects.Components;
 using Content.Client.GameObjects.EntitySystems;
 using Content.Client.Interfaces;
-using Content.Shared.GameObjects.Components.Markers;
+using Content.Shared.GameObjects;
-using Robust.Client.Console.Commands;
 using Robust.Client.Interfaces.Console;
 using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
-using DrawDepth = Content.Shared.GameObjects.DrawDepth;
 
 namespace Content.Client.Commands
 {

Content.Client/Commands/DebugPathfindingCommand.cs

@@ -2,8 +2,6 @@ using Content.Client.GameObjects.EntitySystems.AI;
 using JetBrains.Annotations;
 using Robust.Client.Interfaces.Console;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.IoC;
 
 namespace Content.Client.Commands
 {

Content.Client/EntryPoint.cs

@@ -12,6 +12,8 @@ using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.GameObjects.Components.Cargo;
 using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
+using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
 using Content.Shared.GameObjects.Components.Gravity;
 using Content.Shared.GameObjects.Components.Markers;
 using Content.Shared.GameObjects.Components.Research;

Content.Client/GameObjects/Components/Actor/CharacterInterface.cs

@@ -9,7 +9,6 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 
 namespace Content.Client.GameObjects.Components.Actor

Content.Client/GameObjects/Components/Atmos/GasAnalyzerBoundUserInterface.cs

@@ -1,8 +1,5 @@
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using System;
-using System.Collections.Generic;
-using System.Text;
 using static Content.Shared.GameObjects.Components.SharedGasAnalyzerComponent;
 
 namespace Content.Client.GameObjects.Components.Atmos

Content.Client/GameObjects/Components/Atmos/GasAnalyzerComponent.cs

@@ -1,6 +1,6 @@
-using Content.Client.UserInterface.Stylesheets;
+using System;
+using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -8,9 +8,6 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Content.Client.GameObjects.Components.Atmos
 {

Content.Client/GameObjects/Components/Atmos/GasAnalyzerMenu.cs

@@ -1,19 +1,11 @@
-using System;
+using Content.Client.UserInterface.Stylesheets;
-using Content.Client.Animations;
-using Content.Client.GameObjects.EntitySystems;
-using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
-using Content.Shared.GameObjects.Components;
 using Content.Shared.Utility;
-using Robust.Client.Animations;
-using Robust.Client.Graphics;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Animations;
-using Robust.Shared.Input;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;

Content.Client/GameObjects/Components/Cargo/CargoOrderDatabaseComponent.cs

@@ -1,8 +1,8 @@
-using Content.Shared.GameObjects.Components.Cargo;
+using System;
+using System.Collections.Generic;
+using Content.Shared.GameObjects.Components.Cargo;
 using Content.Shared.Prototypes.Cargo;
 using Robust.Shared.GameObjects;
-using System;
-using System.Collections.Generic;
 
 namespace Content.Client.GameObjects.Components.Cargo
 {

Content.Client/GameObjects/Components/Cargo/GalacticMarketComponent.cs

@@ -1,9 +1,9 @@
-using Content.Shared.GameObjects.Components.Cargo;
+using System;
+using Content.Shared.GameObjects.Components.Cargo;
 using Content.Shared.Prototypes.Cargo;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Prototypes;
-using System;
 
 namespace Content.Client.GameObjects.Components.Cargo
 {

Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterBoundUserInterface.cs

@@ -1,13 +1,12 @@
 #nullable enable
-using Content.Client.GameObjects.Components.Chemistry.ChemMaster;
+using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
-using Content.Shared.GameObjects.Components.Chemistry;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.Localization;
-using static Content.Shared.GameObjects.Components.Chemistry.SharedChemMasterComponent;
+using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
 {
     /// <summary>
     /// Initializes a <see cref="ChemMasterWindow"/> and updates it when new server messages are received.

Content.Client/GameObjects/Components/Chemistry/ChemMaster/ChemMasterWindow.cs

@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using Content.Client.UserInterface;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.GameObjects.Components.Chemistry.ChemMaster;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -12,10 +10,9 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Chemistry.SharedChemMasterComponent;
+using static Content.Shared.GameObjects.Components.Chemistry.ChemMaster.SharedChemMasterComponent;
 
 namespace Content.Client.GameObjects.Components.Chemistry.ChemMaster
 {

Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs

@@ -1,14 +1,13 @@
-using Content.Client.UserInterface;
+using Content.Client.UserInterface.Stylesheets;
-using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
-using Robust.Shared.Timing;
+using Content.Shared.Chemistry;
 using Content.Shared.GameObjects.Components.Chemistry;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Localization;
+using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;
-using Content.Shared.Chemistry;
 
 namespace Content.Client.GameObjects.Components.Chemistry
 {

Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserBoundUserInterface.cs

@@ -1,15 +1,15 @@
 using System.Collections.Generic;
 using System.Linq;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using static Content.Shared.GameObjects.Components.Chemistry.SharedReagentDispenserComponent;
+using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
 {
     /// <summary>
     /// Initializes a <see cref="ReagentDispenserWindow"/> and updates it when new server messages are received.

Content.Client/GameObjects/Components/Chemistry/ReagentDispenser/ReagentDispenserWindow.cs

@@ -1,8 +1,7 @@
 using System.Collections.Generic;
-using Content.Client.UserInterface;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.Chemistry;
-using Content.Shared.GameObjects.Components.Chemistry;
+using Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -12,9 +11,9 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using static Content.Shared.GameObjects.Components.Chemistry.SharedReagentDispenserComponent;
+using static Content.Shared.GameObjects.Components.Chemistry.ReagentDispenser.SharedReagentDispenserComponent;
 
-namespace Content.Client.GameObjects.Components.Chemistry
+namespace Content.Client.GameObjects.Components.Chemistry.ReagentDispenser
 {
     /// <summary>
     /// Client-side UI used to control a <see cref="SharedReagentDispenserComponent"/>

Content.Client/GameObjects/Components/DamageableComponent.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Damage;
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects
+namespace Content.Client.GameObjects.Components
 {
     /// <summary>
     /// Fuck I really hate doing this

Content.Client/GameObjects/Components/Disposal/DisposalUnitBoundUserInterface.cs

@@ -2,7 +2,6 @@
 using JetBrains.Annotations;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.Localization;
 using static Content.Shared.GameObjects.Components.Disposal.SharedDisposalUnitComponent;
 
 namespace Content.Client.GameObjects.Components.Disposal

Content.Client/GameObjects/Components/Disposal/DisposalUnitWindow.cs

@@ -1,5 +1,4 @@
-using System.Runtime.CompilerServices;
+using Content.Shared.GameObjects.Components.Disposal;
-using Content.Shared.GameObjects.Components.Disposal;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;

Content.Client/GameObjects/Components/Gravity/GravityGeneratorBoundUserInterface.cs

@@ -1,4 +1,3 @@
-using System;
 using Content.Shared.GameObjects.Components.Gravity;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.UserInterface.Controls;

Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Content.Client.GameObjects.Components.Clothing;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Components.Inventory;
 using Content.Shared.Preferences.Appearance;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
@@ -10,9 +10,9 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
-using static Content.Shared.GameObjects.SharedInventoryComponent.ClientInventoryMessage;
+using static Content.Shared.GameObjects.Components.Inventory.SharedInventoryComponent.ClientInventoryMessage;
 
-namespace Content.Client.GameObjects
+namespace Content.Client.GameObjects.Components.HUD.Inventory
 {
     /// <summary>
     /// A character UI which shows items the user has equipped within his inventory

Content.Client/GameObjects/Components/HUD/Inventory/HumanInventoryInterfaceController.cs

@@ -1,4 +1,6 @@
-using Content.Client.Utility;
+using System.Collections.Generic;
+using Content.Client.UserInterface;
+using Content.Client.Utility;
 using JetBrains.Annotations;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface;
@@ -9,10 +11,8 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
-using Content.Client.UserInterface;
-using System.Collections.Generic;
 
-namespace Content.Client.GameObjects
+namespace Content.Client.GameObjects.Components.HUD.Inventory
 {
     // Dynamically instantiated by ClientInventoryComponent.
     [UsedImplicitly]

Content.Client/GameObjects/Components/HUD/Inventory/InventoryInterfaceController.cs

@@ -8,7 +8,7 @@ using Robust.Shared.Input;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 
-namespace Content.Client.GameObjects
+namespace Content.Client.GameObjects.Components.HUD.Inventory
 {
     public abstract class InventoryInterfaceController : IDisposable
     {

Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using Content.Client.GameObjects.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Client.Interfaces.GameObjects.Components;

Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs

@@ -4,16 +4,16 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Shared.GameObjects.Components.Instruments;
 using Content.Shared.Physics;
-using Robust.Shared.GameObjects;
 using Robust.Client.Audio.Midi;
+using Robust.Shared.Audio.Midi;
+using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
+using Robust.Shared.Timers;
 using Robust.Shared.ViewVariables;
-using MidiEvent = Robust.Shared.Audio.Midi.MidiEvent;
-using Timer = Robust.Shared.Timers.Timer;
 
 namespace Content.Client.GameObjects.Components.Instruments
 {

Content.Client/GameObjects/Components/Interactable/MultiToolComponent.cs

@@ -1,12 +1,10 @@
-using System;
+using Content.Client.UserInterface.Stylesheets;
-using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
 using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Interactable;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Localization;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 using Robust.Shared.ViewVariables;

Content.Client/GameObjects/Components/Items/ItemStatusComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameObjects;
 
-namespace Content.Client.GameObjects
+namespace Content.Client.GameObjects.Components.Items
 {
     [RegisterComponent]
     public class ItemStatusComponent : Component

Content.Client/GameObjects/Components/Kitchen/MicrowaveBoundUserInterface.cs

@@ -1,21 +1,20 @@
 using System;
-using Robust.Client.GameObjects.Components.UserInterface;
-using Content.Shared.Kitchen;
-using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.IoC;
-using Robust.Shared.Prototypes;
-using Content.Shared.Chemistry;
-using Robust.Shared.GameObjects;
 using System.Collections.Generic;
-using Robust.Shared.Interfaces.GameObjects;
+using Content.Shared.Chemistry;
+using Content.Shared.Kitchen;
 using Robust.Client.GameObjects;
+using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
+using Robust.Shared.GameObjects;
+using Robust.Shared.GameObjects.Components.UserInterface;
+using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.GameObjects.Components.Kitchen
 {

Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs

@@ -7,7 +7,6 @@ using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Shared.Audio;
 using Robust.Shared.Log;
 
-
 namespace Content.Client.GameObjects.Components.Kitchen
 {
     public sealed class MicrowaveVisualizer : AppearanceVisualizer

Content.Client/GameObjects/Components/MagicMirrorBoundUserInterface.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using Content.Client.UserInterface;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.Preferences.Appearance;
 using JetBrains.Annotations;

Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs

@@ -2,7 +2,6 @@
 using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Client.GameObjects;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;

Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs

@@ -1,13 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.Interfaces;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics.Overlays;
 using Robust.Client.Interfaces.Graphics.Overlays;
-using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
@@ -15,7 +13,6 @@ using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Players;
-using Robust.Shared.Utility;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Mobs

Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs

@@ -1,13 +1,10 @@
-using System;
+using Content.Client.UserInterface;
-using Content.Client.UserInterface;
 using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
-using Robust.Shared.Players;
 
 namespace Content.Client.GameObjects.Components.Mobs
 {

Content.Client/GameObjects/Components/Mobs/DamageStateVisualizer.cs

@@ -1,12 +1,11 @@
 using System.Collections.Generic;
+using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.Components.Mobs;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 using Robust.Client.Interfaces.GameObjects.Components;
-using Robust.Shared.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
-using DrawDepth = Content.Shared.GameObjects.DrawDepth;
 
 namespace Content.Client.GameObjects.Components.Mobs
 {

Content.Client/GameObjects/Components/Observer/GhostComponent.cs

@@ -4,7 +4,6 @@ using Robust.Client.GameObjects;
 using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Network;
 using Robust.Shared.IoC;
 using Robust.Shared.ViewVariables;
 

Content.Client/GameObjects/Components/Paper/PaperBoundUserInterface.cs

@@ -3,7 +3,7 @@ using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects.Components.UserInterface;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.GameObjects.Components.Paper
 {
     public class PaperBoundUserInterface : BoundUserInterface
     {

Content.Client/GameObjects/Components/Paper/PaperWindow.cs

@@ -4,7 +4,7 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Maths;
 using Robust.Shared.Utility;
 
-namespace Content.Client.GameObjects.Components
+namespace Content.Client.GameObjects.Components.Paper
 {
     public class PaperWindow : SS14Window
     {

Content.Client/GameObjects/Components/Pointing/RoguePointingArrowVisualizer.cs

@@ -1,5 +1,4 @@
 using System;
-using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.Components.Pointing;
 using JetBrains.Annotations;
 using Robust.Client.Animations;

Content.Client/GameObjects/Components/Power/ApcBoundUserInterface.cs

@@ -1,5 +1,4 @@
 using System;
-using Content.Client.UserInterface;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.GameObjects.Components.Power;
 using Robust.Client.GameObjects.Components.UserInterface;

Content.Client/GameObjects/Components/Power/SolarControlConsoleBoundUserInterface.cs

@@ -1,6 +1,4 @@
 using System;
-using Content.Client.UserInterface;
-using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.GameObjects.Components.Power;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Client.Graphics.Drawing;

Content.Client/GameObjects/Components/RadiatingLightComponent.cs

@@ -4,7 +4,6 @@ using Robust.Client.GameObjects;
 using Robust.Client.GameObjects.Components.Animations;
 using Robust.Shared.Animations;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Maths;
 
 namespace Content.Client.GameObjects.Components
 {

Content.Client/GameObjects/Components/Sound/LoopingSoundComponent.cs

@@ -4,14 +4,12 @@ using Content.Shared.Physics;
 using Robust.Client.GameObjects.EntitySystems;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.Interfaces.Random;
 using Robust.Shared.IoC;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
 using Robust.Shared.Timers;
-using Robust.Shared.Utility;
 
 namespace Content.Client.GameObjects.Components.Sound
 {

Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Collections.Generic;
 using Content.Client.GameObjects.Components.Items;
-using Content.Shared.GameObjects.Components.Storage;
 using Content.Client.Interfaces.GameObjects.Components.Interaction;
+using Content.Shared.GameObjects.Components.Storage;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Network;

Content.Client/GameObjects/Components/Trigger/TimerTriggerVisualizer.cs

@@ -1,5 +1,5 @@
 using System;
-using Content.Shared.GameObjects.Components.Triggers;
+using Content.Shared.GameObjects.Components.Trigger;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
 using Robust.Client.GameObjects.Components.Animations;
@@ -8,7 +8,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Utility;
 using YamlDotNet.RepresentationModel;
 
-namespace Content.Client.GameObjects.Components.Doors
+namespace Content.Client.GameObjects.Components.Trigger
 {
     public class TimerTriggerVisualizer : AppearanceVisualizer
     {

Content.Client/GameObjects/Components/Wires/WiresMenu.cs

@@ -5,7 +5,6 @@ using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
 using Content.Shared.GameObjects.Components;
 using Robust.Client.Animations;
-using Robust.Client.Graphics;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface;

Content.Client/GameObjects/EntitySystems/CharacterInterfaceSystem.cs

@@ -1,11 +1,9 @@
 using Content.Client.GameObjects.Components.Actor;
 using Content.Client.UserInterface;
 using Content.Shared.Input;
-using Robust.Client.GameObjects.EntitySystems;
 using Robust.Client.Player;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 

Content.Client/GameObjects/EntitySystems/ClientInventorySystem.cs

@@ -1,10 +1,9 @@
+using Content.Client.GameObjects.Components.HUD.Inventory;
 using Content.Client.UserInterface;
 using Content.Shared.Input;
-using Robust.Client.GameObjects.EntitySystems;
 using Robust.Client.Player;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.GameObjects.Systems;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 

Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs

@@ -1,25 +1,16 @@
 using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.UserInterface;
-using Content.Client.Utility;
 using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.GameObjects.EntitySystemMessages;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
-using Robust.Client.GameObjects.EntitySystems;
-using Robust.Client.Graphics.Drawing;
-using Robust.Client.Graphics.Overlays;
-using Robust.Client.Interfaces.Graphics.Overlays;
-using Robust.Client.Interfaces.Input;
 using Robust.Client.Player;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
-using Robust.Shared.Maths;
 using Robust.Shared.Players;
-using static Content.Client.StaticIoC;
 
 namespace Content.Client.GameObjects.EntitySystems
 {

Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs

@@ -3,6 +3,7 @@ using Content.Client.Construction;
 using Content.Client.GameObjects.Components.Construction;
 using Content.Client.UserInterface;
 using Content.Shared.Construction;
+using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
@@ -21,7 +22,7 @@ namespace Content.Client.GameObjects.EntitySystems
     /// The client-side implementation of the construction system, which is used for constructing entities in game.
     /// </summary>
     [UsedImplicitly]
-    public class ConstructionSystem : Shared.GameObjects.EntitySystems.SharedConstructionSystem
+    public class ConstructionSystem : SharedConstructionSystem
     {
 #pragma warning disable 649
         [Dependency] private readonly IGameHud _gameHud;

Content.Client/GameObjects/EntitySystems/DragDropSystem.cs

@@ -95,8 +95,8 @@ namespace Content.Client.GameObjects.EntitySystems
 
             _dropTargetInRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetInRange).Instance();
             _dropTargetOutOfRangeShader = _prototypeManager.Index<ShaderPrototype>(ShaderDropTargetOutOfRange).Instance();
-            _interactionSystem = EntitySystem.Get<SharedInteractionSystem>();
+            _interactionSystem = Get<SharedInteractionSystem>();
-            _inputSystem = EntitySystem.Get<InputSystem>();
+            _inputSystem = Get<InputSystem>();
             // needs to fire on mouseup and mousedown so we can detect a drag / drop
             CommandBinds.Builder
                 .Bind(EngineKeyFunctions.Use, new PointerInputCmdHandler(OnUse, false))

Content.Client/GameObjects/EntitySystems/ExamineSystem.cs

@@ -5,7 +5,6 @@ using Content.Shared.GameObjects.EntitySystemMessages;
 using Content.Shared.GameObjects.EntitySystems;
 using Content.Shared.Input;
 using JetBrains.Annotations;
-using Robust.Client.GameObjects.EntitySystems;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Client.Interfaces.Input;
 using Robust.Client.Interfaces.UserInterface;
@@ -13,7 +12,6 @@ using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
@@ -109,7 +107,7 @@ namespace Content.Client.GameObjects.EntitySystems
             FormattedMessage message;
             if (entity.Uid.IsClientSide())
             {
-                message = ExamineSystem.GetExamineText(entity, _playerManager.LocalPlayer.ControlledEntity);
+                message = GetExamineText(entity, _playerManager.LocalPlayer.ControlledEntity);
             }
             else
             {

Content.Client/GameObjects/EntitySystems/GasTileOverlaySystem.cs

@@ -1,22 +1,16 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using Content.Client.Atmos;
-using Content.Client.Utility;
 using Content.Shared.Atmos;
 using Content.Shared.GameObjects.EntitySystems;
 using JetBrains.Annotations;
 using Robust.Client.Graphics;
-using Robust.Client.Interfaces.Graphics.Overlays;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.ResourceManagement;
 using Robust.Client.Utility;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
-using Robust.Shared.Log;
 using Robust.Shared.Map;
 using Robust.Shared.Maths;
-using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
 namespace Content.Client.GameObjects.EntitySystems

Content.Client/GameObjects/EntitySystems/MoverSystem.cs

@@ -1,7 +1,6 @@
 #nullable enable
 using Content.Shared.GameObjects.Components.Movement;
 using Content.Shared.GameObjects.EntitySystems;
-using Content.Shared.Physics;
 using JetBrains.Annotations;
 using Robust.Client.Physics;
 using Robust.Client.Player;

Content.Client/GameObjects/EntitySystems/StatusEffectsSystem.cs

@@ -1,5 +1,4 @@
 using Content.Client.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.Timing;

Content.Client/GameObjects/EntitySystems/VerbSystem.cs

@@ -6,8 +6,8 @@ using System.Threading;
 using Content.Client.State;
 using Content.Client.UserInterface;
 using Content.Client.Utility;
-using Content.Shared.GameObjects;
 using Content.Shared.GameObjects.EntitySystemMessages;
+using Content.Shared.GameObjects.Verbs;
 using Content.Shared.Input;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects.EntitySystems;

Content.Client/GlobalVerbs/ExamineVerb.cs

@@ -1,5 +1,5 @@
 using Content.Client.GameObjects.EntitySystems;
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Verbs;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Localization;

Content.Client/GlobalVerbs/ViewVariablesVerb.cs

@@ -1,4 +1,4 @@
-using Content.Shared.GameObjects;
+using Content.Shared.GameObjects.Verbs;
 using Robust.Client.Console;
 using Robust.Client.ViewVariables;
 using Robust.Shared.Interfaces.GameObjects;

Content.Client/Graphics/Overlays/FlashOverlay.cs

@@ -1,20 +1,16 @@
-using System.Net.Mime;
+using Content.Shared.GameObjects.Components.Mobs;
-using Content.Shared.GameObjects.Components.Mobs;
 using Content.Shared.Interfaces;
 using Robust.Client.Graphics;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Graphics.Overlays;
 using Robust.Client.Graphics.Shaders;
 using Robust.Client.Interfaces.Graphics;
-using Robust.Client.Interfaces.Graphics.ClientEye;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
-using Robust.Shared.Timing;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.PixelFormats;
-using Color = Robust.Shared.Maths.Color;
 
 namespace Content.Client.Graphics.Overlays
 {

Content.Client/Health/BodySystem/BodyScanner/BodyScannerBoundUserInterface.cs

@@ -1,12 +1,10 @@
-using Content.Client.UserInterface;
+using System.Collections.Generic;
-using Content.Shared.BodySystem;
+using Content.Shared.Health.BodySystem.BodyScanner;
 using Robust.Client.GameObjects.Components.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.ViewVariables;
-using System.Collections.Generic;
 
-namespace Content.Client.BodySystem
+namespace Content.Client.Health.BodySystem.BodyScanner
 {
     public class BodyScannerBoundUserInterface : BoundUserInterface
     {

Content.Client/Health/BodySystem/BodyScanner/BodyScannerDisplay.cs

@@ -1,20 +1,14 @@
-using Content.Client.BodySystem;
+using System.Collections.Generic;
-using Content.Shared.BodySystem;
+using System.Globalization;
-using Robust.Client.Graphics.Drawing;
+using Content.Shared.Health.BodySystem.BodyScanner;
-using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.Utility;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using Robust.Shared.Utility;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
 using static Robust.Client.UserInterface.Controls.ItemList;
 
-namespace Content.Client.UserInterface
+namespace Content.Client.Health.BodySystem.BodyScanner
 {
     public sealed class BodyScannerDisplay : SS14Window
     {

Content.Client/Health/BodySystem/Surgery/GenericSurgeryBoundUserInterface.cs

@@ -1,15 +1,8 @@
-using System;
+using Content.Shared.Health.BodySystem.Surgery;
-using System.Collections.Generic;
 using Robust.Client.GameObjects.Components.UserInterface;
 using Robust.Shared.GameObjects.Components.UserInterface;
-using Robust.Shared.IoC;
-using Robust.Shared.Prototypes;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.Network;
-using Robust.Shared.Players;
-using Content.Shared.BodySystem;
 
-namespace Content.Client.BodySystem
+namespace Content.Client.Health.BodySystem.Surgery
 {
 
     //TODO : Make window close if target or surgery tool gets too far away from user.

Content.Client/Health/BodySystem/Surgery/GenericSurgeryWindow.cs

@@ -1,14 +1,13 @@
-using Robust.Client.UserInterface;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Text;
 
-namespace Content.Client.BodySystem
+namespace Content.Client.Health.BodySystem.Surgery
 {
     public class GenericSurgeryWindow : SS14Window
     {

Content.Client/Instruments/InstrumentMenu.cs

@@ -1,4 +1,3 @@
-using System.Threading.Tasks;
 using Content.Client.GameObjects.Components.Instruments;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.GameObjects.EntitySystems;

Content.Client/Jobs/ClownSpecial.cs

@@ -1,4 +1,4 @@
-using Content.Server.Jobs;
+using Content.Shared.Roles;
 using JetBrains.Annotations;
 
 namespace Content.Client.Jobs

Content.Client/Parallax/ParallaxGenerator.cs

@@ -9,7 +9,6 @@ using Robust.Shared.Maths;
 using Robust.Shared.Noise;
 using Robust.Shared.Random;
 using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using Color = Robust.Shared.Maths.Color;
 

Content.Client/Sandbox/SandboxManager.cs

@@ -7,7 +7,6 @@ using Robust.Client.Interfaces.Placement;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Network;

Content.Client/ScreenshotHook.cs

@@ -4,7 +4,6 @@ using System.Threading.Tasks;
 using Content.Shared.Input;
 using Robust.Client.Interfaces.Graphics;
 using Robust.Client.Interfaces.Input;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.Resources;
 using Robust.Shared.IoC;

Content.Client/State/GameScreen.cs

@@ -1,20 +1,13 @@
-using System.Collections.Generic;
-using System.Collections.Immutable;
 using Content.Client.Chat;
 using Content.Client.Interfaces.Chat;
 using Content.Client.UserInterface;
 using Content.Shared.Input;
-using Robust.Client.Console;
 using Robust.Client.Interfaces.Input;
-using Robust.Client.Interfaces.State;
 using Robust.Client.Interfaces.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
-using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Map;
 using Robust.Shared.ViewVariables;
 
 namespace Content.Client.State

Content.Client/State/GameScreenBase.cs

@@ -5,11 +5,10 @@ using Content.Client.GameObjects.Components;
 using Content.Shared.GameObjects.EntitySystems;
 using Robust.Client.GameObjects.EntitySystems;
 using Robust.Client.Interfaces.GameObjects;
-using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Client.Interfaces.Graphics.ClientEye;
 using Robust.Client.Interfaces.Input;
-using Robust.Client.Interfaces.UserInterface;
 using Robust.Client.Interfaces.State;
+using Robust.Client.Interfaces.UserInterface;
 using Robust.Client.Player;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Input;

Content.Client/State/LobbyState.cs

@@ -9,10 +9,8 @@ using Robust.Client.Interfaces;
 using Robust.Client.Interfaces.Input;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.Interfaces.UserInterface;
-using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.Player;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;

Content.Client/UserInterface/Cargo/CargoConsoleMenu.cs

@@ -1,4 +1,7 @@
-using Content.Client.GameObjects.Components.Cargo;
+using System;
+using System.Collections.Generic;
+using Content.Client.GameObjects.Components.Cargo;
+using Content.Client.UserInterface.Stylesheets;
 using Content.Shared.Prototypes.Cargo;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface.Controls;
@@ -7,9 +10,6 @@ using Robust.Client.Utility;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using System;
-using System.Collections.Generic;
-using Content.Client.UserInterface.Stylesheets;
 
 namespace Content.Client.UserInterface.Cargo
 {

Content.Client/UserInterface/Cargo/CargoConsoleOrderMenu.cs

@@ -1,10 +1,8 @@
-using Robust.Client.UserInterface.Controls;
+using System.Collections.Generic;
+using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using System;
-using System.Collections.Generic;
 
 namespace Content.Client.UserInterface.Cargo
 {

Content.Client/UserInterface/Cargo/GalacticBankSelectionMenu.cs

@@ -5,8 +5,6 @@ using Robust.Client.UserInterface.CustomControls;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using System;
-using static Robust.Client.UserInterface.Controls.ItemList;
 
 namespace Content.Client.UserInterface.Cargo
 {

Content.Client/UserInterface/CharacterSetupGui.cs

@@ -3,8 +3,8 @@ using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.Interfaces;
 using Content.Client.UserInterface.Stylesheets;
 using Content.Client.Utility;
-using Content.Shared.Jobs;
 using Content.Shared.Preferences;
+using Content.Shared.Roles;
 using Robust.Client.GameObjects;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.Interfaces.ResourceManagement;

Content.Client/UserInterface/CooldownGraphic.cs

@@ -1,13 +1,12 @@
-using Robust.Client.Graphics.Drawing;
+using System;
-using Robust.Client.Interfaces.GameObjects.Components;
+using Robust.Client.Graphics.Drawing;
-using Robust.Client.Interfaces.Graphics;
-using Robust.Shared.Maths;
-using System;
 using Robust.Client.Graphics.Shaders;
+using Robust.Client.UserInterface;
 using Robust.Shared.IoC;
+using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 
-namespace Robust.Client.UserInterface.Controls
+namespace Content.Client.UserInterface
 {
 
     public class CooldownGraphic : Control

Content.Client/UserInterface/GameHud.cs

@@ -8,12 +8,10 @@ using Robust.Client.Interfaces.Input;
 using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
-using Robust.Shared.Input;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using static Robust.Client.UserInterface.Control;
 
 namespace Content.Client.UserInterface
 {

Content.Client/UserInterface/GhostGui.cs

@@ -1,4 +1,3 @@
-using System.Data;
 using Content.Client.GameObjects.Components.Observer;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;

Content.Client/UserInterface/HumanoidProfileEditor.cs

@@ -3,11 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using Content.Client.GameObjects.Components;
 using Content.Client.Interfaces;
-using Content.Client.Utility;
 using Content.Shared;
-using Content.Shared.Jobs;
-using Content.Shared.Antags;
 using Content.Shared.Preferences;
+using Content.Shared.Roles;
 using Robust.Client.Graphics.Drawing;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -18,7 +16,6 @@ using Robust.Shared.Localization;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using static Content.Client.StaticIoC;
 
 namespace Content.Client.UserInterface
 {

Content.Client/UserInterface/IItemSlotManager.cs

@@ -1,5 +1,4 @@
-using Content.Client.GameObjects;
+using Robust.Client.UserInterface;
-using Robust.Client.UserInterface;
 using Robust.Shared.Interfaces.GameObjects;
 
 namespace Content.Client.UserInterface

Content.Client/UserInterface/ItemSlotButton.cs

@@ -1,5 +1,4 @@
 using System;
-using Content.Shared.GameObjects.Components.Items;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;

Content.Client/UserInterface/ItemSlotManager.cs

@@ -1,17 +1,12 @@
-using System;
+using Content.Client.GameObjects.Components.Storage;
-using Content.Client.GameObjects;
-using Content.Client.GameObjects.Components.Storage;
 using Content.Client.GameObjects.EntitySystems;
-using Content.Client.Utility;
 using Content.Shared.GameObjects.Components.Items;
 using Content.Shared.Input;
 using Robust.Client.GameObjects;
 using Robust.Client.GameObjects.EntitySystems;
-using Robust.Client.Graphics;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Client.Interfaces.Graphics.ClientEye;
 using Robust.Client.Interfaces.Input;
-using Robust.Client.Interfaces.ResourceManagement;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
 using Robust.Shared.Input;

Content.Client/UserInterface/LateJoinGui.cs

@@ -1,19 +1,18 @@
+using System;
+using System.Linq;
+using Content.Shared.Roles;
 using Robust.Client.Console;
 using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.Utility;
-using Content.Shared.Jobs;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Log;
 using Robust.Shared.Maths;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
-
+namespace Content.Client.UserInterface
-namespace Robust.Client.UserInterface.CustomControls
 {
     public sealed class LateJoinGui : SS14Window
     {

Content.Client/UserInterface/LobbyCharacterPreviewPanel.cs

@@ -1,10 +1,10 @@
 using System.Linq;
-using Content.Client.GameObjects;
+using Content.Client.GameObjects.Components.HUD.Inventory;
 using Content.Client.GameObjects.Components.Mobs;
 using Content.Client.Interfaces;
 using Content.Shared;
-using Content.Shared.Jobs;
 using Content.Shared.Preferences;
+using Content.Shared.Roles;
 using Robust.Client.Interfaces.GameObjects.Components;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;

Content.Client/UserInterface/RoundEndSummaryWindow.cs

@@ -1,19 +1,12 @@
-using Robust.Client.Graphics;
+using System;
-using Robust.Client.Interfaces.Input;
+using System.Collections.Generic;
-using Robust.Client.Interfaces.ResourceManagement;
+using System.Linq;
-using Robust.Client.ResourceManagement;
+using Content.Client.Utility;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
-using Content.Client.Utility;
-using Robust.Client.Player;
-using System.Linq;
-using System.Collections.Generic;
-using static Robust.Client.UserInterface.Controls.ItemList;
 using static Content.Shared.SharedGameTicker;
-using System;
 
 namespace Content.Client.UserInterface
 {

Content.IntegrationTests/Tests/AI/AiControllerTest.cs

@@ -1,23 +1,19 @@
-using NUnit.Framework;
+using System;
-using Robust.Shared.GameObjects;
-using Robust.Shared.Interfaces.GameObjects;
-using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Movement;
-using Content.Shared.VendingMachines;
+using NUnit.Framework;
 using Robust.Server.AI;
-using Robust.Shared.Log;
+using Robust.Shared.GameObjects;
-using Robust.Server.Interfaces.Maps;
+using Robust.Shared.Interfaces.GameObjects;
-using Robust.Server.Interfaces.Timing;
+using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Reflection;
 using Robust.Shared.IoC;
+using Robust.Shared.Map;
 using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
 
-namespace Content.IntegrationTests.Tests
+namespace Content.IntegrationTests.Tests.AI
 {
     [TestFixture]
     [TestOf(typeof(AiControllerTest))]

Content.IntegrationTests/Tests/BuckleTest.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.Buckle;
+using Content.Server.GameObjects.Components.Strap;
 using Content.Shared.GameObjects.Components.Buckle;
 using Content.Shared.GameObjects.EntitySystems;
 using NUnit.Framework;
@@ -7,7 +8,6 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using StrapComponent = Content.Server.GameObjects.Components.Strap.StrapComponent;
 
 namespace Content.IntegrationTests.Tests
 {

Content.IntegrationTests/Tests/ContainerOcclusionTest.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using System.Threading.Tasks;
-using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.Components.Items.Storage;
 using NUnit.Framework;
 using Robust.Client.GameObjects;

Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs

@@ -5,7 +5,6 @@ using Content.Server.GameObjects.Components;
 using Content.Server.GameObjects.Components.Disposal;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
 using NUnit.Framework;
-using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;

Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs

@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Content.Server.GameObjects.Components;
-using Content.Server.GameObjects.EntitySystems;
+using Content.Server.GameObjects.EntitySystems.DoAfter;
 using NUnit.Framework;
 using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.Interfaces.GameObjects;
@@ -9,7 +9,6 @@ using Robust.Shared.Interfaces.Map;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.IntegrationTests.Tests.DoAfter
 {

Content.IntegrationTests/Tests/EntityTest.cs

@@ -1,20 +1,21 @@
-using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using NUnit.Framework;
+using Robust.Server.Interfaces.Maps;
+using Robust.Server.Interfaces.Timing;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
-using Robust.Shared.Map;
-using Robust.Shared.Prototypes;
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Robust.Shared.Log;
-using Robust.Server.Interfaces.Maps;
+using Robust.Shared.Map;
-using Robust.Server.Interfaces.Timing;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
 
 namespace Content.IntegrationTests.Tests
 {
     [TestFixture]
-    [TestOf(typeof(Robust.Shared.GameObjects.Entity))]
+    [TestOf(typeof(Entity))]
     public class EntityTest : ContentIntegrationTest
     {
         [Test]
@@ -41,7 +42,7 @@ namespace Content.IntegrationTests.Tests
 
             server.Assert(() =>
                 {
-                    var testLocation = new GridCoordinates(new Robust.Shared.Maths.Vector2(0, 0), grid);
+                    var testLocation = new GridCoordinates(new Vector2(0, 0), grid);
 
                     //Generate list of non-abstract prototypes to test
                     foreach (var prototype in prototypeMan.EnumeratePrototypes<EntityPrototype>())

Content.IntegrationTests/Tests/GravityGridTest.cs

@@ -1,8 +1,6 @@
 using System.Threading.Tasks;
-using Content.Client.GameObjects.Components.Gravity;
 using Content.Server.GameObjects.Components.Gravity;
 using Content.Server.GameObjects.Components.Power.ApcNetComponents;
-using Content.Server.GameObjects.Components.Power;
 using NUnit.Framework;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;

Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs

@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
-using Content.Server.GameObjects;
+using Content.Server.GameObjects.Components.GUI;
 using NUnit.Framework;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Map;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
 namespace Content.IntegrationTests.Tests

Content.Server.Database/Migrations/Postgres/PostgresPreferencesDbContextModelSnapshot.cs

@@ -1,8 +1,7 @@
 // <auto-generated />
-using Content.Server.Database;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace Content.Server.Database.Migrations.Postgres

Content.Server.Database/Migrations/Sqlite/20200118020532_initial.Designer.cs

@@ -1,11 +1,10 @@
 // <auto-generated />
-using Content.Server.Database;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace Content.Server.Database.Migrations
+namespace Content.Server.Database.Migrations.Sqlite
 {
     [DbContext(typeof(SqlitePreferencesDbContext))]
     [Migration("20200118020532_initial")]

Content.Server.Database/Migrations/Sqlite/20200118020532_initial.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 
-namespace Content.Server.Database.Migrations
+namespace Content.Server.Database.Migrations.Sqlite
 {
     public partial class initial : Migration
     {

Content.Server.Database/Migrations/Sqlite/20200118195640_jobs.Designer.cs

@@ -1,11 +1,10 @@
 // <auto-generated />
-using Content.Server.Database;
+
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
-namespace Content.Server.Database.Migrations
+namespace Content.Server.Database.Migrations.Sqlite
 {
     [DbContext(typeof(SqlitePreferencesDbContext))]
     [Migration("20200118195640_jobs")]