Change impl. file to include the header file from corresponding subdir.

Change header file to use relative pathspec when including other files.

Source/Extras/OgreBatchConverter/OgreBatchConverter.cpp

@@ -1,9 +1,9 @@
 // OgreBatchConverter.cpp : Defines the entry point for the console application.
 //
 
-#include <Urho3D/Context.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/Core/Context.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/Core/ProcessUtils.h>
 
 #include <stdio.h>
 

Source/Samples/01_HelloWorld/HelloWorld.cpp

@@ -20,17 +20,17 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
 
 #include "HelloWorld.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 // Expands to this example's entry-point
 DEFINE_APPLICATION_MAIN(HelloWorld)

Source/Samples/02_HelloGUI/HelloGUI.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Button.h>
-#include <Urho3D/BorderImage.h>
-#include <Urho3D/CheckBox.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/LineEdit.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Texture2D.h>
-#include <Urho3D/ToolTip.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/UIElement.h>
-#include <Urho3D/UIEvents.h>
-#include <Urho3D/Window.h>
+#include <Urho3D/UI/Button.h>
+#include <Urho3D/UI/BorderImage.h>
+#include <Urho3D/UI/CheckBox.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/UI/LineEdit.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Graphics/Texture2D.h>
+#include <Urho3D/UI/ToolTip.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/UI/UIElement.h>
+#include <Urho3D/UI/UIEvents.h>
+#include <Urho3D/UI/Window.h>
 
 #include "HelloGUI.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(HelloGUI)
 

Source/Samples/03_Sprites/Sprites.cpp

@@ -20,17 +20,17 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Sprite.h>
-#include <Urho3D/Texture2D.h>
-#include <Urho3D/UI.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/UI/Sprite.h>
+#include <Urho3D/Graphics/Texture2D.h>
+#include <Urho3D/UI/UI.h>
 
 #include "Sprites.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 // Number of sprites to draw
 static const unsigned NUM_SPRITES = 100;

Source/Samples/04_StaticScene/StaticScene.cpp

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
 
 #include "StaticScene.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(StaticScene)
 

Source/Samples/05_AnimatingScene/AnimatingScene.cpp

@@ -20,27 +20,27 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "AnimatingScene.h"
 #include "Rotator.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(AnimatingScene)
 

Source/Samples/05_AnimatingScene/Rotator.cpp

@@ -20,12 +20,12 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Scene.h>
-#include <Urho3D/SceneEvents.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Scene/SceneEvents.h>
 
 #include "Rotator.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 Rotator::Rotator(Context* context) :
     LogicComponent(context),

Source/Samples/05_AnimatingScene/Rotator.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/LogicComponent.h>
+#include <Urho3D/Scene/LogicComponent.h>
 
 // All Urho3D classes reside in namespace Urho3D
 using namespace Urho3D;

Source/Samples/06_SkeletalAnimation/Mover.cpp

@@ -20,14 +20,14 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimatedModel.h>
-#include <Urho3D/AnimationState.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/SceneEvents.h>
+#include <Urho3D/Graphics/AnimatedModel.h>
+#include <Urho3D/Graphics/AnimationState.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Scene/SceneEvents.h>
 
 #include "Mover.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 Mover::Mover(Context* context) :
     LogicComponent(context),

Source/Samples/06_SkeletalAnimation/Mover.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/LogicComponent.h>
+#include <Urho3D/Scene/LogicComponent.h>
 
 using namespace Urho3D;
 

Source/Samples/06_SkeletalAnimation/SkeletalAnimation.cpp

@@ -20,31 +20,31 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Animation.h>
-#include <Urho3D/AnimatedModel.h>
-#include <Urho3D/AnimationState.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Animation.h>
+#include <Urho3D/Graphics/AnimatedModel.h>
+#include <Urho3D/Graphics/AnimationState.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Mover.h"
 #include "SkeletalAnimation.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(SkeletalAnimation)
 

Source/Samples/07_Billboards/Billboards.cpp

@@ -20,29 +20,29 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/BillboardSet.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/BillboardSet.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Billboards.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Billboards)
 

Source/Samples/08_Decals/Decals.cpp

@@ -20,31 +20,31 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Cursor.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/DecalSet.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/XMLFile.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/UI/Cursor.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Graphics/DecalSet.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Resource/XMLFile.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Decals.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Decals)
 

Source/Samples/09_MultipleViewports/MultipleViewports.cpp

@@ -20,31 +20,31 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Cursor.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/RenderPath.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/XMLFile.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/UI/Cursor.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Graphics/RenderPath.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Resource/XMLFile.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "MultipleViewports.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(MultipleViewports)
 

Source/Samples/10_RenderToTexture/RenderToTexture.cpp

@@ -20,30 +20,30 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/RenderSurface.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Technique.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Texture2D.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Graphics/RenderSurface.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/Graphics/Technique.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Graphics/Texture2D.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "RenderToTexture.h"
 #include "Rotator.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(RenderToTexture)
 

Source/Samples/10_RenderToTexture/Rotator.cpp

@@ -20,12 +20,12 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Scene.h>
-#include <Urho3D/SceneEvents.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Scene/SceneEvents.h>
 
 #include "Rotator.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 Rotator::Rotator(Context* context) :
     LogicComponent(context),

