diff --git a/projects/kiwano-audio/kiwano-audio.vcxproj b/projects/kiwano-audio/kiwano-audio.vcxproj
index dcebde87..45892c31 100644
--- a/projects/kiwano-audio/kiwano-audio.vcxproj
+++ b/projects/kiwano-audio/kiwano-audio.vcxproj
@@ -72,7 +72,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
@@ -91,7 +91,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
diff --git a/projects/kiwano-imgui/kiwano-imgui.vcxproj b/projects/kiwano-imgui/kiwano-imgui.vcxproj
index ae17b8f6..4088c4f0 100644
--- a/projects/kiwano-imgui/kiwano-imgui.vcxproj
+++ b/projects/kiwano-imgui/kiwano-imgui.vcxproj
@@ -71,7 +71,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
@@ -90,7 +90,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
diff --git a/projects/kiwano-network/kiwano-network.vcxproj b/projects/kiwano-network/kiwano-network.vcxproj
index aa28657c..20a9d991 100644
--- a/projects/kiwano-network/kiwano-network.vcxproj
+++ b/projects/kiwano-network/kiwano-network.vcxproj
@@ -67,7 +67,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
@@ -86,7 +86,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
diff --git a/projects/kiwano-physics/kiwano-physics.vcxproj b/projects/kiwano-physics/kiwano-physics.vcxproj
index 789ffafb..81b23e73 100644
--- a/projects/kiwano-physics/kiwano-physics.vcxproj
+++ b/projects/kiwano-physics/kiwano-physics.vcxproj
@@ -78,7 +78,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
@@ -97,7 +97,7 @@
       <TreatWarningAsError>true</TreatWarningAsError>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <MinimalRebuild>false</MinimalRebuild>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
diff --git a/projects/kiwano/kiwano.vcxproj b/projects/kiwano/kiwano.vcxproj
index 194381e3..e1ee8a95 100644
--- a/projects/kiwano/kiwano.vcxproj
+++ b/projects/kiwano/kiwano.vcxproj
@@ -232,7 +232,7 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
     <Link>
@@ -251,7 +251,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
-      <AdditionalIncludeDirectories>../../src;</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src;../../src/3rd-party;</AdditionalIncludeDirectories>
       <UseFullPaths>false</UseFullPaths>
     </ClCompile>
     <Link>
