Refactor: BansheeEditor -> bs.Editor namespace, to match the naming of the core namespace

Data/.reqversion

@@ -1 +1 @@
-6
+7

Source/EditorCore/BsEditorPrerequisites.h

@@ -192,7 +192,7 @@ namespace bs
 
 	static constexpr const char* EDITOR_ASSEMBLY = "MBansheeEditor";
 	static constexpr const char* SCRIPT_EDITOR_ASSEMBLY = "MScriptEditor";
-	static constexpr const char* EDITOR_NS = "BansheeEditor";
+	static constexpr const char* EDITOR_NS = "bs.Editor";
 	static const Path PROJECT_INTERNAL_DIR = u8"Internal/";
 	static const Path INTERNAL_ASSEMBLY_PATH = PROJECT_INTERNAL_DIR + "Assemblies/";
 

Source/EditorCore/Build/BsBuildManager.cpp

@@ -76,8 +76,7 @@ namespace bs
 	Vector<Path> BuildManager::getNativeBinaries(PlatformType type) const
 	{
 		Vector<Path> libs = { u8"bsfEngine", u8"bsfCore", u8"bsfUtility",
-			u8"bsfD3D11RenderAPI", u8"bsfGLRenderAPI", u8"bsfMono",
-			u8"RenderBeast", u8"SBansheeEngine",  u8"mono-2.0-sgen", u8"nvtt" };
+			u8"bsfD3D11RenderAPI", u8"bsfGLRenderAPI", u8"RenderBeast",  u8"mono-2.0-sgen", u8"nvtt" };
 
 		switch (type)
 		{

Source/EditorCore/EditorWindow/BsDockManagerLayout.cpp

@@ -108,7 +108,7 @@ namespace bs
 					}
 				}
 
-				if (curEntry->widgetNames.size() == 0)
+				if (curEntry->widgetNames.empty())
 				{
 					Entry* parent = curEntry->parent;
 					if (parent != nullptr)
@@ -122,11 +122,28 @@ namespace bs
 								newParent->children[0] = otherChild;
 							else
 								newParent->children[1] = otherChild;
+
+							bs_delete(parent);
+						}
+						else // Parent is root
+						{
+							if(otherChild)
+							{
+								parent->isLeaf = true;
+								parent->widgetNames = otherChild->widgetNames;
+								parent->children[0] = nullptr;
+								parent->children[1] = nullptr;
+							}
+							else
+							{
+								parent->isLeaf = false;
+								parent->widgetNames.clear();
+							}
 						}
 
-						otherChild->parent = newParent;
+						if(otherChild)
+							otherChild->parent = newParent;
 
-						bs_delete(parent);
 						bs_delete(curEntry);
 					}
 				}

Source/EditorCore/EditorWindow/BsDockManagerLayout.h

@@ -102,7 +102,7 @@ namespace bs
 	public:
 		friend class DockManagerLayoutRTTI;
 		static RTTITypeBase* getRTTIStatic();
-		virtual RTTITypeBase* getRTTI() const override;	
+		RTTITypeBase* getRTTI() const override;	
 	};
 
 	/** @} */

Source/EditorManaged/CMakeLists.txt

@@ -1,5 +1,5 @@
 # Generate the CS project file
-generate_csharp_project(${PROJECT_SOURCE_DIR}/Source/EditorManaged MBansheeEditor BansheeEditor MBansheeEditor)
+generate_csharp_project(${PROJECT_SOURCE_DIR}/Source/EditorManaged MBansheeEditor bs.Editor MBansheeEditor)
 
 # Include the CS project in the build
 set(BS_CS_PROJ "MBansheeEditor.csproj")

Source/EditorManaged/GUI/EditorStyles.cs

@@ -1,6 +1,6 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIColorDistributionField.cs

