Change extension folder structure to reduce file name conflicts (#1647)

* Restructure extension folder structure to reduce conflicts with project source files * Do not include SDFGen headers for Android builds * Ensure correct paths are included for the relevant targets * ImGui is not be enabled for WinUWP, tvOS and iOS * Fix LUA auto binding generator to work with updated extension folder structure * Fix path and linker issues for yasio when using prebuilt option Set correct paths to extensions for prebuilt option
axmolengine · Feb 3, 2024 · 9f8962d · 9f8962d
1 parent ba760bb
commit 9f8962d
Show file tree

Hide file tree

Showing 915 changed files with 1,523 additions and 1,443 deletions.
diff --git a/cmake/Modules/AXLinkHelpers.cmake b/cmake/Modules/AXLinkHelpers.cmake
@@ -90,16 +90,15 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
         PRIVATE ${AX_ROOT_DIR}/thirdparty/lua/plainlua
         PRIVATE ${AX_ROOT_DIR}/thirdparty/lua/tolua/.
         PRIVATE ${AX_ROOT_DIR}/thirdparty/lua/lua-cjson/.
-        PRIVATE ${AX_ROOT_DIR}/extensions/cocostudio
-        PRIVATE ${AX_ROOT_DIR}/extensions/spine/runtime/include
-        PRIVATE ${AX_ROOT_DIR}/extensions/fairygui
-        PRIVATE ${AX_ROOT_DIR}/extensions/GUI
         PRIVATE ${AX_ROOT_DIR}/thirdparty/zlib/_d/include
         PRIVATE ${AX_ROOT_DIR}/thirdparty/jpeg-turbo/_d/include
         PRIVATE ${AX_ROOT_DIR}/thirdparty/openssl/_d/include
         PRIVATE ${AX_ROOT_DIR}/thirdparty/curl/_d/include
+        PRIVATE ${AX_ROOT_DIR}/thirdparty/yasio
     )
 
+
+
     SET (CONFIGURATION_SUBFOLDER "")
     target_link_directories(${APP_NAME}
         PRIVATE ${AX_ROOT_DIR}/thirdparty/openssl/_d/lib/${PLATFORM_NAME}/${ARCH_ALIAS}
@@ -140,44 +139,80 @@ function(ax_link_cxx_prebuilt APP_NAME AX_ROOT_DIR AX_PREBUILT_DIR)
         llhttp
         simdjson
         physics-nodes
+        yasio
     )
 
     if (AX_ENABLE_EXT_DRAGONBONES)
         list(APPEND LIBS "cocostudio")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/DragonBones/src
+        )          
     endif()
 
     if(AX_ENABLE_EXT_COCOSTUDIO)
         list(APPEND LIBS "DragonBones")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/cocostudio/src
+        )          
     endif()
 
     if(AX_ENABLE_EXT_ASSETMANAGER)
         list(APPEND LIBS "assets-manager")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/assets-manager/src
+        )          
     endif()
 
     if(AX_ENABLE_EXT_PARTICLE3D)
         list(APPEND LIBS "particle3d")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/Particle3D/src
+        )         
     endif()
 
     if(AX_ENABLE_EXT_SPINE)
         list(APPEND LIBS "spine")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/spine/runtime/include
+            PRIVATE ${AX_ROOT_DIR}/extensions/spine/src
+        )
     endif()
 
     if (AX_ENABLE_EXT_IMGUI)
         list(APPEND LIBS "ImGui")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/ImGui/src
+            PRIVATE ${AX_ROOT_DIR}/extensions/ImGui/src/ImGui/imgui
+        )
     endif()
 
 	if (AX_ENABLE_EXT_INSPECTOR)
         list(APPEND LIBS "Inspector")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/Inspector/src
+        )        
     endif()
 
     if (AX_ENABLE_EXT_SDFGEN)
         list(APPEND LIBS "SDFGen")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/SDFGen/src
+        )         
     endif()
 
 	if (AX_ENABLE_EXT_DRAWNODEEX)
         list(APPEND LIBS "DrawNodeEx")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/DrawNodeEx/src
+        )         
     endif()
 
