diff --git a/Extra2D/include/extra2d/action/action.h b/Extra2D/include/action/action.h
similarity index 99%
rename from Extra2D/include/extra2d/action/action.h
rename to Extra2D/include/action/action.h
index 8fbbae5..2a006e2 100644
--- a/Extra2D/include/extra2d/action/action.h
+++ b/Extra2D/include/action/action.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/core/types.h>
+#include <core/types.h>
 #include <functional>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/action/action_ease.h b/Extra2D/include/action/action_ease.h
similarity index 99%
rename from Extra2D/include/extra2d/action/action_ease.h
rename to Extra2D/include/action/action_ease.h
index f6bb6dd..d659b97 100644
--- a/Extra2D/include/extra2d/action/action_ease.h
+++ b/Extra2D/include/action/action_ease.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/action/action_interval.h>
-#include <extra2d/action/ease.h>
+#include <action/action_interval.h>
+#include <action/ease.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/action/action_instant.h b/Extra2D/include/action/action_instant.h
similarity index 95%
rename from Extra2D/include/extra2d/action/action_instant.h
rename to Extra2D/include/action/action_instant.h
index af2e45d..7b83f8a 100644
--- a/Extra2D/include/extra2d/action/action_instant.h
+++ b/Extra2D/include/action/action_instant.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/action/finite_time_action.h>
+#include <action/finite_time_action.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/action/action_instant_actions.h b/Extra2D/include/action/action_instant_actions.h
similarity index 97%
rename from Extra2D/include/extra2d/action/action_instant_actions.h
rename to Extra2D/include/action/action_instant_actions.h
index c0a7563..055d0d3 100644
--- a/Extra2D/include/extra2d/action/action_instant_actions.h
+++ b/Extra2D/include/action/action_instant_actions.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/action/action_instant.h>
-#include <extra2d/core/math_types.h>
+#include <action/action_instant.h>
+#include <core/math_types.h>
 #include <functional>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/action/action_interval.h b/Extra2D/include/action/action_interval.h
similarity index 96%
rename from Extra2D/include/extra2d/action/action_interval.h
rename to Extra2D/include/action/action_interval.h
index 194e751..9c10309 100644
--- a/Extra2D/include/extra2d/action/action_interval.h
+++ b/Extra2D/include/action/action_interval.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/action/finite_time_action.h>
-#include <extra2d/action/ease.h>
+#include <action/finite_time_action.h>
+#include <action/ease.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/action/action_interval_actions.h b/Extra2D/include/action/action_interval_actions.h
similarity index 98%
rename from Extra2D/include/extra2d/action/action_interval_actions.h
rename to Extra2D/include/action/action_interval_actions.h
index df369c5..80ca5bd 100644
--- a/Extra2D/include/extra2d/action/action_interval_actions.h
+++ b/Extra2D/include/action/action_interval_actions.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/action/action_interval.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/color.h>
+#include <action/action_interval.h>
+#include <core/math_types.h>
+#include <core/color.h>
 #include <functional>
 #include <vector>
 
diff --git a/Extra2D/include/extra2d/action/action_manager.h b/Extra2D/include/action/action_manager.h
similarity index 98%
rename from Extra2D/include/extra2d/action/action_manager.h
rename to Extra2D/include/action/action_manager.h
index 9acd14d..b4df21b 100644
--- a/Extra2D/include/extra2d/action/action_manager.h
+++ b/Extra2D/include/action/action_manager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/action/action.h>
+#include <action/action.h>
 #include <unordered_map>
 #include <vector>
 #include <functional>
diff --git a/Extra2D/include/extra2d/action/action_special.h b/Extra2D/include/action/action_special.h
similarity index 97%
rename from Extra2D/include/extra2d/action/action_special.h
rename to Extra2D/include/action/action_special.h
index b40527e..a99ee5f 100644
--- a/Extra2D/include/extra2d/action/action_special.h
+++ b/Extra2D/include/action/action_special.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/action/action.h>
-#include <extra2d/action/action_interval.h>
-#include <extra2d/core/math_types.h>
+#include <action/action.h>
+#include <action/action_interval.h>
+#include <core/math_types.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/action/ease.h b/Extra2D/include/action/ease.h
similarity index 100%
rename from Extra2D/include/extra2d/action/ease.h
rename to Extra2D/include/action/ease.h
diff --git a/Extra2D/include/extra2d/action/finite_time_action.h b/Extra2D/include/action/finite_time_action.h
similarity index 96%
rename from Extra2D/include/extra2d/action/finite_time_action.h
rename to Extra2D/include/action/finite_time_action.h
index 7601e5f..c4c71ff 100644
--- a/Extra2D/include/extra2d/action/finite_time_action.h
+++ b/Extra2D/include/action/finite_time_action.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/action/action.h>
+#include <action/action.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/animation/als_parser.h b/Extra2D/include/animation/als_parser.h
similarity index 95%
rename from Extra2D/include/extra2d/animation/als_parser.h
rename to Extra2D/include/animation/als_parser.h
index 5215091..379085f 100644
--- a/Extra2D/include/extra2d/animation/als_parser.h
+++ b/Extra2D/include/animation/als_parser.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <core/math_types.h>
+#include <core/types.h>
 #include <string>
 #include <vector>
 
diff --git a/Extra2D/include/extra2d/animation/ani_binary_parser.h b/Extra2D/include/animation/ani_binary_parser.h
similarity index 92%
rename from Extra2D/include/extra2d/animation/ani_binary_parser.h
rename to Extra2D/include/animation/ani_binary_parser.h
index 08627a8..9ece1b6 100644
--- a/Extra2D/include/extra2d/animation/ani_binary_parser.h
+++ b/Extra2D/include/animation/ani_binary_parser.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <cstdint>
-#include <extra2d/animation/ani_parser.h>
-#include <extra2d/animation/animation_cache.h>
-#include <extra2d/core/types.h>
+#include <animation/ani_parser.h>
+#include <animation/animation_cache.h>
+#include <core/types.h>
 #include <functional>
 #include <string>
 
diff --git a/Extra2D/include/extra2d/animation/ani_parser.h b/Extra2D/include/animation/ani_parser.h
similarity index 91%
rename from Extra2D/include/extra2d/animation/ani_parser.h
rename to Extra2D/include/animation/ani_parser.h
index d704faa..bf206a6 100644
--- a/Extra2D/include/extra2d/animation/ani_parser.h
+++ b/Extra2D/include/animation/ani_parser.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/animation/animation_cache.h>
-#include <extra2d/animation/animation_clip.h>
-#include <extra2d/core/types.h>
+#include <animation/animation_cache.h>
+#include <animation/animation_clip.h>
+#include <core/types.h>
 #include <functional>
 #include <string>
 
diff --git a/Extra2D/include/extra2d/animation/animated_sprite.h b/Extra2D/include/animation/animated_sprite.h
similarity index 96%
rename from Extra2D/include/extra2d/animation/animated_sprite.h
rename to Extra2D/include/animation/animated_sprite.h
index 66fc72f..4bbcc29 100644
--- a/Extra2D/include/extra2d/animation/animated_sprite.h
+++ b/Extra2D/include/animation/animated_sprite.h
@@ -2,9 +2,9 @@
 
 #include <array>
 #include <cstdint>
-#include <extra2d/animation/animation_cache.h>
-#include <extra2d/animation/animation_controller.h>
-#include <extra2d/scene/sprite.h>
+#include <animation/animation_cache.h>
+#include <animation/animation_controller.h>
+#include <scene/sprite.h>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/Extra2D/include/extra2d/animation/animation_cache.h b/Extra2D/include/animation/animation_cache.h
similarity index 98%
rename from Extra2D/include/extra2d/animation/animation_cache.h
rename to Extra2D/include/animation/animation_cache.h
index e894fd0..5befd1c 100644
--- a/Extra2D/include/extra2d/animation/animation_cache.h
+++ b/Extra2D/include/animation/animation_cache.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/animation/animation_clip.h>
+#include <animation/animation_clip.h>
 #include <functional>
 #include <mutex>
 #include <string>
diff --git a/Extra2D/include/extra2d/animation/animation_clip.h b/Extra2D/include/animation/animation_clip.h
similarity index 98%
rename from Extra2D/include/extra2d/animation/animation_clip.h
rename to Extra2D/include/animation/animation_clip.h
index 16bd5c2..1224226 100644
--- a/Extra2D/include/extra2d/animation/animation_clip.h
+++ b/Extra2D/include/animation/animation_clip.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <cassert>
-#include <extra2d/animation/animation_frame.h>
-#include <extra2d/animation/sprite_frame_cache.h>
+#include <animation/animation_frame.h>
+#include <animation/sprite_frame_cache.h>
 #include <string>
 #include <vector>
 
diff --git a/Extra2D/include/extra2d/animation/animation_controller.h b/Extra2D/include/animation/animation_controller.h
similarity index 96%
rename from Extra2D/include/extra2d/animation/animation_controller.h
rename to Extra2D/include/animation/animation_controller.h
index 0bf18f4..dff514e 100644
--- a/Extra2D/include/extra2d/animation/animation_controller.h
+++ b/Extra2D/include/animation/animation_controller.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/animation/animation_clip.h>
-#include <extra2d/animation/interpolation_engine.h>
-#include <extra2d/core/types.h>
+#include <animation/animation_clip.h>
+#include <animation/interpolation_engine.h>
+#include <core/types.h>
 #include <functional>
 #include <string>
 
diff --git a/Extra2D/include/extra2d/animation/animation_event.h b/Extra2D/include/animation/animation_event.h
similarity index 100%
rename from Extra2D/include/extra2d/animation/animation_event.h
rename to Extra2D/include/animation/animation_event.h
diff --git a/Extra2D/include/extra2d/animation/animation_frame.h b/Extra2D/include/animation/animation_frame.h
similarity index 95%
rename from Extra2D/include/extra2d/animation/animation_frame.h
rename to Extra2D/include/animation/animation_frame.h
index 71536a2..c072311 100644
--- a/Extra2D/include/extra2d/animation/animation_frame.h
+++ b/Extra2D/include/animation/animation_frame.h
@@ -2,8 +2,8 @@
 
 #include <array>
 #include <cstdint>
-#include <extra2d/animation/frame_property.h>
-#include <extra2d/animation/sprite_frame.h>
+#include <animation/frame_property.h>
+#include <animation/sprite_frame.h>
 #include <string>
 #include <vector>
 
diff --git a/Extra2D/include/extra2d/animation/animation_node.h b/Extra2D/include/animation/animation_node.h
similarity index 92%
rename from Extra2D/include/extra2d/animation/animation_node.h
rename to Extra2D/include/animation/animation_node.h
index 84d5f10..0327d87 100644
--- a/Extra2D/include/extra2d/animation/animation_node.h
+++ b/Extra2D/include/animation/animation_node.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <extra2d/animation/animation_cache.h>
-#include <extra2d/animation/animation_clip.h>
-#include <extra2d/animation/animation_controller.h>
-#include <extra2d/animation/animation_event.h>
-#include <extra2d/animation/frame_renderer.h>
-#include <extra2d/scene/node.h>
+#include <animation/animation_cache.h>
+#include <animation/animation_clip.h>
+#include <animation/animation_controller.h>
+#include <animation/animation_event.h>
+#include <animation/frame_renderer.h>
+#include <scene/node.h>
 #include <vector>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/animation/composite_animation.h b/Extra2D/include/animation/composite_animation.h
similarity index 91%
rename from Extra2D/include/extra2d/animation/composite_animation.h
rename to Extra2D/include/animation/composite_animation.h
index 2439749..0374eea 100644
--- a/Extra2D/include/extra2d/animation/composite_animation.h
+++ b/Extra2D/include/animation/composite_animation.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/animation/als_parser.h>
-#include <extra2d/animation/animation_event.h>
-#include <extra2d/animation/animation_node.h>
-#include <extra2d/scene/node.h>
+#include <animation/als_parser.h>
+#include <animation/animation_event.h>
+#include <animation/animation_node.h>
+#include <scene/node.h>
 #include <vector>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/animation/frame_property.h b/Extra2D/include/animation/frame_property.h
similarity index 98%
rename from Extra2D/include/extra2d/animation/frame_property.h
rename to Extra2D/include/animation/frame_property.h
index 418e7bf..7a71407 100644
--- a/Extra2D/include/extra2d/animation/frame_property.h
+++ b/Extra2D/include/animation/frame_property.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <any>
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
 #include <optional>
 #include <string>
 #include <unordered_map>
diff --git a/Extra2D/include/extra2d/animation/frame_renderer.h b/Extra2D/include/animation/frame_renderer.h
similarity index 89%
rename from Extra2D/include/extra2d/animation/frame_renderer.h
rename to Extra2D/include/animation/frame_renderer.h
index e9be061..6220c0a 100644
--- a/Extra2D/include/extra2d/animation/frame_renderer.h
+++ b/Extra2D/include/animation/frame_renderer.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <extra2d/animation/animation_frame.h>
-#include <extra2d/animation/interpolation_engine.h>
-#include <extra2d/animation/sprite_frame.h>
-#include <extra2d/animation/sprite_frame_cache.h>
-#include <extra2d/graphics/render_backend.h>
+#include <animation/animation_frame.h>
+#include <animation/interpolation_engine.h>
+#include <animation/sprite_frame.h>
+#include <animation/sprite_frame_cache.h>
+#include <graphics/render_backend.h>
 #include <vector>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/animation/interpolation_engine.h b/Extra2D/include/animation/interpolation_engine.h
similarity index 95%
rename from Extra2D/include/extra2d/animation/interpolation_engine.h
rename to Extra2D/include/animation/interpolation_engine.h
index 8978ab5..d612979 100644
--- a/Extra2D/include/extra2d/animation/interpolation_engine.h
+++ b/Extra2D/include/animation/interpolation_engine.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <cmath>
-#include <extra2d/animation/animation_frame.h>
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <animation/animation_frame.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/animation/sprite_frame.h b/Extra2D/include/animation/sprite_frame.h
similarity index 95%
rename from Extra2D/include/extra2d/animation/sprite_frame.h
rename to Extra2D/include/animation/sprite_frame.h
index 45a843d..c76b9ef 100644
--- a/Extra2D/include/extra2d/animation/sprite_frame.h
+++ b/Extra2D/include/animation/sprite_frame.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/texture.h>
+#include <core/math_types.h>
+#include <core/types.h>
+#include <graphics/texture.h>
 #include <string>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/animation/sprite_frame_cache.h b/Extra2D/include/animation/sprite_frame_cache.h
similarity index 97%
rename from Extra2D/include/extra2d/animation/sprite_frame_cache.h
rename to Extra2D/include/animation/sprite_frame_cache.h
index de47f4f..4631b3c 100644
--- a/Extra2D/include/extra2d/animation/sprite_frame_cache.h
+++ b/Extra2D/include/animation/sprite_frame_cache.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/animation/sprite_frame.h>
-#include <extra2d/graphics/texture.h>
-#include <extra2d/resource/resource_manager.h>
-#include <extra2d/utils/logger.h>
+#include <animation/sprite_frame.h>
+#include <graphics/texture.h>
+#include <resource/resource_manager.h>
+#include <utils/logger.h>
 #include <mutex>
 #include <string>
 #include <unordered_map>
