diff --git a/Mud Designer/Designer.cs b/Mud Designer/Designer.cs
index 026c4be..ef7206f 100644
--- a/Mud Designer/Designer.cs	
+++ b/Mud Designer/Designer.cs	
@@ -8,11 +8,12 @@ using System.Text;
 using System.Windows.Forms;
 
 //Mud Designer
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.GameObjects.Items;
+using MudEngine.FileSystem;
+using MudEngine.GameManagement;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Characters;
+using MudEngine.GameObjects.Environment;
+using MudEngine.GameObjects.Items;
 using MudDesigner.UIWidgets;
 
 namespace MudDesigner
@@ -36,7 +37,7 @@ namespace MudDesigner
         }
 
         //Currently loaded project
-        ProjectInformation _Project;
+        GameSetup _Project;
         //Used for  temporarily holding an object during load.
         BaseObject _GameObject;
         //Check for if the loaded object is saved yet or not.
@@ -53,7 +54,7 @@ namespace MudDesigner
             //instance a baseObject so that we can store inherited classes
             //for use during our runtime
             _GameObject = new BaseObject();
-            _Project = new ProjectInformation();
+            _Project = new GameSetup();
             _Widget = new RealmWidget();
             IsSaved = true;
 
@@ -61,7 +62,7 @@ namespace MudDesigner
             string projectPath = FileManager.GetDataPath(SaveDataTypes.Root);
 
             if (File.Exists(Path.Combine(projectPath, _Project.Filename)))
-                _Project = (ProjectInformation)_Project.Load(projectPath);
+                _Project = (GameSetup)_Project.Load(projectPath);
 
             //ensure the path exists
             ValidatePath(projectPath);
@@ -236,7 +237,7 @@ namespace MudDesigner
                     return;
                 //Project Information file
                 case ObjectType.Project:
-                    _Project = (ProjectInformation)_Project.Load(FileManager.GetDataPath(SaveDataTypes.Root));
+                    _Project = (GameSetup)_Project.Load(FileManager.GetDataPath(SaveDataTypes.Root));
                     propertyObject.SelectedObject = _Project;
                     break;
                 //Currency File
@@ -578,7 +579,7 @@ namespace MudDesigner
         {
             if (propertyObject.SelectedObject is Zone)
             {
-                MudDesigner.MudEngine.UITypeEditors.UIRoomControl control = new MudDesigner.MudEngine.UITypeEditors.UIRoomControl((Zone)propertyObject.SelectedObject);
+                MudDesigner.Engine.UITypeEditors.UIRoomControl control = new MudDesigner.Engine.UITypeEditors.UIRoomControl((Zone)propertyObject.SelectedObject);
 
                 control.ShowDialog();
             }
diff --git a/Mud Designer/Mud Designer.csproj b/Mud Designer/Mud Designer.csproj
index 6df5604..07282f4 100644
--- a/Mud Designer/Mud Designer.csproj	
+++ b/Mud Designer/Mud Designer.csproj	
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F0C50EA1-80F7-4CE6-93A3-A4E9F34F0434}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -69,42 +69,17 @@
     <Compile Include="Designer.Designer.cs">
       <DependentUpon>Designer.cs</DependentUpon>
     </Compile>
-    <Compile Include="MudEngine\Characters\BaseCharacter.cs" />
-    <Compile Include="MudEngine\Characters\CharacterClass.cs" />
-    <Compile Include="MudEngine\Characters\CharacterFaction.cs" />
-    <Compile Include="MudEngine\Characters\CharacterRace.cs" />
-    <Compile Include="MudEngine\Characters\Controlled\PlayerAdmin.cs" />
-    <Compile Include="MudEngine\Characters\Controlled\PlayerGM.cs" />
-    <Compile Include="MudEngine\Characters\Controlled\PlayerBasic.cs" />
-    <Compile Include="MudEngine\Characters\NPC\NPCHostile.cs" />
-    <Compile Include="MudEngine\Characters\NPC\NPCFriendly.cs" />
-    <Compile Include="MudEngine\FileSystem\SaveDataTypes.cs" />
-    <Compile Include="MudEngine\GameCommands\CommandEngine.cs" />
     <Compile Include="MudEngine\GameCommands\CommandExit.cs" />
     <Compile Include="MudEngine\GameCommands\CommandGMTeleport.cs" />
     <Compile Include="MudEngine\GameCommands\CommandLook.cs" />
-    <Compile Include="MudEngine\GameCommands\CommandResults.cs" />
     <Compile Include="MudEngine\GameCommands\CommandWalk.cs" />
     <Compile Include="MudEngine\GameManagement\GameScript.cs" />
-    <Compile Include="MudEngine\GameObjects\Bag.cs" />
-    <Compile Include="MudEngine\GameObjects\BaseObject.cs" />
-    <Compile Include="MudEngine\GameObjects\Currency.cs" />
-    <Compile Include="MudEngine\GameObjects\Environment\Door.cs" />
-    <Compile Include="MudEngine\GameObjects\Environment\StartingLocation.cs" />
-    <Compile Include="MudEngine\GameObjects\Environment\Realm.cs" />
-    <Compile Include="MudEngine\GameObjects\Environment\Room.cs" />
-    <Compile Include="MudEngine\GameObjects\Environment\TravelDirections.cs" />
-    <Compile Include="MudEngine\GameObjects\Environment\Zone.cs" />
-    <Compile Include="MudEngine\GameObjects\Items\BaseItem.cs" />
-    <Compile Include="MudEngine\Interfaces\IGameCommand.cs" />
     <Compile Include="MudEngine\Interfaces\IFileIO.cs" />
     <Compile Include="MudEngine\Interfaces\IGameObject.cs" />
     <Compile Include="MudEngine\Interfaces\IPlayer.cs" />
     <Compile Include="MudEngine\Interfaces\IQuest.cs" />
     <Compile Include="MudEngine\Interfaces\IRoom.cs" />
     <Compile Include="MudEngine\Interfaces\IRuleSet.cs" />
-    <Compile Include="MudEngine\GameManagement\ProjectInformation.cs" />
-    <Compile Include="MudEngine\FileSystem\FileManager.cs" />
     <Compile Include="MudEngine\GameManagement\QuestSetup.cs" />
     <Compile Include="MudEngine\UITypeEditors\UIDoorwayEditor.cs" />
     <Compile Include="MudEngine\UITypeEditors\UIDoorwayControl.cs">
@@ -182,7 +157,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Compile Include="MudEngine\FileSystem\XmlSerialization.cs" />
     <Compile Include="MudEngine\UITypeEditors\UIScriptEditor.cs" />
     <Compile Include="Runtime.cs">
       <SubType>Form</SubType>