Source/Samples/10_RenderToTexture/Rotator.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/LogicComponent.h>
+#include <Urho3D/Scene/LogicComponent.h>
 
 // All Urho3D classes reside in namespace Urho3D
 using namespace Urho3D;

Source/Samples/11_Physics/Physics.cpp

@@ -20,34 +20,34 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionShape.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/File.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsWorld.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Skybox.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Physics/CollisionShape.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/File.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/Skybox.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Physics.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Physics)
 

Source/Samples/12_PhysicsStressTest/PhysicsStressTest.cpp

@@ -20,33 +20,33 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionShape.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/File.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsWorld.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Physics/CollisionShape.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/File.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "PhysicsStressTest.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(PhysicsStressTest)
 

Source/Samples/13_Ragdolls/CreateRagdoll.cpp

@@ -20,15 +20,15 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimatedModel.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/Node.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/PhysicsEvents.h>
+#include <Urho3D/Graphics/AnimatedModel.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/Scene/Node.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Physics/PhysicsEvents.h>
 
 #include "CreateRagdoll.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 CreateRagdoll::CreateRagdoll(Context* context) :
     Component(context)

Source/Samples/13_Ragdolls/CreateRagdoll.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <Urho3D/CollisionShape.h>
-#include <Urho3D/Constraint.h>
+#include <Urho3D/Physics/CollisionShape.h>
+#include <Urho3D/Physics/Constraint.h>
 
 using namespace Urho3D;
 

Source/Samples/13_Ragdolls/Ragdolls.cpp

@@ -20,34 +20,34 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimatedModel.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionShape.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/File.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsWorld.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/AnimatedModel.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Physics/CollisionShape.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/File.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "CreateRagdoll.h"
 #include "Ragdolls.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Ragdolls)
 

Source/Samples/14_SoundEffects/SoundEffects.cpp

@@ -20,24 +20,24 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Audio.h>
-#include <Urho3D/Button.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Slider.h>
-#include <Urho3D/Sound.h>
-#include <Urho3D/SoundSource.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/UIEvents.h>
+#include <Urho3D/Audio/Audio.h>
+#include <Urho3D/UI/Button.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/UI/Slider.h>
+#include <Urho3D/Audio/Sound.h>
+#include <Urho3D/Audio/SoundSource.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/UI/UIEvents.h>
 
 #include "SoundEffects.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 // Custom variable identifier for storing sound effect name within the UI element
 static const StringHash VAR_SOUNDRESOURCE("SoundResource");

Source/Samples/15_Navigation/Navigation.cpp

@@ -20,33 +20,33 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimatedModel.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Cursor.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Navigable.h>
-#include <Urho3D/NavigationMesh.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/XMLFile.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/AnimatedModel.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/UI/Cursor.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Navigation/Navigable.h>
+#include <Urho3D/Navigation/NavigationMesh.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Resource/XMLFile.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Navigation.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Navigation)
 

Source/Samples/16_Chat/Chat.cpp

@@ -20,30 +20,30 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Audio.h>
-#include <Urho3D/Button.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/IOEvents.h>
-#include <Urho3D/LineEdit.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/MemoryBuffer.h>
-#include <Urho3D/Network.h>
-#include <Urho3D/NetworkEvents.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Sound.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/UIEvents.h>
-#include <Urho3D/VectorBuffer.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Audio/Audio.h>
+#include <Urho3D/UI/Button.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/IO/IOEvents.h>
+#include <Urho3D/UI/LineEdit.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/IO/MemoryBuffer.h>
+#include <Urho3D/Network/Network.h>
+#include <Urho3D/Network/NetworkEvents.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Audio/Sound.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/UI/UIEvents.h>
+#include <Urho3D/IO/VectorBuffer.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Chat.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 // Undefine Windows macro, as our Connection class has a function called SendMessage
 #ifdef SendMessage

Source/Samples/17_SceneReplication/SceneReplication.cpp

@@ -20,41 +20,41 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Button.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionShape.h>
-#include <Urho3D/Connection.h>
-#include <Urho3D/Controls.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Cursor.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/LineEdit.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Network.h>
-#include <Urho3D/NetworkEvents.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsEvents.h>
-#include <Urho3D/PhysicsWorld.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/UIEvents.h>
-#include <Urho3D/XMLFile.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/UI/Button.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Physics/CollisionShape.h>
+#include <Urho3D/Network/Connection.h>
+#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/UI/Cursor.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/UI/LineEdit.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Network/Network.h>
+#include <Urho3D/Network/NetworkEvents.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Physics/PhysicsEvents.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/UI/UIEvents.h>
+#include <Urho3D/Resource/XMLFile.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "SceneReplication.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 // UDP port we will use
 static const unsigned short SERVER_PORT = 2345;

Source/Samples/18_CharacterDemo/Character.cpp

@@ -20,14 +20,14 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimationController.h>
-#include <Urho3D/Context.h>
-#include <Urho3D/MemoryBuffer.h>
-#include <Urho3D/PhysicsEvents.h>
-#include <Urho3D/PhysicsWorld.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/SceneEvents.h>
+#include <Urho3D/Graphics/AnimationController.h>
+#include <Urho3D/Core/Context.h>
+#include <Urho3D/IO/MemoryBuffer.h>
+#include <Urho3D/Physics/PhysicsEvents.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Scene/SceneEvents.h>
 
 #include "Character.h"
 