diff --git a/Extra2D/include/extra2d/app/application.h b/Extra2D/include/app/application.h
similarity index 96%
rename from Extra2D/include/extra2d/app/application.h
rename to Extra2D/include/app/application.h
index 24ebc71..d549492 100644
--- a/Extra2D/include/extra2d/app/application.h
+++ b/Extra2D/include/app/application.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/core/string.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/platform/window.h>
+#include <core/string.h>
+#include <core/types.h>
+#include <graphics/render_backend.h>
+#include <platform/window.h>
 #include <memory>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/audio/audio_engine.h b/Extra2D/include/audio/audio_engine.h
similarity index 97%
rename from Extra2D/include/extra2d/audio/audio_engine.h
rename to Extra2D/include/audio/audio_engine.h
index c388d7e..57aac15 100644
--- a/Extra2D/include/extra2d/audio/audio_engine.h
+++ b/Extra2D/include/audio/audio_engine.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <string>
 #include <unordered_map>
-#include <extra2d/core/types.h>
+#include <core/types.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/audio/sound.h b/Extra2D/include/audio/sound.h
similarity index 97%
rename from Extra2D/include/extra2d/audio/sound.h
rename to Extra2D/include/audio/sound.h
index 399cc00..3d83f14 100644
--- a/Extra2D/include/extra2d/audio/sound.h
+++ b/Extra2D/include/audio/sound.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include <extra2d/core/types.h>
+#include <core/types.h>
 
 struct Mix_Chunk;
 
diff --git a/Extra2D/include/extra2d/core/color.h b/Extra2D/include/core/color.h
similarity index 99%
rename from Extra2D/include/extra2d/core/color.h
rename to Extra2D/include/core/color.h
index 6797137..1c1afab 100644
--- a/Extra2D/include/extra2d/core/color.h
+++ b/Extra2D/include/core/color.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <algorithm>
-#include <extra2d/core/types.h>
+#include <core/types.h>
 #include <glm/vec4.hpp>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/core/math_types.h b/Extra2D/include/core/math_types.h
similarity index 99%
rename from Extra2D/include/extra2d/core/math_types.h
rename to Extra2D/include/core/math_types.h
index 2c4d68e..ef5a225 100644
--- a/Extra2D/include/extra2d/core/math_types.h
+++ b/Extra2D/include/core/math_types.h
@@ -2,7 +2,7 @@
 
 #include <algorithm>
 #include <cmath>
-#include <extra2d/core/types.h>
+#include <core/types.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/mat4x4.hpp>
 #include <glm/vec2.hpp>
diff --git a/Extra2D/include/extra2d/core/string.h b/Extra2D/include/core/string.h
similarity index 100%
rename from Extra2D/include/extra2d/core/string.h
rename to Extra2D/include/core/string.h
diff --git a/Extra2D/include/extra2d/core/types.h b/Extra2D/include/core/types.h
similarity index 100%
rename from Extra2D/include/extra2d/core/types.h
rename to Extra2D/include/core/types.h
diff --git a/Extra2D/include/extra2d/effects/custom_effect_manager.h b/Extra2D/include/effects/custom_effect_manager.h
similarity index 98%
rename from Extra2D/include/extra2d/effects/custom_effect_manager.h
rename to Extra2D/include/effects/custom_effect_manager.h
index 9cc7000..842e79c 100644
--- a/Extra2D/include/extra2d/effects/custom_effect_manager.h
+++ b/Extra2D/include/effects/custom_effect_manager.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/types.h>
-#include <extra2d/effects/particle_system.h>
-#include <extra2d/effects/post_process.h>
-#include <extra2d/graphics/shader_system.h>
+#include <core/color.h>
+#include <core/types.h>
+#include <effects/particle_system.h>
+#include <effects/post_process.h>
+#include <graphics/shader_system.h>
 #include <functional>
 #include <string>
 #include <unordered_map>
diff --git a/Extra2D/include/extra2d/effects/particle_system.h b/Extra2D/include/effects/particle_system.h
similarity index 98%
rename from Extra2D/include/extra2d/effects/particle_system.h
rename to Extra2D/include/effects/particle_system.h
index 05bad4a..cfdd285 100644
--- a/Extra2D/include/extra2d/effects/particle_system.h
+++ b/Extra2D/include/effects/particle_system.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/texture.h>
-#include <extra2d/scene/node.h>
+#include <core/color.h>
+#include <core/types.h>
+#include <graphics/texture.h>
+#include <scene/node.h>
 #include <functional>
 #include <random>
 #include <vector>
diff --git a/Extra2D/include/extra2d/effects/post_process.h b/Extra2D/include/effects/post_process.h
similarity index 97%
rename from Extra2D/include/extra2d/effects/post_process.h
rename to Extra2D/include/effects/post_process.h
index 638bc68..014f528 100644
--- a/Extra2D/include/extra2d/effects/post_process.h
+++ b/Extra2D/include/effects/post_process.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/opengl/gl_shader.h>
-#include <extra2d/graphics/texture.h>
+#include <core/color.h>
+#include <core/types.h>
+#include <graphics/opengl/gl_shader.h>
+#include <graphics/texture.h>
 #include <functional>
 #include <string>
 #include <vector>
diff --git a/Extra2D/include/extra2d/event/event.h b/Extra2D/include/event/event.h
similarity index 98%
rename from Extra2D/include/extra2d/event/event.h
rename to Extra2D/include/event/event.h
index 45eb403..67a4a24 100644
--- a/Extra2D/include/extra2d/event/event.h
+++ b/Extra2D/include/event/event.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <cstdint>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <core/math_types.h>
+#include <core/types.h>
 #include <variant>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/event/event_dispatcher.h b/Extra2D/include/event/event_dispatcher.h
similarity index 95%
rename from Extra2D/include/extra2d/event/event_dispatcher.h
rename to Extra2D/include/event/event_dispatcher.h
index 1ddff8a..e3c1a2d 100644
--- a/Extra2D/include/extra2d/event/event_dispatcher.h
+++ b/Extra2D/include/event/event_dispatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/event/event.h>
+#include <core/types.h>
+#include <event/event.h>
 #include <functional>
 #include <unordered_map>
 #include <vector>
diff --git a/Extra2D/include/extra2d/event/event_queue.h b/Extra2D/include/event/event_queue.h
similarity index 92%
rename from Extra2D/include/extra2d/event/event_queue.h
rename to Extra2D/include/event/event_queue.h
index 5ef03bd..8137dd4 100644
--- a/Extra2D/include/extra2d/event/event_queue.h
+++ b/Extra2D/include/event/event_queue.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/event/event.h>
+#include <core/types.h>
+#include <event/event.h>
 #include <mutex>
 #include <queue>
 
diff --git a/Extra2D/include/extra2d/event/input_codes.h b/Extra2D/include/event/input_codes.h
similarity index 100%
rename from Extra2D/include/extra2d/event/input_codes.h
rename to Extra2D/include/event/input_codes.h
diff --git a/Extra2D/include/extra2d.h b/Extra2D/include/extra2d.h
new file mode 100644
index 0000000..33b1420
--- /dev/null
+++ b/Extra2D/include/extra2d.h
@@ -0,0 +1,114 @@
+#pragma once
+
+// Easy2D v3.0 - 统一入口头文件
+// 包含所有公共 API
+
+// Core
+#include <core/types.h>
+#include <core/string.h>
+#include <core/color.h>
+#include <core/math_types.h>
+
+// Platform
+#include <platform/window.h>
+#include <platform/input.h>
+
+// Graphics
+#include <graphics/render_backend.h>
+#include <graphics/texture.h>
+#include <graphics/font.h>
+#include <graphics/camera.h>
+#include <graphics/shader_system.h>
+
+#include <graphics/render_target.h>
+#include <graphics/vram_manager.h>
+
+// Scene
+#include <scene/node.h>
+#include <scene/scene.h>
+#include <scene/sprite.h>
+#include <scene/shape_node.h>
+#include <scene/scene_manager.h>
+#include <scene/transition_scene.h>
+#include <scene/transition_fade_scene.h>
+#include <scene/transition_slide_scene.h>
+#include <scene/transition_scale_scene.h>
+#include <scene/transition_flip_scene.h>
+#include <scene/transition_box_scene.h>
+
+// Animation
+#include <animation/sprite_frame.h>
+#include <animation/sprite_frame_cache.h>
+#include <animation/frame_property.h>
+#include <animation/animation_frame.h>
+#include <animation/animation_clip.h>
+#include <animation/animation_controller.h>
+#include <animation/animation_cache.h>
+#include <animation/interpolation_engine.h>
+#include <animation/animated_sprite.h>
+#include <animation/frame_renderer.h>
+#include <animation/animation_event.h>
+#include <animation/animation_node.h>
+#include <animation/composite_animation.h>
+#include <animation/ani_parser.h>
+#include <animation/ani_binary_parser.h>
+#include <animation/als_parser.h>
+
+// UI
+#include <ui/widget.h>
+#include <ui/button.h>
+#include <ui/text.h>
+#include <ui/label.h>
+#include <ui/progress_bar.h>
+#include <ui/check_box.h>
+#include <ui/radio_button.h>
+#include <ui/slider.h>
+
+// Action
+#include <action/action.h>
+#include <action/finite_time_action.h>
+#include <action/action_interval.h>
+#include <action/action_instant.h>
+#include <action/action_interval_actions.h>
+#include <action/action_instant_actions.h>
+#include <action/action_ease.h>
+#include <action/action_special.h>
+#include <action/action_manager.h>
+#include <action/ease.h>
+
+// Event
+#include <event/event.h>
+#include <event/event_queue.h>
+#include <event/event_dispatcher.h>
+#include <event/input_codes.h>
+
+// Audio
+#include <audio/audio_engine.h>
+#include <audio/sound.h>
+
+// Resource
+#include <resource/resource_manager.h>
+
+// Utils
+#include <utils/logger.h>
+#include <utils/timer.h>
+#include <utils/data.h>
+#include <utils/random.h>
+
+// Spatial
+#include <spatial/spatial_index.h>
+#include <spatial/quadtree.h>
+#include <spatial/spatial_hash.h>
+#include <spatial/spatial_manager.h>
+
+// Effects
+#include <effects/post_process.h>
+#include <effects/particle_system.h>
+#include <effects/custom_effect_manager.h>
+
+// Application
+#include <app/application.h>
+
+#ifdef __SWITCH__
+#include <switch.h>
+#endif
\ No newline at end of file
diff --git a/Extra2D/include/extra2d/extra2d.h b/Extra2D/include/extra2d/extra2d.h
deleted file mode 100644
index 476a636..0000000
--- a/Extra2D/include/extra2d/extra2d.h
+++ /dev/null
@@ -1,114 +0,0 @@
-#pragma once
-
-// Easy2D v3.0 - 统一入口头文件
-// 包含所有公共 API
-
-// Core
-#include <extra2d/core/types.h>
-#include <extra2d/core/string.h>
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-
-// Platform
-#include <extra2d/platform/window.h>
-#include <extra2d/platform/input.h>
-
-// Graphics
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/graphics/texture.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/graphics/camera.h>
-#include <extra2d/graphics/shader_system.h>
-
-#include <extra2d/graphics/render_target.h>
-#include <extra2d/graphics/vram_manager.h>
-
-// Scene
-#include <extra2d/scene/node.h>
-#include <extra2d/scene/scene.h>
-#include <extra2d/scene/sprite.h>
-#include <extra2d/scene/shape_node.h>
-#include <extra2d/scene/scene_manager.h>
-#include <extra2d/scene/transition_scene.h>
-#include <extra2d/scene/transition_fade_scene.h>
-#include <extra2d/scene/transition_slide_scene.h>
-#include <extra2d/scene/transition_scale_scene.h>
-#include <extra2d/scene/transition_flip_scene.h>
-#include <extra2d/scene/transition_box_scene.h>
-
-// Animation
-#include <extra2d/animation/sprite_frame.h>
-#include <extra2d/animation/sprite_frame_cache.h>
-#include <extra2d/animation/frame_property.h>
-#include <extra2d/animation/animation_frame.h>
-#include <extra2d/animation/animation_clip.h>
-#include <extra2d/animation/animation_controller.h>
-#include <extra2d/animation/animation_cache.h>
-#include <extra2d/animation/interpolation_engine.h>
-#include <extra2d/animation/animated_sprite.h>
-#include <extra2d/animation/frame_renderer.h>
-#include <extra2d/animation/animation_event.h>
-#include <extra2d/animation/animation_node.h>
-#include <extra2d/animation/composite_animation.h>
-#include <extra2d/animation/ani_parser.h>
-#include <extra2d/animation/ani_binary_parser.h>
-#include <extra2d/animation/als_parser.h>
-
-// UI
-#include <extra2d/ui/widget.h>
-#include <extra2d/ui/button.h>
-#include <extra2d/ui/text.h>
-#include <extra2d/ui/label.h>
-#include <extra2d/ui/progress_bar.h>
-#include <extra2d/ui/check_box.h>
-#include <extra2d/ui/radio_button.h>
-#include <extra2d/ui/slider.h>
-
-// Action
-#include <extra2d/action/action.h>
-#include <extra2d/action/finite_time_action.h>
-#include <extra2d/action/action_interval.h>
-#include <extra2d/action/action_instant.h>
-#include <extra2d/action/action_interval_actions.h>
-#include <extra2d/action/action_instant_actions.h>
-#include <extra2d/action/action_ease.h>
-#include <extra2d/action/action_special.h>
-#include <extra2d/action/action_manager.h>
-#include <extra2d/action/ease.h>
-
-// Event
-#include <extra2d/event/event.h>
-#include <extra2d/event/event_queue.h>
-#include <extra2d/event/event_dispatcher.h>
-#include <extra2d/event/input_codes.h>
-
-// Audio
-#include <extra2d/audio/audio_engine.h>
-#include <extra2d/audio/sound.h>
-
-// Resource
-#include <extra2d/resource/resource_manager.h>
-
-// Utils
-#include <extra2d/utils/logger.h>
-#include <extra2d/utils/timer.h>
-#include <extra2d/utils/data.h>
-#include <extra2d/utils/random.h>
-
-// Spatial
-#include <extra2d/spatial/spatial_index.h>
-#include <extra2d/spatial/quadtree.h>
-#include <extra2d/spatial/spatial_hash.h>
-#include <extra2d/spatial/spatial_manager.h>
-
-// Effects
-#include <extra2d/effects/post_process.h>
-#include <extra2d/effects/particle_system.h>
-#include <extra2d/effects/custom_effect_manager.h>
-
-// Application
-#include <extra2d/app/application.h>
-
-#ifdef __SWITCH__
-#include <switch.h>
-#endif
\ No newline at end of file
diff --git a/Extra2D/include/extra2d/graphics/alpha_mask.h b/Extra2D/include/graphics/alpha_mask.h
similarity index 95%
rename from Extra2D/include/extra2d/graphics/alpha_mask.h
rename to Extra2D/include/graphics/alpha_mask.h
index 98cdd6b..ba79480 100644
--- a/Extra2D/include/extra2d/graphics/alpha_mask.h
+++ b/Extra2D/include/graphics/alpha_mask.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <core/math_types.h>
+#include <core/types.h>
 #include <vector>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/graphics/camera.h b/Extra2D/include/graphics/camera.h