+    if (AX_ENABLE_EXT_GUI)
+        list(APPEND LIBS "GUI")
+        target_include_directories(${APP_NAME}        
+            PRIVATE ${AX_ROOT_DIR}/extensions/GUI/src
+        )         
+    endif()
 
     if (WINDOWS)
         target_link_libraries(${APP_NAME}

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -309,12 +309,12 @@ use_ax_depend(${_AX_CORE_LIB})
 target_include_directories(${_AX_CORE_LIB}
     PUBLIC ${_AX_ROOT}
     PUBLIC ${_AX_ROOT}/thirdparty
-    PUBLIC ${_AX_ROOT}/extensions
+    PUBLIC ${_AX_ROOT}/extensions/scripting
     PUBLIC ${_AX_ROOT}/core
     PUBLIC ${_AX_ROOT}/core/platform
 
     INTERFACE ${_AX_ROOT}/thirdparty
-    INTERFACE ${_AX_ROOT}/extensions
+    INTERFACE ${_AX_ROOT}/extensions/scripting
     INTERFACE ${_AX_ROOT}/core/base
     INTERFACE ${_AX_ROOT}/core/audio
     INTERFACE ${_AX_ROOT}/core/platform/${PLATFORM_NAME}

diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt
@@ -68,7 +68,10 @@ if(AX_ENABLE_EXT_FAIRYGUI)
   if(BUILD_SHARED_LIBS)
     target_link_libraries(fairygui spine)
   else()
-    target_include_directories(fairygui PUBLIC ${CMAKE_CURRENT_LIST_DIR}/spine/runtime/include)
+    target_include_directories(fairygui 
+        PUBLIC ${CMAKE_CURRENT_LIST_DIR}/spine/runtime/include
+        PUBLIC ${CMAKE_CURRENT_LIST_DIR}/spine/src
+    )
   endif()
 endif()
 
@@ -77,11 +80,11 @@ if(AX_ENABLE_EXT_IMGUI)
   option(AX_ENABLE_EXT_INSPECTOR "Enable extension Inspector" ON)
   if(AX_ENABLE_EXT_INSPECTOR)
       add_subdirectory(Inspector)
-      target_include_directories(Inspector PUBLIC ${CMAKE_CURRENT_LIST_DIR}/ImGui)
+      target_include_directories(Inspector PUBLIC ${CMAKE_CURRENT_LIST_DIR}/ImGui/src/ImGui)
   endif()
   if (AX_ENABLE_EXT_SDFGEN)
       add_subdirectory(SDFGen)
-      target_include_directories(SDFGen PUBLIC ${CMAKE_CURRENT_LIST_DIR}/ImGui)
+      target_include_directories(SDFGen PUBLIC ${CMAKE_CURRENT_LIST_DIR}/ImGui/src/ImGui)
   endif()
 endif()
 
@@ -92,13 +95,19 @@ if(AX_ENABLE_EXT_COCOSTUDIO)
     if(BUILD_SHARED_LIBS)
       target_link_libraries(cocostudio spine particle3d)
     else()
-      target_include_directories(cocostudio PUBLIC ${CMAKE_CURRENT_LIST_DIR}/spine/runtime/include)
+      target_include_directories(cocostudio 
+        PUBLIC ${CMAKE_CURRENT_LIST_DIR}/spine/runtime/include
+        PUBLIC ${CMAKE_CURRENT_LIST_DIR}/spine/src
+        PUBLIC ${CMAKE_CURRENT_LIST_DIR}/Particle3D/src
+      )
     endif()
   endif()
   if(AX_ENABLE_EXT_DRAGONBONES)
     target_compile_definitions(cocostudio PRIVATE AX_ENABLE_EXT_DRAGONBONES=1)
     if(BUILD_SHARED_LIBS)
       target_link_libraries(cocostudio DragonBones)
+    else()
+      target_include_directories(cocostudio PUBLIC ${CMAKE_CURRENT_LIST_DIR}/DragonBones/src)
     endif()
   endif()
 endif()

diff --git a/extensions/DragonBones/CMakeLists.txt b/extensions/DragonBones/CMakeLists.txt
@@ -1,7 +1,8 @@
 set(target_name DragonBones)
 
-FILE(GLOB_RECURSE DRAGONBONES_SOURCES ./*.h;./*.cpp)
+FILE(GLOB_RECURSE DRAGONBONES_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp)
 
 add_library(${target_name} STATIC ${DRAGONBONES_SOURCES})
+target_include_directories(${target_name} PUBLIC src)
 
 setup_ax_extension_config(${target_name})
diff --git a/extensions/DragonBones/CCArmatureDisplay.cpp → ...nes/src/DragonBones/CCArmatureDisplay.cpp b/extensions/DragonBones/CCArmatureDisplay.cpp → ...nes/src/DragonBones/CCArmatureDisplay.cpp
diff --git a/extensions/DragonBones/CCArmatureDisplay.h → ...Bones/src/DragonBones/CCArmatureDisplay.h b/extensions/DragonBones/CCArmatureDisplay.h → ...Bones/src/DragonBones/CCArmatureDisplay.h
diff --git a/...nsions/DragonBones/CCDragonBonesHeaders.h → ...es/src/DragonBones/CCDragonBonesHeaders.h b/...nsions/DragonBones/CCDragonBonesHeaders.h → ...es/src/DragonBones/CCDragonBonesHeaders.h
diff --git a/extensions/DragonBones/CCFactory.cpp → ...DragonBones/src/DragonBones/CCFactory.cpp b/extensions/DragonBones/CCFactory.cpp → ...DragonBones/src/DragonBones/CCFactory.cpp
diff --git a/extensions/DragonBones/CCFactory.h → ...s/DragonBones/src/DragonBones/CCFactory.h b/extensions/DragonBones/CCFactory.h → ...s/DragonBones/src/DragonBones/CCFactory.h
diff --git a/extensions/DragonBones/CCSlot.cpp → ...ns/DragonBones/src/DragonBones/CCSlot.cpp b/extensions/DragonBones/CCSlot.cpp → ...ns/DragonBones/src/DragonBones/CCSlot.cpp
diff --git a/extensions/DragonBones/CCSlot.h → ...ions/DragonBones/src/DragonBones/CCSlot.h b/extensions/DragonBones/CCSlot.h → ...ions/DragonBones/src/DragonBones/CCSlot.h
diff --git a/...nsions/DragonBones/CCTextureAtlasData.cpp → ...es/src/DragonBones/CCTextureAtlasData.cpp b/...nsions/DragonBones/CCTextureAtlasData.cpp → ...es/src/DragonBones/CCTextureAtlasData.cpp
diff --git a/extensions/DragonBones/CCTextureAtlasData.h → ...ones/src/DragonBones/CCTextureAtlasData.h b/extensions/DragonBones/CCTextureAtlasData.h → ...ones/src/DragonBones/CCTextureAtlasData.h
diff --git a/extensions/DragonBones/DragonBonesHeaders.h → ...ones/src/DragonBones/DragonBonesHeaders.h b/extensions/DragonBones/DragonBonesHeaders.h → ...ones/src/DragonBones/DragonBonesHeaders.h
diff --git a/...sions/DragonBones/animation/Animation.cpp → ...s/src/DragonBones/animation/Animation.cpp b/...sions/DragonBones/animation/Animation.cpp → ...s/src/DragonBones/animation/Animation.cpp
diff --git a/extensions/DragonBones/animation/Animation.h → ...nes/src/DragonBones/animation/Animation.h b/extensions/DragonBones/animation/Animation.h → ...nes/src/DragonBones/animation/Animation.h
diff --git a/.../DragonBones/animation/AnimationState.cpp → .../DragonBones/animation/AnimationState.cpp b/.../DragonBones/animation/AnimationState.cpp → .../DragonBones/animation/AnimationState.cpp
diff --git a/...ns/DragonBones/animation/AnimationState.h → ...rc/DragonBones/animation/AnimationState.h b/...ns/DragonBones/animation/AnimationState.h → ...rc/DragonBones/animation/AnimationState.h
diff --git a/...agonBones/animation/BaseTimelineState.cpp → ...agonBones/animation/BaseTimelineState.cpp b/...agonBones/animation/BaseTimelineState.cpp → ...agonBones/animation/BaseTimelineState.cpp
diff --git a/...DragonBones/animation/BaseTimelineState.h → ...DragonBones/animation/BaseTimelineState.h b/...DragonBones/animation/BaseTimelineState.h → ...DragonBones/animation/BaseTimelineState.h
diff --git a/...sions/DragonBones/animation/IAnimatable.h → ...s/src/DragonBones/animation/IAnimatable.h b/...sions/DragonBones/animation/IAnimatable.h → ...s/src/DragonBones/animation/IAnimatable.h
diff --git a/...s/DragonBones/animation/TimelineState.cpp → ...c/DragonBones/animation/TimelineState.cpp b/...s/DragonBones/animation/TimelineState.cpp → ...c/DragonBones/animation/TimelineState.cpp
diff --git a/...ons/DragonBones/animation/TimelineState.h → ...src/DragonBones/animation/TimelineState.h b/...ons/DragonBones/animation/TimelineState.h → ...src/DragonBones/animation/TimelineState.h
diff --git a/...ions/DragonBones/animation/WorldClock.cpp → .../src/DragonBones/animation/WorldClock.cpp b/...ions/DragonBones/animation/WorldClock.cpp → .../src/DragonBones/animation/WorldClock.cpp
diff --git a/...nsions/DragonBones/animation/WorldClock.h → ...es/src/DragonBones/animation/WorldClock.h b/...nsions/DragonBones/animation/WorldClock.h → ...es/src/DragonBones/animation/WorldClock.h
diff --git a/extensions/DragonBones/armature/Armature.cpp → ...nes/src/DragonBones/armature/Armature.cpp b/extensions/DragonBones/armature/Armature.cpp → ...nes/src/DragonBones/armature/Armature.cpp
diff --git a/extensions/DragonBones/armature/Armature.h → ...Bones/src/DragonBones/armature/Armature.h b/extensions/DragonBones/armature/Armature.h → ...Bones/src/DragonBones/armature/Armature.h
diff --git a/extensions/DragonBones/armature/Bone.cpp → ...onBones/src/DragonBones/armature/Bone.cpp b/extensions/DragonBones/armature/Bone.cpp → ...onBones/src/DragonBones/armature/Bone.cpp
diff --git a/extensions/DragonBones/armature/Bone.h → ...agonBones/src/DragonBones/armature/Bone.h b/extensions/DragonBones/armature/Bone.h → ...agonBones/src/DragonBones/armature/Bone.h
diff --git a/...sions/DragonBones/armature/Constraint.cpp → ...s/src/DragonBones/armature/Constraint.cpp b/...sions/DragonBones/armature/Constraint.cpp → ...s/src/DragonBones/armature/Constraint.cpp
diff --git a/extensions/DragonBones/armature/Constraint.h → ...nes/src/DragonBones/armature/Constraint.h b/extensions/DragonBones/armature/Constraint.h → ...nes/src/DragonBones/armature/Constraint.h
diff --git a/...s/DragonBones/armature/DeformVertices.cpp → ...c/DragonBones/armature/DeformVertices.cpp b/...s/DragonBones/armature/DeformVertices.cpp → ...c/DragonBones/armature/DeformVertices.cpp
diff --git a/...ons/DragonBones/armature/DeformVertices.h → ...src/DragonBones/armature/DeformVertices.h b/...ons/DragonBones/armature/DeformVertices.h → ...src/DragonBones/armature/DeformVertices.h
diff --git a/...ons/DragonBones/armature/IArmatureProxy.h → ...src/DragonBones/armature/IArmatureProxy.h b/...ons/DragonBones/armature/IArmatureProxy.h → ...src/DragonBones/armature/IArmatureProxy.h
diff --git a/extensions/DragonBones/armature/Slot.cpp → ...onBones/src/DragonBones/armature/Slot.cpp b/extensions/DragonBones/armature/Slot.cpp → ...onBones/src/DragonBones/armature/Slot.cpp
diff --git a/extensions/DragonBones/armature/Slot.h → ...agonBones/src/DragonBones/armature/Slot.h b/extensions/DragonBones/armature/Slot.h → ...agonBones/src/DragonBones/armature/Slot.h
diff --git a/.../DragonBones/armature/TransformObject.cpp → .../DragonBones/armature/TransformObject.cpp b/.../DragonBones/armature/TransformObject.cpp → .../DragonBones/armature/TransformObject.cpp
diff --git a/...ns/DragonBones/armature/TransformObject.h → ...rc/DragonBones/armature/TransformObject.h b/...ns/DragonBones/armature/TransformObject.h → ...rc/DragonBones/armature/TransformObject.h
diff --git a/extensions/DragonBones/core/BaseObject.cpp → ...Bones/src/DragonBones/core/BaseObject.cpp b/extensions/DragonBones/core/BaseObject.cpp → ...Bones/src/DragonBones/core/BaseObject.cpp
diff --git a/extensions/DragonBones/core/BaseObject.h → ...onBones/src/DragonBones/core/BaseObject.h b/extensions/DragonBones/core/BaseObject.h → ...onBones/src/DragonBones/core/BaseObject.h
diff --git a/extensions/DragonBones/core/DragonBones.cpp → ...ones/src/DragonBones/core/DragonBones.cpp b/extensions/DragonBones/core/DragonBones.cpp → ...ones/src/DragonBones/core/DragonBones.cpp
diff --git a/extensions/DragonBones/core/DragonBones.h → ...nBones/src/DragonBones/core/DragonBones.h b/extensions/DragonBones/core/DragonBones.h → ...nBones/src/DragonBones/core/DragonBones.h
diff --git a/extensions/DragonBones/event/EventObject.cpp → ...nes/src/DragonBones/event/EventObject.cpp b/extensions/DragonBones/event/EventObject.cpp → ...nes/src/DragonBones/event/EventObject.cpp
diff --git a/extensions/DragonBones/event/EventObject.h → ...Bones/src/DragonBones/event/EventObject.h b/extensions/DragonBones/event/EventObject.h → ...Bones/src/DragonBones/event/EventObject.h
diff --git a/...ions/DragonBones/event/IEventDispatcher.h → .../src/DragonBones/event/IEventDispatcher.h b/...ions/DragonBones/event/IEventDispatcher.h → .../src/DragonBones/event/IEventDispatcher.h
diff --git a/...sions/DragonBones/factory/BaseFactory.cpp → ...s/src/DragonBones/factory/BaseFactory.cpp b/...sions/DragonBones/factory/BaseFactory.cpp → ...s/src/DragonBones/factory/BaseFactory.cpp
diff --git a/extensions/DragonBones/factory/BaseFactory.h → ...nes/src/DragonBones/factory/BaseFactory.h b/extensions/DragonBones/factory/BaseFactory.h → ...nes/src/DragonBones/factory/BaseFactory.h
diff --git a/extensions/DragonBones/geom/ColorTransform.h → ...nes/src/DragonBones/geom/ColorTransform.h b/extensions/DragonBones/geom/ColorTransform.h → ...nes/src/DragonBones/geom/ColorTransform.h
diff --git a/extensions/DragonBones/geom/Matrix.h → ...DragonBones/src/DragonBones/geom/Matrix.h b/extensions/DragonBones/geom/Matrix.h → ...DragonBones/src/DragonBones/geom/Matrix.h
diff --git a/extensions/DragonBones/geom/Point.cpp → ...ragonBones/src/DragonBones/geom/Point.cpp b/extensions/DragonBones/geom/Point.cpp → ...ragonBones/src/DragonBones/geom/Point.cpp
diff --git a/extensions/DragonBones/geom/Point.h → .../DragonBones/src/DragonBones/geom/Point.h b/extensions/DragonBones/geom/Point.h → .../DragonBones/src/DragonBones/geom/Point.h
diff --git a/extensions/DragonBones/geom/Rectangle.h → ...gonBones/src/DragonBones/geom/Rectangle.h b/extensions/DragonBones/geom/Rectangle.h → ...gonBones/src/DragonBones/geom/Rectangle.h
diff --git a/extensions/DragonBones/geom/Transform.cpp → ...nBones/src/DragonBones/geom/Transform.cpp b/extensions/DragonBones/geom/Transform.cpp → ...nBones/src/DragonBones/geom/Transform.cpp
diff --git a/extensions/DragonBones/geom/Transform.h → ...gonBones/src/DragonBones/geom/Transform.h b/extensions/DragonBones/geom/Transform.h → ...gonBones/src/DragonBones/geom/Transform.h
diff --git a/...ons/DragonBones/model/AnimationConfig.cpp → ...src/DragonBones/model/AnimationConfig.cpp b/...ons/DragonBones/model/AnimationConfig.cpp → ...src/DragonBones/model/AnimationConfig.cpp
diff --git a/...sions/DragonBones/model/AnimationConfig.h → ...s/src/DragonBones/model/AnimationConfig.h b/...sions/DragonBones/model/AnimationConfig.h → ...s/src/DragonBones/model/AnimationConfig.h
diff --git a/...sions/DragonBones/model/AnimationData.cpp → ...s/src/DragonBones/model/AnimationData.cpp b/...sions/DragonBones/model/AnimationData.cpp → ...s/src/DragonBones/model/AnimationData.cpp
diff --git a/extensions/DragonBones/model/AnimationData.h → ...nes/src/DragonBones/model/AnimationData.h b/extensions/DragonBones/model/AnimationData.h → ...nes/src/DragonBones/model/AnimationData.h
diff --git a/...nsions/DragonBones/model/ArmatureData.cpp → ...es/src/DragonBones/model/ArmatureData.cpp b/...nsions/DragonBones/model/ArmatureData.cpp → ...es/src/DragonBones/model/ArmatureData.cpp
diff --git a/extensions/DragonBones/model/ArmatureData.h → ...ones/src/DragonBones/model/ArmatureData.h b/extensions/DragonBones/model/ArmatureData.h → ...ones/src/DragonBones/model/ArmatureData.h
diff --git a/...ons/DragonBones/model/BoundingBoxData.cpp → ...src/DragonBones/model/BoundingBoxData.cpp b/...ons/DragonBones/model/BoundingBoxData.cpp → ...src/DragonBones/model/BoundingBoxData.cpp
diff --git a/...sions/DragonBones/model/BoundingBoxData.h → ...s/src/DragonBones/model/BoundingBoxData.h b/...sions/DragonBones/model/BoundingBoxData.h → ...s/src/DragonBones/model/BoundingBoxData.h
diff --git a/extensions/DragonBones/model/CanvasData.cpp → ...ones/src/DragonBones/model/CanvasData.cpp b/extensions/DragonBones/model/CanvasData.cpp → ...ones/src/DragonBones/model/CanvasData.cpp
diff --git a/extensions/DragonBones/model/CanvasData.h → ...nBones/src/DragonBones/model/CanvasData.h b/extensions/DragonBones/model/CanvasData.h → ...nBones/src/DragonBones/model/CanvasData.h
diff --git a/...ions/DragonBones/model/ConstraintData.cpp → .../src/DragonBones/model/ConstraintData.cpp b/...ions/DragonBones/model/ConstraintData.cpp → .../src/DragonBones/model/ConstraintData.cpp
diff --git a/...nsions/DragonBones/model/ConstraintData.h → ...es/src/DragonBones/model/ConstraintData.h b/...nsions/DragonBones/model/ConstraintData.h → ...es/src/DragonBones/model/ConstraintData.h
diff --git a/extensions/DragonBones/model/DisplayData.cpp → ...nes/src/DragonBones/model/DisplayData.cpp b/extensions/DragonBones/model/DisplayData.cpp → ...nes/src/DragonBones/model/DisplayData.cpp
diff --git a/extensions/DragonBones/model/DisplayData.h → ...Bones/src/DragonBones/model/DisplayData.h b/extensions/DragonBones/model/DisplayData.h → ...Bones/src/DragonBones/model/DisplayData.h
diff --git a/...ons/DragonBones/model/DragonBonesData.cpp → ...src/DragonBones/model/DragonBonesData.cpp b/...ons/DragonBones/model/DragonBonesData.cpp → ...src/DragonBones/model/DragonBonesData.cpp
diff --git a/...sions/DragonBones/model/DragonBonesData.h → ...s/src/DragonBones/model/DragonBonesData.h b/...sions/DragonBones/model/DragonBonesData.h → ...s/src/DragonBones/model/DragonBonesData.h
diff --git a/extensions/DragonBones/model/SkinData.cpp → ...nBones/src/DragonBones/model/SkinData.cpp b/extensions/DragonBones/model/SkinData.cpp → ...nBones/src/DragonBones/model/SkinData.cpp
diff --git a/extensions/DragonBones/model/SkinData.h → ...gonBones/src/DragonBones/model/SkinData.h b/extensions/DragonBones/model/SkinData.h → ...gonBones/src/DragonBones/model/SkinData.h
diff --git a/...ns/DragonBones/model/TextureAtlasData.cpp → ...rc/DragonBones/model/TextureAtlasData.cpp b/...ns/DragonBones/model/TextureAtlasData.cpp → ...rc/DragonBones/model/TextureAtlasData.cpp
diff --git a/...ions/DragonBones/model/TextureAtlasData.h → .../src/DragonBones/model/TextureAtlasData.h b/...ions/DragonBones/model/TextureAtlasData.h → .../src/DragonBones/model/TextureAtlasData.h
diff --git a/extensions/DragonBones/model/UserData.cpp → ...nBones/src/DragonBones/model/UserData.cpp b/extensions/DragonBones/model/UserData.cpp → ...nBones/src/DragonBones/model/UserData.cpp
diff --git a/extensions/DragonBones/model/UserData.h → ...gonBones/src/DragonBones/model/UserData.h b/extensions/DragonBones/model/UserData.h → ...gonBones/src/DragonBones/model/UserData.h
diff --git a/...s/DragonBones/parser/BinaryDataParser.cpp → ...c/DragonBones/parser/BinaryDataParser.cpp b/...s/DragonBones/parser/BinaryDataParser.cpp → ...c/DragonBones/parser/BinaryDataParser.cpp
diff --git a/...ons/DragonBones/parser/BinaryDataParser.h → ...src/DragonBones/parser/BinaryDataParser.h b/...ons/DragonBones/parser/BinaryDataParser.h → ...src/DragonBones/parser/BinaryDataParser.h
diff --git a/extensions/DragonBones/parser/DataParser.cpp → ...nes/src/DragonBones/parser/DataParser.cpp b/extensions/DragonBones/parser/DataParser.cpp → ...nes/src/DragonBones/parser/DataParser.cpp
diff --git a/extensions/DragonBones/parser/DataParser.h → ...Bones/src/DragonBones/parser/DataParser.h b/extensions/DragonBones/parser/DataParser.h → ...Bones/src/DragonBones/parser/DataParser.h
diff --git a/...ons/DragonBones/parser/JSONDataParser.cpp → ...src/DragonBones/parser/JSONDataParser.cpp b/...ons/DragonBones/parser/JSONDataParser.cpp → ...src/DragonBones/parser/JSONDataParser.cpp
diff --git a/...sions/DragonBones/parser/JSONDataParser.h → ...s/src/DragonBones/parser/JSONDataParser.h b/...sions/DragonBones/parser/JSONDataParser.h → ...s/src/DragonBones/parser/JSONDataParser.h
diff --git a/extensions/DrawNodeEx/CMakeLists.txt b/extensions/DrawNodeEx/CMakeLists.txt
@@ -1,7 +1,8 @@
 set(target_name DrawNodeEx)
 
-FILE(GLOB DRAWNODEEX_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp)
+FILE(GLOB_RECURSE DRAWNODEEX_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp)
 
 add_library(${target_name} ${DRAWNODEEX_SOURCES})
+target_include_directories(${target_name} PUBLIC src)
 
 setup_ax_extension_config(${target_name})
diff --git a/extensions/DrawNodeEx/DrawNodeEx.cpp → .../DrawNodeEx/src/DrawNodeEx/DrawNodeEx.cpp b/extensions/DrawNodeEx/DrawNodeEx.cpp → .../DrawNodeEx/src/DrawNodeEx/DrawNodeEx.cpp
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include "extensions/DrawNodeEx/DrawNodeEx.h"
+#include "DrawNodeEx/DrawNodeEx.h"
 #include <stddef.h>  // offsetof
 #include "base/Types.h"
 #include "base/EventType.h"

diff --git a/extensions/DrawNodeEx/DrawNodeEx.h → ...ns/DrawNodeEx/src/DrawNodeEx/DrawNodeEx.h b/extensions/DrawNodeEx/DrawNodeEx.h → ...ns/DrawNodeEx/src/DrawNodeEx/DrawNodeEx.h
diff --git a/extensions/GUI/CMakeLists.txt b/extensions/GUI/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(target_name GUI)
 
-FILE(GLOB GUI_CONTROL_SOURCES ControlExtension/*.h;ControlExtension/*.cpp)
-FILE(GLOB GUI_SCROLLVIEW_SOURCES ScrollView/*.h;ScrollView/*.cpp)
+FILE(GLOB_RECURSE GUI_CONTROL_SOURCES src/GUI/ControlExtension/*.h;src/GUI/ControlExtension/*.cpp)
+FILE(GLOB_RECURSE GUI_SCROLLVIEW_SOURCES src/GUI/ScrollView/*.h;src/GUI/ScrollView/*.cpp)
 
 SOURCE_GROUP("ControlExtension" FILES ${GUI_CONTROL_SOURCES})
 SOURCE_GROUP("ScrollView" FILES ${GUI_SCROLLVIEW_SOURCES})
@@ -10,6 +10,9 @@ add_library(${target_name}
         ${GUI_CONTROL_SOURCES} 
         ${GUI_SCROLLVIEW_SOURCES})
 
-target_include_directories(${target_name} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+target_include_directories(${target_name} 
+    PUBLIC ${CMAKE_CURRENT_LIST_DIR}/src
+    INTERFACE ${CMAKE_CURRENT_LIST_DIR}/src/GUI
+)
 
 setup_ax_extension_config(${target_name})
diff --git a/extensions/GUI/ControlExtension/Control.cpp → .../GUI/src/GUI/ControlExtension/Control.cpp b/extensions/GUI/ControlExtension/Control.cpp → .../GUI/src/GUI/ControlExtension/Control.cpp
diff --git a/extensions/GUI/ControlExtension/Control.h → ...ns/GUI/src/GUI/ControlExtension/Control.h b/extensions/GUI/ControlExtension/Control.h → ...ns/GUI/src/GUI/ControlExtension/Control.h
diff --git a/...ns/GUI/ControlExtension/ControlButton.cpp → ...rc/GUI/ControlExtension/ControlButton.cpp b/...ns/GUI/ControlExtension/ControlButton.cpp → ...rc/GUI/ControlExtension/ControlButton.cpp
diff --git a/...ions/GUI/ControlExtension/ControlButton.h → .../src/GUI/ControlExtension/ControlButton.h b/...ions/GUI/ControlExtension/ControlButton.h → .../src/GUI/ControlExtension/ControlButton.h
diff --git a/.../ControlExtension/ControlColourPicker.cpp → .../ControlExtension/ControlColourPicker.cpp b/.../ControlExtension/ControlColourPicker.cpp → .../ControlExtension/ControlColourPicker.cpp
diff --git a/...UI/ControlExtension/ControlColourPicker.h → ...UI/ControlExtension/ControlColourPicker.h b/...UI/ControlExtension/ControlColourPicker.h → ...UI/ControlExtension/ControlColourPicker.h
diff --git a/.../GUI/ControlExtension/ControlExtensions.h → .../GUI/ControlExtension/ControlExtensions.h b/.../GUI/ControlExtension/ControlExtensions.h → .../GUI/ControlExtension/ControlExtensions.h
diff --git a/...GUI/ControlExtension/ControlHuePicker.cpp → ...GUI/ControlExtension/ControlHuePicker.cpp b/...GUI/ControlExtension/ControlHuePicker.cpp → ...GUI/ControlExtension/ControlHuePicker.cpp
diff --git a/...s/GUI/ControlExtension/ControlHuePicker.h → ...c/GUI/ControlExtension/ControlHuePicker.h b/...s/GUI/ControlExtension/ControlHuePicker.h → ...c/GUI/ControlExtension/ControlHuePicker.h
diff --git a/...ControlExtension/ControlPotentiometer.cpp → ...ControlExtension/ControlPotentiometer.cpp b/...ControlExtension/ControlPotentiometer.cpp → ...ControlExtension/ControlPotentiometer.cpp
diff --git a/...I/ControlExtension/ControlPotentiometer.h → ...I/ControlExtension/ControlPotentiometer.h b/...I/ControlExtension/ControlPotentiometer.h → ...I/ControlExtension/ControlPotentiometer.h
diff --git a/...ion/ControlSaturationBrightnessPicker.cpp → ...ion/ControlSaturationBrightnessPicker.cpp b/...ion/ControlSaturationBrightnessPicker.cpp → ...ion/ControlSaturationBrightnessPicker.cpp
diff --git a/...nsion/ControlSaturationBrightnessPicker.h → ...nsion/ControlSaturationBrightnessPicker.h b/...nsion/ControlSaturationBrightnessPicker.h → ...nsion/ControlSaturationBrightnessPicker.h
diff --git a/...ns/GUI/ControlExtension/ControlSlider.cpp → ...rc/GUI/ControlExtension/ControlSlider.cpp b/...ns/GUI/ControlExtension/ControlSlider.cpp → ...rc/GUI/ControlExtension/ControlSlider.cpp
diff --git a/...ions/GUI/ControlExtension/ControlSlider.h → .../src/GUI/ControlExtension/ControlSlider.h b/...ions/GUI/ControlExtension/ControlSlider.h → .../src/GUI/ControlExtension/ControlSlider.h
diff --git a/...s/GUI/ControlExtension/ControlStepper.cpp → ...c/GUI/ControlExtension/ControlStepper.cpp b/...s/GUI/ControlExtension/ControlStepper.cpp → ...c/GUI/ControlExtension/ControlStepper.cpp
diff --git a/...ons/GUI/ControlExtension/ControlStepper.h → ...src/GUI/ControlExtension/ControlStepper.h b/...ons/GUI/ControlExtension/ControlStepper.h → ...src/GUI/ControlExtension/ControlStepper.h
diff --git a/...ns/GUI/ControlExtension/ControlSwitch.cpp → ...rc/GUI/ControlExtension/ControlSwitch.cpp b/...ns/GUI/ControlExtension/ControlSwitch.cpp → ...rc/GUI/ControlExtension/ControlSwitch.cpp
diff --git a/...ions/GUI/ControlExtension/ControlSwitch.h → .../src/GUI/ControlExtension/ControlSwitch.h b/...ions/GUI/ControlExtension/ControlSwitch.h → .../src/GUI/ControlExtension/ControlSwitch.h
diff --git a/...ons/GUI/ControlExtension/ControlUtils.cpp → ...src/GUI/ControlExtension/ControlUtils.cpp b/...ons/GUI/ControlExtension/ControlUtils.cpp → ...src/GUI/ControlExtension/ControlUtils.cpp
diff --git a/...sions/GUI/ControlExtension/ControlUtils.h → ...I/src/GUI/ControlExtension/ControlUtils.h b/...sions/GUI/ControlExtension/ControlUtils.h → ...I/src/GUI/ControlExtension/ControlUtils.h
diff --git a/...sions/GUI/ControlExtension/Invocation.cpp → ...I/src/GUI/ControlExtension/Invocation.cpp b/...sions/GUI/ControlExtension/Invocation.cpp → ...I/src/GUI/ControlExtension/Invocation.cpp
diff --git a/extensions/GUI/ControlExtension/Invocation.h → ...GUI/src/GUI/ControlExtension/Invocation.h b/extensions/GUI/ControlExtension/Invocation.h → ...GUI/src/GUI/ControlExtension/Invocation.h
diff --git a/extensions/GUI/ScrollView/ScrollView.cpp → ...ons/GUI/src/GUI/ScrollView/ScrollView.cpp b/extensions/GUI/ScrollView/ScrollView.cpp → ...ons/GUI/src/GUI/ScrollView/ScrollView.cpp
diff --git a/extensions/GUI/ScrollView/ScrollView.h → ...sions/GUI/src/GUI/ScrollView/ScrollView.h b/extensions/GUI/ScrollView/ScrollView.h → ...sions/GUI/src/GUI/ScrollView/ScrollView.h
diff --git a/extensions/GUI/ScrollView/TableView.cpp → ...ions/GUI/src/GUI/ScrollView/TableView.cpp b/extensions/GUI/ScrollView/TableView.cpp → ...ions/GUI/src/GUI/ScrollView/TableView.cpp
diff --git a/extensions/GUI/ScrollView/TableView.h → ...nsions/GUI/src/GUI/ScrollView/TableView.h b/extensions/GUI/ScrollView/TableView.h → ...nsions/GUI/src/GUI/ScrollView/TableView.h
diff --git a/extensions/GUI/ScrollView/TableViewCell.cpp → .../GUI/src/GUI/ScrollView/TableViewCell.cpp b/extensions/GUI/ScrollView/TableViewCell.cpp → .../GUI/src/GUI/ScrollView/TableViewCell.cpp
diff --git a/extensions/GUI/ScrollView/TableViewCell.h → ...ns/GUI/src/GUI/ScrollView/TableViewCell.h b/extensions/GUI/ScrollView/TableViewCell.h → ...ns/GUI/src/GUI/ScrollView/TableViewCell.h
diff --git a/extensions/ImGui/CMakeLists.txt b/extensions/ImGui/CMakeLists.txt
@@ -1,42 +1,42 @@
 set(target_name ImGui)
 
-include_directories(imgui)
+include_directories(src/ImGui/imgui)
 
 set(HEADER
-    ImGuiPresenter.h
+    src/ImGui/ImGuiPresenter.h
     # CCImGuiColorTextEdit.h
-    imgui/imconfig.h
-    imgui/imgui.h
-    imgui/imgui_internal.h
-    imgui/imstb_rectpack.h
-    imgui/imstb_textedit.h
-    imgui/imstb_truetype.h
-    imgui/misc/cpp/imgui_stdlib.h
+    src/ImGui/imgui/imconfig.h
+    src/ImGui/imgui/imgui.h
+    src/ImGui/imgui/imgui_internal.h
+    src/ImGui/imgui/imstb_rectpack.h
+    src/ImGui/imgui/imstb_textedit.h
+    src/ImGui/imgui/imstb_truetype.h
+    src/ImGui/imgui/misc/cpp/imgui_stdlib.h
     #~ imgui_markdown/imgui_markdown.h
     #~ ImGuiColorTextEdit/TextEditor.h
     #~ implot/implot.h
 )
 
 set(SOURCE
-    ImGuiPresenter.cpp
+    src/ImGui/ImGuiPresenter.cpp
     # CCImGuiColorTextEdit.cpp
-    imgui/imgui.cpp
-    imgui/imgui_demo.cpp
-    imgui/imgui_draw.cpp
-    imgui/imgui_widgets.cpp
-    imgui/imgui_tables.cpp
-    imgui/misc/cpp/imgui_stdlib.cpp
+    src/ImGui/imgui/imgui.cpp
+    src/ImGui/imgui/imgui_demo.cpp
+    src/ImGui/imgui/imgui_draw.cpp
+    src/ImGui/imgui/imgui_widgets.cpp
+    src/ImGui/imgui/imgui_tables.cpp
+    src/ImGui/imgui/misc/cpp/imgui_stdlib.cpp
     #~ ImGuiColorTextEdit/TextEditor.cpp
     #~ implot/implot.cpp
     #~ implot/implot_demo.cpp
 )
 
 if(ANDROID)
-    list(APPEND HEADER imgui_impl_ax_android.cpp)
-    list(APPEND SOURCE imgui_impl_ax_android.h)
+    list(APPEND SOURCE src/ImGui/imgui_impl_ax_android.cpp)
+    list(APPEND HEADER src/ImGui/imgui_impl_ax_android.h)
 else()
-    list(APPEND HEADER imgui_impl_ax.cpp)
-    list(APPEND SOURCE imgui_impl_ax.h)
+    list(APPEND SOURCE src/ImGui/imgui_impl_ax.cpp)
+    list(APPEND HEADER src/ImGui/imgui_impl_ax.h)
 endif()
 
 #~ if(AX_ENABLE_EXT_LUA)
@@ -74,6 +74,13 @@ add_library(${target_name} STATIC
         ${HEADER}
         ${SOURCE})
 
+target_include_directories(${target_name} 
+    PUBLIC src
+    PUBLIC src/ImGui/imgui
+
+    INTERFACE src
+    INTERFACE src/ImGui/imgui
+    )
 
 ax_find_shaders(${CMAKE_CURRENT_LIST_DIR}/shaders IMGUI_SHADER_SOURCES)
 ax_target_compile_shaders(${target_name} FILES ${IMGUI_SHADER_SOURCES} CUSTOM)

diff --git a/extensions/ImGui/ImGuiPresenter.cpp → ...nsions/ImGui/src/ImGui/ImGuiPresenter.cpp b/extensions/ImGui/ImGuiPresenter.cpp → ...nsions/ImGui/src/ImGui/ImGuiPresenter.cpp
@@ -5,7 +5,7 @@
 #else
 #    include "imgui_impl_ax.h"
 #endif
-#include "imgui_internal.h"
+#include "imgui/imgui_internal.h"
 
 // TODO: mac metal
 #if defined(AX_USE_GL) && defined(AX_PLATFORM_PC)

diff --git a/extensions/ImGui/ImGuiPresenter.h → extensions/ImGui/src/ImGui/ImGuiPresenter.h b/extensions/ImGui/ImGuiPresenter.h → extensions/ImGui/src/ImGui/ImGuiPresenter.h
@@ -4,7 +4,7 @@
 #include <tuple>
 
 #include "axmol.h"
-#include "ExtensionMacros.h"
+#include "extensions/ExtensionMacros.h"
 
 #include "imgui/imgui.h"
 

diff --git a/extensions/ImGui/LICENSE → extensions/ImGui/src/ImGui/LICENSE b/extensions/ImGui/LICENSE → extensions/ImGui/src/ImGui/LICENSE
diff --git a/extensions/ImGui/README.md → extensions/ImGui/src/ImGui/README.md b/extensions/ImGui/README.md → extensions/ImGui/src/ImGui/README.md
diff --git a/extensions/ImGui/imgui/LICENSE.txt → extensions/ImGui/src/ImGui/imgui/LICENSE.txt b/extensions/ImGui/imgui/LICENSE.txt → extensions/ImGui/src/ImGui/imgui/LICENSE.txt
diff --git a/extensions/ImGui/imgui/imconfig.h → extensions/ImGui/src/ImGui/imgui/imconfig.h b/extensions/ImGui/imgui/imconfig.h → extensions/ImGui/src/ImGui/imgui/imconfig.h
diff --git a/extensions/ImGui/imgui/imgui.cpp → extensions/ImGui/src/ImGui/imgui/imgui.cpp b/extensions/ImGui/imgui/imgui.cpp → extensions/ImGui/src/ImGui/imgui/imgui.cpp
diff --git a/extensions/ImGui/imgui/imgui.h → extensions/ImGui/src/ImGui/imgui/imgui.h b/extensions/ImGui/imgui/imgui.h → extensions/ImGui/src/ImGui/imgui/imgui.h
diff --git a/extensions/ImGui/imgui/imgui_demo.cpp → ...ions/ImGui/src/ImGui/imgui/imgui_demo.cpp b/extensions/ImGui/imgui/imgui_demo.cpp → ...ions/ImGui/src/ImGui/imgui/imgui_demo.cpp
diff --git a/extensions/ImGui/imgui/imgui_draw.cpp → ...ions/ImGui/src/ImGui/imgui/imgui_draw.cpp b/extensions/ImGui/imgui/imgui_draw.cpp → ...ions/ImGui/src/ImGui/imgui/imgui_draw.cpp
diff --git a/extensions/ImGui/imgui/imgui_internal.h → ...ns/ImGui/src/ImGui/imgui/imgui_internal.h b/extensions/ImGui/imgui/imgui_internal.h → ...ns/ImGui/src/ImGui/imgui/imgui_internal.h
diff --git a/extensions/ImGui/imgui/imgui_tables.cpp → ...ns/ImGui/src/ImGui/imgui/imgui_tables.cpp b/extensions/ImGui/imgui/imgui_tables.cpp → ...ns/ImGui/src/ImGui/imgui/imgui_tables.cpp
diff --git a/extensions/ImGui/imgui/imgui_widgets.cpp → ...s/ImGui/src/ImGui/imgui/imgui_widgets.cpp b/extensions/ImGui/imgui/imgui_widgets.cpp → ...s/ImGui/src/ImGui/imgui/imgui_widgets.cpp
diff --git a/extensions/ImGui/imgui/imstb_rectpack.h → ...ns/ImGui/src/ImGui/imgui/imstb_rectpack.h b/extensions/ImGui/imgui/imstb_rectpack.h → ...ns/ImGui/src/ImGui/imgui/imstb_rectpack.h
diff --git a/extensions/ImGui/imgui/imstb_textedit.h → ...ns/ImGui/src/ImGui/imgui/imstb_textedit.h b/extensions/ImGui/imgui/imstb_textedit.h → ...ns/ImGui/src/ImGui/imgui/imstb_textedit.h
diff --git a/extensions/ImGui/imgui/imstb_truetype.h → ...ns/ImGui/src/ImGui/imgui/imstb_truetype.h b/extensions/ImGui/imgui/imstb_truetype.h → ...ns/ImGui/src/ImGui/imgui/imstb_truetype.h
diff --git a/extensions/ImGui/imgui/misc/cpp/README.txt → ...ImGui/src/ImGui/imgui/misc/cpp/README.txt b/extensions/ImGui/imgui/misc/cpp/README.txt → ...ImGui/src/ImGui/imgui/misc/cpp/README.txt
diff --git a/...ons/ImGui/imgui/misc/cpp/imgui_stdlib.cpp → ...src/ImGui/imgui/misc/cpp/imgui_stdlib.cpp b/...ons/ImGui/imgui/misc/cpp/imgui_stdlib.cpp → ...src/ImGui/imgui/misc/cpp/imgui_stdlib.cpp
diff --git a/...sions/ImGui/imgui/misc/cpp/imgui_stdlib.h → ...i/src/ImGui/imgui/misc/cpp/imgui_stdlib.h b/...sions/ImGui/imgui/misc/cpp/imgui_stdlib.h → ...i/src/ImGui/imgui/misc/cpp/imgui_stdlib.h
diff --git a/extensions/ImGui/imgui_impl_ax.cpp → extensions/ImGui/src/ImGui/imgui_impl_ax.cpp b/extensions/ImGui/imgui_impl_ax.cpp → extensions/ImGui/src/ImGui/imgui_impl_ax.cpp
diff --git a/extensions/ImGui/imgui_impl_ax.h → extensions/ImGui/src/ImGui/imgui_impl_ax.h b/extensions/ImGui/imgui_impl_ax.h → extensions/ImGui/src/ImGui/imgui_impl_ax.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "imgui.h"
+#include "imgui/imgui.h"
 
 struct GLFWwindow;
 

diff --git a/extensions/ImGui/imgui_impl_ax_android.cpp → ...ImGui/src/ImGui/imgui_impl_ax_android.cpp b/extensions/ImGui/imgui_impl_ax_android.cpp → ...ImGui/src/ImGui/imgui_impl_ax_android.cpp
diff --git a/extensions/ImGui/imgui_impl_ax_android.h → ...s/ImGui/src/ImGui/imgui_impl_ax_android.h b/extensions/ImGui/imgui_impl_ax_android.h → ...s/ImGui/src/ImGui/imgui_impl_ax_android.h
diff --git a/extensions/Inspector/CMakeLists.txt b/extensions/Inspector/CMakeLists.txt
@@ -1,7 +1,9 @@
 set(target_name Inspector)
 
-FILE(GLOB INSPECTOR_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp)
+FILE(GLOB_RECURSE INSPECTOR_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp)
 
 add_library(${target_name} STATIC ${INSPECTOR_SOURCES})
-
+target_include_directories(
+    ${target_name} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
 setup_ax_extension_config(${target_name})
diff --git a/extensions/Inspector/Inspector.cpp → ...ons/Inspector/src/Inspector/Inspector.cpp b/extensions/Inspector/Inspector.cpp → ...ons/Inspector/src/Inspector/Inspector.cpp
diff --git a/extensions/Inspector/Inspector.h → ...sions/Inspector/src/Inspector/Inspector.h b/extensions/Inspector/Inspector.h → ...sions/Inspector/src/Inspector/Inspector.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "ExtensionMacros.h"
+#include "extensions/ExtensionMacros.h"
 #include "base/Config.h"
 #include <string>
 #include <unordered_map>

diff --git a/extensions/JSONDefault/CMakeLists.txt b/extensions/JSONDefault/CMakeLists.txt
@@ -1,10 +1,12 @@
 set(target_name JSONDefault)
 
-FILE(GLOB JSON_DEFAULT_HEADER *.h)
-FILE(GLOB JSON_DEFAULT_SOURCE *.cpp)
+FILE(GLOB JSON_DEFAULT_HEADER src/JSONDefault/*.h)
+FILE(GLOB JSON_DEFAULT_SOURCE src/JSONDefault/*.cpp)
 
 add_library(${target_name} STATIC
         ${JSON_DEFAULT_HEADER} 
         ${JSON_DEFAULT_SOURCE})
 
+target_include_directories(${target_name} PUBLIC src)
+
 setup_ax_extension_config(${target_name})
diff --git a/extensions/JSONDefault/JSONDefault.cpp → ...ONDefault/src/JSONDefault/JSONDefault.cpp b/extensions/JSONDefault/JSONDefault.cpp → ...ONDefault/src/JSONDefault/JSONDefault.cpp
diff --git a/extensions/JSONDefault/JSONDefault.h → ...JSONDefault/src/JSONDefault/JSONDefault.h b/extensions/JSONDefault/JSONDefault.h → ...JSONDefault/src/JSONDefault/JSONDefault.h
@@ -28,7 +28,7 @@ THE SOFTWARE.
 #define __SUPPORT_JSONDEFAULT_H__
 
 #include "platform/PlatformMacros.h"
-#include "ExtensionMacros.h"
+#include "extensions/ExtensionMacros.h"
 #include <string>
 
 #include "yasio/string_view.hpp"

diff --git a/extensions/Particle3D/CMakeLists.txt b/extensions/Particle3D/CMakeLists.txt
@@ -1,7 +1,8 @@
 set(target_name particle3d)
 
-FILE(GLOB PARTICLE3D_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp)
+FILE(GLOB_RECURSE PARTICLE3D_SOURCES *.h;*.cpp;./**/*.h;./**/*.cpp)
 
 add_library(${target_name} ${PARTICLE3D_SOURCES})
+target_include_directories(${target_name} PUBLIC src)
 
 setup_ax_extension_config(${target_name})
diff --git a/extensions/Particle3D/PU/PUAffector.cpp → ...rticle3D/src/Particle3D/PU/PUAffector.cpp b/extensions/Particle3D/PU/PUAffector.cpp → ...rticle3D/src/Particle3D/PU/PUAffector.cpp
@@ -24,9 +24,9 @@
  THE SOFTWARE.
  ****************************************************************************/
 
-#include "extensions/Particle3D/PU/PUAffector.h"
-#include "extensions/Particle3D/PU/PUEmitter.h"
-#include "extensions/Particle3D/PU/PUParticleSystem3D.h"
+#include "Particle3D/PU/PUAffector.h"
+#include "Particle3D/PU/PUEmitter.h"
+#include "Particle3D/PU/PUParticleSystem3D.h"
 
 NS_AX_BEGIN
 

diff --git a/extensions/Particle3D/PU/PUAffector.h → ...Particle3D/src/Particle3D/PU/PUAffector.h b/extensions/Particle3D/PU/PUAffector.h → ...Particle3D/src/Particle3D/PU/PUAffector.h
@@ -29,7 +29,7 @@
 
 #include "base/Ref.h"
 #include "math/Math.h"
-#include "extensions/Particle3D/Particle3DAffector.h"
+#include "Particle3D/Particle3DAffector.h"
 #include <vector>
 #include <string>