Source/Samples/18_CharacterDemo/Character.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <Urho3D/Controls.h>
-#include <Urho3D/LogicComponent.h>
+#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Scene/LogicComponent.h>
 
 using namespace Urho3D;
 

Source/Samples/18_CharacterDemo/CharacterDemo.cpp

@@ -20,36 +20,36 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimatedModel.h>
-#include <Urho3D/AnimationController.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionShape.h>
-#include <Urho3D/Controls.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsWorld.h>
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/AnimatedModel.h>
+#include <Urho3D/Graphics/AnimationController.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Physics/CollisionShape.h>
+#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Character.h"
 #include "CharacterDemo.h"
 #include "Touch.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(CharacterDemo)
 

Source/Samples/18_CharacterDemo/Touch.cpp

@@ -20,10 +20,10 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Controls.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Renderer.h>
+#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Renderer.h>
 
 #include "Character.h"
 #include "Touch.h"

Source/Samples/18_CharacterDemo/Touch.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/Object.h>
+#include <Urho3D/Core/Object.h>
 
 using namespace Urho3D;
 

Source/Samples/19_VehicleDemo/Vehicle.cpp

@@ -20,17 +20,17 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/CollisionShape.h>
-#include <Urho3D/Constraint.h>
-#include <Urho3D/Context.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/PhysicsEvents.h>
-#include <Urho3D/PhysicsWorld.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
+#include <Urho3D/Physics/CollisionShape.h>
+#include <Urho3D/Physics/Constraint.h>
+#include <Urho3D/Core/Context.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Physics/PhysicsEvents.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
 
 #include "Vehicle.h"
 

Source/Samples/19_VehicleDemo/Vehicle.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include <Urho3D/Controls.h>
-#include <Urho3D/LogicComponent.h>
+#include <Urho3D/Network/Controls.h>
+#include <Urho3D/Scene/LogicComponent.h>
 
 namespace Urho3D
 {

Source/Samples/19_VehicleDemo/VehicleDemo.cpp

@@ -20,34 +20,34 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionShape.h>
-#include <Urho3D/Constraint.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsWorld.h>
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/RigidBody.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Terrain.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Physics/CollisionShape.h>
+#include <Urho3D/Physics/Constraint.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Physics/RigidBody.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/Graphics/Terrain.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Vehicle.h"
 #include "VehicleDemo.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 const float CAMERA_DISTANCE = 10.0f;
 

Source/Samples/20_HugeObjectCount/HugeObjectCount.cpp

@@ -20,27 +20,27 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Profiler.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModelGroup.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Core/Profiler.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModelGroup.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "HugeObjectCount.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(HugeObjectCount)
 

Source/Samples/21_AngelScriptIntegration/AngelScriptIntegration.cpp

@@ -20,29 +20,29 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Script.h>
-#include <Urho3D/ScriptFile.h>
-#include <Urho3D/ScriptInstance.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Script/Script.h>
+#include <Urho3D/Script/ScriptFile.h>
+#include <Urho3D/Script/ScriptInstance.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "AngelScriptIntegration.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(AngelScriptIntegration)
 

Source/Samples/22_LuaIntegration/LuaIntegration.cpp

@@ -20,30 +20,30 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/LuaFile.h>
-#include <Urho3D/LuaFunction.h>
-#include <Urho3D/LuaScript.h>
-#include <Urho3D/LuaScriptInstance.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/LuaScript/LuaFile.h>
+#include <Urho3D/LuaScript/LuaFunction.h>
+#include <Urho3D/LuaScript/LuaScript.h>
+#include <Urho3D/LuaScript/LuaScriptInstance.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "LuaIntegration.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(LuaIntegration)
 

Source/Samples/23_Water/Water.cpp

@@ -20,33 +20,33 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/File.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/RenderSurface.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Skybox.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Terrain.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Texture2D.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/File.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Graphics/RenderSurface.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/Skybox.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/Graphics/Terrain.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Graphics/Texture2D.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Water.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Water)
 

Source/Samples/23_Water/Water.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/Plane.h>
+#include <Urho3D/Math/Plane.h>
 
 #include "Sample.h"
 

Source/Samples/24_Urho2DSprite/Urho2DSprite.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimatedSprite2D.h>
-#include <Urho3D/AnimationSet2D.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Sprite2D.h>
-#include <Urho3D/StaticSprite2D.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Urho2D/AnimatedSprite2D.h>
+#include <Urho3D/Urho2D/AnimationSet2D.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Urho2D/Sprite2D.h>
+#include <Urho3D/Urho2D/StaticSprite2D.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Urho2DSprite.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 // Number of static sprites to draw
 static const unsigned NUM_SPRITES = 200;

Source/Samples/25_Urho2DParticle/Urho2DParticle.cpp

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/InputEvents.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/ParticleEmitter2D.h>
-#include <Urho3D/ParticleEffect2D.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Input/InputEvents.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Urho2D/ParticleEmitter2D.h>
+#include <Urho3D/Urho2D/ParticleEffect2D.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Urho2DParticle.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho2DParticle)
 

Source/Samples/26_ConsoleInput/ConsoleInput.cpp

@@ -20,20 +20,20 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Button.h>
-#include <Urho3D/Console.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/EngineEvents.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/Random.h>
-#include <Urho3D/Timer.h>
+#include <Urho3D/UI/Button.h>
+#include <Urho3D/Engine/Console.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/Engine/EngineEvents.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/Math/Random.h>
+#include <Urho3D/Core/Timer.h>
 
 #include "ConsoleInput.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 // Expands to this example's entry-point
 DEFINE_APPLICATION_MAIN(ConsoleInput)

Source/Samples/27_Urho2DPhysics/Urho2DPhysics.cpp

@@ -20,30 +20,30 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionBox2D.h>
-#include <Urho3D/CollisionCircle2D.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Drawable2D.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsWorld2D.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/RigidBody2D.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/SceneEvents.h>
-#include <Urho3D/Sprite2D.h>
-#include <Urho3D/StaticSprite2D.h>
-#include <Urho3D/Text.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Urho2D/CollisionBox2D.h>
+#include <Urho3D/Urho2D/CollisionCircle2D.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Urho2D/Drawable2D.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Urho2D/PhysicsWorld2D.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Urho2D/RigidBody2D.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Scene/SceneEvents.h>
+#include <Urho3D/Urho2D/Sprite2D.h>
+#include <Urho3D/Urho2D/StaticSprite2D.h>
+#include <Urho3D/UI/Text.h>
 
 #include "Urho2DPhysics.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho2DPhysics)
 

Source/Samples/28_Urho2DPhysicsRope/Urho2DPhysicsRope.cpp

@@ -20,28 +20,28 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionBox2D.h>
-#include <Urho3D/CollisionEdge2D.h>
-#include <Urho3D/ConstraintRevolute2D.h>
-#include <Urho3D/ConstraintRope2D.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsWorld2D.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/RigidBody2D.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/SceneEvents.h>
-#include <Urho3D/Text.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Urho2D/CollisionBox2D.h>
+#include <Urho3D/Urho2D/CollisionEdge2D.h>
+#include <Urho3D/Urho2D/ConstraintRevolute2D.h>
+#include <Urho3D/Urho2D/ConstraintRope2D.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Urho2D/PhysicsWorld2D.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Urho2D/RigidBody2D.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Scene/SceneEvents.h>
+#include <Urho3D/UI/Text.h>
 
 #include "Urho2DPhysicsRope.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho2DPhysicsRope)
 

Source/Samples/29_SoundSynthesis/SoundSynthesis.cpp

@@ -20,20 +20,20 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/BufferedSoundStream.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/Node.h>
-#include <Urho3D/SoundSource.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
+#include <Urho3D/Audio/BufferedSoundStream.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/Scene/Node.h>
+#include <Urho3D/Audio/SoundSource.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
 
 #include "SoundSynthesis.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 // Expands to this example's entry-point
 DEFINE_APPLICATION_MAIN(SoundSynthesis)

Source/Samples/30_LightAnimation/LightAnimation.cpp

@@ -20,28 +20,28 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Animatable.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/ObjectAnimation.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/ValueAnimation.h>
+#include <Urho3D/Scene/Animatable.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Scene/ObjectAnimation.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Scene/ValueAnimation.h>
 
 #include "LightAnimation.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(LightAnimation)
 

Source/Samples/31_MaterialAnimation/MaterialAnimation.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/ValueAnimation.h>
-#include <Urho3D/UI.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Scene/ValueAnimation.h>
+#include <Urho3D/UI/UI.h>
 
 #include "MaterialAnimation.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(MaterialAnimation)
 

Source/Samples/32_Urho2DConstraints/Urho2DConstraints.cpp

@@ -20,44 +20,44 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CollisionBox2D.h>
-#include <Urho3D/CollisionCircle2D.h>
-#include <Urho3D/CollisionEdge2D.h>
-#include <Urho3D/CollisionPolygon2D.h>
-#include <Urho3D/ConstraintDistance2D.h>
-#include <Urho3D/ConstraintFriction2D.h>
-#include <Urho3D/ConstraintGear2D.h>
-#include <Urho3D/ConstraintMotor2D.h>
-#include <Urho3D/ConstraintMouse2D.h>
-#include <Urho3D/ConstraintPrismatic2D.h>
-#include <Urho3D/ConstraintPulley2D.h>
-#include <Urho3D/ConstraintRevolute2D.h>
-#include <Urho3D/ConstraintRope2D.h>
-#include <Urho3D/ConstraintWeld2D.h>
-#include <Urho3D/ConstraintWheel2D.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/DebugNew.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/Drawable2D.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/PhysicsWorld2D.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/RigidBody2D.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/SceneEvents.h>
-#include <Urho3D/Sprite2D.h>
-#include <Urho3D/StaticSprite2D.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Text3D.h>
-#include <Urho3D/Vector.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Urho2D/CollisionBox2D.h>
+#include <Urho3D/Urho2D/CollisionCircle2D.h>
+#include <Urho3D/Urho2D/CollisionEdge2D.h>
+#include <Urho3D/Urho2D/CollisionPolygon2D.h>
+#include <Urho3D/Urho2D/ConstraintDistance2D.h>
+#include <Urho3D/Urho2D/ConstraintFriction2D.h>
+#include <Urho3D/Urho2D/ConstraintGear2D.h>
+#include <Urho3D/Urho2D/ConstraintMotor2D.h>
+#include <Urho3D/Urho2D/ConstraintMouse2D.h>
+#include <Urho3D/Urho2D/ConstraintPrismatic2D.h>
+#include <Urho3D/Urho2D/ConstraintPulley2D.h>
+#include <Urho3D/Urho2D/ConstraintRevolute2D.h>
+#include <Urho3D/Urho2D/ConstraintRope2D.h>
+#include <Urho3D/Urho2D/ConstraintWeld2D.h>
+#include <Urho3D/Urho2D/ConstraintWheel2D.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Container/DebugNew.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/Urho2D/Drawable2D.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Urho2D/PhysicsWorld2D.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Urho2D/RigidBody2D.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Scene/SceneEvents.h>
+#include <Urho3D/Urho2D/Sprite2D.h>
+#include <Urho3D/Urho2D/StaticSprite2D.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/Text3D.h>
+#include <Urho3D/Container/Vector.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Urho2DConstraints.h"
 