similarity index 96%
rename from Extra2D/include/extra2d/graphics/camera.h
rename to Extra2D/include/graphics/camera.h
index 2b56423..1743146 100644
--- a/Extra2D/include/extra2d/graphics/camera.h
+++ b/Extra2D/include/graphics/camera.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
 #include <glm/mat4x4.hpp>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/graphics/font.h b/Extra2D/include/graphics/font.h
similarity index 92%
rename from Extra2D/include/extra2d/graphics/font.h
rename to Extra2D/include/graphics/font.h
index c3f06d8..106ac66 100644
--- a/Extra2D/include/extra2d/graphics/font.h
+++ b/Extra2D/include/graphics/font.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/graphics/gpu_context.h b/Extra2D/include/graphics/gpu_context.h
similarity index 100%
rename from Extra2D/include/extra2d/graphics/gpu_context.h
rename to Extra2D/include/graphics/gpu_context.h
diff --git a/Extra2D/include/extra2d/graphics/opengl/gl_font_atlas.h b/Extra2D/include/graphics/opengl/gl_font_atlas.h
similarity index 89%
rename from Extra2D/include/extra2d/graphics/opengl/gl_font_atlas.h
rename to Extra2D/include/graphics/opengl/gl_font_atlas.h
index a3e8d65..a5ec6e6 100644
--- a/Extra2D/include/extra2d/graphics/opengl/gl_font_atlas.h
+++ b/Extra2D/include/graphics/opengl/gl_font_atlas.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/graphics/opengl/gl_texture.h>
-#include <extra2d/graphics/texture.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
+#include <graphics/font.h>
+#include <graphics/opengl/gl_texture.h>
+#include <graphics/texture.h>
 #include <memory>
 #include <stb/stb_rect_pack.h>
 #include <stb/stb_truetype.h>
diff --git a/Extra2D/include/extra2d/graphics/opengl/gl_renderer.h b/Extra2D/include/graphics/opengl/gl_renderer.h
similarity index 96%
rename from Extra2D/include/extra2d/graphics/opengl/gl_renderer.h
rename to Extra2D/include/graphics/opengl/gl_renderer.h
index a2bea93..edd7459 100644
--- a/Extra2D/include/extra2d/graphics/opengl/gl_renderer.h
+++ b/Extra2D/include/graphics/opengl/gl_renderer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/graphics/opengl/gl_shader.h>
-#include <extra2d/graphics/opengl/gl_sprite_batch.h>
-#include <extra2d/graphics/render_backend.h>
+#include <graphics/opengl/gl_shader.h>
+#include <graphics/opengl/gl_sprite_batch.h>
+#include <graphics/render_backend.h>
 
 #include <array>
 #include <glad/glad.h>
diff --git a/Extra2D/include/extra2d/graphics/opengl/gl_shader.h b/Extra2D/include/graphics/opengl/gl_shader.h
similarity index 100%
rename from Extra2D/include/extra2d/graphics/opengl/gl_shader.h
rename to Extra2D/include/graphics/opengl/gl_shader.h
diff --git a/Extra2D/include/extra2d/graphics/opengl/gl_sprite_batch.h b/Extra2D/include/graphics/opengl/gl_sprite_batch.h
similarity index 92%
rename from Extra2D/include/extra2d/graphics/opengl/gl_sprite_batch.h
rename to Extra2D/include/graphics/opengl/gl_sprite_batch.h
index 5372881..9ccfdc9 100644
--- a/Extra2D/include/extra2d/graphics/opengl/gl_sprite_batch.h
+++ b/Extra2D/include/graphics/opengl/gl_sprite_batch.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/opengl/gl_shader.h>
-#include <extra2d/graphics/texture.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
+#include <graphics/opengl/gl_shader.h>
+#include <graphics/texture.h>
 #include <glm/mat4x4.hpp>
 #include <vector>
 #include <array>
diff --git a/Extra2D/include/extra2d/graphics/opengl/gl_texture.h b/Extra2D/include/graphics/opengl/gl_texture.h
similarity index 96%
rename from Extra2D/include/extra2d/graphics/opengl/gl_texture.h
rename to Extra2D/include/graphics/opengl/gl_texture.h
index 8d559a7..b2768ec 100644
--- a/Extra2D/include/extra2d/graphics/opengl/gl_texture.h
+++ b/Extra2D/include/graphics/opengl/gl_texture.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/graphics/texture.h>
-#include <extra2d/graphics/alpha_mask.h>
+#include <graphics/texture.h>
+#include <graphics/alpha_mask.h>
 
 #include <glad/glad.h>
 
diff --git a/Extra2D/include/extra2d/graphics/render_backend.h b/Extra2D/include/graphics/render_backend.h
similarity index 98%
rename from Extra2D/include/extra2d/graphics/render_backend.h
rename to Extra2D/include/graphics/render_backend.h
index 83dbe5d..ddfc42f 100644
--- a/Extra2D/include/extra2d/graphics/render_backend.h
+++ b/Extra2D/include/graphics/render_backend.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
 #include <glm/mat4x4.hpp>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/graphics/render_command.h b/Extra2D/include/graphics/render_command.h
similarity index 97%
rename from Extra2D/include/extra2d/graphics/render_command.h
rename to Extra2D/include/graphics/render_command.h
index 3caeb04..43ec081 100644
--- a/Extra2D/include/extra2d/graphics/render_command.h
+++ b/Extra2D/include/graphics/render_command.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/texture.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
+#include <graphics/texture.h>
 #include <glm/mat4x4.hpp>
 #include <cstdint>
 #include <variant>
diff --git a/Extra2D/include/extra2d/graphics/render_target.h b/Extra2D/include/graphics/render_target.h
similarity index 98%
rename from Extra2D/include/extra2d/graphics/render_target.h
rename to Extra2D/include/graphics/render_target.h
index e214c7d..aa48e1a 100644
--- a/Extra2D/include/extra2d/graphics/render_target.h
+++ b/Extra2D/include/graphics/render_target.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/opengl/gl_texture.h>
-#include <extra2d/graphics/texture.h>
+#include <core/color.h>
+#include <core/types.h>
+#include <graphics/opengl/gl_texture.h>
+#include <graphics/texture.h>
 #include <mutex>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/graphics/shader_preset.h b/Extra2D/include/graphics/shader_preset.h
similarity index 98%
rename from Extra2D/include/extra2d/graphics/shader_preset.h
rename to Extra2D/include/graphics/shader_preset.h
index 801f88b..146f25e 100644
--- a/Extra2D/include/extra2d/graphics/shader_preset.h
+++ b/Extra2D/include/graphics/shader_preset.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/graphics/opengl/gl_shader.h>
-#include <extra2d/core/types.h>
-#include <extra2d/core/color.h>
+#include <graphics/opengl/gl_shader.h>
+#include <core/types.h>
+#include <core/color.h>
 #include <glm/vec4.hpp>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/graphics/shader_system.h b/Extra2D/include/graphics/shader_system.h
similarity index 98%
rename from Extra2D/include/extra2d/graphics/shader_system.h
rename to Extra2D/include/graphics/shader_system.h
index a3af2fe..6115cff 100644
--- a/Extra2D/include/extra2d/graphics/shader_system.h
+++ b/Extra2D/include/graphics/shader_system.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/opengl/gl_shader.h>
+#include <core/color.h>
+#include <core/types.h>
+#include <graphics/opengl/gl_shader.h>
 #include <functional>
 #include <string>
 #include <unordered_map>
diff --git a/Extra2D/include/extra2d/graphics/texture.h b/Extra2D/include/graphics/texture.h
similarity index 96%
rename from Extra2D/include/extra2d/graphics/texture.h
rename to Extra2D/include/graphics/texture.h
index 712915e..2ceacec 100644
--- a/Extra2D/include/extra2d/graphics/texture.h
+++ b/Extra2D/include/graphics/texture.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/core/math_types.h>
+#include <core/types.h>
+#include <core/math_types.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/graphics/texture_atlas.h b/Extra2D/include/graphics/texture_atlas.h
similarity index 96%
rename from Extra2D/include/extra2d/graphics/texture_atlas.h
rename to Extra2D/include/graphics/texture_atlas.h
index a912040..7c62563 100644
--- a/Extra2D/include/extra2d/graphics/texture_atlas.h
+++ b/Extra2D/include/graphics/texture_atlas.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/texture.h>
-#include <extra2d/graphics/opengl/gl_texture.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
+#include <graphics/texture.h>
+#include <graphics/opengl/gl_texture.h>
 #include <string>
 #include <vector>
 #include <unordered_map>
diff --git a/Extra2D/include/extra2d/graphics/vram_manager.h b/Extra2D/include/graphics/vram_manager.h
similarity index 100%
rename from Extra2D/include/extra2d/graphics/vram_manager.h
rename to Extra2D/include/graphics/vram_manager.h
diff --git a/Extra2D/include/extra2d/platform/input.h b/Extra2D/include/platform/input.h
similarity index 97%
rename from Extra2D/include/extra2d/platform/input.h
rename to Extra2D/include/platform/input.h
index ff16b13..11dd1ca 100644
--- a/Extra2D/include/extra2d/platform/input.h
+++ b/Extra2D/include/platform/input.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <array>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
-#include <extra2d/event/input_codes.h>
+#include <core/math_types.h>
+#include <core/types.h>
+#include <event/input_codes.h>
 
 #include <SDL.h>
 
diff --git a/Extra2D/include/extra2d/platform/window.h b/Extra2D/include/platform/window.h
similarity index 97%
rename from Extra2D/include/extra2d/platform/window.h
rename to Extra2D/include/platform/window.h
index 234d5e7..a1f4cac 100644
--- a/Extra2D/include/extra2d/platform/window.h
+++ b/Extra2D/include/platform/window.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/core/string.h>
-#include <extra2d/core/math_types.h>
+#include <core/types.h>
+#include <core/string.h>
+#include <core/math_types.h>
 #include <functional>
 
 #include <SDL.h>
diff --git a/Extra2D/include/extra2d/resource/resource_manager.h b/Extra2D/include/resource/resource_manager.h
similarity index 98%
rename from Extra2D/include/extra2d/resource/resource_manager.h
rename to Extra2D/include/resource/resource_manager.h
index 4b59853..c731f36 100644
--- a/Extra2D/include/extra2d/resource/resource_manager.h
+++ b/Extra2D/include/resource/resource_manager.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <extra2d/audio/sound.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/alpha_mask.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/graphics/texture.h>
+#include <audio/sound.h>
+#include <core/types.h>
+#include <graphics/alpha_mask.h>
+#include <graphics/font.h>
+#include <graphics/texture.h>
 #include <functional>
 #include <future>
 #include <mutex>
diff --git a/Extra2D/include/extra2d/scene/node.h b/Extra2D/include/scene/node.h
similarity index 98%
rename from Extra2D/include/extra2d/scene/node.h
rename to Extra2D/include/scene/node.h
index 8924e12..eb65779 100644
--- a/Extra2D/include/extra2d/scene/node.h
+++ b/Extra2D/include/scene/node.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <algorithm>
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
-#include <extra2d/event/event_dispatcher.h>
-#include <extra2d/graphics/render_backend.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <core/types.h>
+#include <event/event_dispatcher.h>
+#include <graphics/render_backend.h>
 #include <functional>
 #include <string>
 #include <vector>
diff --git a/Extra2D/include/extra2d/scene/scene.h b/Extra2D/include/scene/scene.h
similarity index 96%
rename from Extra2D/include/extra2d/scene/scene.h
rename to Extra2D/include/scene/scene.h
index 9d0a3d6..bc9c63a 100644
--- a/Extra2D/include/extra2d/scene/scene.h
+++ b/Extra2D/include/scene/scene.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/graphics/camera.h>
-#include <extra2d/scene/node.h>
-#include <extra2d/spatial/spatial_manager.h>
+#include <core/color.h>
+#include <graphics/camera.h>
+#include <scene/node.h>
+#include <spatial/spatial_manager.h>
 #include <vector>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/scene/scene_manager.h b/Extra2D/include/scene/scene_manager.h
similarity index 97%
rename from Extra2D/include/extra2d/scene/scene_manager.h
rename to Extra2D/include/scene/scene_manager.h
index 0b67928..04e45fd 100644
--- a/Extra2D/include/extra2d/scene/scene_manager.h
+++ b/Extra2D/include/scene/scene_manager.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/scene/scene.h>
-#include <extra2d/scene/transition_scene.h>
+#include <core/types.h>
+#include <scene/scene.h>
+#include <scene/transition_scene.h>
 #include <functional>
 #include <stack>
 #include <string>
diff --git a/Extra2D/include/extra2d/scene/shape_node.h b/Extra2D/include/scene/shape_node.h
similarity index 97%
rename from Extra2D/include/extra2d/scene/shape_node.h
rename to Extra2D/include/scene/shape_node.h
index 64550e6..3203fe3 100644
--- a/Extra2D/include/extra2d/scene/shape_node.h
+++ b/Extra2D/include/scene/shape_node.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/math_types.h>
-#include <extra2d/scene/node.h>
+#include <core/color.h>
+#include <core/math_types.h>
+#include <scene/node.h>
 #include <vector>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/scene/sprite.h b/Extra2D/include/scene/sprite.h
similarity index 95%
rename from Extra2D/include/extra2d/scene/sprite.h
rename to Extra2D/include/scene/sprite.h
index 0968ec4..d706f7e 100644
--- a/Extra2D/include/extra2d/scene/sprite.h
+++ b/Extra2D/include/scene/sprite.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/graphics/texture.h>
-#include <extra2d/scene/node.h>
+#include <graphics/texture.h>
+#include <scene/node.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/scene/transition_box_scene.h b/Extra2D/include/scene/transition_box_scene.h
similarity index 95%
rename from Extra2D/include/extra2d/scene/transition_box_scene.h
rename to Extra2D/include/scene/transition_box_scene.h
index 0a8a298..97635fb 100644
--- a/Extra2D/include/extra2d/scene/transition_box_scene.h
+++ b/Extra2D/include/scene/transition_box_scene.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/scene/transition_scene.h>
+#include <scene/transition_scene.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/scene/transition_fade_scene.h b/Extra2D/include/scene/transition_fade_scene.h
similarity index 93%
rename from Extra2D/include/extra2d/scene/transition_fade_scene.h
rename to Extra2D/include/scene/transition_fade_scene.h
index 095724c..1e242a1 100644
--- a/Extra2D/include/extra2d/scene/transition_fade_scene.h
+++ b/Extra2D/include/scene/transition_fade_scene.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/scene/transition_scene.h>
-#include <extra2d/scene/sprite.h>
-#include <extra2d/core/color.h>
+#include <scene/transition_scene.h>
+#include <scene/sprite.h>
+#include <core/color.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/scene/transition_flip_scene.h b/Extra2D/include/scene/transition_flip_scene.h
similarity index 95%
rename from Extra2D/include/extra2d/scene/transition_flip_scene.h
rename to Extra2D/include/scene/transition_flip_scene.h
index 9a0122b..aa2ba3b 100644
--- a/Extra2D/include/extra2d/scene/transition_flip_scene.h
+++ b/Extra2D/include/scene/transition_flip_scene.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/scene/transition_scene.h>
+#include <scene/transition_scene.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/scene/transition_scale_scene.h b/Extra2D/include/scene/transition_scale_scene.h
similarity index 94%
rename from Extra2D/include/extra2d/scene/transition_scale_scene.h
rename to Extra2D/include/scene/transition_scale_scene.h
index 0f1972e..8f379bc 100644
--- a/Extra2D/include/extra2d/scene/transition_scale_scene.h
+++ b/Extra2D/include/scene/transition_scale_scene.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/scene/transition_scene.h>
+#include <scene/transition_scene.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/scene/transition_scene.h b/Extra2D/include/scene/transition_scene.h
similarity index 99%
rename from Extra2D/include/extra2d/scene/transition_scene.h
rename to Extra2D/include/scene/transition_scene.h
index 93c9b2f..052ccd5 100644
--- a/Extra2D/include/extra2d/scene/transition_scene.h
+++ b/Extra2D/include/scene/transition_scene.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/scene/scene.h>
+#include <scene/scene.h>
 #include <functional>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/scene/transition_slide_scene.h b/Extra2D/include/scene/transition_slide_scene.h