@@ -264,4 +264,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/scripts/coapp/kiwano.autopkg b/scripts/coapp/kiwano.autopkg
index 8a480ef2..533b4889 100644
--- a/scripts/coapp/kiwano.autopkg
+++ b/scripts/coapp/kiwano.autopkg
@@ -59,7 +59,7 @@ nuget {
         owners: Nomango;
         licenseUrl: "https://github.com/KiwanoEngine/Kiwano/blob/master/LICENSE";
         projectUrl: "https://github.com/KiwanoEngine/Kiwano";
-        iconUrl: "https://github.com/KiwanoEngine/Kiwano/raw/master/logo/logo_square.png";
+        iconUrl: "https://github.com/KiwanoEngine/Kiwano/raw/master/logo/logo.png";
         description: A simple game framework for C++;
         releaseNotes: "Initial release of a Nuget package for Kiwano Game Engine";
         copyright: Copyright 2019;
@@ -86,17 +86,19 @@ nuget {
 
     files {
         #defines {
-            SRC_ROOT            = ..\..\src;
-            OUTPUT_DIR          = ..\..\projects\output;
+            SRC_ROOT   = ..\..\src;
+            OUTPUT_DIR = ..\..\projects\output;
         }
 
         include: {
-            ${SRC_ROOT}\**\*.h,
-            ${SRC_ROOT}\**\*.hpp
+            ${SRC_ROOT}\kiwano*\**\*.h, ${SRC_ROOT}\kiwano*\**\*.hpp,
+            ${SRC_ROOT}\3rd-party\**\*.h, ${SRC_ROOT}\3rd-party\**\*.hpp,
         };
 
         // third patry
-        bin: { ${SRC_ROOT}\3rd-party\**\*.dll };
+        bin: {
+            ${SRC_ROOT}\3rd-party\**\*.dll
+        };
 
         ("v140,v141,v142", "Win32", "Debug") => {
             [${0},${1},${2}] {
@@ -135,4 +137,4 @@ nuget {
         //    Defines += HAS_MyLib;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/kiwano-imgui/imgui_impl/imgui_impl_dx10.h b/src/kiwano-imgui/imgui_impl/imgui_impl_dx10.h
index 7fd26e53..8546325d 100644
--- a/src/kiwano-imgui/imgui_impl/imgui_impl_dx10.h
+++ b/src/kiwano-imgui/imgui_impl/imgui_impl_dx10.h
@@ -1,7 +1,7 @@
 // dear imgui: Renderer for Kiwano (DirectX10)
 
 #pragma once
-#include <3rd-party/imgui/imgui.h>
+#include <imgui/imgui.h>
 
 #ifndef KGE_DOXYGEN_DO_NOT_INCLUDE
 
diff --git a/src/kiwano-imgui/imgui_impl/imgui_impl_dx11.h b/src/kiwano-imgui/imgui_impl/imgui_impl_dx11.h
index e15f79d1..1ee11238 100644
--- a/src/kiwano-imgui/imgui_impl/imgui_impl_dx11.h
+++ b/src/kiwano-imgui/imgui_impl/imgui_impl_dx11.h
@@ -1,7 +1,7 @@
 // dear imgui: Renderer for Kiwano (DirectX11)
 
 #pragma once
-#include <3rd-party/imgui/imgui.h>
+#include <imgui/imgui.h>
 
 #ifndef KGE_DOXYGEN_DO_NOT_INCLUDE
 
diff --git a/src/kiwano-imgui/kiwano-imgui.h b/src/kiwano-imgui/kiwano-imgui.h
index 637b9614..6f8a1ab2 100644
--- a/src/kiwano-imgui/kiwano-imgui.h
+++ b/src/kiwano-imgui/kiwano-imgui.h
@@ -24,4 +24,4 @@
 #include <kiwano-imgui/ImGuiModule.h>
 
 // ImGui
-#include <3rd-party/imgui/imgui.h>
+#include <imgui/imgui.h>
diff --git a/src/kiwano-network/HttpModule.cpp b/src/kiwano-network/HttpModule.cpp
index 6acd609d..6b3865e2 100644
--- a/src/kiwano-network/HttpModule.cpp
+++ b/src/kiwano-network/HttpModule.cpp
@@ -25,7 +25,7 @@
 #include <kiwano-network/HttpRequest.h>
 #include <kiwano-network/HttpResponse.hpp>
 #include <kiwano-network/HttpModule.h>
-#include <3rd-party/curl/curl.h>  // CURL
+#include <curl/curl.h>  // CURL
 
 namespace
 {
diff --git a/src/kiwano-physics/Global.h b/src/kiwano-physics/Global.h
index abbd66b0..55d355bd 100644
--- a/src/kiwano-physics/Global.h
+++ b/src/kiwano-physics/Global.h
@@ -22,7 +22,7 @@
 #include <kiwano/kiwano.h>
 
 // Box2D
-#include <3rd-party/Box2D/Box2D.h>
+#include <Box2D/Box2D.h>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/Json.h b/src/kiwano/core/Json.h
index dbc20ff6..b526a3d2 100644
--- a/src/kiwano/core/Json.h
+++ b/src/kiwano/core/Json.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Common.h>
-#include <3rd-party/nlohmann/json.hpp>
+#include <nlohmann/json.hpp>
 
 namespace kiwano
 {
diff --git a/src/kiwano/core/Xml.h b/src/kiwano/core/Xml.h
index b81e7046..69e73820 100644
--- a/src/kiwano/core/Xml.h
+++ b/src/kiwano/core/Xml.h
@@ -20,7 +20,7 @@
 
 #pragma once
 #include <kiwano/core/Common.h>
-#include <3rd-party/pugixml/pugixml.hpp>
+#include <pugixml/pugixml.hpp>
 
 namespace kiwano
 {
diff --git a/src/kiwano/render/DirectX/D3D10DeviceResources.h b/src/kiwano/render/DirectX/D3D10DeviceResources.h
index e13958d6..7ea02e61 100644
--- a/src/kiwano/render/DirectX/D3D10DeviceResources.h
+++ b/src/kiwano/render/DirectX/D3D10DeviceResources.h
@@ -37,26 +37,31 @@ public:
         KGE_ASSERT(device_);
         return device_.Get();
     }
+
     inline ID3D10RenderTargetView* GetRenderTargetView()
     {
         KGE_ASSERT(rt_view_);
         return rt_view_.Get();
     }
+
     inline ID3D10DepthStencilView* GetDepthStencilView()
     {
         KGE_ASSERT(ds_view_);
         return ds_view_.Get();
     }
+
     inline IDXGIFactory* GetDXGIFactory()
     {
         KGE_ASSERT(dxgi_factory_);
         return dxgi_factory_.Get();
     }
+
     inline IDXGIDevice* GetDXGIDevice()
     {
         KGE_ASSERT(dxgi_device_);
         return dxgi_device_.Get();
     }
+
     inline IDXGISwapChain* GetDXGISwapChain()
     {
         KGE_ASSERT(dxgi_swap_chain_);
diff --git a/src/kiwano/render/DirectX/D3D11DeviceResources.h b/src/kiwano/render/DirectX/D3D11DeviceResources.h
index 29a1b36a..1cb12daf 100644
--- a/src/kiwano/render/DirectX/D3D11DeviceResources.h
+++ b/src/kiwano/render/DirectX/D3D11DeviceResources.h
@@ -37,31 +37,37 @@ public:
         KGE_ASSERT(device_);
         return device_.Get();
     }
+
     inline ID3D11DeviceContext* GetDeviceContext()
     {
         KGE_ASSERT(device_context_);
         return device_context_.Get();
     }
+
     inline ID3D11RenderTargetView* GetRenderTargetView()
     {
         KGE_ASSERT(rt_view_);
         return rt_view_.Get();
     }
+
     inline ID3D11DepthStencilView* GetDepthStencilView()
     {
         KGE_ASSERT(ds_view_);
         return ds_view_.Get();
     }
+
     inline IDXGIFactory* GetDXGIFactory()
     {
         KGE_ASSERT(dxgi_factory_);
         return dxgi_factory_.Get();
     }
+
     inline IDXGIDevice* GetDXGIDevice()
     {
         KGE_ASSERT(dxgi_device_);
         return dxgi_device_.Get();
     }
+
     inline IDXGISwapChain* GetDXGISwapChain()
     {
         KGE_ASSERT(dxgi_swap_chain_);