@@ -1,7 +1,7 @@
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     partial class GUIColorDistributionField
     {

Source/EditorManaged/GUI/GUIColorField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIColorGradient.cs

@@ -1,7 +1,7 @@
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     partial class GUIColorGradient
     {

Source/EditorManaged/GUI/GUIColorGradientField.cs

@@ -1,7 +1,7 @@
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     partial class GUIColorGradientField
     {

Source/EditorManaged/GUI/GUICurvesField.cs

@@ -1,7 +1,7 @@
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     partial class GUICurvesField
     {

Source/EditorManaged/GUI/GUIDictionaryField.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIEnumField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIFloatDistributionField.cs

@@ -1,7 +1,7 @@
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     partial class GUIFloatDistributionField
     {

Source/EditorManaged/GUI/GUIFloatField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIGameObjectField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIIntField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIListBoxField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIListField.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIResourceField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUISceneTreeView.cs

@@ -4,9 +4,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUISliderField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUITextField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUITextureField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIToggleField.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIVector2DistributionField.cs

@@ -1,7 +1,7 @@
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     partial class GUIVector2DistributionField
     {

Source/EditorManaged/GUI/GUIVector2Field.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIVector3DistributionField.cs

@@ -1,7 +1,7 @@
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     partial class GUIVector3DistributionField
     {

Source/EditorManaged/GUI/GUIVector3Field.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/GUIVector4Field.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/GUI/LocEdString.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup GUI-Editor 
      *  @{

Source/EditorManaged/General/EditorApplication.cs

@@ -4,9 +4,9 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.IO;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup General 
      *  @{

Source/EditorManaged/General/EditorPersistentData.cs

@@ -1,9 +1,9 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 using System.Collections.Generic;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup General
      *  @{

Source/EditorManaged/General/IGlobalShortcuts.cs

@@ -1,6 +1,6 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup General 
      *  @{

Source/EditorManaged/General/Program.cs

@@ -1,9 +1,9 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup BansheeEditor
      *  Scripting API available in editor only, mainly used for extending the editor in various ways.

Source/EditorManaged/General/Selection.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Runtime.CompilerServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup General 
      *  @{

Source/EditorManaged/Generated/AnimationSplitInfo.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/AnimationWindowIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of icons that may be displayed in the animation editor window.</summary>
 	public enum AnimationWindowIcon

Source/EditorManaged/Generated/AudioClipImportOptions.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/BuiltinEditorResources.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Utility-Editor
 	 *  @{

Source/EditorManaged/Generated/CharRange.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Text
 	 *  @{

Source/EditorManaged/Generated/CollisionMeshType.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/CubemapSourceType.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Utility
 	 *  @{

Source/EditorManaged/Generated/CurveDrawInfo.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/CurveDrawOption.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/EditorIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of icons used in various areas throughout the editor.</summary>
 	public enum EditorIcon

Source/EditorManaged/Generated/FontImportOptions.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Text
 	 *  @{

Source/EditorManaged/Generated/FontRenderMode.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Text
 	 *  @{

Source/EditorManaged/Generated/GUIColorDistributionField.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUIColorGradient.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUIColorGradientField.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUICurves.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUICurvesField.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUIFloatDistributionField.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUIGraphTicks.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUITextureFieldType.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUI-Editor
 	 *  @{

Source/EditorManaged/Generated/GUITickStepType.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUITimeline.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUIVector2DistributionField.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/GUIVector3DistributionField.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup GUIEditor
 	 *  @{

Source/EditorManaged/Generated/ImportOptions.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/ImportedAnimationEvents.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/InspectorWindowIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of icons that may be displayed in the inspector window.</summary>
 	public enum InspectorWindowIcon

Source/EditorManaged/Generated/LibraryWindowIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of icons that may be displayed in the library window.</summary>
 	public enum LibraryWindowIcon

Source/EditorManaged/Generated/LogMessageIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of icons to be used along with log messages depending on their severity.</summary>
 	public enum LogMessageIcon

Source/EditorManaged/Generated/MeshImportOptions.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/ProjectLibraryIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of valid icons used when viewing the project library.</summary>
 	public enum ProjectLibraryIcon

Source/EditorManaged/Generated/ProjectResourceIcons.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Different icon sizes for project resource preview icons.</summary>
 	[StructLayout(LayoutKind.Sequential), SerializeObject]

Source/EditorManaged/Generated/SceneViewIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of icons that are used as 3D icons in the scene view.</summary>
 	public enum SceneViewIcon

Source/EditorManaged/Generated/SceneWindowIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of icons that may be displayed in the scene window.</summary>
 	public enum SceneWindowIcon

Source/EditorManaged/Generated/ScriptCodeImportOptions.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/ShaderImportOptions.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/ShadingLanguageFlag.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/TextureImportOptions.editor.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/** @addtogroup Importer
 	 *  @{

Source/EditorManaged/Generated/ToolbarIcon.generated.cs

@@ -3,9 +3,9 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
 	/// <summary>Types of icons that may be displayed on the tool bar.</summary>
 	public enum ToolbarIcon

Source/EditorManaged/Input/EditorInput.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Input-Editor 
      *  @{

Source/EditorManaged/Input/EditorVirtualInput.cs

@@ -2,7 +2,7 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System.Runtime.CompilerServices;
 
-namespace BansheeEngine
+namespace bs
 {
     /** @addtogroup Input-Editor 
      *  @{

Source/EditorManaged/Inspectors/AnimationClipInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/AnimationInspector.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/AudioClipInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/AudioListenerInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/AudioSourceInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/BoneInspector.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System.Collections;
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/BoxColliderInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/CameraInspector.cs

@@ -1,9 +1,9 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/CapsuleColliderInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/CharacterControllerInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/ColliderInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/D6JointInspector.cs

@@ -1,9 +1,9 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/DistanceJointInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/FixedJointInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/FontInspector.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/GUISkinInspector.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/GUIWidgetInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/HingeJointInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/JointInspector.cs

@@ -1,8 +1,8 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/LightInspector.cs

@@ -1,9 +1,9 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/LightProbeVolumeInspector.cs

@@ -2,9 +2,9 @@
 //**************** Copyright (c) 2017 Marko Pintera ([email protected]). All rights reserved. **********************//
 
 using System.Collections.Generic;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{

Source/EditorManaged/Inspectors/LimitInspectors.cs

@@ -1,9 +1,9 @@
 //********************************** Banshee Engine (www.banshee3d.com) **************************************************//
 //**************** Copyright (c) 2016 Marko Pintera ([email protected]). All rights reserved. **********************//
 using System;
-using BansheeEngine;
+using bs;
 
-namespace BansheeEditor
+namespace bs.Editor
 {
     /** @addtogroup Inspectors
      *  @{