similarity index 95%
rename from Extra2D/include/extra2d/scene/transition_slide_scene.h
rename to Extra2D/include/scene/transition_slide_scene.h
index f41e490..e69a1af 100644
--- a/Extra2D/include/extra2d/scene/transition_slide_scene.h
+++ b/Extra2D/include/scene/transition_slide_scene.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/scene/transition_scene.h>
+#include <scene/transition_scene.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/spatial/quadtree.h b/Extra2D/include/spatial/quadtree.h
similarity index 98%
rename from Extra2D/include/extra2d/spatial/quadtree.h
rename to Extra2D/include/spatial/quadtree.h
index d48337e..5b1cbe5 100644
--- a/Extra2D/include/extra2d/spatial/quadtree.h
+++ b/Extra2D/include/spatial/quadtree.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <array>
-#include <extra2d/spatial/spatial_index.h>
+#include <spatial/spatial_index.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/spatial/spatial_hash.h b/Extra2D/include/spatial/spatial_hash.h
similarity index 98%
rename from Extra2D/include/extra2d/spatial/spatial_hash.h
rename to Extra2D/include/spatial/spatial_hash.h
index 57d42bf..bfc7eae 100644
--- a/Extra2D/include/extra2d/spatial/spatial_hash.h
+++ b/Extra2D/include/spatial/spatial_hash.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/spatial/spatial_index.h>
+#include <spatial/spatial_index.h>
 #include <unordered_map>
 #include <vector>
 
diff --git a/Extra2D/include/extra2d/spatial/spatial_index.h b/Extra2D/include/spatial/spatial_index.h
similarity index 92%
rename from Extra2D/include/extra2d/spatial/spatial_index.h
rename to Extra2D/include/spatial/spatial_index.h
index a8e33dd..06ae8af 100644
--- a/Extra2D/include/extra2d/spatial/spatial_index.h
+++ b/Extra2D/include/spatial/spatial_index.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
+#include <core/math_types.h>
+#include <core/types.h>
 #include <memory>
 #include <vector>
 
diff --git a/Extra2D/include/extra2d/spatial/spatial_manager.h b/Extra2D/include/spatial/spatial_manager.h
similarity index 97%
rename from Extra2D/include/extra2d/spatial/spatial_manager.h
rename to Extra2D/include/spatial/spatial_manager.h
index ad6ddad..496c11f 100644
--- a/Extra2D/include/extra2d/spatial/spatial_manager.h
+++ b/Extra2D/include/spatial/spatial_manager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/spatial/spatial_index.h>
+#include <spatial/spatial_index.h>
 #include <functional>
 #include <memory>
 
diff --git a/Extra2D/include/extra2d/ui/button.h b/Extra2D/include/ui/button.h
similarity index 98%
rename from Extra2D/include/extra2d/ui/button.h
rename to Extra2D/include/ui/button.h
index db81183..d98c5e4 100644
--- a/Extra2D/include/extra2d/ui/button.h
+++ b/Extra2D/include/ui/button.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/graphics/texture.h>
-#include <extra2d/platform/window.h>
-#include <extra2d/ui/widget.h>
+#include <core/types.h>
+#include <graphics/font.h>
+#include <graphics/texture.h>
+#include <platform/window.h>
+#include <ui/widget.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/ui/check_box.h b/Extra2D/include/ui/check_box.h
similarity index 97%
rename from Extra2D/include/extra2d/ui/check_box.h
rename to Extra2D/include/ui/check_box.h
index c689eda..9a38520 100644
--- a/Extra2D/include/extra2d/ui/check_box.h
+++ b/Extra2D/include/ui/check_box.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/ui/widget.h>
+#include <core/types.h>
+#include <graphics/font.h>
+#include <ui/widget.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/ui/label.h b/Extra2D/include/ui/label.h
similarity index 98%
rename from Extra2D/include/extra2d/ui/label.h
rename to Extra2D/include/ui/label.h
index f272443..a27c68b 100644
--- a/Extra2D/include/extra2d/ui/label.h
+++ b/Extra2D/include/ui/label.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/ui/widget.h>
+#include <core/types.h>
+#include <graphics/font.h>
+#include <ui/widget.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/ui/progress_bar.h b/Extra2D/include/ui/progress_bar.h
similarity index 98%
rename from Extra2D/include/extra2d/ui/progress_bar.h
rename to Extra2D/include/ui/progress_bar.h
index e613d49..c09438e 100644
--- a/Extra2D/include/extra2d/ui/progress_bar.h
+++ b/Extra2D/include/ui/progress_bar.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/ui/widget.h>
+#include <core/types.h>
+#include <graphics/font.h>
+#include <ui/widget.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/ui/radio_button.h b/Extra2D/include/ui/radio_button.h
similarity index 97%
rename from Extra2D/include/extra2d/ui/radio_button.h
rename to Extra2D/include/ui/radio_button.h
index b3b8c49..305e65b 100644
--- a/Extra2D/include/extra2d/ui/radio_button.h
+++ b/Extra2D/include/ui/radio_button.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/ui/widget.h>
+#include <core/types.h>
+#include <graphics/font.h>
+#include <ui/widget.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/ui/slider.h b/Extra2D/include/ui/slider.h
similarity index 98%
rename from Extra2D/include/extra2d/ui/slider.h
rename to Extra2D/include/ui/slider.h
index ee670e6..96c0365 100644
--- a/Extra2D/include/extra2d/ui/slider.h
+++ b/Extra2D/include/ui/slider.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/ui/widget.h>
+#include <core/types.h>
+#include <graphics/font.h>
+#include <ui/widget.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/ui/text.h b/Extra2D/include/ui/text.h
similarity index 97%
rename from Extra2D/include/extra2d/ui/text.h
rename to Extra2D/include/ui/text.h
index d156393..33a20fe 100644
--- a/Extra2D/include/extra2d/ui/text.h
+++ b/Extra2D/include/ui/text.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/core/color.h>
-#include <extra2d/core/types.h>
-#include <extra2d/graphics/font.h>
-#include <extra2d/ui/widget.h>
+#include <core/color.h>
+#include <core/types.h>
+#include <graphics/font.h>
+#include <ui/widget.h>
 #include <cstdarg>
 #include <cstdio>
 #include <string>
diff --git a/Extra2D/include/extra2d/ui/widget.h b/Extra2D/include/ui/widget.h
similarity index 96%
rename from Extra2D/include/extra2d/ui/widget.h
rename to Extra2D/include/ui/widget.h
index 3aa44b5..c7f7625 100644
--- a/Extra2D/include/extra2d/ui/widget.h
+++ b/Extra2D/include/ui/widget.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <extra2d/core/math_types.h>
-#include <extra2d/core/types.h>
-#include <extra2d/platform/input.h>
-#include <extra2d/scene/node.h>
+#include <core/math_types.h>
+#include <core/types.h>
+#include <platform/input.h>
+#include <scene/node.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/include/extra2d/utils/data.h b/Extra2D/include/utils/data.h
similarity index 99%
rename from Extra2D/include/extra2d/utils/data.h
rename to Extra2D/include/utils/data.h
index 212400b..839fde4 100644
--- a/Extra2D/include/extra2d/utils/data.h
+++ b/Extra2D/include/utils/data.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/core/types.h>
+#include <core/types.h>
 #include <functional>
 #include <string>
 #include <vector>
diff --git a/Extra2D/include/extra2d/utils/logger.h b/Extra2D/include/utils/logger.h
similarity index 99%
rename from Extra2D/include/extra2d/utils/logger.h
rename to Extra2D/include/utils/logger.h
index 837ca26..8f0c3ba 100644
--- a/Extra2D/include/extra2d/utils/logger.h
+++ b/Extra2D/include/utils/logger.h
@@ -2,7 +2,7 @@
 
 #include <cstdarg>
 #include <cstdio>
-#include <extra2d/core/types.h>
+#include <core/types.h>
 #include <sstream>
 #include <string>
 #include <type_traits>
diff --git a/Extra2D/include/extra2d/utils/object_pool.h b/Extra2D/include/utils/object_pool.h
similarity index 99%
rename from Extra2D/include/extra2d/utils/object_pool.h
rename to Extra2D/include/utils/object_pool.h
index 39d54f8..55535b7 100644
--- a/Extra2D/include/extra2d/utils/object_pool.h
+++ b/Extra2D/include/utils/object_pool.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <extra2d/core/types.h>
-#include <extra2d/utils/logger.h>
+#include <core/types.h>
+#include <utils/logger.h>
 #include <atomic>
 #include <chrono>
 #include <cstddef>