@@ -220,6 +194,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MudEngine\MudEngine.csproj">
+      <Project>{498943A8-DF5A-4DB0-B506-0BFF44788657}</Project>
+      <Name>MudEngine</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Mud Designer/MudEngine/Characters/BaseCharacter.cs b/Mud Designer/MudEngine/Characters/BaseCharacter.cs
deleted file mode 100644
index 87d2839..0000000
--- a/Mud Designer/MudEngine/Characters/BaseCharacter.cs	
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
-
-using MudDesigner.MudEngine.Interfaces;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameCommands;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.GameObjects.Items;
-
-namespace MudDesigner.MudEngine.Characters
-{
-    public class BaseCharacter : BaseObject
-    {
-        public Room CurrentRoom { get; set; }
-
-        public virtual void OnTravel(AvailableTravelDirections travelDirection)
-        {
-            if (CurrentRoom.DoorwayExist(travelDirection.ToString()))
-            {
-                string connectedRoom = CurrentRoom.GetDoor(travelDirection).ConnectedRoom;
-                CurrentRoom = (Room)CurrentRoom.Load(connectedRoom);
-            }
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/Characters/CharacterClass.cs b/Mud Designer/MudEngine/Characters/CharacterClass.cs
deleted file mode 100644
index f0f2497..0000000
--- a/Mud Designer/MudEngine/Characters/CharacterClass.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.Characters
-{
-    public class CharacterClass
-    {
-    }
-}
diff --git a/Mud Designer/MudEngine/Characters/CharacterFaction.cs b/Mud Designer/MudEngine/Characters/CharacterFaction.cs
deleted file mode 100644
index f030798..0000000
--- a/Mud Designer/MudEngine/Characters/CharacterFaction.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.Characters
-{
-    public class CharacterFaction
-    {
-    }
-}
diff --git a/Mud Designer/MudEngine/Characters/CharacterRace.cs b/Mud Designer/MudEngine/Characters/CharacterRace.cs
deleted file mode 100644
index 12af780..0000000
--- a/Mud Designer/MudEngine/Characters/CharacterRace.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.Characters
-{
-    public class CharacterRace : BaseCharacter
-    {
-    }
-}
diff --git a/Mud Designer/MudEngine/Characters/Controlled/PlayerAdmin.cs b/Mud Designer/MudEngine/Characters/Controlled/PlayerAdmin.cs
deleted file mode 100644
index 6c705c2..0000000
--- a/Mud Designer/MudEngine/Characters/Controlled/PlayerAdmin.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.Characters.Controlled
-{
-    class PlayerAdmin : PlayerBasic
-    {
-    }
-}
diff --git a/Mud Designer/MudEngine/Characters/Controlled/PlayerBasic.cs b/Mud Designer/MudEngine/Characters/Controlled/PlayerBasic.cs
deleted file mode 100644
index 22249ed..0000000
--- a/Mud Designer/MudEngine/Characters/Controlled/PlayerBasic.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.Characters.Controlled
-{
-    public class PlayerBasic : BaseCharacter
-    {
-    }
-}
diff --git a/Mud Designer/MudEngine/Characters/Controlled/PlayerGM.cs b/Mud Designer/MudEngine/Characters/Controlled/PlayerGM.cs
deleted file mode 100644
index ec5cd21..0000000
--- a/Mud Designer/MudEngine/Characters/Controlled/PlayerGM.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.Characters.Controlled
-{
-    class PlayerGM : PlayerAdmin
-    {
-    }
-}
diff --git a/Mud Designer/MudEngine/Characters/NPC/NPCFriendly.cs b/Mud Designer/MudEngine/Characters/NPC/NPCFriendly.cs
deleted file mode 100644
index a11ccb4..0000000
--- a/Mud Designer/MudEngine/Characters/NPC/NPCFriendly.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.Characters.NPC
-{
-    class NPCFriendly
-    {
-    }
-}
diff --git a/Mud Designer/MudEngine/Characters/NPC/NPCHostile.cs b/Mud Designer/MudEngine/Characters/NPC/NPCHostile.cs
deleted file mode 100644
index 4e08163..0000000
--- a/Mud Designer/MudEngine/Characters/NPC/NPCHostile.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.Characters.NPC
-{
-    class NPCHostile
-    {
-    }
-}
diff --git a/Mud Designer/MudEngine/FileSystem/FileManager.cs b/Mud Designer/MudEngine/FileSystem/FileManager.cs
deleted file mode 100644
index d8c999d..0000000
--- a/Mud Designer/MudEngine/FileSystem/FileManager.cs	
+++ /dev/null
@@ -1,99 +0,0 @@
-//.NET 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
-
-//Mud Designer
-using MudDesigner.MudEngine.Interfaces;
-
-namespace MudDesigner.MudEngine.FileSystem
-{
-    /// <summary>
-    /// Handles saving and loading of engine objects
-    /// </summary>
-    public static class FileManager
-    {
-        public enum OutputFormats
-        {
-            XML = 0,
-        }
-
-        /// <summary>
-        /// The filetype that the MUDs files will be saved as
-        /// </summary>
-        public static OutputFormats FileType
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Saves the object using the specified output format
-        /// </summary>
-        /// <param name="Filename"></param>
-        /// <param name="o"></param>
-        public static void Save(string Filename, object o)
-        {
-            if (FileType == OutputFormats.XML)
-            {
-                XmlSerialization.Save(Filename, o);
-            }
-        }
-
-        /// <summary>
-        /// Loads the object using the specified FileType format
-        /// </summary>
-        /// <param name="Filename"></param>
-        /// <param name="o"></param>
-        /// <returns></returns>
-        public static object Load(string Filename, object o)
-        {
-            if (FileType == OutputFormats.XML)
-            {
-                return XmlSerialization.Load(Filename, o);
-            }
-            else return null;
-        }
-
-        /// <summary>
-        /// Returns the complete path to the specified data's save folder.
-        /// </summary>
-        /// <param name="DataType"></param>
-        /// <returns></returns>
-        public static string GetDataPath(SaveDataTypes DataType)
-        {
-            string assemblyPath = System.Reflection.Assembly.GetExecutingAssembly().ManifestModule.FullyQualifiedName;
-            string assemblyName = System.IO.Path.GetFileName(assemblyPath);
-            string installBase = assemblyPath.Substring(0, assemblyPath.Length - assemblyName.Length);
-            string rootPath = System.IO.Path.Combine(installBase, "Project");
-
-            if (DataType == SaveDataTypes.Root)
-                return rootPath;
-            else
-                return System.IO.Path.Combine(rootPath, DataType.ToString());
-        }
-
-        public static string GetDataPath(string Realm, string Zone)
-        {
-            string assemblyPath = System.Reflection.Assembly.GetExecutingAssembly().ManifestModule.FullyQualifiedName;
-            string assemblyName = System.IO.Path.GetFileName(assemblyPath);
-            string installBase = assemblyPath.Substring(0, assemblyPath.Length - assemblyName.Length);
-            string rootPath = System.IO.Path.Combine(installBase, "Project");
-            string realmsPath = System.IO.Path.Combine(rootPath, "Realms");
-            string requestRealm = Path.Combine(realmsPath, Realm);
-            string requestedRealmZones = Path.Combine(requestRealm, "Zones");
-            string requestedZone = Path.Combine(requestedRealmZones, Zone);
-
-            return requestedZone;
-        }
-
-        public static string GetDataPath(string Realm, string Zone, string Room)
-        {
-            return System.IO.Path.Combine(GetDataPath(Realm, Zone), Room);
-        }
-
-        //TODO Write CopyDirectory method.
-    }
-}
diff --git a/Mud Designer/MudEngine/FileSystem/SaveDataTypes.cs b/Mud Designer/MudEngine/FileSystem/SaveDataTypes.cs
deleted file mode 100644
index c4c37c0..0000000
--- a/Mud Designer/MudEngine/FileSystem/SaveDataTypes.cs	
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace MudDesigner.MudEngine.FileSystem
-{
-    public enum SaveDataTypes
-    {
-        Root,
-        Currencies,
-        Realms,
-        Zones,
-    }
-}
\ No newline at end of file
diff --git a/Mud Designer/MudEngine/FileSystem/XmlSerialization.cs b/Mud Designer/MudEngine/FileSystem/XmlSerialization.cs
deleted file mode 100644
index f210228..0000000
--- a/Mud Designer/MudEngine/FileSystem/XmlSerialization.cs	
+++ /dev/null
@@ -1,42 +0,0 @@
-#region ====== Using Statements ======
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using System.Xml;
-using System.Xml.Serialization;
-using System.IO;
-#endregion
-
-namespace MudDesigner.MudEngine.FileSystem
-{
-    internal class XmlSerialization
-    {
-        internal static void Save(string Filename, object o)
-        {
-            Stream stream = File.Create(Filename);
-
-            XmlSerializer serializer = new XmlSerializer(o.GetType());
-            serializer.Serialize(stream, o);
-            stream.Close();
-        }
-
-
-        /// <summary>
-        /// Loads an item via Xml Deserialization
-        /// </summary>
-        /// <param name="Filename">The Xml document to deserialize.</param>
-        /// <returns></returns>
-        internal static object Load(string Filename, object o)
-        {
-            Stream stream = File.OpenRead(Filename);
-
-            object obj = new object();
-            XmlSerializer serializer = new XmlSerializer(o.GetType());
-            obj = (object)serializer.Deserialize(stream);
-
-            stream.Close();
-            return obj;
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameCommands/CommandEngine.cs b/Mud Designer/MudEngine/GameCommands/CommandEngine.cs
deleted file mode 100644
index c01e3e6..0000000
--- a/Mud Designer/MudEngine/GameCommands/CommandEngine.cs	
+++ /dev/null
@@ -1,122 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Windows.Forms;
-
-using MudDesigner.MudEngine.Interfaces;
-using MudDesigner.MudEngine.Characters;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects.Environment;
-
-namespace MudDesigner.MudEngine.GameCommands
-{
-    public class CommandEngine
-    {
-        #region ====== Public Enumerators, Structures & Properties ======
-        /// <summary>
-        /// Gets or Sets a Dictionary list of available commands to use.
-        /// </summary>
-        static internal Dictionary<string, IGameCommand> Commands { get; set; }
-
-        public List<string> GetCommands
-        {
-            get
-            {
-                List<string> temp = new List<string>();
-                foreach (string name in Commands.Keys)
-                {
-                    temp.Add(name);
-                }
-
-                return temp;
-            }
-        }
-        #endregion
-
-        #region ====== Public Methods ======
-        public bool GetCommand(string Name)
-        {
-            if (Commands.ContainsKey(Name.ToLower()))
-                return true;
-            else
-                return false;
-        }
-        /// <summary>
-        /// Executes the specified command name if it exists in the Commands Dictionary.
-        /// </summary>
-        /// <param name="Name"></param>
-        /// <param name="Parameter"></param>
-        /// <returns></returns>
-        public static CommandResults ExecuteCommand(string Name, BaseCharacter player, ProjectInformation project, Room room, string command)
-        {
-            Name = Name.Insert(0, "Command");
-            foreach (string key in Commands.Keys)
-            {
-                if (Name.ToLower().Contains(key.ToLower()))
-                {
-                    return Commands[key.ToLower()].Execute(player, project, room, command);
-                }
-            }
-
-            return new CommandResults();
-        }
-        /// <summary>
-        /// Dynamically loads the specified library into memory and stores all of the
-        /// classess inheriting from MudCreator.InputCommands.ICommand into the CommandEngines
-        /// commands dictionary for use with the project
-        /// </summary>
-        /// <param name="CommandLibrary"></param>
-        public static void LoadAllCommands()
-        {
-            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
-            Commands = new Dictionary<string, IGameCommand>();
-            foreach (Type t in assembly.GetTypes())
-            {
-                if (t.GetInterface(typeof(IGameCommand).FullName) != null)
-                {
-                    //Use activator to create an instance
-                    IGameCommand command = (IGameCommand)Activator.CreateInstance(t);
-
-                    if (command != null)
-                    {
-                        if (command.Name == null)
-                            command.Name = t.Name.ToLower();
-                        else //Make sure the command is always in lower case.
-                            command.Name = command.Name.ToLower();
-
-                        //Add the command to the commands list if it does not already exist
-                        if (Commands.ContainsKey(command.Name))
-                        {
-                            //Command exists, check if the command is set to override existing commands or not
-                            if (command.Override)
-                            {
-                                Commands[command.Name] = command;
-                            }
-                        }
-                        //Command does not exist, add it to the commands list
-                        else
-                            Commands.Add(command.Name, command);
-                    }
-                }
-            }
-        }
-
-        public static string GetCommand(object Parameter)
-        {
-            List<object> objectList = (List<object>)Parameter;
-
-            foreach (object obj in objectList)
-            {
-                if (obj is string)
-                    return (string)obj;
-            }
-
-            return null;
-        }
-        #endregion
-    }
-}
diff --git a/Mud Designer/MudEngine/GameCommands/CommandExit.cs b/Mud Designer/MudEngine/GameCommands/CommandExit.cs
index 72b4fcf..2882dc2 100644
--- a/Mud Designer/MudEngine/GameCommands/CommandExit.cs	
+++ b/Mud Designer/MudEngine/GameCommands/CommandExit.cs	
@@ -4,19 +4,20 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using MudDesigner.MudEngine.Interfaces;
-using MudDesigner.MudEngine.Characters;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects.Environment;
+using MudDesigner.Engine.Interfaces;
+using MudEngine.GameObjects.Characters;
+using MudEngine.GameManagement;
+using MudEngine.Commands;
+using MudEngine.GameObjects.Environment;
 
-namespace MudDesigner.MudEngine.GameCommands
+namespace MudEngine.Commands
 {
     public class CommandExit : IGameCommand
     {
         public bool Override { get; set; }
         public string Name { get; set; }
 
-        public CommandResults Execute(BaseCharacter player, ProjectInformation project, Room room, string command)
+        public CommandResults Execute(BaseCharacter player, GameSetup project, Room room, string command)
         {
             Application.Exit();
 
diff --git a/Mud Designer/MudEngine/GameCommands/CommandGMTeleport.cs b/Mud Designer/MudEngine/GameCommands/CommandGMTeleport.cs
index b86e867..1f58416 100644
--- a/Mud Designer/MudEngine/GameCommands/CommandGMTeleport.cs	
+++ b/Mud Designer/MudEngine/GameCommands/CommandGMTeleport.cs	
@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-using MudDesigner.MudEngine.Interfaces;
-using MudDesigner.MudEngine.Characters;
-using MudDesigner.MudEngine.Characters.Controlled;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects.Environment;
+using MudDesigner.Engine.Interfaces;
+using MudEngine.GameObjects.Characters;
+using MudEngine.GameObjects.Characters.Controlled;
+using MudEngine.GameManagement;
+using MudEngine.GameObjects.Environment;
 
-namespace MudDesigner.MudEngine.GameCommands
+namespace MudEngine.Commands
 {
     public class CommandGMTeleport : IGameCommand
     {
@@ -21,8 +21,9 @@ namespace MudDesigner.MudEngine.GameCommands
             Override = true;
         }
 
-        public CommandResults Execute(BaseCharacter player, ProjectInformation project, Room room, string command)
+        public CommandResults Execute(BaseCharacter player, GameSetup project, Room room, string command)
         {
+            /* TODO: Re-implement this.
             PlayerGM playerGM = new PlayerGM();
             
             if (player is PlayerGM)
@@ -31,7 +32,7 @@ namespace MudDesigner.MudEngine.GameCommands
             }
             else
                 return null;
-
+            */
             //TODO: Find the Realm/Zone/Room that the GM specified to teleport to.
             return null;
         }
diff --git a/Mud Designer/MudEngine/GameCommands/CommandLook.cs b/Mud Designer/MudEngine/GameCommands/CommandLook.cs
index 3be9512..a4a9b50 100644
--- a/Mud Designer/MudEngine/GameCommands/CommandLook.cs	
+++ b/Mud Designer/MudEngine/GameCommands/CommandLook.cs	
@@ -3,23 +3,23 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-using MudDesigner.MudEngine.Characters;
-using MudDesigner.MudEngine.Characters.Controlled;
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameCommands;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.GameObjects.Items;
-using MudDesigner.MudEngine.Interfaces;
+using MudEngine.GameObjects.Characters;
+using MudEngine.GameObjects.Characters.Controlled;
+using MudEngine.FileSystem;
+using MudEngine.Commands;
+using MudEngine.GameManagement;
+using MudEngine.GameObjects.Environment;
+using MudEngine.GameObjects.Items;
+using MudDesigner.Engine.Interfaces;
 
-namespace MudDesigner.MudEngine.GameCommands
+namespace MudEngine.Commands
 {
     public class CommandLook : IGameCommand
     {
         public string Name { get; set; }
         public bool Override { get; set; }
 
-        public CommandResults Execute(BaseCharacter player, ProjectInformation project, Room room, string command)
+        public CommandResults Execute(BaseCharacter player, GameSetup project, Room room, string command)
         {
             StringBuilder desc = new StringBuilder();
 
@@ -31,7 +31,7 @@ namespace MudDesigner.MudEngine.GameCommands
             desc.AppendLine(room.Description);
             foreach (Door door in room.Doorways)
             {
-                if (door.TravelDirection != MudDesigner.MudEngine.GameObjects.AvailableTravelDirections.Down && door.TravelDirection != MudDesigner.MudEngine.GameObjects.AvailableTravelDirections.Up)
+                if (door.TravelDirection != MudEngine.GameObjects.AvailableTravelDirections.Down && door.TravelDirection != MudEngine.GameObjects.AvailableTravelDirections.Up)
                 {
                     desc.AppendLine(door.Description);
                 }
diff --git a/Mud Designer/MudEngine/GameCommands/CommandResults.cs b/Mud Designer/MudEngine/GameCommands/CommandResults.cs
deleted file mode 100644
index 03ba7d5..0000000
--- a/Mud Designer/MudEngine/GameCommands/CommandResults.cs	
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using System.Text;
-using System.Xml;
-using System.Xml.Serialization;
-
-namespace MudDesigner.MudEngine.GameCommands
-{
-    public class CommandResults
-    {
-        /// <summary>
-        /// Result of the command.
-        /// </summary>
-        public object[] Result { get; set; }
-
-        public CommandResults()
-        {
-        }
-
-        public CommandResults(object[] Result)
-        {
-            this.Result = Result;
-        }
-
-        public CommandResults(string message)
-        {
-            this.Result = new object[] { message };
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameCommands/CommandWalk.cs b/Mud Designer/MudEngine/GameCommands/CommandWalk.cs
index 8995888..d23310b 100644
--- a/Mud Designer/MudEngine/GameCommands/CommandWalk.cs	
+++ b/Mud Designer/MudEngine/GameCommands/CommandWalk.cs	
@@ -4,21 +4,21 @@ using System.Linq;
 using System.Text;
 using System.IO;
 
-using MudDesigner.MudEngine.Interfaces;
-using MudDesigner.MudEngine.Characters;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.FileSystem;
+using MudDesigner.Engine.Interfaces;
+using MudEngine.GameObjects.Characters;
+using MudEngine.GameManagement;
+using MudEngine.GameObjects.Environment;
+using MudEngine.GameObjects;
+using MudEngine.FileSystem;
 
-namespace MudDesigner.MudEngine.GameCommands
+namespace MudEngine.Commands
 {
     public class CommandWalk : IGameCommand
     {
         public string Name { get; set; }
         public bool Override { get; set; }
 
-        public CommandResults Execute(BaseCharacter player, ProjectInformation project, Room room, string command)
+        public CommandResults Execute(BaseCharacter player, GameSetup project, Room room, string command)
         {
             string[] words = command.Split(' ');
             List<string> directions = new List<string>();
diff --git a/Mud Designer/MudEngine/GameManagement/GameScript.cs b/Mud Designer/MudEngine/GameManagement/GameScript.cs
index c8e1a1d..703198b 100644
--- a/Mud Designer/MudEngine/GameManagement/GameScript.cs	
+++ b/Mud Designer/MudEngine/GameManagement/GameScript.cs	
@@ -4,11 +4,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 //MudEngine
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects;
+using MudEngine.FileSystem;
+using MudEngine.GameManagement;
+using MudEngine.GameObjects;
 
-namespace MudDesigner.MudEngine.GameManagement
+namespace MudEngine.GameManagement
 {
     public class GameScript
     {
diff --git a/Mud Designer/MudEngine/GameManagement/ProjectInformation.cs b/Mud Designer/MudEngine/GameManagement/ProjectInformation.cs
deleted file mode 100644
index cb6354f..0000000
--- a/Mud Designer/MudEngine/GameManagement/ProjectInformation.cs	
+++ /dev/null
@@ -1,167 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
-using System.Xml.Serialization;
-using System.Xml;
-using System.IO;
-
-//MudEngine
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.Interfaces;
-
-namespace MudDesigner.MudEngine.GameManagement
-{
-    /// <summary>
-    /// Manages all of the projects settings.
-    /// </summary>
-    [XmlInclude(typeof(StartingLocation))]
-    [XmlInclude(typeof(Currency))]
-    public class ProjectInformation : IFileIO
-    {
-        public enum TimeOfDayOptions
-        {
-            AlwaysDay,
-            AlwaysNight,
-            Transition,
-        }
-
-        [Category("Company Settings")]
-        [Description("The name of the Company or Author building the game.")]
-        /// <summary>
-        /// Gets or Sets the name of the company
-        /// </summary>
-        public string CompanyName { get; set; }
-
-        [Category("Company Settings")]
-        [Description("The website URL that a player can visit to view additional information related to the game")]
-        /// <summary>
-        /// Gets or Sets the companies website for this project
-        /// </summary>
-        public string Website { get; set; }
-
-        [Category("Project Settings")]
-        [Description("The name of the game displayed to the users, and title bar of the runtime.")]
-        public string GameTitle { get; set; }
-
-        [Category("Project Settings")]
-        [Description("Enable or Disable Auto-saving of players when the player travels")]
-        /// <summary>
-        /// Gets or Sets if the game autosaves when the player changes locations.
-        /// </summary>
-        public bool AutoSave { get; set; }
-
-        [Category("Project Settings")]
-        [Description("Hide Room names from being outputted to the console.")]
-        /// <summary>
-        /// Gets or Sets if room names are hidden during console output.
-        /// </summary>
-        public bool HideRoomNames { get; set; }
-        
-        [Category("Day Management")]
-        [Description("Set what time of day the world will take place in.")]
-        public TimeOfDayOptions TimeOfDay
-        {
-            get;
-            set;
-        }
-
-        [Category("Day Management")]
-        [Description("Set how long in minutes it takes to transition from day to night.")]
-        public int TimeOfDayTransition
-        {
-            get;
-            set;
-        }
-
-        [Category("Day Management")]
-        [Description("Sets how long in minutes a day lasts in the game world.")]
-        public int DayLength
-        {
-            get;
-            set;
-        }
-
-        [Category("Project Settings")]
-        [Description("The current working version of the game.")]
-        public string Version { get; set; }
-
-        [Category("Game Currency")]
-        [DefaultValue(1)]
-        [Description("Sets the amount that the base currency is valued at.")]
-        public uint BaseCurrencyAmount { get; set; }
-
-
-        [Category("Game Currency")]
-        [DefaultValue("Copper")]
-        public string BaseCurrencyName { get; set; }
-
-
-
-        //TODO: Add Party support.
-        [Category("Project Settings")]
-        [Description("If enabled, all objects will be loaded during server startup resulting in a slower server start time, but faster load time during gameplay")]
-        public bool PreCacheObjects { get; set; }
-
-        [Browsable(false)]
-        public List<Currency> CurrencyList { get; set; }
-
-        [Browsable(false)]
-        public string ProjectPath { get; set; }
-
-        [Category("Environment Settings")]
-        [ReadOnly(true)]
-        public StartingLocation InitialLocation { get; set; }
-
-        [Browsable(false)]
-        public string Story
-        {
-            get;
-            set;
-        }
-
-        [Category("Object Setup")]
-        public string Filename 
-        {
-            get
-            {
-                return _Filename;
-            }
-        }
-        private string _Filename;
-
-        public ProjectInformation()
-        {
-            CurrencyList = new List<Currency>();
-            GameTitle = "New Game";
-            _Filename = "Game.xml";
-            BaseCurrencyAmount = 1;
-            BaseCurrencyName = "Copper";
-            InitialLocation = new StartingLocation();
-        }
-
-        public void Save(string filename)
-        {
-            string directory = Path.GetDirectoryName(filename);
-
-            if (!Directory.Exists(directory))
-                Directory.CreateDirectory(directory);
-
-            FileManager.Save(filename, this);
-        }
-
-        public object Load(string path)
-        {
-            string fileName = Path.Combine(path, _Filename);
-            if (!File.Exists(fileName))
-            {
-                return null;
-            }
-
-            return FileManager.Load(fileName, this);
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameManagement/QuestSetup.cs b/Mud Designer/MudEngine/GameManagement/QuestSetup.cs
index d88f9a9..db25fa9 100644
--- a/Mud Designer/MudEngine/GameManagement/QuestSetup.cs	
+++ b/Mud Designer/MudEngine/GameManagement/QuestSetup.cs	
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace MudDesigner.MudEngine.GameManagement
+namespace MudEngine.GameManagement
 {
     public class QuestSetup
     {
diff --git a/Mud Designer/MudEngine/GameObjects/Bag.cs b/Mud Designer/MudEngine/GameObjects/Bag.cs
deleted file mode 100644
index 7f72bbf..0000000
--- a/Mud Designer/MudEngine/GameObjects/Bag.cs	
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using MudDesigner.MudEngine.GameObjects.Items;
-
-namespace MudDesigner.MudEngine.GameObjects
-{
-    public class Bag : BaseObject
-    {
-        /// <summary>
-        /// Gets or Sets the size of the bag.
-        /// </summary>
-        public int Size
-        {
-            get;
-            set;
-        }
-
-        private List<Items.BaseItem> Items { get; set; }
-
-        public void Add(BaseItem item)
-        {
-            if (Items.Count < Size)
-                Items.Add(item);
-        }
-
-        public int GetSlotsRemaining()
-        {
-            return Size - Items.Count;
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameObjects/BaseObject.cs b/Mud Designer/MudEngine/GameObjects/BaseObject.cs
deleted file mode 100644
index a1c271c..0000000
--- a/Mud Designer/MudEngine/GameObjects/BaseObject.cs	
+++ /dev/null
@@ -1,199 +0,0 @@
-//.NET
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
-using System.Windows.Forms;
-using System.Xml.Serialization;
-using System.IO;
-
-//Mud Designer
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.Interfaces;
-using MudDesigner.MudEngine.UITypeEditors;
-
-namespace MudDesigner.MudEngine.GameObjects
-{
-    public class BaseObject : IGameObject, IFileIO
-    {
-        #region Properties & Fields
-        [Category("Object Setup")]
-        [Description("The Display Name assigned to this object.")]
-        //Required to refresh Filename property in the editors propertygrid
-        [RefreshProperties(RefreshProperties.All)]
-        public string Name
-        {
-            get
-            {
-                return this._Name;
-            }
-            set
-            {
-                this._Name = value;
-                this.Filename = value + "." + this.GetType().Name;
-            }
-        }
-
-        [Category("Object Setup")]
-        [Description("A brief description of this object. The description is displayed to users when they use a command for investigating an object")]
-        public string Description
-        {
-            get;
-            set;
-        }
-        
-        [Category("Object Setup")]
-        [Description("The object script that can manipulate the object during the games life.")]
-        [EditorAttribute(typeof(UIScriptEditor), typeof(System.Drawing.Design.UITypeEditor))]
-        public string Script { get; set; }
-
-        [Category("Object Setup")]
-        [ReadOnly(true)]
-        [Description("The filename of the current object. This is assigned by the engine and not editable.")]
-        public string Filename
-        {
-            //Returns the name of the object + the objects Type as it's extension.
-            //Filenames are generated by the class itself, users can not assign it.
-            get
-            {
-                return this._Filename;
-            }
-            set 
-            {
-                string extension = "." + this.GetType().Name;
-                if (!value.EndsWith(extension))
-                    value += extension;
-
-                this._Filename = value; 
-            }
-        }
-
-        [Category("Environment Information")]
-        [Description("If a user asks to use his/her senses to investigate an area, this is one of the results that will be displayed. Senses can be used to assist blind characters.")]
-        [DefaultValue("You don't smell anything unsual.")]
-        public string Smell
-        {
-            get;
-            set;
-        }
-
-        [Category("Environment Information")]
-        [Description("If a user asks to use his/her senses to investigate an area, this is one of the results that will be displayed. Senses can be used to assist blind characters.")]
-        [DefaultValue("You hear nothing of interest.")]
-        public string Listen
-        {
-            get;
-            set;
-        }
-
-        [Category("Environment Information")]
-        [Description("If a user asks to use his/her senses to investigate an area, this is one of the results that will be displayed. Senses can be used to assist blind characters.")]
-        [DefaultValue("You feel nothing.")]
-        public string Feel
-        {
-            get;
-            set;
-        }
-
-        private string _Filename = "";
-        private string _Name = "";
-        #endregion
-
-        /// <summary>
-        /// Initializes the base object
-        /// </summary>
-        public BaseObject()
-        {
-            Script = "";
-            _Name = "New " + this.GetType().Name;
-            _Filename = _Name + "." + this.GetType().Name;
-
-            this.Feel = "You feel nothing.";
-            this.Listen = "You hear nothing of interest.";
-            this.Smell = "You don't smell anything unsual.";
-            this.Name = DefaultName();
-        }
-
-        private bool ShouldSerializeName()
-        {
-            return this.Name != DefaultName();
-        }
-
-        private void ResetName()
-        {
-            this.Name = DefaultName();
-        }
-
-        private string DefaultName()
-        {
-            return "New " + this.GetType().Name;
-        }
-
-        #region Public Methods
-        /// <summary>
-        /// Loads the supplied filename and returns it.
-        /// </summary>
-        /// <param name="filename"></param>
-        /// <returns></returns>
-        public virtual object Load(string filename)
-        {
-            if (!File.Exists(filename))
-            {
-                return null;
-            }
-
-            return FileManager.Load(filename, this);
-        }
-
-        /// <summary>
-        /// Saves the current object with the supplied filename
-        /// </summary>
-        /// <param name="filename"></param>
-        public void Save(string filename)
-        {
-            string directory = Path.GetDirectoryName(filename);
-            if (!Directory.Exists(directory))
-                Directory.CreateDirectory(directory);
-            FileManager.Save(filename, this);
-        }
-
-        public override string ToString()
-        {
-            return this.Name;
-        }
-
-        public virtual void OnEnter()
-        {
-        }
-
-        public virtual void OnExit()
-        {
-        }
-
-        public virtual void OnCreate()
-        {
-        }
-
-        public virtual void OnDestroy()
-        {
-        }
-
-        public virtual void OnEquip()
-        {
-        }
-
-        public virtual void OnUnequip()
-        {
-        }
-
-        public virtual void OnMount()
-        {
-        }
-
-        public virtual void OnDismount()
-        {
-        }
-        #endregion
-    }
-}
diff --git a/Mud Designer/MudEngine/GameObjects/Currency.cs b/Mud Designer/MudEngine/GameObjects/Currency.cs
deleted file mode 100644
index a77469e..0000000
--- a/Mud Designer/MudEngine/GameObjects/Currency.cs	
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
-
-namespace MudDesigner.MudEngine.GameObjects
-{
-    public class Currency : BaseObject
-    {
-        [Category("Currency Settings")]
-        [Description("The value of the currency is based off the BaseCurrencyValue set in the Project Information. If BaseCurrencyValue is 1, and a new Currency is 10, then it will take 10 BaseCurrency to equal 1 of the new Currencies.")]
-        [DefaultValue(100)]
-        /// <summary>
-        /// The value of this currency. It should be how many 'base currency' it takes to equal 1 of this currency
-        /// </summary>
-        public int Value
-        {
-            get;
-            set;
-        }
-
-        public Currency()
-        {
-            this.Name = "New Currency";
-            this.Value = 100;
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameObjects/Environment/Door.cs b/Mud Designer/MudEngine/GameObjects/Environment/Door.cs
deleted file mode 100644
index 478ca21..0000000
--- a/Mud Designer/MudEngine/GameObjects/Environment/Door.cs	
+++ /dev/null
@@ -1,64 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Serialization;
-using System.ComponentModel;
-
-using MudDesigner.MudEngine.UITypeEditors;
-using MudDesigner.MudEngine.GameObjects.Items;
-
-namespace MudDesigner.MudEngine.GameObjects.Environment
-{
-    [XmlInclude(typeof(BaseItem))]
-    [Serializable]
-    public class Door
-    {
-        [Category("Door Settings")]
-        [DefaultValue(false)]
-        public bool IsLocked
-        {
-            get;
-            set;
-        }
-
-        [Category("Door Settings")]
-        [Browsable(false)]
-        public BaseItem RequiredKey
-        {
-            get;
-            set;
-        }
-
-        [Category("Door Settings")]
-        [DefaultValue(0)]
-        public int LevelRequirement
-        {
-            get;
-            set;
-        }
-
-        [Category("Door Settings")]
-        public AvailableTravelDirections TravelDirection { get; set; }
-
-        public string ConnectedRoom { get; set; }
-
-        [Category("Environment Information")]
-        [Description("The description displayed to the user when a 'Look' command is used.")]
-        public string Description { get; set; }
-
-        public Door()
-        {
-            LevelRequirement = 0;
-            IsLocked = false;
-            RequiredKey = new BaseItem();
-        }
-
-        public Door(AvailableTravelDirections travelDirection, string connectedRoom)
-            : this()
-        {
-            ConnectedRoom = connectedRoom;
-            TravelDirection = travelDirection;
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameObjects/Environment/Realm.cs b/Mud Designer/MudEngine/GameObjects/Environment/Realm.cs
deleted file mode 100644
index 7f63d84..0000000
--- a/Mud Designer/MudEngine/GameObjects/Environment/Realm.cs	
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
-using System.ComponentModel;
-
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.UITypeEditors;
-
-namespace MudDesigner.MudEngine.GameObjects.Environment
-{
-    public class Realm : BaseObject
-    {
-
-        [Category("Environment Information")]
-        [Description("A collection of Zones that are contained within this Realm. Players can traverse the world be traveling through Rooms that are contained within Zones. Note that it is not required to place a Zone into a Realm.")]
-        [EditorAttribute(typeof(UIRealmEditor), typeof(System.Drawing.Design.UITypeEditor))]
-        public List<string> Zones { get; set; }
-
-        public Realm()
-        {
-            Zones = new List<string>();
-        }
-
-        /// <summary>
-        /// Returns the requested Zone if the Zone exists within this Realm.
-        /// </summary>
-        /// <param name="zoneName"></param>
-        /// <returns></returns>
-        public Zone GetZone(string filename)
-        {
-            var filterQuery =
-                from zone in Zones
-                where zone == filename
-                select zone;
-
-            Zone z = new Zone();
-            foreach (var zone in filterQuery)
-                return (Zone)z.Load(zone); ;
-
-            return null;
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameObjects/Environment/Room.cs b/Mud Designer/MudEngine/GameObjects/Environment/Room.cs
deleted file mode 100644
index d52eb65..0000000
--- a/Mud Designer/MudEngine/GameObjects/Environment/Room.cs	
+++ /dev/null
@@ -1,187 +0,0 @@
-using System;
-using System.Collections;
-using System.ComponentModel;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Serialization;
-using System.Drawing.Design;
-using System.IO;
-
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.UITypeEditors;
-
-namespace MudDesigner.MudEngine.GameObjects.Environment
-{
-    [XmlInclude(typeof(Door))]
-    public class Room : BaseObject
-    {
-        [Category("Environment Information")]
-        [Description("Shows what rooms are currently created and linked to within this Room.")]
-        [ReadOnly(true)]
-        public string InstalledDoorways
-        {
-            get
-            {
-                string installed = "";
-                if (this.Doorways.Count != 0)
-                {
-                    foreach (Door d in Doorways)
-                    {
-                        installed += d.TravelDirection.ToString() + ",";
-                    }
-                    if (Doorways.Count >= 2)
-                    {
-                        installed = installed.Substring(0, installed.Length - 1);
-                    }
-                    return installed;
-                }
-                else
-                    return "None Installed.";
-            }
-        }
-
-        [Category("Environment Information")]
-        [Description("Allows for linking of Rooms together via Doorways")]
-        [EditorAttribute(typeof(UIDoorwayEditor), typeof(UITypeEditor))]
-        [RefreshProperties(RefreshProperties.All)]
-        public List<Door> Doorways
-        {
-            get;
-            set;
-        }
-
-        [ReadOnly(true)]
-        [Description("This is the Zone that the Room is currently assigned to.")]
-        [Category("Environment Information")]
-        public string Zone
-        {
-            get;
-            set;
-        }
-
-        [ReadOnly(true)]
-        [Description("This is the Realm that the Room belongs to.")]
-        [Category("Environment Information")]
-        public string Realm
-        {
-            get;
-            set;
-        }
-
-        [Category("Environment Information")]
-        [DefaultValue(false)]
-        [Description("Determins if the Player can be attacked within this Room or not.")]
-        public bool IsSafe
-        {
-            get;
-            set;
-        }
-
-        [Browsable(false)]
-        public string InstallPath
-        {
-            get
-            {
-                string zonePath = "";
-                if (this.Realm == null || this.Realm == "No Realm Associated.")
-                {
-                    zonePath = FileManager.GetDataPath(SaveDataTypes.Zones);
-                    zonePath = Path.Combine(zonePath, this.Zone);
-                }
-                else
-                    zonePath = FileManager.GetDataPath(this.Realm, this.Zone);
-
-                string roomPath = Path.Combine(zonePath, "Rooms");
-                string filename = Path.Combine(roomPath, this.Filename);
-                return filename;
-            }
-        }
-
-        public Room()
-        {
-            Doorways = new List<Door>();
-            
-            IsSafe = false;
-        }
-
-        public bool DoorwayExist(string travelDirection)
-        {
-            foreach (Door door in Doorways)
-            {
-                if (door.TravelDirection.ToString().ToLower() == travelDirection.ToLower())
-                    return true;
-            }
-
-            return false;
-        }
-
-        public Door GetDoor(AvailableTravelDirections travelDirection)
-        {
-            foreach (Door door in this.Doorways)
-            {
-                if (door.TravelDirection == travelDirection)
-                    return door;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Load a Room that exists within the same Zone as the current Room
-        /// </summary>
-        /// <param name="roomName"></param>
-        /// <returns></returns>
-        public override object Load(string roomName)
-        {
-            //Correct the roomname incase it doesnt contain a file extension
-            if (!roomName.ToLower().EndsWith(".room"))
-                roomName += ".room";
-
-            //If the current room does not belong within a Realm, then load it from the
-            //Zones root directory
-            if (this.Realm != null || this.Realm != "No Realm Associated.")
-            {
-                return this.Load(roomName, this.Zone);
-            }
-                //This Zone is contained within a Realm so we have to load it from within the
-                //Realm and not from within the Zones root directory
-            else
-                return this.Load(roomName, this.Zone, this.Realm);
-        }
-
-        public object Load(string roomName, string zoneName)
-        {
-            string filename = "";
-            if (!roomName.ToLower().EndsWith(".room"))
-                roomName += ".room";
-
-            if (this.Realm != null && this.Realm != "No Realm Associated.")
-            {
-                return this.Load(roomName, zoneName, this.Realm);
-            }
-            else
-                filename = FileManager.GetDataPath(SaveDataTypes.Zones);
-
-            filename = Path.Combine(filename, zoneName);
-            filename = Path.Combine(filename, "Rooms");
-            filename = Path.Combine(filename, roomName);
-
-            return base.Load(filename);
-        }
-
-        public object Load(string roomName, string zoneName, string realmName)
-        {
-            if (!roomName.ToLower().EndsWith(".room"))
-                roomName += ".room";
-
-            string filename = FileManager.GetDataPath(realmName, zoneName);
-            filename = Path.Combine(filename, "Rooms");
-            filename = Path.Combine(filename, roomName);
-
-            if (realmName == null || realmName == "No Realm Associated.")
-                return this.Load(roomName, zoneName);
-
-            return base.Load(filename);
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameObjects/Environment/StartingLocation.cs b/Mud Designer/MudEngine/GameObjects/Environment/StartingLocation.cs
deleted file mode 100644
index 18ad6cd..0000000
--- a/Mud Designer/MudEngine/GameObjects/Environment/StartingLocation.cs	
+++ /dev/null
@@ -1,32 +0,0 @@
-//MudEngine
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
-
-namespace MudDesigner.MudEngine.GameObjects.Environment
-{
-    public struct StartingLocation
-    {
-        public string Room;
-        public string Zone;
-        public string Realm;
-
-        public override string ToString()
-        {
-            if (string.IsNullOrEmpty(Room))
-                return "No initial location defined.";
-            else
-            {
-                if (Realm == "No Realm Associated.")
-                {
-                    return Zone + "->" + Room;
-                }
-                else
-                {
-                    return Realm + "->" + Zone + "->" + Room;
-                }
-            }
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/Mud Designer/MudEngine/GameObjects/Environment/TravelDirections.cs b/Mud Designer/MudEngine/GameObjects/Environment/TravelDirections.cs
deleted file mode 100644
index 4b39f8e..0000000
--- a/Mud Designer/MudEngine/GameObjects/Environment/TravelDirections.cs	
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-
-namespace MudDesigner.MudEngine.GameObjects
-{
-    public enum AvailableTravelDirections
-    {
-        None = 0,
-        North,
-        South,
-        East,
-        West,
-        Up,
-        Down,
-    }
-
-    public static class TravelDirections
-    {
-        public static AvailableTravelDirections GetReverseDirection(AvailableTravelDirections Direction)
-        {
-            switch (Direction)
-            {
-                case AvailableTravelDirections.Down:
-                    return AvailableTravelDirections.Up;
-                case AvailableTravelDirections.East:
-                    return AvailableTravelDirections.West;
-                case AvailableTravelDirections.None:
-                    return AvailableTravelDirections.None;
-                case AvailableTravelDirections.North:
-                    return AvailableTravelDirections.South;
-                case AvailableTravelDirections.South:
-                    return AvailableTravelDirections.North;
-                case AvailableTravelDirections.Up:
-                    return AvailableTravelDirections.Down;
-                case AvailableTravelDirections.West:
-                    return AvailableTravelDirections.East;
-                default:
-                    return AvailableTravelDirections.None;
-            }
-        }
-
-        public static AvailableTravelDirections GetTravelDirectionValue(string Direction)
-        {
-            Array values = Enum.GetValues(typeof(AvailableTravelDirections));
-
-            foreach (int value in values)
-            {
-                string displayName = Enum.GetName(typeof(AvailableTravelDirections), value);
-
-                if (displayName.ToLower() == Direction.ToLower())
-                    return (AvailableTravelDirections)Enum.Parse(typeof(AvailableTravelDirections), displayName);
-            }
-
-            return AvailableTravelDirections.None;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Mud Designer/MudEngine/GameObjects/Environment/Zone.cs b/Mud Designer/MudEngine/GameObjects/Environment/Zone.cs
deleted file mode 100644
index a76e4e4..0000000
--- a/Mud Designer/MudEngine/GameObjects/Environment/Zone.cs	
+++ /dev/null
@@ -1,124 +0,0 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.ComponentModel;
-using System.Xml.Serialization;
-using System.Drawing.Design;
-
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.UITypeEditors;
-
-namespace MudDesigner.MudEngine.GameObjects.Environment
-{
-    [XmlInclude(typeof(Room))]
-    public class Zone : BaseObject
-    {
-        [Category("Environment Information")]
-        [DefaultValue(0)]
-        [Description("The amount to drain each stat by if StatDrain is enabled.")]
-        public int StatDrainAmount
-        {
-            get;
-            set;
-        }
-
-        [Category("Environment Information")]
-        [Description("Enable or Disable the ability for draining stats while traversing.")]
-        [DefaultValue(false)]
-        public bool StatDrain
-        {
-            get;
-            set;
-        }
-
-        [ReadOnly(true)]
-        [Category("Environment Information")]
-        [Description("The Realm that this Zone is assigned to. It is not required to be contained within a Realm.")]
-        public string Realm
-        {
-            get;
-            set;
-        }
-
-        [Category("Environment Information")]
-        [Description("Determins if the Player can be attacked within this Room or not.")]
-        [DefaultValue(false)]
-        public bool IsSafe
-        {
-            get;
-            set;
-        }
-        
-        [Category("Environment Information")]
-        [EditorAttribute(typeof(UIRoomEditor), typeof(UITypeEditor))]
-        [Description("Collection of Rooms that have been created. Editing the Rooms Collection lets you manage the Zones rooms.")]
-        public List<string> Rooms { get; set; }
-
-        [Category("Environment Information")]
-        public string EntranceRoom { get; set; }
-
-        public Zone()
-        {
-            Rooms = new List<string>();
-            IsSafe = false;
-            Realm = "No Realm Associated.";
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        /// <param name="RoomName"></param>
-        /// <returns></returns>
-        public Room GetRoomByName(string name)
-        {
-            var filterQuery =
-                from room in Rooms
-                where room == name
-                select room;
-
-            foreach (string room in filterQuery)
-            {
-                Room r = new Room();
-                return (Room)r.Load(room, this.Name);
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Clears out the Zones room collection and re-builds it.
-        /// This is a time consuming process if there are a large amount of
-        /// of rooms, use sparingly.
-        /// </summary>
-        public void RebuildRoomCollection()
-        {
-            Rooms = new List<string>();
-            //Create our collection of Rooms.
-            string realmPath = Path.Combine(FileManager.GetDataPath(SaveDataTypes.Realms), this.Realm);
-            string zonePath = Path.Combine(realmPath, this.Name);
-
-            //incase the zone hasn't been saved yet.
-            if (!Directory.Exists(zonePath))
-                return;
-
-            //Zone exists, so it's already been saved.
-            string[] rooms = Directory.GetFiles(zonePath, "*.room");
-            
-            //Clear the existing collection of Rooms
-            this.Rooms.Clear();
-            //Build a new one based off of the files 
-            foreach (string file in rooms)
-            {
-                Room r = new Room();
-                r = (Room)r.Load(Path.GetFileNameWithoutExtension(file));
-                //r = (Room)FileManager.Load(file, r);
-                this.Rooms.Add(r.Name);
-            }
-
-            //Save the re-built Room collection
-            this.Save(Path.Combine(zonePath, this.Filename));
-        }
-    }
-}
diff --git a/Mud Designer/MudEngine/GameObjects/Items/BaseItem.cs b/Mud Designer/MudEngine/GameObjects/Items/BaseItem.cs
deleted file mode 100644
index 1dcf828..0000000
--- a/Mud Designer/MudEngine/GameObjects/Items/BaseItem.cs	
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace MudDesigner.MudEngine.GameObjects.Items
-{
-    public class BaseItem : BaseObject
-    {
-
-    }
-}
diff --git a/Mud Designer/MudEngine/Interfaces/IFileIO.cs b/Mud Designer/MudEngine/Interfaces/IFileIO.cs
index 98029f2..d83496e 100644
--- a/Mud Designer/MudEngine/Interfaces/IFileIO.cs	
+++ b/Mud Designer/MudEngine/Interfaces/IFileIO.cs	
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace MudDesigner.MudEngine.Interfaces
+namespace MudDesigner.Engine.Interfaces
 {
     public interface IFileIO
     {
diff --git a/Mud Designer/MudEngine/Interfaces/IGameCommand.cs b/Mud Designer/MudEngine/Interfaces/IGameCommand.cs
deleted file mode 100644
index 276009e..0000000
--- a/Mud Designer/MudEngine/Interfaces/IGameCommand.cs	
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using MudDesigner.MudEngine.GameCommands;
-using MudDesigner.MudEngine.Characters;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects.Environment;
-
-namespace MudDesigner.MudEngine.Interfaces
-{
-    public interface IGameCommand
-    {
-        //Name of the command
-        string Name { get; set; }
-        //Used to override commands with the same name
-        bool Override { get; set; }
-        //Executes the command.
-        CommandResults Execute(BaseCharacter player, ProjectInformation project, Room room, string command);
-    }
-}
diff --git a/Mud Designer/MudEngine/Interfaces/IGameObject.cs b/Mud Designer/MudEngine/Interfaces/IGameObject.cs
index 99674b9..2426b69 100644
--- a/Mud Designer/MudEngine/Interfaces/IGameObject.cs	
+++ b/Mud Designer/MudEngine/Interfaces/IGameObject.cs	
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace MudDesigner.MudEngine.Interfaces
+namespace MudDesigner.Engine.Interfaces
 {
     public interface IGameObject
     {
diff --git a/Mud Designer/MudEngine/Interfaces/IPlayer.cs b/Mud Designer/MudEngine/Interfaces/IPlayer.cs
index 21c988e..b89cfd2 100644
--- a/Mud Designer/MudEngine/Interfaces/IPlayer.cs	
+++ b/Mud Designer/MudEngine/Interfaces/IPlayer.cs	
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace MudDesigner.MudEngine.Interfaces
+namespace MudDesigner.Engine.Interfaces
 {
     public interface IPlayer : IGameObject
     {
diff --git a/Mud Designer/MudEngine/Interfaces/IQuest.cs b/Mud Designer/MudEngine/Interfaces/IQuest.cs
index 2ea73cf..81558cd 100644
--- a/Mud Designer/MudEngine/Interfaces/IQuest.cs	
+++ b/Mud Designer/MudEngine/Interfaces/IQuest.cs	
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using MudDesigner.MudEngine.GameObjects;
-namespace MudDesigner.MudEngine.Interfaces
+using MudEngine.GameObjects;
+namespace MudDesigner.Engine.Interfaces
 {
     interface IQuest
     {
diff --git a/Mud Designer/MudEngine/Interfaces/IRoom.cs b/Mud Designer/MudEngine/Interfaces/IRoom.cs
index 3b47e54..e125d4b 100644
--- a/Mud Designer/MudEngine/Interfaces/IRoom.cs	
+++ b/Mud Designer/MudEngine/Interfaces/IRoom.cs	
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace MudDesigner.MudEngine.Interfaces
+namespace MudDesigner.Engine.Interfaces
 {
     public interface IRoom : IGameObject
     {
diff --git a/Mud Designer/MudEngine/Interfaces/IRuleSet.cs b/Mud Designer/MudEngine/Interfaces/IRuleSet.cs
index d436be5..a05d260 100644
--- a/Mud Designer/MudEngine/Interfaces/IRuleSet.cs	
+++ b/Mud Designer/MudEngine/Interfaces/IRuleSet.cs	
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace MudDesigner.MudEngine.Interfaces
+namespace MudDesigner.Engine.Interfaces
 {
     public interface IRuleSet
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIDoorwayControl.Designer.cs b/Mud Designer/MudEngine/UITypeEditors/UIDoorwayControl.Designer.cs
index 4349c4c..3c4597b 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIDoorwayControl.Designer.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIDoorwayControl.Designer.cs	
@@ -1,4 +1,4 @@
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     partial class UIDoorwayControl
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIDoorwayControl.cs b/Mud Designer/MudEngine/UITypeEditors/UIDoorwayControl.cs
index a3ae44b..0360960 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIDoorwayControl.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIDoorwayControl.cs	
@@ -8,12 +8,12 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.FileSystem;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Environment;
+using MudEngine.GameManagement;
+using MudEngine.FileSystem;
 
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     public partial class UIDoorwayControl : Form
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIDoorwayEditor.cs b/Mud Designer/MudEngine/UITypeEditors/UIDoorwayEditor.cs
index a274da3..e6401a9 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIDoorwayEditor.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIDoorwayEditor.cs	
@@ -5,10 +5,10 @@ using System.Text;
 using System.Drawing.Design;
 using System.IO;
 
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.FileSystem;
+using MudEngine.GameObjects.Environment;
+using MudEngine.FileSystem;
 
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     public class UIDoorwayEditor : UITypeEditor
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIRealmControl.Designer.cs b/Mud Designer/MudEngine/UITypeEditors/UIRealmControl.Designer.cs
index 917d7d4..e85ff18 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIRealmControl.Designer.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIRealmControl.Designer.cs	
@@ -1,4 +1,4 @@
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     partial class UIRealmControl
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIRealmControl.cs b/Mud Designer/MudEngine/UITypeEditors/UIRealmControl.cs
index e181142..248110e 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIRealmControl.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIRealmControl.cs	
@@ -8,12 +8,12 @@ using System.Text;
 using System.IO;
 using System.Windows.Forms;
 
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.FileSystem;
+using MudEngine.GameManagement;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Environment;
+using MudEngine.FileSystem;
 
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     public partial class UIRealmControl : Form
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIRealmEditor.cs b/Mud Designer/MudEngine/UITypeEditors/UIRealmEditor.cs
index cd7fc04..d881c6f 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIRealmEditor.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIRealmEditor.cs	
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Environment;
 using System.Windows.Forms;
 
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     public class UIRealmEditor : System.Drawing.Design.UITypeEditor
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIRoomControl.Designer.cs b/Mud Designer/MudEngine/UITypeEditors/UIRoomControl.Designer.cs
index 38da245..6b6f46b 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIRoomControl.Designer.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIRoomControl.Designer.cs	
@@ -1,4 +1,4 @@
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     partial class UIRoomControl
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIRoomControl.cs b/Mud Designer/MudEngine/UITypeEditors/UIRoomControl.cs
index e0055ec..76b88c6 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIRoomControl.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIRoomControl.cs	
@@ -8,11 +8,11 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
+using MudEngine.FileSystem;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Environment;
 
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     public partial class UIRoomControl : Form
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIRoomEditor.cs b/Mud Designer/MudEngine/UITypeEditors/UIRoomEditor.cs
index 21816dd..4fe434e 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIRoomEditor.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIRoomEditor.cs	
@@ -7,10 +7,10 @@ using System.Windows.Forms;
 using System.Drawing.Design;
 using System.IO;
 
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.FileSystem;
+using MudEngine.GameObjects.Environment;
+using MudEngine.FileSystem;
 
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     public class UIRoomEditor : System.Drawing.Design.UITypeEditor
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIScriptControl.Designer.cs b/Mud Designer/MudEngine/UITypeEditors/UIScriptControl.Designer.cs
index 1cb6fff..45e9398 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIScriptControl.Designer.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIScriptControl.Designer.cs	
@@ -1,4 +1,4 @@
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     partial class UIScriptControl
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIScriptControl.cs b/Mud Designer/MudEngine/UITypeEditors/UIScriptControl.cs
index 1abeec4..64754ee 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIScriptControl.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIScriptControl.cs	
@@ -7,9 +7,9 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-using MudDesigner.MudEngine.GameObjects;
+using MudEngine.GameObjects;
 
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     public partial class UIScriptControl : UserControl
     {
diff --git a/Mud Designer/MudEngine/UITypeEditors/UIScriptEditor.cs b/Mud Designer/MudEngine/UITypeEditors/UIScriptEditor.cs
index 6c8019f..76d7cb8 100644
--- a/Mud Designer/MudEngine/UITypeEditors/UIScriptEditor.cs	
+++ b/Mud Designer/MudEngine/UITypeEditors/UIScriptEditor.cs	
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Environment;
 using System.Windows.Forms;
 
-namespace MudDesigner.MudEngine.UITypeEditors
+namespace MudDesigner.Engine.UITypeEditors
 {
     public class UIScriptEditor : System.Drawing.Design.UITypeEditor
     {
diff --git a/Mud Designer/Program.cs b/Mud Designer/Program.cs
index 31e06ed..ca3d2d3 100644
--- a/Mud Designer/Program.cs	
+++ b/Mud Designer/Program.cs	
@@ -1,15 +1,15 @@
-using System;
+//Microsoft .NET Framework
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using System.Drawing.Design;
 
-//MudEngine
-using MudDesigner.MudEngine;
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
+//MUD Engine
+using MudEngine.FileSystem;
+using MudEngine.GameManagement;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Environment;
 
 namespace MudDesigner
 {
diff --git a/Mud Designer/Runtime.cs b/Mud Designer/Runtime.cs
index 21a8bc0..e05ad41 100644
--- a/Mud Designer/Runtime.cs	
+++ b/Mud Designer/Runtime.cs	
@@ -1,4 +1,4 @@
-//.Net Framework
+//Microsoft .NET Framework
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -9,16 +9,16 @@ using System.Linq;
 using System.Text;
 using System.Windows.Forms;
 
-//Mud Designer
-using MudDesigner.MudEngine.Characters;
-using MudDesigner.MudEngine.Characters.Controlled;
-using MudDesigner.MudEngine.Characters.NPC;
-using MudDesigner.MudEngine.GameCommands;
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameManagement;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
-using MudDesigner.MudEngine.GameObjects.Items;
+//MUD Designer
+using MudEngine.Commands;
+using MudEngine.FileSystem;
+using MudEngine.GameManagement;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Characters;
+using MudEngine.GameObjects.Characters.Controlled;
+//using MudEngine.GameObjects.Characters.NPC;
+using MudEngine.GameObjects.Environment;
+using MudEngine.GameObjects.Items;
 
 namespace MudDesigner
 {
@@ -26,13 +26,13 @@ namespace MudDesigner
     {
         PlayerBasic _Player;
         Room _Room;
-        ProjectInformation _Project;
+        GameSetup _Project;
 
         public Runtime()
         {
             InitializeComponent();
             _Player = new PlayerBasic();
-            _Project = new ProjectInformation();
+            _Project = new GameSetup();
             _Room = new Room();
         }
 
@@ -54,7 +54,7 @@ namespace MudDesigner
                         _Room = (Room)obj;
                         break;
                     case "projectinformation":
-                        _Project = (ProjectInformation)obj;
+                        _Project = (GameSetup)obj;
                         break;
                     case "playerbasic":
                         _Player = (PlayerBasic)obj;
@@ -87,7 +87,7 @@ namespace MudDesigner
                 Print("Failed Loading Project Information... Runtime failed to initialize.");
                 return;
             }
-            _Project = (ProjectInformation)_Project.Load(FileManager.GetDataPath(SaveDataTypes.Root));
+            _Project = (GameSetup)_Project.Load(FileManager.GetDataPath(SaveDataTypes.Root));
             if (_Project.InitialLocation.Zone == null && _Project.InitialLocation.Zone == "")
             {
                 Print("No Initial Zone was defined within the Project Information. Please associated a Zone to the Projects Initial Zone setting in order to launch the game.");
diff --git a/Mud Designer/UIWidgets/RealmWidget.cs b/Mud Designer/UIWidgets/RealmWidget.cs
index e63b5bb..b7c6933 100644
--- a/Mud Designer/UIWidgets/RealmWidget.cs	
+++ b/Mud Designer/UIWidgets/RealmWidget.cs	
@@ -8,9 +8,9 @@ using System.Text;
 using System.Windows.Forms;
 using System.IO;
 
-using MudDesigner.MudEngine.FileSystem;
-using MudDesigner.MudEngine.GameObjects;
-using MudDesigner.MudEngine.GameObjects.Environment;
+using MudEngine.FileSystem;
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Environment;
 
 namespace MudDesigner.UIWidgets
 {
diff --git a/MudEngine/Commands/CommandEngine.cs b/MudEngine/Commands/CommandEngine.cs
index f8804c6..01613e9 100644
--- a/MudEngine/Commands/CommandEngine.cs
+++ b/MudEngine/Commands/CommandEngine.cs
@@ -1,11 +1,18 @@
-using System;
+//Microsoft .NET Framework
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+//MUD Engine
+using MudEngine.GameObjects;
+using MudEngine.GameObjects.Characters;
+using MudEngine.GameObjects.Environment;
+using MudEngine.GameManagement;
+
 namespace MudEngine.Commands
 {
-    class CommandEngine
+    public class CommandEngine
     {
         /// <summary>
         /// Gets or Sets a Dictionary list of available commands to use.
@@ -25,5 +32,85 @@ namespace MudEngine.Commands
                 return temp;
             }
         }
+
+        public bool GetCommand(string Name)
+        {
+            if (Commands.ContainsKey(Name.ToLower()))
+                return true;
+            else
+                return false;
+        }
+        /// <summary>
+        /// Executes the specified command name if it exists in the Commands Dictionary.
+        /// </summary>
+        /// <param name="Name"></param>
+        /// <param name="Parameter"></param>
+        /// <returns></returns>
+        public static CommandResults ExecuteCommand(string Name, BaseCharacter player, GameSetup project, Room room, string command)
+        {
+            Name = Name.Insert(0, "Command");
+            foreach (string key in Commands.Keys)
+            {
+                if (Name.ToLower().Contains(key.ToLower()))
+                {
+                    return Commands[key.ToLower()].Execute(player, project, room, command);
+                }
+            }
+
+            return new CommandResults();
+        }
+        /// <summary>
+        /// Dynamically loads the specified library into memory and stores all of the
+        /// classess inheriting from MudCreator.InputCommands.ICommand into the CommandEngines
+        /// commands dictionary for use with the project
+        /// </summary>
+        /// <param name="CommandLibrary"></param>
+        public static void LoadAllCommands()
+        {
+            System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
+            Commands = new Dictionary<string, IGameCommand>();
+            foreach (Type t in assembly.GetTypes())
+            {
+                if (t.GetInterface(typeof(IGameCommand).FullName) != null)
+                {
+                    //Use activator to create an instance
+                    IGameCommand command = (IGameCommand)Activator.CreateInstance(t);
+
+                    if (command != null)
+                    {
+                        if (command.Name == null)
+                            command.Name = t.Name.ToLower();
+                        else //Make sure the command is always in lower case.
+                            command.Name = command.Name.ToLower();
+
+                        //Add the command to the commands list if it does not already exist
+                        if (Commands.ContainsKey(command.Name))
+                        {
+                            //Command exists, check if the command is set to override existing commands or not
+                            if (command.Override)
+                            {
+                                Commands[command.Name] = command;
+                            }
+                        }
+                        //Command does not exist, add it to the commands list
+                        else
+                            Commands.Add(command.Name, command);
+                    }
+                }
+            }
+        }
+
+        public static string GetCommand(object Parameter)
+        {
+            List<object> objectList = (List<object>)Parameter;
+
+            foreach (object obj in objectList)
+            {
+                if (obj is string)
+                    return (string)obj;
+            }
+
+            return null;
+        }
     }
 }
diff --git a/MudEngine/Commands/CommandResults.cs b/MudEngine/Commands/CommandResults.cs
index 8111349..737f28f 100644
--- a/MudEngine/Commands/CommandResults.cs
+++ b/MudEngine/Commands/CommandResults.cs
@@ -1,4 +1,5 @@
-using System;
+//Microsoft .NET Framework
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/MudEngine/Commands/ICommand.cs b/MudEngine/Commands/ICommand.cs
index 8d1edfe..c834e22 100644
--- a/MudEngine/Commands/ICommand.cs
+++ b/MudEngine/Commands/ICommand.cs
@@ -1,8 +1,10 @@
-using System;
+//Microsoft .NET Framework
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
+//MUD Engine
 using MudEngine.Commands;
 using MudEngine.GameObjects.Characters;
 using MudEngine.GameManagement;
diff --git a/MudEngine/MudEngine.csproj b/MudEngine/MudEngine.csproj
index a0c1e87..a98ec70 100644
--- a/MudEngine/MudEngine.csproj
+++ b/MudEngine/MudEngine.csproj
@@ -55,6 +55,7 @@
     <Compile Include="GameObjects\Bag.cs" />
     <Compile Include="GameObjects\BaseObject.cs" />
     <Compile Include="GameObjects\Characters\BaseCharacter.cs" />
+    <Compile Include="GameObjects\Characters\Controlled\PlayerBasic.cs" />
     <Compile Include="GameObjects\Environment\Door.cs" />
     <Compile Include="GameObjects\Environment\Realm.cs" />
     <Compile Include="GameObjects\Environment\Room.cs" />
@@ -66,7 +67,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="GameObjects\Characters\Controlled\" />
     <Folder Include="GameObjects\Characters\NPC\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />