Merge remote-tracking branch 'upstream/master' into ci-stuff

.editorconfig

@@ -10,3 +10,6 @@ charset = utf-8
 
 [*.{csproj, xml, yml}]
 indent_size = 2
+
+[*.dll.config]
+indent_size = 2

SS14.Client/Collision/CollisionManager.cs

@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.Collision
+namespace SS14.Client.Collision
 {
     //Its the bucket list!
     /// <summary>

SS14.Client/Configuration/ConfigurationManager.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Xml.Serialization;
 using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.Configuration
+namespace SS14.Client.Configuration
 {
     [IoCTarget]
     public sealed class ConfigurationManager : IPlayerConfigurationManager

SS14.Client/Configuration/PlayerConfiguration.cs

@@ -1,7 +1,7 @@
 using System;
 using SFML.Window;
 
-namespace SS14.Client.Services.Configuration
+namespace SS14.Client.Configuration
 {
     [Serializable]
     public class PlayerConfiguration

SS14.Client/Console/ConsoleCommands.cs

@@ -7,8 +7,9 @@ using SS14.Client.Interfaces.UserInterface;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.Console
+namespace SS14.Client.Console
 {
+    [IoCTarget]
     class ClearCommand : IConsoleCommand
     {
         public string Command => "cls";
@@ -22,6 +23,7 @@ namespace SS14.Client.Services.Console
         }
     }
 
+    [IoCTarget]
     class FillCommand : IConsoleCommand
     {
         public string Command => "fill";

SS14.Client/Console/HelpCommands.cs

@@ -9,62 +9,63 @@ using SS14.Client.Interfaces.UserInterface;
 using SS14.Client.Interfaces.Network;
 using SFML.Graphics;
 
-namespace SS14.Client.Services.Console
+namespace SS14.Client.Console
 {
-	class HelpCommand : IConsoleCommand
-	{
-		public string Command => "help";
-		public string Help => "When no arguments are provided, displays a generic help text. When an argument is passed, display the help text for the command with that name.";
-		public string Description => "Display help text.";
+    [IoCTarget]
+    class HelpCommand : IConsoleCommand
+    {
+        public string Command => "help";
+        public string Help => "When no arguments are provided, displays a generic help text. When an argument is passed, display the help text for the command with that name.";
+        public string Description => "Display help text.";
 
-		public bool Execute(IDebugConsole console, params string[] args)
-		{
-			switch (args.Length)
-			{
-				case 0:
-					console.AddLine("To display help for a specific command, write 'help <command>'. To list all available commands, write 'list'.", Color.White);
-					break;
+        public bool Execute(IDebugConsole console, params string[] args)
+        {
+            switch (args.Length)
+            {
+                case 0:
+                    console.AddLine("To display help for a specific command, write 'help <command>'. To list all available commands, write 'list'.", Color.White);
+                    break;
 
-				case 1:
-					string commandname = args[0];
-					if (!console.Commands.ContainsKey(commandname))
-					{
-						if (!IoCManager.Resolve<INetworkManager>().IsConnected)
-						{
-							// No server so nothing to respond with unknown command.
-							console.AddLine("Unknown command: " + commandname, Color.Red);
-							return false;
-						}
-						// TODO: Maybe have a server side help?
-						return false; // return true;
-					}
-					IConsoleCommand command = console.Commands[commandname];
-					console.AddLine(string.Format("{0} - {1}", command.Command, command.Description), Color.White);
-					console.AddLine(command.Help, Color.White);
-					break;
+                case 1:
+                    string commandname = args[0];
+                    if (!console.Commands.ContainsKey(commandname))
+                    {
+                        if (!IoCManager.Resolve<INetworkManager>().IsConnected)
+                        {
+                            // No server so nothing to respond with unknown command.
+                            console.AddLine("Unknown command: " + commandname, Color.Red);
+                            return false;
+                        }
+                        // TODO: Maybe have a server side help?
+                        return false; // return true;
+                    }
+                    IConsoleCommand command = console.Commands[commandname];
+                    console.AddLine(string.Format("{0} - {1}", command.Command, command.Description), Color.White);
+                    console.AddLine(command.Help, Color.White);
+                    break;
 
-				default:
-					console.AddLine("Invalid amount of arguments.", Color.Red);
-					break;
-			}
-			return false;
-		}
-	}
+                default:
+                    console.AddLine("Invalid amount of arguments.", Color.Red);
+                    break;
+            }
+            return false;
+        }
+    }
 
-	class ListCommand : IConsoleCommand
-	{
-		public string Command => "list";
-		public string Help => "Lists all available commands, and their short descriptions.";
-		public string Description => "List all commands";
+    class ListCommand : IConsoleCommand
+    {
+        public string Command => "list";
+        public string Help => "Lists all available commands, and their short descriptions.";
+        public string Description => "List all commands";
 
-		public bool Execute(IDebugConsole console, params string[] args)
-		{
-			foreach (IConsoleCommand command in console.Commands.Values)
-			{
-				console.AddLine(command.Command + ": " + command.Description, Color.White);
-			}
+        public bool Execute(IDebugConsole console, params string[] args)
+        {
+            foreach (IConsoleCommand command in console.Commands.Values)
+            {
+                console.AddLine(command.Command + ": " + command.Description, Color.White);
+            }
 
-			return false;
-		}
-	}
+            return false;
+        }
+    }
 }

SS14.Client/Console/QuitCommand.cs

@@ -4,9 +4,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using SS14.Client.Interfaces.Console;
+using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.Console
+namespace SS14.Client.Console
 {
+    [IoCTarget]
     class QuitCommand : IConsoleCommand
     {
         public string Command => "quit";

SS14.Client/GOC/EntityManagerContainer.cs

@@ -2,7 +2,7 @@ using SS14.Client.Interfaces.GOC;
 using SS14.Shared.GameObjects;
 using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.GOC
+namespace SS14.Client.GOC
 {
     [IoCTarget]
     public class EntityManagerContainer : IEntityManagerContainer

SS14.Client/GameController.cs

@@ -8,17 +8,17 @@ using SS14.Client.Interfaces.Network;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.State;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.State.States;
+using SS14.Client.State.States;
 using SS14.Shared.IoC;
 using SS14.Shared.Log;
 using SS14.Shared.ServerEnums;
+using SS14.Shared.Utility;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Windows.Forms;
 using KeyArgs = SFML.Window.KeyEventArgs;
-using SS14.Shared.Utility;
 
 namespace SS14.Client
 {
@@ -50,12 +50,12 @@ namespace SS14.Client
         public GameController()
         {
             LogManager.Log("Initialising GameController.", LogLevel.Debug);
-          
+
             ShowSplashScreen();
-          
+
             var assemblies = new List<Assembly>();
-            string assemblyDir = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
-            assemblies.Add(Assembly.LoadFrom(Path.Combine(assemblyDir, "SS14.Client.Services.dll")));
+            assemblies.Add(AppDomain.CurrentDomain.GetAssemblyByName("SS14.Shared"));
+            assemblies.Add(Assembly.GetExecutingAssembly());
 
             IoCManager.AddAssemblies(assemblies);
 
@@ -108,7 +108,7 @@ namespace SS14.Client
             CluwneLib.CleanupSplashScreen();
         }
 
-        
+
         #endregion
 
         #region EventHandlers

SS14.Client/GameStates/GameStateManager.cs

@@ -4,7 +4,7 @@ using SS14.Shared.GameStates;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.GameStates
+namespace SS14.Client.GameStates
 {
     public class GameStateManager : Dictionary<uint, GameState>, IGameStateManager
     {

SS14.Client/GameTimer/GameTimer.cs

@@ -1,7 +1,7 @@
 using SS14.Client.Interfaces.GameTimer;
 using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.GameTimer
+namespace SS14.Client.GameTimer
 {
     [IoCTarget]
     public class GameTimer : IGameTimer

SS14.Client/Helpers/GaussianBlur.cs

@@ -7,7 +7,7 @@ using SS14.Client.Interfaces.Utility;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.Helpers
+namespace SS14.Client.Helpers
 {
     public class GaussianBlur
     {

SS14.Client/Helpers/InterpolationPacket.cs

@@ -1,7 +1,7 @@
 using Lidgren.Network;
 using SFML.System;
 
-namespace SS14.Client.Services.Helpers
+namespace SS14.Client.Helpers
 {
     public struct InterpolationPacket
     {

SS14.Client/Helpers/StarScroller.cs

@@ -2,7 +2,7 @@
 using SS14.Client.Graphics;
 using System;
 
-namespace SS14.Client.Services.Helpers
+namespace SS14.Client.Helpers
 {
     public class StarScroller
     {

SS14.Client/Helpers/Utilities.cs

@@ -8,7 +8,7 @@ using SS14.Shared.GO;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.Helpers
+namespace SS14.Client.Helpers
 {
     internal static class Utilities
     {

SS14.Client/Input/KeyBindingManager.cs

@@ -9,7 +9,7 @@ using System.IO;
 using System.Linq;
 using System.Xml;
 
-namespace SS14.Client.Services.Input
+namespace SS14.Client.Input
 {
     [IoCTarget]
     public class KeyBindingManager : IKeyBindingManager

SS14.Client/Interfaces/Console/IConsoleCommand.cs

@@ -1,8 +1,9 @@
 using SS14.Shared.Command;
+using SS14.Shared.IoC;
 
 namespace SS14.Client.Interfaces.Console
 {
-    public interface IConsoleCommand : ICommand
+    public interface IConsoleCommand : ICommand, IIoCInterface
     {
         /// <summary>
         /// Executes the command

SS14.Client/Lighting/Light.cs

@@ -4,7 +4,7 @@ using SS14.Client.Interfaces.Lighting;
 using SS14.Shared;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.Lighting
+namespace SS14.Client.Lighting
 {
     public class Light : ILight
     {

SS14.Client/Lighting/LightArea.cs

@@ -7,7 +7,7 @@ using SS14.Client.Interfaces.Resource;
 using SS14.Shared.IoC;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.Lighting
+namespace SS14.Client.Lighting
 {
     public class LightArea : ILightArea
     {

SS14.Client/Lighting/LightManager.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-namespace SS14.Client.Services.Lighting
+namespace SS14.Client.Lighting
 {
     [IoCTarget]
     public class LightManager : ILightManager

SS14.Client/Lighting/QuadRenderer.cs

@@ -1,7 +1,7 @@
 using SFML.Graphics;
 using SFML.System;
 
-namespace SS14.Client.Services.Lighting
+namespace SS14.Client.Lighting
 {
     public class QuadRenderer
     {

SS14.Client/Lighting/ShadowMapResolver.cs

@@ -9,7 +9,7 @@ using System;
 using Color = SFML.Graphics.Color;
 
 
-namespace SS14.Client.Services.Lighting
+namespace SS14.Client.Lighting
 {
     public class ShadowMapResolver : IDisposable
     {

SS14.Client/Lighting/ShadowmapSize.cs

@@ -1,4 +1,4 @@
-namespace SS14.Client.Services.Lighting
+namespace SS14.Client.Lighting
 {
     public enum ShadowmapSize
     {

SS14.Client/Map/HardcodedTileDefinitions.cs

@@ -6,7 +6,7 @@ using SS14.Client.Interfaces.Map;
 using SS14.Client.Interfaces.Resource;
 using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.Map
+namespace SS14.Client.Map
 {
     [System.Diagnostics.DebuggerDisplay("TileDef: {Name}")]
     public sealed class SpaceTileDefinition : ITileDefinition

SS14.Client/Map/MapManager.cs

@@ -9,7 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.Map
+namespace SS14.Client.Map
 {
     [IoCTarget]
     public class MapManager : IMapManager
@@ -262,7 +262,7 @@ namespace SS14.Client.Services.Map
 
         //public Tile GenerateNewTile(string typeName, TileState state, Vector2D pos, Direction dir = Direction.North)
         //{
-        //    Type tileType = Type.GetType("SS14.Client.Services.Tiles." + typeName, false);
+        //    Type tileType = Type.GetType("SS14.Client.Tiles." + typeName, false);
 
         //    if (tileType == null) throw new ArgumentException("Invalid Tile Type specified : '" + typeName + "' .");
         //    RectangleF rect = new FloatRect();

SS14.Client/Map/TileDefinition.cs

@@ -5,7 +5,7 @@ using SS14.Client.Interfaces.Map;
 using SS14.Shared.IoC;
 using System.Diagnostics;
 
-namespace SS14.Client.Services.Map
+namespace SS14.Client.Map
 {
     [System.Diagnostics.DebuggerDisplay("TileDef: {Name}")]
     public class TileDefinition : ITileDefinition

SS14.Client/Map/TileDefinitionManager.cs

@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.Map
+namespace SS14.Client.Map
 {
     [IoCTarget]
     public sealed class TileDefinitionManager : ITileDefinitionManager

SS14.Client/MessageLogging/MessageLogger.cs

@@ -7,7 +7,7 @@ using System;
 using System.ServiceModel;
 using System.Timers;
 
-namespace SS14.Client.Services.MessageLogging
+namespace SS14.Client.MessageLogging
 {
     [IoCTarget]
     public class MessageLogger : IMessageLogger

SS14.Client/Network/NetworkGrapher.cs

@@ -8,7 +8,7 @@ using SS14.Shared.IoC;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.Network
+namespace SS14.Client.Network
 {
     [IoCTarget]
     public class NetworkGrapher : INetworkGrapher

SS14.Client/Network/NetworkManager.cs

@@ -2,12 +2,12 @@
 using SS14.Client.Interfaces.Configuration;
 using SS14.Client.Interfaces.Map;
 using SS14.Client.Interfaces.Network;
-using SS14.Client.Services.Map;
+using SS14.Client.Map;
 using SS14.Shared;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.Network
+namespace SS14.Client.Network
 {
     [IoCTarget]
     public class NetworkManager : INetworkManager

SS14.Client/Placement/Modes/AlignFree.cs

@@ -3,7 +3,7 @@ using SFML.System;
 using SS14.Client.Graphics;
 using SS14.Client.Interfaces.Map;
 
-namespace SS14.Client.Services.Placement.Modes
+namespace SS14.Client.Placement.Modes
 {
     public class AlignFree : PlacementMode
     {

SS14.Client/Placement/Modes/AlignNone.cs

@@ -6,7 +6,7 @@ using SS14.Client.Interfaces.Map;
 using SS14.Shared.GO;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.Placement.Modes
+namespace SS14.Client.Placement.Modes
 {
     public class AlignNone : PlacementMode
     {

SS14.Client/Placement/Modes/AlignSimilar.cs

@@ -12,7 +12,7 @@ using System.Collections.Generic;
 using System.Linq;
 using EntityManager = SS14.Client.GameObjects.EntityManager;
 
-namespace SS14.Client.Services.Placement.Modes
+namespace SS14.Client.Placement.Modes
 {
     public class AlignSimilar : PlacementMode
     {

SS14.Client/Placement/Modes/AlignTileAny.cs

@@ -6,7 +6,7 @@ using SS14.Client.Interfaces.Map;
 using SS14.Shared.GO;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.Placement.Modes
+namespace SS14.Client.Placement.Modes
 {
     public class AlignTileAny : PlacementMode
     {

SS14.Client/Placement/Modes/AlignTileEmpty.cs

@@ -6,7 +6,7 @@ using SS14.Client.Interfaces.Map;
 using SS14.Shared.GO;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.Placement.Modes
+namespace SS14.Client.Placement.Modes
 {
     public class AlignTileEmpty : PlacementMode
     {

SS14.Client/Placement/Modes/AlignTileNonSolid.cs

@@ -6,7 +6,7 @@ using SS14.Client.Interfaces.Map;
 using SS14.Shared.GO;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.Placement.Modes
+namespace SS14.Client.Placement.Modes
 {
     public class AlignTileNonSolid : PlacementMode
     {

SS14.Client/Placement/Modes/AlignTileSolid.cs

@@ -6,7 +6,7 @@ using SS14.Client.Interfaces.Map;
 using SS14.Shared.GO;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.Placement.Modes
+namespace SS14.Client.Placement.Modes
 {
     public class AlignTileSolid : PlacementMode
     {

SS14.Client/Placement/Modes/AlignWall.cs

@@ -8,7 +8,7 @@ using SS14.Shared.Maths;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.Placement.Modes
+namespace SS14.Client.Placement.Modes
 {
     public class AlignWall : PlacementMode
     {

SS14.Client/Placement/PlacementManager.cs

@@ -11,7 +11,7 @@ using SS14.Client.Interfaces.Placement;
 using SS14.Client.Interfaces.Player;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.Map;
+using SS14.Client.Map;
 using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.GO;
@@ -21,7 +21,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-namespace SS14.Client.Services.Placement
+namespace SS14.Client.Placement
 {
     [IoCTarget]
     public class PlacementManager : IPlacementManager

SS14.Client/Placement/PlacementMode.cs

@@ -2,7 +2,7 @@
 using SFML.System;
 using SS14.Client.Interfaces.Map;
 
-namespace SS14.Client.Services.Placement
+namespace SS14.Client.Placement
 {
     public class PlacementMode
     {

SS14.Client/Player/PlayerManager.cs

@@ -5,8 +5,8 @@ using SS14.Client.Graphics.Render;
 using SS14.Client.Interfaces.GOC;
 using SS14.Client.Interfaces.Network;
 using SS14.Client.Interfaces.Player;
-using SS14.Client.Services.Player.PostProcessing;
-using SS14.Client.Services.State.States;
+using SS14.Client.Player.PostProcessing;
+using SS14.Client.State.States;
 using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.GameStates;
@@ -16,7 +16,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.Player
+namespace SS14.Client.Player
 {
     [IoCTarget]
     public class PlayerManager : IPlayerManager

SS14.Client/Player/PostProcessing/BlurPostProcessingEffect.cs

@@ -1,11 +1,11 @@
 using SFML.System;
 using SS14.Client.Graphics.Render;
 using SS14.Client.Interfaces.Resource;
-using SS14.Client.Services.Helpers;
+using SS14.Client.Helpers;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.Player.PostProcessing
+namespace SS14.Client.Player.PostProcessing
 {
     public class BlurPostProcessingEffect : PostProcessingEffect
     {

SS14.Client/Player/PostProcessing/DeathPostProcessingEffect.cs

@@ -6,7 +6,7 @@ using SS14.Shared.IoC;
 using System;
 
 
-namespace SS14.Client.Services.Player.PostProcessing
+namespace SS14.Client.Player.PostProcessing
 {
     public class DeathPostProcessingEffect : PostProcessingEffect
     {

SS14.Client/Player/PostProcessing/PostProcessingEffect.cs

@@ -1,6 +1,6 @@
 using SS14.Client.Graphics.Render;
 
-namespace SS14.Client.Services.Player.PostProcessing
+namespace SS14.Client.Player.PostProcessing
 {
     public delegate void PostProcessingEffectExpired(PostProcessingEffect p);
 

SS14.Client/Properties/AssemblyInfo.cs

@@ -1,21 +1,21 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("SpaceStation14")]
+[assembly: AssemblyTitle("SS14.Client")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SpaceStation14")]
+[assembly: AssemblyProduct("SS14.Client")]
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 
 [assembly: ComVisible(false)]
@@ -27,13 +27,13 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyVersion("0.1.*")]
-[assembly: AssemblyFileVersion("0.1")]
+[assembly: AssemblyFileVersion("0.1")]

SS14.Client/ResourceManagment/ResourceManagerZip.cs

@@ -20,7 +20,7 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using TextureCache = SS14.Client.Graphics.texture.TextureCache;
 
-namespace SS14.Client.Services.Resources
+namespace SS14.Client.Resources
 {
     [IoCTarget]
     public class ResourceManager : IResourceManager
@@ -57,15 +57,15 @@ namespace SS14.Client.Services.Resources
         /// </summary>
         public void LoadBaseResources()
         {
-            Assembly _assembly = Assembly.GetExecutingAssembly(); ;
+            Assembly _assembly = Assembly.GetExecutingAssembly();
             Stream _stream;
 
-            _stream = _assembly.GetManifestResourceStream("SS14.Client.Services._EmbeddedBaseResources.bluehigh.ttf");
+            _stream = _assembly.GetManifestResourceStream("SS14.Client._EmbeddedBaseResources.bluehigh.ttf");
             if (_stream != null)
                 _fonts.Add("base_font", new Font( _stream));
             _stream = null;
 
-            _stream = _assembly.GetManifestResourceStream("SS14.Client.Services._EmbeddedBaseResources.noSprite.png");
+            _stream = _assembly.GetManifestResourceStream("SS14.Client._EmbeddedBaseResources.noSprite.png");
             if (_stream != null)
             {
                 Texture nospriteimage = new Texture( _stream);

SS14.Client/SS14.Client.csproj

@@ -10,7 +10,7 @@
     </ApplicationIcon>
     <AssemblyKeyContainerName>
     </AssemblyKeyContainerName>
-    <AssemblyName>SpaceStation14</AssemblyName>
+    <AssemblyName>SS14.Client</AssemblyName>
     <DefaultClientScript>JScript</DefaultClientScript>
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

SS14.Client/Serialization/SS14Serializer.cs

@@ -1,7 +1,7 @@
 using SS14.Client.Interfaces.Serialization;
 using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.Serialization
+namespace SS14.Client.Serialization
 {
     [IoCTarget]
     public class SS14Serializer : SS14.Shared.Serialization.SS14Serializer, ISS14Serializer

SS14.Client/State/State.cs

@@ -10,7 +10,7 @@ using SS14.Client.Interfaces.UserInterface;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.State
+namespace SS14.Client.State
 {
     public abstract class State
     {

SS14.Client/State/StateManager.cs

@@ -15,7 +15,7 @@ using System;
 using System.Collections.Generic;
 using KeyEventArgs = SFML.Window.KeyEventArgs;
 
-namespace SS14.Client.Services.State
+namespace SS14.Client.State
 {
     [IoCTarget]
     public class StateManager : IStateManager

SS14.Client/State/States/GameScreen.cs

@@ -16,10 +16,10 @@ using SS14.Client.Interfaces.Player;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.Serialization;
 using SS14.Client.Interfaces.State;
-using SS14.Client.Services.Helpers;
-using SS14.Client.Services.Lighting;
-using SS14.Client.Services.UserInterface.Components;
-using SS14.Client.Services.UserInterface.Inventory;
+using SS14.Client.Helpers;
+using SS14.Client.Lighting;
+using SS14.Client.UserInterface.Components;
+using SS14.Client.UserInterface.Inventory;
 using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.GameStates;
@@ -32,7 +32,7 @@ using System.Linq;
 using EntityManager = SS14.Client.GameObjects.EntityManager;
 using KeyEventArgs = SFML.Window.KeyEventArgs;
 
-namespace SS14.Client.Services.State.States
+namespace SS14.Client.State.States
 {
     public class GameScreen : State, IState
     {

SS14.Client/State/States/LobbyMenu.cs

@@ -7,7 +7,7 @@ using SS14.Client.Graphics.Event;
 using SS14.Client.Interfaces.Network;
 using SS14.Client.Interfaces.Player;
 using SS14.Client.Interfaces.State;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.UserInterface.Components;
 using SS14.Shared;
 using SS14.Shared.IoC;
 using SS14.Shared.Maths;
@@ -16,7 +16,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.State.States
+namespace SS14.Client.State.States
 {
     public class Lobby : State, IState
     {

SS14.Client/State/States/LobbyScreen.cs

@@ -5,13 +5,13 @@ using SS14.Client.Graphics;
 using SS14.Client.Graphics.Event;
 using SS14.Client.Graphics.Sprite;
 using SS14.Client.Interfaces.State;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.UserInterface.Components;
 using SS14.Shared;
 using SS14.Shared.Utility;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.State.States
+namespace SS14.Client.State.States
 {
     public class LobbyScreen : State, IState
     {

SS14.Client/State/States/MainMenu.cs

@@ -5,14 +5,14 @@ using SFML.Window;
 using SS14.Client.Graphics;
 using SS14.Client.Graphics.Event;
 using SS14.Client.Interfaces.State;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.UserInterface.Components;
 using SS14.Shared.Maths;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace SS14.Client.Services.State.States
+namespace SS14.Client.State.States
 {
     public class MainScreen : State, IState
     {

SS14.Client/State/States/OptionsMenu.cs

@@ -4,15 +4,15 @@ using SFML.Window;
 using SS14.Client.Graphics;
 using SS14.Client.Graphics.Event;
 using SS14.Client.Interfaces.State;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.UserInterface.Components;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using KeyEventArgs = SFML.Window.KeyEventArgs;
-using Label = SS14.Client.Services.UserInterface.Components.Label;
+using Label = SS14.Client.UserInterface.Components.Label;
 
-namespace SS14.Client.Services.State.States
+namespace SS14.Client.State.States
 {
     public class OptionsMenu : State, IState
     {

SS14.Client/UserInterface/Components/ArmorInfoLabel.cs

@@ -10,7 +10,7 @@ using SS14.Shared.GO;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class ArmorInfoLabel : GuiComponent
     {

SS14.Client/UserInterface/Components/BlueprintButton.cs

@@ -6,7 +6,7 @@ using SS14.Client.Graphics.Sprite;
 using SS14.Client.Interfaces.Resource;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class BlueprintButton : GuiComponent
     {

SS14.Client/UserInterface/Components/Button.cs

@@ -7,7 +7,7 @@ using SS14.Client.Interfaces.Resource;
 using SS14.Shared.Maths;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class Button : GuiComponent
     {

SS14.Client/UserInterface/Components/Chatbox.cs

@@ -14,7 +14,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
 
     public class Chatbox : ScrollableContainer

SS14.Client/UserInterface/Components/Checkbox.cs

@@ -4,7 +4,7 @@ using SS14.Client.Graphics;
 using SS14.Client.Interfaces.Resource;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class Checkbox : GuiComponent
     {

SS14.Client/UserInterface/Components/ContextMenu.cs

@@ -11,7 +11,7 @@ using SS14.Shared.GO;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class ContextMenu : GuiComponent
     {

SS14.Client/UserInterface/Components/DebugConsole.cs

@@ -18,7 +18,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using SFML.Graphics;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class DebugConsole : ScrollableContainer, IDebugConsole
     {
@@ -238,11 +238,8 @@ namespace SS14.Client.Services.UserInterface.Components
 
         private void InitializeCommands()
         {
-            foreach (Type t in Assembly.GetExecutingAssembly().GetTypes())
+            foreach (Type t in IoCManager.ResolveEnumerable<IConsoleCommand>())
             {
-                if (!typeof(IConsoleCommand).IsAssignableFrom(t) || t == typeof(ServerDummyCommand))
-                    continue;
-
                 var instance = Activator.CreateInstance(t, null) as IConsoleCommand;
                 if (commands.ContainsKey(instance.Command))
                     throw new Exception(string.Format("Command already registered: {0}", instance.Command));
@@ -287,6 +284,7 @@ namespace SS14.Client.Services.UserInterface.Components
     /// <summary>
     /// These dummies are made purely so list and help can list server-side commands.
     /// </summary>
+    [IoCTarget(Disabled=true)]
     class ServerDummyCommand : IConsoleCommand
     {
         readonly string command;

SS14.Client/UserInterface/Components/DisconnectedScreenBlocker.cs

@@ -4,10 +4,10 @@ using SS14.Client.Graphics;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.State;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.State.States;
+using SS14.Client.State.States;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class DisconnectedScreenBlocker : GuiComponent
     {

SS14.Client/UserInterface/Components/EntitySpawnPanel.cs

@@ -4,7 +4,7 @@ using SS14.Client.Graphics;
 using SS14.Client.Interfaces.GOC;
 using SS14.Client.Interfaces.Placement;
 using SS14.Client.Interfaces.Resource;
-using SS14.Client.Services.Placement;
+using SS14.Client.Placement;
 using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.IoC;
@@ -12,7 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class EntitySpawnPanel : Window
     {

SS14.Client/UserInterface/Components/EntitySpawnSelectButton.cs

@@ -8,7 +8,7 @@ using SS14.Shared.GameObjects;
 using SS14.Shared.Maths;
 using System.Linq;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class EntitySpawnSelectButton : GuiComponent
     {

SS14.Client/UserInterface/Components/ExamineWindow.cs

@@ -5,7 +5,7 @@ using SS14.Client.Interfaces.Resource;
 using SS14.Shared.GameObjects;
 using SS14.Shared.GO;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal sealed class ExamineWindow : Window
     {

SS14.Client/UserInterface/Components/FloatingDeco.cs

@@ -7,7 +7,7 @@ using SS14.Client.Interfaces.UserInterface;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class FloatingDecoration : GuiComponent
     {

SS14.Client/UserInterface/Components/GuiComponent.cs

@@ -7,7 +7,7 @@ using SS14.Shared;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class GuiComponent : IGuiComponent
     {

SS14.Client/UserInterface/Components/HandsGui.cs

@@ -6,7 +6,7 @@ using SS14.Client.Graphics;
 using SS14.Client.Interfaces.Player;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.Helpers;
+using SS14.Client.Helpers;
 using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.GO;
@@ -14,7 +14,7 @@ using SS14.Shared.IoC;
 using System;
 using System.Linq;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public struct UiHandInfo
     {

SS14.Client/UserInterface/Components/HealthPanel.cs

@@ -14,7 +14,7 @@ using SS14.Shared.IoC;
 using SS14.Shared.Maths;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class HealthPanel : GuiComponent
     {

SS14.Client/UserInterface/Components/ImageButton.cs

@@ -5,7 +5,7 @@ using SS14.Client.Interfaces.Resource;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class ImageButton : GuiComponent
     {

SS14.Client/UserInterface/Components/Label.cs

@@ -6,7 +6,7 @@ using SS14.Client.Graphics.Sprite;
 using SS14.Client.Interfaces.Resource;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class Label : GuiComponent
     {

SS14.Client/UserInterface/Components/Listbox.cs

@@ -11,7 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class Listbox : GuiComponent
     {

SS14.Client/UserInterface/Components/MenuWindow.cs

@@ -8,13 +8,13 @@ using SS14.Client.Interfaces.Player;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.State;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.State.States;
+using SS14.Client.State.States;
 using SS14.Shared;
 using SS14.Shared.GO;
 using SS14.Shared.IoC;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class MenuWindow : Window
     {

SS14.Client/UserInterface/Components/ProgressBar.cs

@@ -6,7 +6,7 @@ using SS14.Client.Graphics.Sprite;
 using SS14.Client.Interfaces.Resource;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class Progress_Bar : GuiComponent
     {

SS14.Client/UserInterface/Components/PropEditWindow.cs

@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal struct PropWindowStruct
     {

SS14.Client/UserInterface/Components/SVarEditWindow.cs

@@ -8,7 +8,7 @@ using SS14.Shared.Maths;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal sealed class SVarEditWindow : Window
     {

SS14.Client/UserInterface/Components/ScrollableContainer.cs

@@ -9,7 +9,7 @@ using SS14.Shared.Maths;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class ScrollableContainer : GuiComponent
     //This is a note: Spooge wants support for mouseover-scrolling of scrollable containers inside other scrollable containers.

SS14.Client/UserInterface/Components/Scrollbar.cs

@@ -7,7 +7,7 @@ using SS14.Client.Graphics.Sprite;
 using SS14.Client.Interfaces.Resource;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class Scrollbar : GuiComponent
     {

SS14.Client/UserInterface/Components/Showcase.cs

@@ -8,7 +8,7 @@ using SS14.Shared.Maths;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class Showcase : GuiComponent
     {

SS14.Client/UserInterface/Components/SimpleImage.cs

@@ -6,7 +6,7 @@ using SS14.Client.Interfaces.Resource;
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class SimpleImage : GuiComponent
     {

SS14.Client/UserInterface/Components/TemplateGuiComponent.cs

@@ -3,7 +3,7 @@ using SFML.Window;
 using SS14.Shared;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class TemplateGuiComponent : GuiComponent
     {

SS14.Client/UserInterface/Components/Textbox.cs

@@ -9,7 +9,7 @@ using SS14.Shared.IoC;
 using SS14.Shared.Maths;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class Textbox : GuiComponent
     {

SS14.Client/UserInterface/Components/TileSpawnPanel.cs

@@ -9,7 +9,7 @@ using SS14.Shared.IoC;
 using System;
 using System.Linq;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class TileSpawnPanel : Window
     {

SS14.Client/UserInterface/Components/TimerBar.cs

@@ -5,7 +5,7 @@ using SS14.Client.Interfaces.Resource;
 using System;
 using System.Diagnostics;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class Timer_Bar : Progress_Bar
     {

SS14.Client/UserInterface/Components/Window.cs

@@ -5,7 +5,7 @@ using SS14.Client.Graphics.VertexData;
 using SS14.Client.Interfaces.Resource;
 using SS14.Shared.Maths;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class Window : ScrollableContainer
     {

SS14.Client/UserInterface/DragDropInfo.cs

@@ -3,11 +3,11 @@ using SS14.Client.Interfaces.GOC;
 using SS14.Client.Interfaces.Placement;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.Helpers;
+using SS14.Client.Helpers;
 using SS14.Shared.GameObjects;
 using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.UserInterface
+namespace SS14.Client.UserInterface
 {
     public class DragDropInfo : IDragDropInfo
     {

SS14.Client/UserInterface/Inventory/EquipmentSlotUi.cs

@@ -7,14 +7,14 @@ using SS14.Client.Graphics.Sprite;
 using SS14.Client.Interfaces.Player;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.Helpers;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.Helpers;
+using SS14.Client.UserInterface.Components;
 using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.GO;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Inventory
+namespace SS14.Client.UserInterface.Inventory
 {
     internal class EquipmentSlotUi : GuiComponent
     {

SS14.Client/UserInterface/Inventory/HumanComboGUI.cs

@@ -9,7 +9,7 @@ using SS14.Client.Interfaces.Network;
 using SS14.Client.Interfaces.Player;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.UserInterface.Components;
 using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.GO;
@@ -17,7 +17,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.UserInterface.Inventory
+namespace SS14.Client.UserInterface.Inventory
 {
     public class HumanComboGui : GuiComponent
     {

SS14.Client/UserInterface/Inventory/InventorySlotUi.cs

@@ -3,12 +3,12 @@ using SFML.System;
 using SFML.Window;
 using SS14.Client.Graphics;
 using SS14.Client.Interfaces.Resource;
-using SS14.Client.Services.Helpers;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.Helpers;
+using SS14.Client.UserInterface.Components;
 using SS14.Shared.GameObjects;
 using System;
 
-namespace SS14.Client.Services.UserInterface.Inventory
+namespace SS14.Client.UserInterface.Inventory
 {
     internal class InventorySlotUi : GuiComponent
     {

SS14.Client/UserInterface/Inventory/InventoryViewer.cs

@@ -3,12 +3,12 @@ using SFML.Window;
 using SS14.Client.GameObjects;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.UserInterface.Components;
 using SS14.Shared.GameObjects;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.UserInterface.Inventory
+namespace SS14.Client.UserInterface.Inventory
 {
     internal class InventoryViewer : GuiComponent
     {

SS14.Client/UserInterface/LobbyState/LobbyShowcase.cs

@@ -6,7 +6,7 @@ using SS14.Shared.Maths;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     public class LobbyShowcase : Showcase
     {

SS14.Client/UserInterface/LobbyState/PlayerLstTab.cs

@@ -6,7 +6,7 @@ using SS14.Client.Interfaces.Resource;
 using SS14.Shared;
 using SS14.Shared.IoC;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class PlayerListTab : TabContainer
     {

SS14.Client/UserInterface/LobbyState/TabContainer.cs

@@ -3,7 +3,7 @@ using SFML.System;
 using SFML.Window;
 using SS14.Client.Interfaces.Resource;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class TabContainer : ScrollableContainer
     {

SS14.Client/UserInterface/LobbyState/TabbedMenu.cs

@@ -7,7 +7,7 @@ using SS14.Shared.IoC;
 using System;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.UserInterface.Components
+namespace SS14.Client.UserInterface.Components
 {
     internal class TabbedMenu : GuiComponent
     {

SS14.Client/UserInterface/UserInterfaceManager.cs

@@ -9,7 +9,7 @@ using SS14.Client.Interfaces.GOC;
 using SS14.Client.Interfaces.Placement;
 using SS14.Client.Interfaces.Resource;
 using SS14.Client.Interfaces.UserInterface;
-using SS14.Client.Services.UserInterface.Components;
+using SS14.Client.UserInterface.Components;
 using SS14.Shared;
 using SS14.Shared.GameObjects;
 using SS14.Shared.IoC;
@@ -18,7 +18,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace SS14.Client.Services.UserInterface
+namespace SS14.Client.UserInterface
 {
     //TODO Make sure all ui compos use gorgon.currentrendertarget instead of gorgon.screen so they draw to the ui rendertarget. also add the actual rendertarget.
     /// <summary>

SS14.Client/Utility/Rand.cs

@@ -2,7 +2,7 @@
 using SS14.Shared.IoC;
 using System;
 
-namespace SS14.Client.Services.Utility
+namespace SS14.Client.Utility
 {
     [IoCTarget]
     public class Rand : IRand

SS14.Client/Utility/RobustSortedDrawing.cs

@@ -1,7 +1,7 @@
 using SS14.Shared.GameObjects;
 using System.Collections.Generic;
 
-namespace SS14.Client.Services.Utility
+namespace SS14.Client.Utility
 {
     class RobustSortedDrawing
     {

SS14.Server/Chat/ChatManager.cs

@@ -16,7 +16,7 @@ using System.Linq;
 using System.Reflection;
 using System.Xml.Serialization;
 
-namespace SS14.Server.Services.Chat
+namespace SS14.Server.Chat
 {
     [IoCTarget]
     public class ChatManager : IChatManager
@@ -181,12 +181,7 @@ namespace SS14.Server.Services.Chat
         // Load all command types.
         private void LoadCommands()
         {
-            List<Type> CommandTypes = new List<Type>();
-            CommandTypes.AddRange(
-                Assembly.GetCallingAssembly().GetTypes().Where(t => typeof(IChatCommand).IsAssignableFrom(t))
-            );
-
-            foreach (Type t in CommandTypes)
+            foreach (Type t in IoCManager.ResolveEnumerable<IChatCommand>())
             {
                 IChatCommand instance = (IChatCommand)Activator.CreateInstance(t, null);
                 if (_commands.ContainsKey(instance.Command))