diff --git a/Extra2D/include/extra2d/utils/random.h b/Extra2D/include/utils/random.h
similarity index 98%
rename from Extra2D/include/extra2d/utils/random.h
rename to Extra2D/include/utils/random.h
index 3909059..b83e744 100644
--- a/Extra2D/include/extra2d/utils/random.h
+++ b/Extra2D/include/utils/random.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <extra2d/core/types.h>
+#include <core/types.h>
 #include <random>
 
 namespace extra2d {
diff --git a/Extra2D/include/extra2d/utils/timer.h b/Extra2D/include/utils/timer.h
similarity index 98%
rename from Extra2D/include/extra2d/utils/timer.h
rename to Extra2D/include/utils/timer.h
index e220a8b..95f9428 100644
--- a/Extra2D/include/extra2d/utils/timer.h
+++ b/Extra2D/include/utils/timer.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <chrono>
-#include <extra2d/core/types.h>
+#include <core/types.h>
 #include <map>
 #include <memory>
 #include <vector>
diff --git a/Extra2D/src/action/action.cpp b/Extra2D/src/action/action.cpp
index e770896..3dbcb58 100644
--- a/Extra2D/src/action/action.cpp
+++ b/Extra2D/src/action/action.cpp
@@ -1,5 +1,5 @@
-#include "extra2d/action/action.h"
-#include "extra2d/scene/node.h"
+#include "action/action.h"
+#include "scene/node.h"
 
 namespace extra2d {
 
diff --git a/Extra2D/src/action/action_ease.cpp b/Extra2D/src/action/action_ease.cpp
index e2eec8b..2421536 100644
--- a/Extra2D/src/action/action_ease.cpp
+++ b/Extra2D/src/action/action_ease.cpp
@@ -1,4 +1,4 @@
-#include "extra2d/action/action_ease.h"
+#include "action/action_ease.h"
 #include <cmath>
 
 #ifndef M_PI
diff --git a/Extra2D/src/action/action_instant.cpp b/Extra2D/src/action/action_instant.cpp
index 7cd8ad1..9a3b74a 100644
--- a/Extra2D/src/action/action_instant.cpp
+++ b/Extra2D/src/action/action_instant.cpp
@@ -1,5 +1,5 @@
-#include "extra2d/action/action_instant.h"
-#include "extra2d/scene/node.h"
+#include "action/action_instant.h"
+#include "scene/node.h"
 
 namespace extra2d {
 
diff --git a/Extra2D/src/action/action_instant_actions.cpp b/Extra2D/src/action/action_instant_actions.cpp
index 7afcae3..cb0d89c 100644
--- a/Extra2D/src/action/action_instant_actions.cpp
+++ b/Extra2D/src/action/action_instant_actions.cpp
@@ -1,5 +1,5 @@
-#include "extra2d/action/action_instant_actions.h"
-#include "extra2d/scene/node.h"
+#include "action/action_instant_actions.h"
+#include "scene/node.h"
 
 namespace extra2d {
 
diff --git a/Extra2D/src/action/action_interval.cpp b/Extra2D/src/action/action_interval.cpp
index 5643020..8b07c7b 100644
--- a/Extra2D/src/action/action_interval.cpp
+++ b/Extra2D/src/action/action_interval.cpp
@@ -1,5 +1,5 @@
-#include "extra2d/action/action_interval.h"
-#include "extra2d/scene/node.h"
+#include "action/action_interval.h"
+#include "scene/node.h"
 
 namespace extra2d {
 
diff --git a/Extra2D/src/action/action_interval_actions.cpp b/Extra2D/src/action/action_interval_actions.cpp
index f986c99..ad43696 100644
--- a/Extra2D/src/action/action_interval_actions.cpp
+++ b/Extra2D/src/action/action_interval_actions.cpp
@@ -1,5 +1,5 @@
-#include "extra2d/action/action_interval_actions.h"
-#include "extra2d/scene/node.h"
+#include "action/action_interval_actions.h"
+#include "scene/node.h"
 #include <algorithm>
 #include <cstdarg>
 
diff --git a/Extra2D/src/action/action_manager.cpp b/Extra2D/src/action/action_manager.cpp
index cbecbf8..6e4aabf 100644
--- a/Extra2D/src/action/action_manager.cpp
+++ b/Extra2D/src/action/action_manager.cpp
@@ -1,6 +1,6 @@
-#include "extra2d/action/action_manager.h"
-#include "extra2d/scene/node.h"
-#include "extra2d/utils/logger.h"
+#include "action/action_manager.h"
+#include "scene/node.h"
+#include "utils/logger.h"
 
 namespace extra2d {
 
diff --git a/Extra2D/src/action/action_special.cpp b/Extra2D/src/action/action_special.cpp
index a3df981..4c548d9 100644
--- a/Extra2D/src/action/action_special.cpp
+++ b/Extra2D/src/action/action_special.cpp
@@ -1,5 +1,5 @@
-#include "extra2d/action/action_special.h"
-#include "extra2d/scene/node.h"
+#include "action/action_special.h"
+#include "scene/node.h"
 
 namespace extra2d {
 
diff --git a/Extra2D/src/action/ease.cpp b/Extra2D/src/action/ease.cpp
index aa382b9..6b7f47f 100644
--- a/Extra2D/src/action/ease.cpp
+++ b/Extra2D/src/action/ease.cpp
@@ -1,4 +1,4 @@
-#include "extra2d/action/ease.h"
+#include "action/ease.h"
 #include <cmath>
 
 namespace extra2d {
diff --git a/Extra2D/src/action/finite_time_action.cpp b/Extra2D/src/action/finite_time_action.cpp
index 41d6a7e..d82a03b 100644
--- a/Extra2D/src/action/finite_time_action.cpp
+++ b/Extra2D/src/action/finite_time_action.cpp
@@ -1,4 +1,4 @@
-#include "extra2d/action/finite_time_action.h"
+#include "action/finite_time_action.h"
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/als_parser.cpp b/Extra2D/src/animation/als_parser.cpp
index 73808ad..9b767e1 100644
--- a/Extra2D/src/animation/als_parser.cpp
+++ b/Extra2D/src/animation/als_parser.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/animation/als_parser.h>
-#include <extra2d/utils/logger.h>
+#include <animation/als_parser.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/ani_binary_parser.cpp b/Extra2D/src/animation/ani_binary_parser.cpp
index e7c035a..ee8c628 100644
--- a/Extra2D/src/animation/ani_binary_parser.cpp
+++ b/Extra2D/src/animation/ani_binary_parser.cpp
@@ -1,8 +1,8 @@
 #include <cassert>
 #include <cstring>
-#include <extra2d/animation/ani_binary_parser.h>
-#include <extra2d/animation/sprite_frame_cache.h>
-#include <extra2d/utils/logger.h>
+#include <animation/ani_binary_parser.h>
+#include <animation/sprite_frame_cache.h>
+#include <utils/logger.h>
 #include <fstream>
 
 namespace extra2d {
diff --git a/Extra2D/src/animation/ani_parser.cpp b/Extra2D/src/animation/ani_parser.cpp
index 29fd3b1..f2f9fc8 100644
--- a/Extra2D/src/animation/ani_parser.cpp
+++ b/Extra2D/src/animation/ani_parser.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/animation/ani_parser.h>
-#include <extra2d/animation/sprite_frame_cache.h>
-#include <extra2d/utils/logger.h>
+#include <animation/ani_parser.h>
+#include <animation/sprite_frame_cache.h>
+#include <utils/logger.h>
 #include <fstream>
 #include <sstream>
 
diff --git a/Extra2D/src/animation/animated_sprite.cpp b/Extra2D/src/animation/animated_sprite.cpp
index 4619df3..5d26e90 100644
--- a/Extra2D/src/animation/animated_sprite.cpp
+++ b/Extra2D/src/animation/animated_sprite.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/animation/animated_sprite.h>
-#include <extra2d/animation/interpolation_engine.h>
+#include <animation/animated_sprite.h>
+#include <animation/interpolation_engine.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/animation_cache.cpp b/Extra2D/src/animation/animation_cache.cpp
index 95bcff2..b50021a 100644
--- a/Extra2D/src/animation/animation_cache.cpp
+++ b/Extra2D/src/animation/animation_cache.cpp
@@ -1,7 +1,7 @@
-#include <extra2d/animation/ani_binary_parser.h>
-#include <extra2d/animation/ani_parser.h>
-#include <extra2d/animation/animation_cache.h>
-#include <extra2d/utils/logger.h>
+#include <animation/ani_binary_parser.h>
+#include <animation/ani_parser.h>
+#include <animation/animation_cache.h>
+#include <utils/logger.h>
 #include <fstream>
 
 namespace extra2d {
diff --git a/Extra2D/src/animation/animation_clip.cpp b/Extra2D/src/animation/animation_clip.cpp
index a37a281..43c2226 100644
--- a/Extra2D/src/animation/animation_clip.cpp
+++ b/Extra2D/src/animation/animation_clip.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/animation/animation_clip.h>
+#include <animation/animation_clip.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/animation_controller.cpp b/Extra2D/src/animation/animation_controller.cpp
index 8466510..22ad90e 100644
--- a/Extra2D/src/animation/animation_controller.cpp
+++ b/Extra2D/src/animation/animation_controller.cpp
@@ -1,5 +1,5 @@
 #include <cassert>
-#include <extra2d/animation/animation_controller.h>
+#include <animation/animation_controller.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/animation_frame.cpp b/Extra2D/src/animation/animation_frame.cpp
index f4396dd..68abc56 100644
--- a/Extra2D/src/animation/animation_frame.cpp
+++ b/Extra2D/src/animation/animation_frame.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/animation/animation_frame.h>
+#include <animation/animation_frame.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/animation_node.cpp b/Extra2D/src/animation/animation_node.cpp
index 3b8788d..b52c7ba 100644
--- a/Extra2D/src/animation/animation_node.cpp
+++ b/Extra2D/src/animation/animation_node.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/animation/animation_node.h>
-#include <extra2d/animation/interpolation_engine.h>
+#include <animation/animation_node.h>
+#include <animation/interpolation_engine.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/composite_animation.cpp b/Extra2D/src/animation/composite_animation.cpp
index 07b186a..82ce4e6 100644
--- a/Extra2D/src/animation/composite_animation.cpp
+++ b/Extra2D/src/animation/composite_animation.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/animation/animation_cache.h>
-#include <extra2d/animation/composite_animation.h>
+#include <animation/animation_cache.h>
+#include <animation/composite_animation.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/frame_property.cpp b/Extra2D/src/animation/frame_property.cpp
index 03736fc..28de721 100644
--- a/Extra2D/src/animation/frame_property.cpp
+++ b/Extra2D/src/animation/frame_property.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/animation/frame_property.h>
+#include <animation/frame_property.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/frame_renderer.cpp b/Extra2D/src/animation/frame_renderer.cpp
index 5e4ce2d..c16430f 100644
--- a/Extra2D/src/animation/frame_renderer.cpp
+++ b/Extra2D/src/animation/frame_renderer.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/animation/frame_renderer.h>
-#include <extra2d/graphics/texture.h>
+#include <animation/frame_renderer.h>
+#include <graphics/texture.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/interpolation_engine.cpp b/Extra2D/src/animation/interpolation_engine.cpp
index d0799bc..c403171 100644
--- a/Extra2D/src/animation/interpolation_engine.cpp
+++ b/Extra2D/src/animation/interpolation_engine.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/animation/interpolation_engine.h>
+#include <animation/interpolation_engine.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/sprite_frame.cpp b/Extra2D/src/animation/sprite_frame.cpp
index 2b72137..ae39e55 100644
--- a/Extra2D/src/animation/sprite_frame.cpp
+++ b/Extra2D/src/animation/sprite_frame.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/animation/sprite_frame.h>
+#include <animation/sprite_frame.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/animation/sprite_frame_cache.cpp b/Extra2D/src/animation/sprite_frame_cache.cpp
index 0a08b67..33e8c99 100644
--- a/Extra2D/src/animation/sprite_frame_cache.cpp
+++ b/Extra2D/src/animation/sprite_frame_cache.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/animation/sprite_frame_cache.h>
+#include <animation/sprite_frame_cache.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/app/application.cpp b/Extra2D/src/app/application.cpp
index dbec1a4..7a0738e 100644
--- a/Extra2D/src/app/application.cpp
+++ b/Extra2D/src/app/application.cpp
@@ -1,18 +1,18 @@
-#include <extra2d/action/action_manager.h>
-#include <extra2d/app/application.h>
-#include <extra2d/audio/audio_engine.h>
-#include <extra2d/event/event_dispatcher.h>
-#include <extra2d/event/event_queue.h>
-#include <extra2d/graphics/camera.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/graphics/vram_manager.h>
-#include <extra2d/platform/input.h>
-#include <extra2d/platform/window.h>
-#include <extra2d/resource/resource_manager.h>
-#include <extra2d/scene/scene_manager.h>
-#include <extra2d/utils/logger.h>
-#include <extra2d/utils/object_pool.h>
-#include <extra2d/utils/timer.h>
+#include <action/action_manager.h>
+#include <app/application.h>
+#include <audio/audio_engine.h>
+#include <event/event_dispatcher.h>
+#include <event/event_queue.h>
+#include <graphics/camera.h>
+#include <graphics/render_backend.h>
+#include <graphics/vram_manager.h>
+#include <platform/input.h>
+#include <platform/window.h>
+#include <resource/resource_manager.h>
+#include <scene/scene_manager.h>
+#include <utils/logger.h>
+#include <utils/object_pool.h>
+#include <utils/timer.h>
 
 
 #include <chrono>
diff --git a/Extra2D/src/audio/audio_engine.cpp b/Extra2D/src/audio/audio_engine.cpp
index cc7f6f1..ac368d4 100644
--- a/Extra2D/src/audio/audio_engine.cpp
+++ b/Extra2D/src/audio/audio_engine.cpp
@@ -1,6 +1,6 @@
-#include "extra2d/audio/audio_engine.h"
-#include "extra2d/audio/sound.h"
-#include "extra2d/utils/logger.h"
+#include "audio/audio_engine.h"
+#include "audio/sound.h"
+#include "utils/logger.h"
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_mixer.h>
diff --git a/Extra2D/src/audio/sound.cpp b/Extra2D/src/audio/sound.cpp
index b5dad3a..9f253ad 100644
--- a/Extra2D/src/audio/sound.cpp
+++ b/Extra2D/src/audio/sound.cpp
@@ -1,6 +1,6 @@
 #include <SDL2/SDL_mixer.h>
-#include <extra2d/audio/sound.h>
-#include <extra2d/utils/logger.h>
+#include <audio/sound.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/core/string.cpp b/Extra2D/src/core/string.cpp
index 95e05b2..128089d 100644
--- a/Extra2D/src/core/string.cpp
+++ b/Extra2D/src/core/string.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/core/string.h>
+#include <core/string.h>
 
 #ifdef _WIN32
 #include <windows.h>
diff --git a/Extra2D/src/effects/custom_effect_manager.cpp b/Extra2D/src/effects/custom_effect_manager.cpp
index 7265e97..4c97bfb 100644
--- a/Extra2D/src/effects/custom_effect_manager.cpp
+++ b/Extra2D/src/effects/custom_effect_manager.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/effects/custom_effect_manager.h>
-#include <extra2d/utils/logger.h>
+#include <effects/custom_effect_manager.h>
+#include <utils/logger.h>
 #include <fstream>
 #include <nlohmann/json.hpp>
 #include <sstream>
diff --git a/Extra2D/src/effects/particle_system.cpp b/Extra2D/src/effects/particle_system.cpp
index e9bdd9c..42a626d 100644
--- a/Extra2D/src/effects/particle_system.cpp
+++ b/Extra2D/src/effects/particle_system.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
-#include <extra2d/effects/particle_system.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/utils/logger.h>
+#include <effects/particle_system.h>
+#include <graphics/render_backend.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/effects/post_process.cpp b/Extra2D/src/effects/post_process.cpp
index 72c378c..7138994 100644
--- a/Extra2D/src/effects/post_process.cpp
+++ b/Extra2D/src/effects/post_process.cpp
@@ -1,7 +1,7 @@
-#include <extra2d/effects/post_process.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/graphics/render_target.h>
-#include <extra2d/utils/logger.h>
+#include <effects/post_process.h>
+#include <graphics/render_backend.h>
+#include <graphics/render_target.h>
+#include <utils/logger.h>
 
 #include <glad/glad.h>
 
diff --git a/Extra2D/src/event/event.cpp b/Extra2D/src/event/event.cpp
index b4b85dc..9fd0cac 100644
--- a/Extra2D/src/event/event.cpp
+++ b/Extra2D/src/event/event.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/event/event.h>
+#include <event/event.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/event/event_dispatcher.cpp b/Extra2D/src/event/event_dispatcher.cpp
index 8e69221..740c889 100644
--- a/Extra2D/src/event/event_dispatcher.cpp
+++ b/Extra2D/src/event/event_dispatcher.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/event/event_dispatcher.h>
-#include <extra2d/event/event_queue.h>
+#include <event/event_dispatcher.h>
+#include <event/event_queue.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/event/event_queue.cpp b/Extra2D/src/event/event_queue.cpp
index 538254a..5be9cde 100644
--- a/Extra2D/src/event/event_queue.cpp
+++ b/Extra2D/src/event/event_queue.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/event/event_queue.h>
+#include <event/event_queue.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/graphics/alpha_mask.cpp b/Extra2D/src/graphics/alpha_mask.cpp
index 1a6fde9..2a5efe0 100644
--- a/Extra2D/src/graphics/alpha_mask.cpp
+++ b/Extra2D/src/graphics/alpha_mask.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/graphics/alpha_mask.h>
+#include <graphics/alpha_mask.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/graphics/camera.cpp b/Extra2D/src/graphics/camera.cpp
index 1d982d2..1126123 100644
--- a/Extra2D/src/graphics/camera.cpp
+++ b/Extra2D/src/graphics/camera.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <extra2d/graphics/camera.h>
+#include <graphics/camera.h>
 #include <glm/gtc/matrix_transform.hpp>
 
 namespace extra2d {
diff --git a/Extra2D/src/graphics/gpu_context.cpp b/Extra2D/src/graphics/gpu_context.cpp
index 959dbfd..9aaf161 100644
--- a/Extra2D/src/graphics/gpu_context.cpp
+++ b/Extra2D/src/graphics/gpu_context.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/graphics/gpu_context.h>
+#include <graphics/gpu_context.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/graphics/opengl/gl_font_atlas.cpp b/Extra2D/src/graphics/opengl/gl_font_atlas.cpp
index 6fd4dd4..e91c63d 100644
--- a/Extra2D/src/graphics/opengl/gl_font_atlas.cpp
+++ b/Extra2D/src/graphics/opengl/gl_font_atlas.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/graphics/opengl/gl_font_atlas.h>
-#include <extra2d/core/string.h>
-#include <extra2d/utils/logger.h>
+#include <graphics/opengl/gl_font_atlas.h>
+#include <core/string.h>
+#include <utils/logger.h>
 #include <fstream>
 #define STB_TRUETYPE_IMPLEMENTATION
 #include <stb/stb_truetype.h>
diff --git a/Extra2D/src/graphics/opengl/gl_renderer.cpp b/Extra2D/src/graphics/opengl/gl_renderer.cpp
index 2be034c..bfcc9ac 100644
--- a/Extra2D/src/graphics/opengl/gl_renderer.cpp
+++ b/Extra2D/src/graphics/opengl/gl_renderer.cpp
@@ -2,14 +2,14 @@
 #include <algorithm>
 #include <cmath>
 #include <cstring>
-#include <extra2d/core/string.h>
-#include <extra2d/graphics/gpu_context.h>
-#include <extra2d/graphics/opengl/gl_font_atlas.h>
-#include <extra2d/graphics/opengl/gl_renderer.h>
-#include <extra2d/graphics/opengl/gl_texture.h>
-#include <extra2d/graphics/vram_manager.h>
-#include <extra2d/platform/window.h>
-#include <extra2d/utils/logger.h>
+#include <core/string.h>
+#include <graphics/gpu_context.h>
+#include <graphics/opengl/gl_font_atlas.h>
+#include <graphics/opengl/gl_renderer.h>
+#include <graphics/opengl/gl_texture.h>
+#include <graphics/vram_manager.h>
+#include <platform/window.h>
+#include <utils/logger.h>
 #include <vector>
 
 namespace extra2d {
diff --git a/Extra2D/src/graphics/opengl/gl_shader.cpp b/Extra2D/src/graphics/opengl/gl_shader.cpp
index c20e777..9ab1944 100644
--- a/Extra2D/src/graphics/opengl/gl_shader.cpp
+++ b/Extra2D/src/graphics/opengl/gl_shader.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/graphics/opengl/gl_shader.h>
-#include <extra2d/utils/logger.h>
+#include <graphics/opengl/gl_shader.h>
+#include <utils/logger.h>
 #include <fstream>
 #include <sstream>
 
diff --git a/Extra2D/src/graphics/opengl/gl_sprite_batch.cpp b/Extra2D/src/graphics/opengl/gl_sprite_batch.cpp
index 2969e0e..b56dedd 100644
--- a/Extra2D/src/graphics/opengl/gl_sprite_batch.cpp
+++ b/Extra2D/src/graphics/opengl/gl_sprite_batch.cpp
@@ -1,6 +1,6 @@
 #include <cstring>
-#include <extra2d/graphics/opengl/gl_sprite_batch.h>
-#include <extra2d/utils/logger.h>
+#include <graphics/opengl/gl_sprite_batch.h>
+#include <utils/logger.h>
 #include <glm/gtc/matrix_transform.hpp>
 
 namespace extra2d {
diff --git a/Extra2D/src/graphics/opengl/gl_texture.cpp b/Extra2D/src/graphics/opengl/gl_texture.cpp
index d914d07..bdec889 100644
--- a/Extra2D/src/graphics/opengl/gl_texture.cpp
+++ b/Extra2D/src/graphics/opengl/gl_texture.cpp
@@ -1,9 +1,9 @@
-#include <extra2d/graphics/opengl/gl_texture.h>
-#include <extra2d/graphics/gpu_context.h>
-#include <extra2d/graphics/vram_manager.h>
+#include <graphics/opengl/gl_texture.h>
+#include <graphics/gpu_context.h>
+#include <graphics/vram_manager.h>
 #define STB_IMAGE_IMPLEMENTATION
 #include <cstring>
-#include <extra2d/utils/logger.h>
+#include <utils/logger.h>
 #include <fstream>
 #include <stb/stb_image.h>
 
diff --git a/Extra2D/src/graphics/render_backend.cpp b/Extra2D/src/graphics/render_backend.cpp
index 3a4c1db..64d38b6 100644
--- a/Extra2D/src/graphics/render_backend.cpp
+++ b/Extra2D/src/graphics/render_backend.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/graphics/opengl/gl_renderer.h>
-#include <extra2d/graphics/render_backend.h>
+#include <graphics/opengl/gl_renderer.h>
+#include <graphics/render_backend.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/graphics/render_command.cpp b/Extra2D/src/graphics/render_command.cpp
index 19980cc..8c10c61 100644
--- a/Extra2D/src/graphics/render_command.cpp
+++ b/Extra2D/src/graphics/render_command.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/graphics/render_command.h>
+#include <graphics/render_command.h>
 #include <algorithm>
 
 namespace extra2d {
diff --git a/Extra2D/src/graphics/render_target.cpp b/Extra2D/src/graphics/render_target.cpp
index adac9ac..ccb3f50 100644
--- a/Extra2D/src/graphics/render_target.cpp
+++ b/Extra2D/src/graphics/render_target.cpp
@@ -1,7 +1,7 @@
 #include <glad/glad.h>
-#include <extra2d/graphics/opengl/gl_texture.h>
-#include <extra2d/graphics/render_target.h>
-#include <extra2d/utils/logger.h>
+#include <graphics/opengl/gl_texture.h>
+#include <graphics/render_target.h>
+#include <utils/logger.h>
 
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include <stb/stb_image_write.h>
diff --git a/Extra2D/src/graphics/shader_preset.cpp b/Extra2D/src/graphics/shader_preset.cpp
index e9cce1e..796bfda 100644
--- a/Extra2D/src/graphics/shader_preset.cpp
+++ b/Extra2D/src/graphics/shader_preset.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/graphics/shader_preset.h>
-#include <extra2d/utils/logger.h>
+#include <graphics/shader_preset.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/graphics/shader_system.cpp b/Extra2D/src/graphics/shader_system.cpp
index f330f7c..a2cccb8 100644
--- a/Extra2D/src/graphics/shader_system.cpp
+++ b/Extra2D/src/graphics/shader_system.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/core/color.h>
-#include <extra2d/graphics/shader_system.h>
-#include <extra2d/utils/logger.h>
+#include <core/color.h>
+#include <graphics/shader_system.h>
+#include <utils/logger.h>
 #include <fstream>
 #include <sstream>
 #include <sys/stat.h>
diff --git a/Extra2D/src/graphics/texture_atlas.cpp b/Extra2D/src/graphics/texture_atlas.cpp
index ba44b81..d9dcf7a 100644
--- a/Extra2D/src/graphics/texture_atlas.cpp
+++ b/Extra2D/src/graphics/texture_atlas.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/graphics/texture_atlas.h>
-#include <extra2d/utils/logger.h>
+#include <graphics/texture_atlas.h>
+#include <utils/logger.h>
 #include <algorithm>
 #include <cstring>
 
diff --git a/Extra2D/src/graphics/vram_manager.cpp b/Extra2D/src/graphics/vram_manager.cpp
index 97dfae4..ccedf76 100644
--- a/Extra2D/src/graphics/vram_manager.cpp
+++ b/Extra2D/src/graphics/vram_manager.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
-#include <extra2d/graphics/vram_manager.h>
-#include <extra2d/utils/logger.h>
+#include <graphics/vram_manager.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/platform/input.cpp b/Extra2D/src/platform/input.cpp
index 3b7f0c9..ed33345 100644
--- a/Extra2D/src/platform/input.cpp
+++ b/Extra2D/src/platform/input.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/event/input_codes.h>
-#include <extra2d/platform/input.h>
-#include <extra2d/utils/logger.h>
+#include <event/input_codes.h>
+#include <platform/input.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/platform/window.cpp b/Extra2D/src/platform/window.cpp
index a92ea8e..26049e6 100644
--- a/Extra2D/src/platform/window.cpp
+++ b/Extra2D/src/platform/window.cpp
@@ -1,7 +1,7 @@
-#include <extra2d/event/event_queue.h>
-#include <extra2d/platform/input.h>
-#include <extra2d/platform/window.h>
-#include <extra2d/utils/logger.h>
+#include <event/event_queue.h>
+#include <platform/input.h>
+#include <platform/window.h>
+#include <utils/logger.h>
 
 #include <SDL.h>
 
diff --git a/Extra2D/src/resource/resource_manager.cpp b/Extra2D/src/resource/resource_manager.cpp
index 29e6c4e..247cd81 100644
--- a/Extra2D/src/resource/resource_manager.cpp
+++ b/Extra2D/src/resource/resource_manager.cpp
@@ -1,10 +1,10 @@
 #include <algorithm>
 #include <cstring>
-#include <extra2d/audio/audio_engine.h>
-#include <extra2d/graphics/opengl/gl_font_atlas.h>
-#include <extra2d/graphics/opengl/gl_texture.h>
-#include <extra2d/resource/resource_manager.h>
-#include <extra2d/utils/logger.h>
+#include <audio/audio_engine.h>
+#include <graphics/opengl/gl_font_atlas.h>
+#include <graphics/opengl/gl_texture.h>
+#include <resource/resource_manager.h>
+#include <utils/logger.h>
 #include <sys/stat.h>
 
 // Windows 平台需要包含的头文件
diff --git a/Extra2D/src/scene/node.cpp b/Extra2D/src/scene/node.cpp
index ec24190..f28ee36 100644
--- a/Extra2D/src/scene/node.cpp
+++ b/Extra2D/src/scene/node.cpp
@@ -1,11 +1,11 @@
 #include <algorithm>
 #include <cmath>
-#include <extra2d/action/action.h>
-#include <extra2d/action/action_manager.h>
-#include <extra2d/graphics/render_command.h>
-#include <extra2d/scene/node.h>
-#include <extra2d/scene/scene.h>
-#include <extra2d/utils/logger.h>
+#include <action/action.h>
+#include <action/action_manager.h>
+#include <graphics/render_command.h>
+#include <scene/node.h>
+#include <scene/scene.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/scene/scene.cpp b/Extra2D/src/scene/scene.cpp
index adb6050..5bd58f1 100644
--- a/Extra2D/src/scene/scene.cpp
+++ b/Extra2D/src/scene/scene.cpp
@@ -1,7 +1,7 @@
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/graphics/render_command.h>
-#include <extra2d/scene/scene.h>
-#include <extra2d/utils/logger.h>
+#include <graphics/render_backend.h>
+#include <graphics/render_command.h>
+#include <scene/scene.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/scene/scene_manager.cpp b/Extra2D/src/scene/scene_manager.cpp
index 8a8f82c..bf768cc 100644
--- a/Extra2D/src/scene/scene_manager.cpp
+++ b/Extra2D/src/scene/scene_manager.cpp
@@ -1,16 +1,16 @@
 #include <algorithm>
-#include <extra2d/app/application.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/graphics/render_command.h>
-#include <extra2d/platform/input.h>
-#include <extra2d/scene/scene_manager.h>
-#include <extra2d/scene/transition_box_scene.h>
-#include <extra2d/scene/transition_fade_scene.h>
-#include <extra2d/scene/transition_flip_scene.h>
-#include <extra2d/scene/transition_scale_scene.h>
-#include <extra2d/scene/transition_scene.h>
-#include <extra2d/scene/transition_slide_scene.h>
-#include <extra2d/utils/logger.h>
+#include <app/application.h>
+#include <graphics/render_backend.h>
+#include <graphics/render_command.h>
+#include <platform/input.h>
+#include <scene/scene_manager.h>
+#include <scene/transition_box_scene.h>
+#include <scene/transition_fade_scene.h>
+#include <scene/transition_flip_scene.h>
+#include <scene/transition_scale_scene.h>
+#include <scene/transition_scene.h>
+#include <scene/transition_slide_scene.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/scene/shape_node.cpp b/Extra2D/src/scene/shape_node.cpp
index fb46c41..80a1268 100644
--- a/Extra2D/src/scene/shape_node.cpp
+++ b/Extra2D/src/scene/shape_node.cpp
@@ -1,8 +1,8 @@
 #include <algorithm>
 #include <cmath>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/graphics/render_command.h>
-#include <extra2d/scene/shape_node.h>
+#include <graphics/render_backend.h>
+#include <graphics/render_command.h>
+#include <scene/shape_node.h>
 #include <limits>
 
 namespace extra2d {
diff --git a/Extra2D/src/scene/sprite.cpp b/Extra2D/src/scene/sprite.cpp
index 185f483..e2890f3 100644
--- a/Extra2D/src/scene/sprite.cpp
+++ b/Extra2D/src/scene/sprite.cpp
@@ -1,9 +1,9 @@
 #include <algorithm>
 #include <cmath>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/graphics/render_command.h>
-#include <extra2d/graphics/texture.h>
-#include <extra2d/scene/sprite.h>
+#include <graphics/render_backend.h>
+#include <graphics/render_command.h>
+#include <graphics/texture.h>
+#include <scene/sprite.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/scene/transition_box_scene.cpp b/Extra2D/src/scene/transition_box_scene.cpp
index 220a451..efc6cab 100644
--- a/Extra2D/src/scene/transition_box_scene.cpp
+++ b/Extra2D/src/scene/transition_box_scene.cpp
@@ -1,7 +1,7 @@
-#include <extra2d/scene/transition_box_scene.h>
-#include <extra2d/app/application.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/core/color.h>
+#include <scene/transition_box_scene.h>
+#include <app/application.h>
+#include <graphics/render_backend.h>
+#include <core/color.h>
 #include <glm/gtc/matrix_transform.hpp>
 #include <algorithm>
 
diff --git a/Extra2D/src/scene/transition_fade_scene.cpp b/Extra2D/src/scene/transition_fade_scene.cpp
index 45c6789..53f8a0c 100644
--- a/Extra2D/src/scene/transition_fade_scene.cpp
+++ b/Extra2D/src/scene/transition_fade_scene.cpp
@@ -1,8 +1,8 @@
-#include <extra2d/scene/transition_fade_scene.h>
-#include <extra2d/app/application.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/graphics/render_target.h>
-#include <extra2d/utils/logger.h>
+#include <scene/transition_fade_scene.h>
+#include <app/application.h>
+#include <graphics/render_backend.h>
+#include <graphics/render_target.h>
+#include <utils/logger.h>
 #include <glm/gtc/matrix_transform.hpp>
 
 namespace extra2d {
diff --git a/Extra2D/src/scene/transition_flip_scene.cpp b/Extra2D/src/scene/transition_flip_scene.cpp
index b63075f..c600265 100644
--- a/Extra2D/src/scene/transition_flip_scene.cpp
+++ b/Extra2D/src/scene/transition_flip_scene.cpp
@@ -1,7 +1,7 @@
-#include <extra2d/scene/transition_flip_scene.h>
-#include <extra2d/graphics/camera.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/core/math_types.h>
+#include <scene/transition_flip_scene.h>
+#include <graphics/camera.h>
+#include <graphics/render_backend.h>
+#include <core/math_types.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/scene/transition_scale_scene.cpp b/Extra2D/src/scene/transition_scale_scene.cpp
index 235b533..549386a 100644
--- a/Extra2D/src/scene/transition_scale_scene.cpp
+++ b/Extra2D/src/scene/transition_scale_scene.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/scene/transition_scale_scene.h>
-#include <extra2d/graphics/camera.h>
-#include <extra2d/graphics/render_backend.h>
+#include <scene/transition_scale_scene.h>
+#include <graphics/camera.h>
+#include <graphics/render_backend.h>
 #include <algorithm>
 
 namespace extra2d {
diff --git a/Extra2D/src/scene/transition_scene.cpp b/Extra2D/src/scene/transition_scene.cpp
index 592d891..56da9b5 100644
--- a/Extra2D/src/scene/transition_scene.cpp
+++ b/Extra2D/src/scene/transition_scene.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/scene/transition_scene.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/utils/logger.h>
+#include <scene/transition_scene.h>
+#include <graphics/render_backend.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/scene/transition_slide_scene.cpp b/Extra2D/src/scene/transition_slide_scene.cpp
index b5b3f0a..e5f9de8 100644
--- a/Extra2D/src/scene/transition_slide_scene.cpp
+++ b/Extra2D/src/scene/transition_slide_scene.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/scene/transition_slide_scene.h>
-#include <extra2d/graphics/camera.h>
-#include <extra2d/graphics/render_backend.h>
+#include <scene/transition_slide_scene.h>
+#include <graphics/camera.h>
+#include <graphics/render_backend.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/spatial/quadtree.cpp b/Extra2D/src/spatial/quadtree.cpp
index 5d6672e..0cd394c 100644
--- a/Extra2D/src/spatial/quadtree.cpp
+++ b/Extra2D/src/spatial/quadtree.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
-#include <extra2d/scene/node.h>
-#include <extra2d/spatial/quadtree.h>
+#include <scene/node.h>
+#include <spatial/quadtree.h>
 #include <functional>
 
 namespace extra2d {
diff --git a/Extra2D/src/spatial/spatial_hash.cpp b/Extra2D/src/spatial/spatial_hash.cpp
index 463707f..d904201 100644
--- a/Extra2D/src/spatial/spatial_hash.cpp
+++ b/Extra2D/src/spatial/spatial_hash.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include <cstdint>
-#include <extra2d/scene/node.h>
-#include <extra2d/spatial/spatial_hash.h>
+#include <scene/node.h>
+#include <spatial/spatial_hash.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/spatial/spatial_manager.cpp b/Extra2D/src/spatial/spatial_manager.cpp
index 45bd2d7..7a27552 100644
--- a/Extra2D/src/spatial/spatial_manager.cpp
+++ b/Extra2D/src/spatial/spatial_manager.cpp
@@ -1,8 +1,8 @@
 #include <chrono>
-#include <extra2d/scene/node.h>
-#include <extra2d/spatial/quadtree.h>
-#include <extra2d/spatial/spatial_hash.h>
-#include <extra2d/spatial/spatial_manager.h>
+#include <scene/node.h>
+#include <spatial/quadtree.h>
+#include <spatial/spatial_hash.h>
+#include <spatial/spatial_manager.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/ui/button.cpp b/Extra2D/src/ui/button.cpp
index 79c44ca..b44cc52 100644
--- a/Extra2D/src/ui/button.cpp
+++ b/Extra2D/src/ui/button.cpp
@@ -1,9 +1,9 @@
 #include <algorithm>
 #include <cmath>
-#include <extra2d/app/application.h>
-#include <extra2d/core/string.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/ui/button.h>
+#include <app/application.h>
+#include <core/string.h>
+#include <graphics/render_backend.h>
+#include <ui/button.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/ui/check_box.cpp b/Extra2D/src/ui/check_box.cpp
index e471ebb..be4e401 100644
--- a/Extra2D/src/ui/check_box.cpp
+++ b/Extra2D/src/ui/check_box.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/ui/check_box.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/core/string.h>
+#include <ui/check_box.h>
+#include <graphics/render_backend.h>
+#include <core/string.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/ui/label.cpp b/Extra2D/src/ui/label.cpp
index dd1401d..00e82e1 100644
--- a/Extra2D/src/ui/label.cpp
+++ b/Extra2D/src/ui/label.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/ui/label.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/core/string.h>
+#include <ui/label.h>
+#include <graphics/render_backend.h>
+#include <core/string.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/ui/progress_bar.cpp b/Extra2D/src/ui/progress_bar.cpp
index dd40491..d7a87b4 100644
--- a/Extra2D/src/ui/progress_bar.cpp
+++ b/Extra2D/src/ui/progress_bar.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/ui/progress_bar.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/core/string.h>
+#include <ui/progress_bar.h>
+#include <graphics/render_backend.h>
+#include <core/string.h>
 #include <cmath>
 
 namespace extra2d {
diff --git a/Extra2D/src/ui/radio_button.cpp b/Extra2D/src/ui/radio_button.cpp
index cdd4a70..33cf53e 100644
--- a/Extra2D/src/ui/radio_button.cpp
+++ b/Extra2D/src/ui/radio_button.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/ui/radio_button.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/core/string.h>
+#include <ui/radio_button.h>
+#include <graphics/render_backend.h>
+#include <core/string.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/ui/slider.cpp b/Extra2D/src/ui/slider.cpp
index f358385..5d081b5 100644
--- a/Extra2D/src/ui/slider.cpp
+++ b/Extra2D/src/ui/slider.cpp
@@ -1,6 +1,6 @@
-#include <extra2d/ui/slider.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/core/string.h>
+#include <ui/slider.h>
+#include <graphics/render_backend.h>
+#include <core/string.h>
 #include <cmath>
 
 namespace extra2d {
diff --git a/Extra2D/src/ui/text.cpp b/Extra2D/src/ui/text.cpp
index 789707b..ebbc0c7 100644
--- a/Extra2D/src/ui/text.cpp
+++ b/Extra2D/src/ui/text.cpp
@@ -1,8 +1,8 @@
 #include <cstdarg>
 #include <cstdio>
-#include <extra2d/core/string.h>
-#include <extra2d/graphics/render_backend.h>
-#include <extra2d/ui/text.h>
+#include <core/string.h>
+#include <graphics/render_backend.h>
+#include <ui/text.h>
 
 
 namespace extra2d {
diff --git a/Extra2D/src/ui/widget.cpp b/Extra2D/src/ui/widget.cpp
index 83b117b..a629968 100644
--- a/Extra2D/src/ui/widget.cpp
+++ b/Extra2D/src/ui/widget.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
-#include <extra2d/graphics/camera.h>
-#include <extra2d/scene/scene.h>
-#include <extra2d/ui/widget.h>
+#include <graphics/camera.h>
+#include <scene/scene.h>
+#include <ui/widget.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/utils/data.cpp b/Extra2D/src/utils/data.cpp
index 52a300a..c0a9234 100644
--- a/Extra2D/src/utils/data.cpp
+++ b/Extra2D/src/utils/data.cpp
@@ -1,5 +1,5 @@
-#include <extra2d/utils/data.h>
-#include <extra2d/utils/logger.h>
+#include <utils/data.h>
+#include <utils/logger.h>
 #include <simpleini/SimpleIni.h>
 
 // Switch 平台特定头文件
diff --git a/Extra2D/src/utils/logger.cpp b/Extra2D/src/utils/logger.cpp
index 1f03a2f..5b3fa4b 100644
--- a/Extra2D/src/utils/logger.cpp
+++ b/Extra2D/src/utils/logger.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/utils/logger.h>
+#include <utils/logger.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/utils/object_pool.cpp b/Extra2D/src/utils/object_pool.cpp
index 1c929c9..5b19f33 100644
--- a/Extra2D/src/utils/object_pool.cpp
+++ b/Extra2D/src/utils/object_pool.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/utils/object_pool.h>
+#include <utils/object_pool.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/utils/random.cpp b/Extra2D/src/utils/random.cpp
index cc2a528..2f96f26 100644
--- a/Extra2D/src/utils/random.cpp
+++ b/Extra2D/src/utils/random.cpp
@@ -1,5 +1,5 @@
 #include <chrono>
-#include <extra2d/utils/random.h>
+#include <utils/random.h>
 
 namespace extra2d {
 
diff --git a/Extra2D/src/utils/timer.cpp b/Extra2D/src/utils/timer.cpp
index ec1ae7d..5b6c37e 100644
--- a/Extra2D/src/utils/timer.cpp
+++ b/Extra2D/src/utils/timer.cpp
@@ -1,5 +1,5 @@
 #include <algorithm>
-#include <extra2d/utils/timer.h>
+#include <utils/timer.h>
 
 namespace extra2d {
 
diff --git a/examples/collision_demo/main.cpp b/examples/collision_demo/main.cpp
index 9b0c105..eaa6d9d 100644
--- a/examples/collision_demo/main.cpp
+++ b/examples/collision_demo/main.cpp
@@ -1,5 +1,5 @@
 #include <cmath>
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 using namespace extra2d;
 
diff --git a/examples/flappy_bird/BaseScene.cpp b/examples/flappy_bird/BaseScene.cpp
index eb29595..75de238 100644
--- a/examples/flappy_bird/BaseScene.cpp
+++ b/examples/flappy_bird/BaseScene.cpp
@@ -3,8 +3,8 @@
 // ============================================================================
 
 #include "BaseScene.h"
-#include <extra2d/scene/transition_scene.h>
-#include <extra2d/utils/logger.h>
+#include <scene/transition_scene.h>
+#include <utils/logger.h>
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/BaseScene.h b/examples/flappy_bird/BaseScene.h
index 7189f8a..a1634c0 100644
--- a/examples/flappy_bird/BaseScene.h
+++ b/examples/flappy_bird/BaseScene.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/GameOverLayer.h b/examples/flappy_bird/GameOverLayer.h
index 4feda4d..50409f1 100644
--- a/examples/flappy_bird/GameOverLayer.h
+++ b/examples/flappy_bird/GameOverLayer.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/GameScene.cpp b/examples/flappy_bird/GameScene.cpp
index 7b27383..0130f9c 100644
--- a/examples/flappy_bird/GameScene.cpp
+++ b/examples/flappy_bird/GameScene.cpp
@@ -5,7 +5,7 @@
 #include "GameScene.h"
 #include "GameOverLayer.h"
 #include "ResLoader.h"
-#include "input.h"
+#include "platform/input.h"
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/Number.h b/examples/flappy_bird/Number.h
index db75767..449a60c 100644
--- a/examples/flappy_bird/Number.h
+++ b/examples/flappy_bird/Number.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/ResLoader.h b/examples/flappy_bird/ResLoader.h
index c22301e..1babaeb 100644
--- a/examples/flappy_bird/ResLoader.h
+++ b/examples/flappy_bird/ResLoader.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 #include <map>
 #include <string>
 
diff --git a/examples/flappy_bird/SplashScene.cpp b/examples/flappy_bird/SplashScene.cpp
index f45a23e..5f79d06 100644
--- a/examples/flappy_bird/SplashScene.cpp
+++ b/examples/flappy_bird/SplashScene.cpp
@@ -5,7 +5,7 @@
 #include "SplashScene.h"
 #include "ResLoader.h"
 #include "StartScene.h"
-#include <extra2d/utils/logger.h>
+#include <utils/logger.h>
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/StartScene.cpp b/examples/flappy_bird/StartScene.cpp
index ae43a51..83c9f67 100644
--- a/examples/flappy_bird/StartScene.cpp
+++ b/examples/flappy_bird/StartScene.cpp
@@ -7,7 +7,7 @@
 #include "GameScene.h"
 #include "Ground.h"
 #include "ResLoader.h"
-#include "extra2d/event/input_codes.h"
+#include "event/input_codes.h"
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/bird.h b/examples/flappy_bird/bird.h
index 560b815..d7aa951 100644
--- a/examples/flappy_bird/bird.h
+++ b/examples/flappy_bird/bird.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/ground.h b/examples/flappy_bird/ground.h
index 1f23986..35791c0 100644
--- a/examples/flappy_bird/ground.h
+++ b/examples/flappy_bird/ground.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/main.cpp b/examples/flappy_bird/main.cpp
index 14cff1e..6c2f6a2 100644
--- a/examples/flappy_bird/main.cpp
+++ b/examples/flappy_bird/main.cpp
@@ -6,7 +6,7 @@
 
 #include "ResLoader.h"
 #include "SplashScene.h"
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 using namespace extra2d;
 
diff --git a/examples/flappy_bird/pipe.h b/examples/flappy_bird/pipe.h
index 3ceda9b..74c1862 100644
--- a/examples/flappy_bird/pipe.h
+++ b/examples/flappy_bird/pipe.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace flappybird {
 
diff --git a/examples/flappy_bird/pipes.h b/examples/flappy_bird/pipes.h
index 11dd88d..b6f8a7f 100644
--- a/examples/flappy_bird/pipes.h
+++ b/examples/flappy_bird/pipes.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 #include "Pipe.h"
 
 namespace flappybird {
diff --git a/examples/hello_world/main.cpp b/examples/hello_world/main.cpp
index 2d1fa7d..e4f8a21 100644
--- a/examples/hello_world/main.cpp
+++ b/examples/hello_world/main.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 using namespace extra2d;
 
diff --git a/examples/push_box/BaseScene.cpp b/examples/push_box/BaseScene.cpp
index 888af25..c44163f 100644
--- a/examples/push_box/BaseScene.cpp
+++ b/examples/push_box/BaseScene.cpp
@@ -3,8 +3,8 @@
 // ============================================================================
 
 #include "BaseScene.h"
-#include <extra2d/scene/transition_scene.h>
-#include <extra2d/utils/logger.h>
+#include <scene/transition_scene.h>
+#include <utils/logger.h>
 
 namespace pushbox {
 
diff --git a/examples/push_box/BaseScene.h b/examples/push_box/BaseScene.h
index 2799ee0..4efce5c 100644
--- a/examples/push_box/BaseScene.h
+++ b/examples/push_box/BaseScene.h
@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace pushbox {
 
diff --git a/examples/push_box/PlayScene.cpp b/examples/push_box/PlayScene.cpp
index 429fac2..841bf4e 100644
--- a/examples/push_box/PlayScene.cpp
+++ b/examples/push_box/PlayScene.cpp
@@ -8,8 +8,8 @@
 #include "SuccessScene.h"
 #include "audio_manager.h"
 #include "storage.h"
-#include <extra2d/extra2d.h>
-#include <extra2d/utils/object_pool.h>
+#include <extra2d.h>
+#include <utils/object_pool.h>
 
 namespace pushbox {
 
diff --git a/examples/push_box/PlayScene.h b/examples/push_box/PlayScene.h
index 3cfdad8..009994a 100644
--- a/examples/push_box/PlayScene.h
+++ b/examples/push_box/PlayScene.h
@@ -6,8 +6,8 @@
 
 #include "BaseScene.h"
 #include "data.h"
-#include <extra2d/extra2d.h>
-#include <extra2d/utils/object_pool.h>
+#include <extra2d.h>
+#include <utils/object_pool.h>
 #include <stack>
 
 namespace pushbox {
diff --git a/examples/push_box/StartScene.cpp b/examples/push_box/StartScene.cpp
index deae581..2bf0273 100644
--- a/examples/push_box/StartScene.cpp
+++ b/examples/push_box/StartScene.cpp
@@ -7,7 +7,7 @@
 #include "PlayScene.h"
 #include "audio_manager.h"
 #include "data.h"
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace pushbox {
 
diff --git a/examples/push_box/StartScene.h b/examples/push_box/StartScene.h
index c792d78..0f338b6 100644
--- a/examples/push_box/StartScene.h
+++ b/examples/push_box/StartScene.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "BaseScene.h"
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace pushbox {
 
diff --git a/examples/push_box/SuccessScene.cpp b/examples/push_box/SuccessScene.cpp
index bbe9e4b..dd5b2f0 100644
--- a/examples/push_box/SuccessScene.cpp
+++ b/examples/push_box/SuccessScene.cpp
@@ -4,7 +4,7 @@
 
 #include "SuccessScene.h"
 
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace pushbox {
 
diff --git a/examples/push_box/SuccessScene.h b/examples/push_box/SuccessScene.h
index 2158e48..688c14c 100644
--- a/examples/push_box/SuccessScene.h
+++ b/examples/push_box/SuccessScene.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "BaseScene.h"
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace pushbox {
 
diff --git a/examples/push_box/audio_manager.h b/examples/push_box/audio_manager.h
index d9c6e19..5917443 100644
--- a/examples/push_box/audio_manager.h
+++ b/examples/push_box/audio_manager.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "data.h"
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 
 namespace pushbox {
 
diff --git a/examples/push_box/main.cpp b/examples/push_box/main.cpp
index 3c3f5d4..9fa64ac 100644
--- a/examples/push_box/main.cpp
+++ b/examples/push_box/main.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 #include "StartScene.h"
 #include "data.h"
 #include "storage.h"
diff --git a/examples/push_box/storage.cpp b/examples/push_box/storage.cpp
index cf153aa..e219867 100644
--- a/examples/push_box/storage.cpp
+++ b/examples/push_box/storage.cpp
@@ -1,6 +1,6 @@
 #include "storage.h"
 
-#include <extra2d/utils/data.h>
+#include <utils/data.h>
 #include <string>
 
 namespace pushbox {
diff --git a/examples/spatial_index_demo/main.cpp b/examples/spatial_index_demo/main.cpp
index 4fa89d8..09609b0 100644
--- a/examples/spatial_index_demo/main.cpp
+++ b/examples/spatial_index_demo/main.cpp
@@ -1,4 +1,4 @@
-#include <extra2d/extra2d.h>
+#include <extra2d.h>
 #include <random>
 
 using namespace extra2d;
diff --git a/scripts/move_dirs_to_include.js b/scripts/move_dirs_to_include.js
new file mode 100644
index 0000000..793641e
--- /dev/null
+++ b/scripts/move_dirs_to_include.js
@@ -0,0 +1,147 @@
+/**
+ * @file move_dirs_to_include.js
+ * @brief 将 extra2d 子目录移动到 include 根目录
+ * @description 此脚本将 Extra2D/include/extra2d/ 下的所有子目录（如 action、animation 等）
+ *              移动到 Extra2D/include/ 根目录下
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+// 配置路径
+const SOURCE_DIR = path.join(__dirname, '..', 'Extra2D', 'include', 'extra2d');
+const TARGET_DIR = path.join(__dirname, '..', 'Extra2D', 'include');
+
+/**
+ * @brief 获取目录下的所有子目录
+ * @param {string} dir - 要扫描的目录
+ * @returns {string[]} 子目录路径数组
+ */
+function getSubdirectories(dir) {
+    const items = fs.readdirSync(dir);
+    const dirs = [];
+
+    for (const item of items) {
+        const fullPath = path.join(dir, item);
+        const stat = fs.statSync(fullPath);
+
+        if (stat.isDirectory()) {
+            dirs.push(fullPath);
+        }
+    }
+
+    return dirs;
+}
+
+/**
+ * @brief 移动目录到目标位置
+ * @param {string} sourcePath - 源目录路径
+ * @param {string} targetPath - 目标目录路径
+ * @returns {boolean} 是否成功
+ */
+function moveDirectory(sourcePath, targetPath) {
+    const dirName = path.basename(sourcePath);
+
+    // 检查目标目录是否已存在
+    if (fs.existsSync(targetPath)) {
+        console.warn(`⚠️  目标目录已存在，跳过: ${dirName}`);
+        return false;
+    }
+
+    try {
+        fs.renameSync(sourcePath, targetPath);
+        console.log(`✅ 已移动: extra2d/${dirName} -> ${dirName}/`);
+        return true;
+    } catch (err) {
+        console.error(`❌ 移动失败: ${sourcePath}`, err.message);
+        return false;
+    }
+}
+
+/**
+ * @brief 主函数
+ */
+function main() {
+    console.log('========================================');
+    console.log('🚀 开始移动 extra2d 子目录到 include 根目录');
+    console.log('========================================');
+    console.log(`📁 源目录: ${SOURCE_DIR}`);
+    console.log(`📁 目标目录: ${TARGET_DIR}`);
+    console.log('');
+
+    // 检查源目录是否存在
+    if (!fs.existsSync(SOURCE_DIR)) {
+        console.error(`❌ 源目录不存在: ${SOURCE_DIR}`);
+        process.exit(1);
+    }
+
+    // 获取所有子目录
+    const subdirs = getSubdirectories(SOURCE_DIR);
+    console.log(`📊 发现 ${subdirs.length} 个子目录`);
+    console.log('');
+
+    if (subdirs.length === 0) {
+        console.log('⚠️ 没有找到子目录');
+        return;
+    }
+
+    // 移动目录
+    let successCount = 0;
+    let skipCount = 0;
+
+    for (const dirPath of subdirs) {
+        const dirName = path.basename(dirPath);
+        const targetPath = path.join(TARGET_DIR, dirName);
+
+        if (moveDirectory(dirPath, targetPath)) {
+            successCount++;
+        } else {
+            skipCount++;
+        }
+    }
+
+    // 移动 extra2d.h 文件（如果存在）
+    const extra2dHeader = path.join(SOURCE_DIR, 'extra2d.h');
+    if (fs.existsSync(extra2dHeader)) {
+        const targetHeader = path.join(TARGET_DIR, 'extra2d.h');
+        if (!fs.existsSync(targetHeader)) {
+            try {
+                fs.renameSync(extra2dHeader, targetHeader);
+                console.log(`✅ 已移动: extra2d/extra2d.h -> extra2d.h`);
+                successCount++;
+            } catch (err) {
+                console.error(`❌ 移动失败: extra2d.h`, err.message);
+                skipCount++;
+            }
+        } else {
+            console.warn(`⚠️  extra2d.h 已存在，跳过`);
+            skipCount++;
+        }
+    }
+
+    // 尝试删除空的 extra2d 目录
+    try {
+        const remainingItems = fs.readdirSync(SOURCE_DIR);
+        if (remainingItems.length === 0) {
+            fs.rmdirSync(SOURCE_DIR);
+            console.log('');
+            console.log('🗑️  已删除空目录: extra2d/');
+        } else {
+            console.log('');
+            console.log(`⚠️  extra2d 目录中仍有 ${remainingItems.length} 个项目，保留目录`);
+            remainingItems.forEach(item => console.log(`   - ${item}`));
+        }
+    } catch (err) {
+        // 忽略错误
+    }
+
+    console.log('');
+    console.log('========================================');
+    console.log('✨ 处理完成！');
+    console.log(`   成功移动: ${successCount} 个项目`);
+    console.log(`   跳过: ${skipCount} 个项目`);
+    console.log('========================================');
+}
+
+// 执行主函数
+main();
diff --git a/scripts/update_includes.js b/scripts/update_includes.js
new file mode 100644
index 0000000..f2fe7e8
--- /dev/null
+++ b/scripts/update_includes.js
@@ -0,0 +1,144 @@
+/**
+ * @file update_includes.js
+ * @brief 更新头文件包含路径
+ * @description 将 #include <extra2d/xxx/xxx.h> 替换为 #include <xxx/xxx.h>
+ *              扫描所有 .h, .hpp, .cpp 文件进行替换
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+// 配置
+const TARGET_DIRS = [
+    path.join(__dirname, '..', 'Extra2D', 'include'),
+    path.join(__dirname, '..', 'Extra2D', 'src'),
+    path.join(__dirname, '..', 'examples')
+];
+
+const FILE_EXTENSIONS = ['.h', '.hpp', '.cpp'];
+
+// 替换规则：将 <extra2d/ 替换为 <
+const OLD_PREFIX = /<extra2d\//g;
+const NEW_PREFIX = '<';
+
+/**
+ * @brief 递归获取所有目标文件
+ * @param {string} dir - 要扫描的目录
+ * @param {string[]} files - 文件列表（用于递归）
+ * @returns {string[]} 文件路径数组
+ */
+function getTargetFiles(dir, files = []) {
+    if (!fs.existsSync(dir)) {
+        return files;
+    }
+
+    const items = fs.readdirSync(dir);
+
+    for (const item of items) {
+        const fullPath = path.join(dir, item);
+        const stat = fs.statSync(fullPath);
+
+        if (stat.isDirectory()) {
+            // 递归扫描子目录
+            getTargetFiles(fullPath, files);
+        } else if (stat.isFile()) {
+            // 检查是否为目标文件类型
+            const ext = path.extname(item).toLowerCase();
+            if (FILE_EXTENSIONS.includes(ext)) {
+                files.push(fullPath);
+            }
+        }
+    }
+
+    return files;
+}
+
+/**
+ * @brief 处理单个文件，替换包含路径
+ * @param {string} filePath - 文件路径
+ * @returns {object} 处理结果 { modified: boolean, changes: number }
+ */
+function processFile(filePath) {
+    let content = fs.readFileSync(filePath, 'utf-8');
+    const originalContent = content;
+
+    // 统计替换次数
+    let matchCount = 0;
+    const matches = content.match(OLD_PREFIX);
+    if (matches) {
+        matchCount = matches.length;
+    }
+
+    // 执行替换
+    content = content.replace(OLD_PREFIX, NEW_PREFIX);
+
+    // 检查是否有修改
+    if (content !== originalContent) {
+        fs.writeFileSync(filePath, content, 'utf-8');
+        return { modified: true, changes: matchCount };
+    }
+
+    return { modified: false, changes: 0 };
+}
+
+/**
+ * @brief 主函数
+ */
+function main() {
+    console.log('========================================');
+    console.log('🚀 开始更新头文件包含路径');
+    console.log('========================================');
+    console.log('替换规则: #include <extra2d/xxx.h> -> #include <xxx.h>');
+    console.log('');
+
+    // 收集所有目标文件
+    let allFiles = [];
+    for (const dir of TARGET_DIRS) {
+        const files = getTargetFiles(dir);
+        allFiles = allFiles.concat(files);
+    }
+
+    console.log(`📊 发现 ${allFiles.length} 个目标文件`);
+    console.log('');
+
+    if (allFiles.length === 0) {
+        console.log('⚠️ 没有找到目标文件');
+        return;
+    }
+
+    // 处理文件
+    let modifiedCount = 0;
+    let totalChanges = 0;
+    const modifiedFiles = [];
+
+    for (const filePath of allFiles) {
+        const result = processFile(filePath);
+        if (result.modified) {
+            modifiedCount++;
+            totalChanges += result.changes;
+            const relativePath = path.relative(path.join(__dirname, '..'), filePath);
+            modifiedFiles.push({ path: relativePath, changes: result.changes });
+            console.log(`✅ 已更新: ${relativePath} (${result.changes} 处替换)`);
+        }
+    }
+
+    console.log('');
+    console.log('========================================');
+    console.log('✨ 处理完成！');
+    console.log(`   扫描文件: ${allFiles.length} 个`);
+    console.log(`   修改文件: ${modifiedCount} 个`);
+    console.log(`   总替换数: ${totalChanges} 处`);
+    console.log('========================================');
+
+    // 显示修改的文件列表
+    if (modifiedFiles.length > 0) {
+        console.log('');
+        console.log('📋 修改的文件列表:');
+        modifiedFiles.forEach((file, index) => {
+            console.log(`   ${index + 1}. ${file.path} (${file.changes} 处)`);
+        });
+    }
+}
+
+// 执行主函数
+main();
diff --git a/scripts/update_includes_v2.js b/scripts/update_includes_v2.js
new file mode 100644
index 0000000..7deed33
--- /dev/null
+++ b/scripts/update_includes_v2.js
@@ -0,0 +1,149 @@
+/**
+ * @file update_includes_v2.js
+ * @brief 更新头文件包含路径（完整版）
+ * @description 将 #include <extra2d/xxx/xxx.h> 或 #include "extra2d/xxx/xxx.h"
+ *              替换为 #include <xxx/xxx.h> 或 #include "xxx/xxx.h"
+ *              扫描所有 .h, .hpp, .cpp 文件进行替换
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+// 配置
+const TARGET_DIRS = [
+    path.join(__dirname, '..', 'Extra2D', 'include'),
+    path.join(__dirname, '..', 'Extra2D', 'src'),
+    path.join(__dirname, '..', 'examples')
+];
+
+const FILE_EXTENSIONS = ['.h', '.hpp', '.cpp'];
+
+// 替换规则：处理尖括号和双引号两种情况
+const PATTERNS = [
+    { regex: /#include\s+<extra2d\//g, replacement: '#include <' },
+    { regex: /#include\s+"extra2d\//g, replacement: '#include "' }
+];
+
+/**
+ * @brief 递归获取所有目标文件
+ * @param {string} dir - 要扫描的目录
+ * @param {string[]} files - 文件列表（用于递归）
+ * @returns {string[]} 文件路径数组
+ */
+function getTargetFiles(dir, files = []) {
+    if (!fs.existsSync(dir)) {
+        return files;
+    }
+
+    const items = fs.readdirSync(dir);
+
+    for (const item of items) {
+        const fullPath = path.join(dir, item);
+        const stat = fs.statSync(fullPath);
+
+        if (stat.isDirectory()) {
+            // 递归扫描子目录
+            getTargetFiles(fullPath, files);
+        } else if (stat.isFile()) {
+            // 检查是否为目标文件类型
+            const ext = path.extname(item).toLowerCase();
+            if (FILE_EXTENSIONS.includes(ext)) {
+                files.push(fullPath);
+            }
+        }
+    }
+
+    return files;
+}
+
+/**
+ * @brief 处理单个文件，替换包含路径
+ * @param {string} filePath - 文件路径
+ * @returns {object} 处理结果 { modified: boolean, changes: number }
+ */
+function processFile(filePath) {
+    let content = fs.readFileSync(filePath, 'utf-8');
+    const originalContent = content;
+    let totalChanges = 0;
+
+    // 应用所有替换规则
+    for (const pattern of PATTERNS) {
+        const matches = content.match(pattern.regex);
+        if (matches) {
+            totalChanges += matches.length;
+        }
+        content = content.replace(pattern.regex, pattern.replacement);
+    }
+
+    // 检查是否有修改
+    if (content !== originalContent) {
+        fs.writeFileSync(filePath, content, 'utf-8');
+        return { modified: true, changes: totalChanges };
+    }
+
+    return { modified: false, changes: 0 };
+}
+
+/**
+ * @brief 主函数
+ */
+function main() {
+    console.log('========================================');
+    console.log('🚀 开始更新头文件包含路径（完整版）');
+    console.log('========================================');
+    console.log('替换规则:');
+    console.log('  #include <extra2d/xxx.h> -> #include <xxx.h>');
+    console.log('  #include "extra2d/xxx.h" -> #include "xxx.h"');
+    console.log('');
+
+    // 收集所有目标文件
+    let allFiles = [];
+    for (const dir of TARGET_DIRS) {
+        const files = getTargetFiles(dir);
+        allFiles = allFiles.concat(files);
+    }
+
+    console.log(`📊 发现 ${allFiles.length} 个目标文件`);
+    console.log('');
+
+    if (allFiles.length === 0) {
+        console.log('⚠️ 没有找到目标文件');
+        return;
+    }
+
+    // 处理文件
+    let modifiedCount = 0;
+    let totalChanges = 0;
+    const modifiedFiles = [];
+
+    for (const filePath of allFiles) {
+        const result = processFile(filePath);
+        if (result.modified) {
+            modifiedCount++;
+            totalChanges += result.changes;
+            const relativePath = path.relative(path.join(__dirname, '..'), filePath);
+            modifiedFiles.push({ path: relativePath, changes: result.changes });
+            console.log(`✅ 已更新: ${relativePath} (${result.changes} 处替换)`);
+        }
+    }
+
+    console.log('');
+    console.log('========================================');
+    console.log('✨ 处理完成！');
+    console.log(`   扫描文件: ${allFiles.length} 个`);
+    console.log(`   修改文件: ${modifiedCount} 个`);
+    console.log(`   总替换数: ${totalChanges} 处`);
+    console.log('========================================');
+
+    // 显示修改的文件列表
+    if (modifiedFiles.length > 0) {
+        console.log('');
+        console.log('📋 修改的文件列表:');
+        modifiedFiles.forEach((file, index) => {
+            console.log(`   ${index + 1}. ${file.path} (${file.changes} 处)`);
+        });
+    }
+}
+
+// 执行主函数
+main();
diff --git a/xmake/engine.lua b/xmake/engine.lua
index 9b4e1ba..8e3c74b 100644
--- a/xmake/engine.lua
+++ b/xmake/engine.lua
@@ -19,7 +19,6 @@ function define_extra2d_engine()
 
         -- 头文件路径
         add_includedirs("Extra2D/include", {public = true})
-        add_includedirs("Extra2D/include/extra2d/platform", {public = true})
         
         -- 第三方库头文件路径
         add_includedirs("third_party/glad/include", {public = true})