Source/Samples/33_Urho2DSpriterAnimation/Urho2DSpriterAnimation.cpp

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimatedSprite2D.h>
-#include <Urho3D/AnimationSet2D.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Drawable2D.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Urho2D/AnimatedSprite2D.h>
+#include <Urho3D/Urho2D/AnimationSet2D.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Urho2D/Drawable2D.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "Urho2DSpriterAnimation.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 static const char* animationNames[] =
 {

Source/Samples/34_DynamicGeometry/DynamicGeometry.cpp

@@ -20,31 +20,31 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Geometry.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/IndexBuffer.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Profiler.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/VertexBuffer.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/Zone.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Geometry.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Graphics/IndexBuffer.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Core/Profiler.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Graphics/VertexBuffer.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Graphics/Zone.h>
 
 #include "DynamicGeometry.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(DynamicGeometry)
 

Source/Samples/35_SignedDistanceFieldText/SignedDistanceFieldText.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StaticModel.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Text3D.h>
-#include <Urho3D/UI.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Graphics/StaticModel.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/Text3D.h>
+#include <Urho3D/UI/UI.h>
 
 #include "SignedDistanceFieldText.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(SignedDistanceFieldText)
 

Source/Samples/36_Urho2DTileMap/Urho2DTileMap.cpp

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Camera.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/Octree.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/Zone.h>
-#include <Urho3D/TmxFile2D.h>
-#include <Urho3D/TileMap2D.h>
-#include <Urho3D/Drawable2D.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Graphics/Octree.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/Graphics/Zone.h>
+#include <Urho3D/Urho2D/TmxFile2D.h>
+#include <Urho3D/Urho2D/TileMap2D.h>
+#include <Urho3D/Urho2D/Drawable2D.h>
 
 #include "Urho2DTileMap.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho2DTileMap)
 

Source/Samples/37_UIDrag/UIDrag.cpp

@@ -20,15 +20,15 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Button.h>
-#include <Urho3D/CoreEvents.h>
-#include <Urho3D/Font.h>
-#include <Urho3D/Text.h>
-#include <Urho3D/UIEvents.h>
+#include <Urho3D/UI/Button.h>
+#include <Urho3D/Core/CoreEvents.h>
+#include <Urho3D/UI/Font.h>
+#include <Urho3D/UI/Text.h>
+#include <Urho3D/UI/UIEvents.h>
 
 #include "UIDrag.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(UIDrag)
 

Source/Samples/Sample.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/Application.h>
+#include <Urho3D/Engine/Application.h>
 
 namespace Urho3D
 {

Source/Samples/Sample.inl

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Application.h>
-#include <Urho3D/Camera.h>
-#include <Urho3D/Console.h>
-#include <Urho3D/Cursor.h>
-#include <Urho3D/DebugHud.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Input.h>
-#include <Urho3D/InputEvents.h>
-#include <Urho3D/Renderer.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/SceneEvents.h>
-#include <Urho3D/Sprite.h>
-#include <Urho3D/Texture2D.h>
-#include <Urho3D/Timer.h>
-#include <Urho3D/UI.h>
-#include <Urho3D/XMLFile.h>
+#include <Urho3D/Engine/Application.h>
+#include <Urho3D/Graphics/Camera.h>
+#include <Urho3D/Engine/Console.h>
+#include <Urho3D/UI/Cursor.h>
+#include <Urho3D/Engine/DebugHud.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Input/Input.h>
+#include <Urho3D/Input/InputEvents.h>
+#include <Urho3D/Graphics/Renderer.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Scene/SceneEvents.h>
+#include <Urho3D/UI/Sprite.h>
+#include <Urho3D/Graphics/Texture2D.h>
+#include <Urho3D/Core/Timer.h>
+#include <Urho3D/UI/UI.h>
+#include <Urho3D/Resource/XMLFile.h>
 
 Sample::Sample(Context* context) :
     Application(context),

Source/Tools/AssetImporter/AssetImporter.cpp

@@ -20,34 +20,34 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/AnimatedModel.h>
-#include <Urho3D/Animation.h>
-#include <Urho3D/Context.h>
-#include <Urho3D/DebugRenderer.h>
-#include <Urho3D/File.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Geometry.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/IndexBuffer.h>
-#include <Urho3D/Light.h>
-#include <Urho3D/Material.h>
-#include <Urho3D/Model.h>
-#include <Urho3D/Octree.h>
+#include <Urho3D/Graphics/AnimatedModel.h>
+#include <Urho3D/Graphics/Animation.h>
+#include <Urho3D/Core/Context.h>
+#include <Urho3D/Graphics/DebugRenderer.h>
+#include <Urho3D/IO/File.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/Graphics/Geometry.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/Graphics/IndexBuffer.h>
+#include <Urho3D/Graphics/Light.h>
+#include <Urho3D/Graphics/Material.h>
+#include <Urho3D/Graphics/Model.h>
+#include <Urho3D/Graphics/Octree.h>
 #ifdef URHO3D_PHYSICS
-#include <Urho3D/PhysicsWorld.h>
+#include <Urho3D/Physics/PhysicsWorld.h>
 #endif
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/Quaternion.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Scene.h>
-#include <Urho3D/StringUtils.h>
-#include <Urho3D/Vector3.h>
-#include <Urho3D/VertexBuffer.h>
-#include <Urho3D/WorkQueue.h>
-#include <Urho3D/XMLFile.h>
-#include <Urho3D/Zone.h>
-
-#include <Urho3D/Sort.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/Math/Quaternion.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Scene/Scene.h>
+#include <Urho3D/Core/StringUtils.h>
+#include <Urho3D/Math/Vector3.h>
+#include <Urho3D/Graphics/VertexBuffer.h>
+#include <Urho3D/Core/WorkQueue.h>
+#include <Urho3D/Resource/XMLFile.h>
+#include <Urho3D/Graphics/Zone.h>
+
+#include <Urho3D/Container/Sort.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -60,7 +60,7 @@
 
 #include <cstring>
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 using namespace Urho3D;
 

Source/Tools/OgreImporter/OgreImporter.cpp

@@ -20,14 +20,14 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Context.h>
-#include <Urho3D/File.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/HashSet.h>
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/Sort.h>
-#include <Urho3D/Tangent.h>
-#include <Urho3D/XMLFile.h>
+#include <Urho3D/Core/Context.h>
+#include <Urho3D/IO/File.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/Container/HashSet.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/Container/Sort.h>
+#include <Urho3D/Graphics/Tangent.h>
+#include <Urho3D/Resource/XMLFile.h>
 
 #include "OgreImporterUtils.h"
 
@@ -38,7 +38,7 @@
 #include <cstddef>
 #include <cstring>
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 static const int VERTEX_CACHE_SIZE = 32;
 

Source/Tools/OgreImporter/OgreImporterUtils.h

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include <Urho3D/Animation.h>
-#include <Urho3D/BoundingBox.h>
-#include <Urho3D/Graphics.h>
-#include <Urho3D/Serializer.h>
-#include <Urho3D/Matrix3x4.h>
+#include <Urho3D/Graphics/Animation.h>
+#include <Urho3D/Math/BoundingBox.h>
+#include <Urho3D/Graphics/Graphics.h>
+#include <Urho3D/IO/Serializer.h>
+#include <Urho3D/Math/Matrix3x4.h>
 
 using namespace Urho3D;
 

Source/Tools/PackageTool/PackageTool.cpp

@@ -20,11 +20,11 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Context.h>
-#include <Urho3D/ArrayPtr.h>
-#include <Urho3D/File.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/ProcessUtils.h>
+#include <Urho3D/Core/Context.h>
+#include <Urho3D/Container/ArrayPtr.h>
+#include <Urho3D/IO/File.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/Core/ProcessUtils.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -32,10 +32,10 @@
 
 #include <cstdio>
 #include <cstring>
-#include <lz4.h>
-#include <lz4hc.h>
+#include <LZ4/lz4.h>
+#include <LZ4/lz4hc.h>
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 using namespace Urho3D;
 

Source/Tools/RampGenerator/RampGenerator.cpp

@@ -20,10 +20,10 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/ArrayPtr.h>
-#include <Urho3D/MathDefs.h>
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/StringUtils.h>
+#include <Urho3D/Container/ArrayPtr.h>
+#include <Urho3D/Math/MathDefs.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/Core/StringUtils.h>
 
 #ifdef WIN32
 #include <windows.h>
@@ -32,7 +32,7 @@
 #include <stb_image.h>
 #include <stb_image_write.h>
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 using namespace Urho3D;
 

Source/Tools/ScriptCompiler/ScriptCompiler.cpp

@@ -20,25 +20,25 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Context.h>
-#include <Urho3D/Engine.h>
-#include <Urho3D/File.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/Script.h>
-#include <Urho3D/ScriptFile.h>
+#include <Urho3D/Core/Context.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/File.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Script/Script.h>
+#include <Urho3D/Script/ScriptFile.h>
 
 #ifdef URHO3D_LUA
-#include <Urho3D/LuaScript.h>
+#include <Urho3D/LuaScript/LuaScript.h>
 #endif
 
 #ifdef WIN32
 #include <windows.h>
 #endif
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 using namespace Urho3D;
 

Source/Tools/Urho3DPlayer/Urho3DPlayer.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include <Urho3D/Engine.h>
-#include <Urho3D/FileSystem.h>
-#include <Urho3D/Log.h>
-#include <Urho3D/Main.h>
-#include <Urho3D/ProcessUtils.h>
-#include <Urho3D/ResourceCache.h>
-#include <Urho3D/ResourceEvents.h>
+#include <Urho3D/Engine/Engine.h>
+#include <Urho3D/IO/FileSystem.h>
+#include <Urho3D/IO/Log.h>
+#include <Urho3D/Core/Main.h>
+#include <Urho3D/Core/ProcessUtils.h>
+#include <Urho3D/Resource/ResourceCache.h>
+#include <Urho3D/Resource/ResourceEvents.h>
 
 #ifdef URHO3D_ANGELSCRIPT
-#include <Urho3D/ScriptFile.h>
-#include <Urho3D/Script.h>
+#include <Urho3D/Script/ScriptFile.h>
+#include <Urho3D/Script/Script.h>
 #endif
 
 #ifdef URHO3D_LUA
-#include <Urho3D/LuaScript.h>
+#include <Urho3D/LuaScript/LuaScript.h>
 #endif
 
 #include "Urho3DPlayer.h"
 
-#include <Urho3D/DebugNew.h>
+#include <Urho3D/Container/DebugNew.h>
 
 DEFINE_APPLICATION_MAIN(Urho3DPlayer);
 

Source/Tools/Urho3DPlayer/Urho3DPlayer.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <Urho3D/Application.h>
+#include <Urho3D/Engine/Application.h>
 
 using namespace Urho3D;
 

Source/Urho3D/Audio/Audio.cpp

@@ -20,21 +20,21 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "Audio.h"
-#include "Context.h"
-#include "CoreEvents.h"
-#include "Log.h"
-#include "Mutex.h"
-#include "ProcessUtils.h"
-#include "Profiler.h"
-#include "Sound.h"
-#include "SoundListener.h"
-#include "SoundSource3D.h"
+#include "../Precompiled.h"
+#include "../Audio/Audio.h"
+#include "../Core/Context.h"
+#include "../Core/CoreEvents.h"
+#include "../IO/Log.h"
+#include "../Core/Mutex.h"
+#include "../Core/ProcessUtils.h"
+#include "../Core/Profiler.h"
+#include "../Audio/Sound.h"
+#include "../Audio/SoundListener.h"
+#include "../Audio/SoundSource3D.h"
 
 #include <SDL/SDL.h>
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/Audio.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "ArrayPtr.h"
-#include "AudioDefs.h"
-#include "Mutex.h"
-#include "Object.h"
+#include "../Container/ArrayPtr.h"
+#include "../Audio/AudioDefs.h"
+#include "../Core/Mutex.h"
+#include "../Core/Object.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/AudioDefs.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Str.h"
+#include "../Container/Str.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/BufferedSoundStream.cpp

@@ -20,12 +20,12 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "BufferedSoundStream.h"
+#include "../Precompiled.h"
+#include "../Audio/BufferedSoundStream.h"
 
 #include <cstring>
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/BufferedSoundStream.h

@@ -22,11 +22,11 @@
 
 #pragma once
 
-#include "ArrayPtr.h"
-#include "List.h"
-#include "Mutex.h"
-#include "Pair.h"
-#include "SoundStream.h"
+#include "../Container/ArrayPtr.h"
+#include "../Container/List.h"
+#include "../Core/Mutex.h"
+#include "../Container/Pair.h"
+#include "../Audio/SoundStream.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/OggVorbisSoundStream.cpp

@@ -20,13 +20,13 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "OggVorbisSoundStream.h"
-#include "Sound.h"
+#include "../Precompiled.h"
+#include "../Audio/OggVorbisSoundStream.h"
+#include "../Audio/Sound.h"
 
-#include <stb_vorbis.h>
+#include <STB/stb_vorbis.h>
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/OggVorbisSoundStream.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "ArrayPtr.h"
-#include "SoundStream.h"
+#include "../Container/ArrayPtr.h"
+#include "../Audio/SoundStream.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/Sound.cpp

@@ -20,20 +20,20 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "Context.h"
-#include "FileSystem.h"
-#include "Log.h"
-#include "OggVorbisSoundStream.h"
-#include "Profiler.h"
-#include "ResourceCache.h"
-#include "Sound.h"
-#include "XMLFile.h"
+#include "../Precompiled.h"
+#include "../Core/Context.h"
+#include "../IO/FileSystem.h"
+#include "../IO/Log.h"
+#include "../Audio/OggVorbisSoundStream.h"
+#include "../Core/Profiler.h"
+#include "../Resource/ResourceCache.h"
+#include "../Audio/Sound.h"
+#include "../Resource/XMLFile.h"
 
 #include <cstring>
-#include <stb_vorbis.h>
+#include <STB/stb_vorbis.h>
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/Sound.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "ArrayPtr.h"
-#include "Resource.h"
+#include "../Container/ArrayPtr.h"
+#include "../Resource/Resource.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/SoundListener.cpp

@@ -20,11 +20,11 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "Context.h"
-#include "SoundListener.h"
+#include "../Precompiled.h"
+#include "../Core/Context.h"
+#include "../Audio/SoundListener.h"
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/SoundListener.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Component.h"
+#include "../Scene/Component.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/SoundSource.cpp

@@ -20,17 +20,17 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "Audio.h"
-#include "Context.h"
-#include "ResourceCache.h"
-#include "Sound.h"
-#include "SoundSource.h"
-#include "SoundStream.h"
+#include "../Precompiled.h"
+#include "../Audio/Audio.h"
+#include "../Core/Context.h"
+#include "../Resource/ResourceCache.h"
+#include "../Audio/Sound.h"
+#include "../Audio/SoundSource.h"
+#include "../Audio/SoundStream.h"
 
 #include <cstring>
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/SoundSource.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "AudioDefs.h"
-#include "Component.h"
+#include "../Audio/AudioDefs.h"
+#include "../Scene/Component.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/SoundSource3D.cpp

@@ -20,16 +20,16 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "Audio.h"
-#include "Context.h"
-#include "DebugRenderer.h"
-#include "Node.h"
-#include "Sound.h"
-#include "SoundListener.h"
-#include "SoundSource3D.h"
+#include "../Precompiled.h"
+#include "../Audio/Audio.h"
+#include "../Core/Context.h"
+#include "../Graphics/DebugRenderer.h"
+#include "../Scene/Node.h"
+#include "../Audio/Sound.h"
+#include "../Audio/SoundListener.h"
+#include "../Audio/SoundSource3D.h"
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/SoundSource3D.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "SoundSource.h"
+#include "../Audio/SoundSource.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/SoundStream.cpp

@@ -20,10 +20,10 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "SoundStream.h"
+#include "../Precompiled.h"
+#include "../Audio/SoundStream.h"
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Audio/SoundStream.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "RefCounted.h"
+#include "../Container/RefCounted.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/Allocator.cpp

@@ -20,12 +20,12 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "Allocator.h"
+#include "../Precompiled.h"
+#include "../Container/Allocator.h"
 
 #include "stdio.h"
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/Allocator.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Urho3D.h"
+#include "../Urho3D.h"
 
 #include <new>
 

Source/Urho3D/Container/ArrayPtr.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "HashBase.h"
-#include "RefCounted.h"
+#include "../Container/HashBase.h"
+#include "../Container/RefCounted.h"
 
 #include <cassert>
 

Source/Urho3D/Container/ForEach.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Vector.h"
+#include "../Container/Vector.h"
 
 // Note: ForEach is not supported on all compilers, such as VS2008.
 

Source/Urho3D/Container/HashBase.cpp

@@ -20,10 +20,10 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "HashBase.h"
+#include "../Precompiled.h"
+#include "../Container/HashBase.h"
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/HashBase.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "Urho3D.h"
-#include "Allocator.h"
-#include "Hash.h"
-#include "Swap.h"
+#include "../Urho3D.h"
+#include "../Container/Allocator.h"
+#include "../Container/Hash.h"
+#include "../Container/Swap.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/HashMap.h

@@ -22,10 +22,10 @@
 
 #pragma once
 
-#include "HashBase.h"
-#include "Pair.h"
-#include "Sort.h"
-#include "Vector.h"
+#include "../Container/HashBase.h"
+#include "../Container/Pair.h"
+#include "../Container/Sort.h"
+#include "../Container/Vector.h"
 
 #include <cassert>
 

Source/Urho3D/Container/HashSet.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "HashBase.h"
-#include "Sort.h"
+#include "../Container/HashBase.h"
+#include "../Container/Sort.h"
 
 #include <cassert>
 

Source/Urho3D/Container/HashTable.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "Allocator.h"
-#include "Vector.h"
+#include "../Container/Allocator.h"
+#include "../Container/Vector.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/LinkedList.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Urho3D.h"
+#include "../Urho3D.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/List.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "ListBase.h"
+#include "../Container/ListBase.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/ListBase.h

@@ -22,9 +22,9 @@
 
 #pragma once
 
-#include "Urho3D.h"
-#include "Allocator.h"
-#include "Swap.h"
+#include "../Urho3D.h"
+#include "../Container/Allocator.h"
+#include "../Container/Swap.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/Pair.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Hash.h"
+#include "../Container/Hash.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/Ptr.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "RefCounted.h"
+#include "../Container/RefCounted.h"
 
 #include <cassert>
 #include <cstddef>

Source/Urho3D/Container/RefCounted.cpp

@@ -20,12 +20,12 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "RefCounted.h"
+#include "../Precompiled.h"
+#include "../Container/RefCounted.h"
 
 #include <cassert>
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/RefCounted.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Urho3D.h"
+#include "../Urho3D.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/Sort.h

@@ -22,8 +22,8 @@
 
 #pragma once
 
-#include "Swap.h"
-#include "VectorBase.h"
+#include "../Container/Swap.h"
+#include "../Container/VectorBase.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/Str.cpp

@@ -20,13 +20,13 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "Str.h"
-#include "Swap.h"
+#include "../Precompiled.h"
+#include "../Container/Str.h"
+#include "../Container/Swap.h"
 
 #include <cstdio>
 
-#include "DebugNew.h"
+#include "../Container/DebugNew.h"
 
 namespace Urho3D
 {

Source/Urho3D/Container/Str.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "Vector.h"
+#include "../Container/Vector.h"
 
 #include <cstring>
 #include <cstdarg>

Source/Urho3D/Container/Swap.cpp

@@ -20,11 +20,11 @@
 // THE SOFTWARE.
 //
 
-#include "Precompiled.h"
-#include "HashBase.h"
-#include "ListBase.h"
-#include "Str.h"
-#include "VectorBase.h"
+#include "../Precompiled.h"
+#include "../Container/HashBase.h"
+#include "../Container/ListBase.h"
+#include "../Container/Str.h"
+#include "../Container/VectorBase.h"
 
 namespace Urho3D
 {