*rename

258 files changed, 71 insertions, 71 deletions

diff --git a/source/Asura.Editor/controls/button.h b/source/Asura.Editor/controls/button.h
index 14cd041..3f07c1c 100644
--- a/source/Asura.Editor/controls/button.h
+++ b/source/Asura.Editor/controls/button.h
@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-core/graphics/image.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-core/graphics/image.h>
 
 #include "../core/signal.h"
 #include "widget.h"
diff --git a/source/Asura.Editor/controls/label.h b/source/Asura.Editor/controls/label.h
index 1d053f8..32b61d4 100644
--- a/source/Asura.Editor/controls/label.h
+++ b/source/Asura.Editor/controls/label.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_EDITOR_LABEL_H__
 #define __ASURA_EDITOR_LABEL_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-core/graphics/image.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-core/graphics/image.h>
 
 #include "widget.h"
 
diff --git a/source/Asura.Editor/controls/widget.h b/source/Asura.Editor/controls/widget.h
index 9ffd1fb..c934351 100644
--- a/source/Asura.Editor/controls/widget.h
+++ b/source/Asura.Editor/controls/widget.h
@@ -3,11 +3,11 @@
 
 #include <list>
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/type.h>
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-core/input/event.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/type.h>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-core/input/event.h>
 
 namespace AsuraEditor
 {
diff --git a/source/Asura.Editor/core/signal.h b/source/Asura.Editor/core/signal.h
index f1ab9b4..f73f4b1 100644
--- a/source/Asura.Editor/core/signal.h
+++ b/source/Asura.Editor/core/signal.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../widgets/widget.h"
 #include "slot.h"
diff --git a/source/Asura.Editor/core/slot.h b/source/Asura.Editor/core/slot.h
index ff565cf..b62f406 100644
--- a/source/Asura.Editor/core/slot.h
+++ b/source/Asura.Editor/core/slot.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_EDITOR_SLOT_H__
 #define __ASURA_EDITOR_SLOT_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-core/input/event.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-core/input/event.h>
 
 #include "../widgets/widget.h"
 
diff --git a/source/Asura.Editor/dui_module.h b/source/Asura.Editor/dui_module.h
index 48c341f..657c404 100644
--- a/source/Asura.Editor/dui_module.h
+++ b/source/Asura.Editor/dui_module.h
@@ -1,7 +1,7 @@
 #ifndef __ASRUA_EDITOR_DIRECTUI_MODULE_H__
 #define __ASRUA_EDITOR_DIRECTUI_MODULE_H__
 
-#include <asura-lib-utils/module.h>
+#include <asura-utils/module.h>
 
 namespace AsuraEditor
 {
diff --git a/source/Asura.Editor/editor.h b/source/Asura.Editor/editor.h
index b56852f..b086532 100644
--- a/source/Asura.Editor/editor.h
+++ b/source/Asura.Editor/editor.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_EDITOR_H__
 #define __ASURA_EDITOR_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEditor
 {
diff --git a/source/libs/asura-lib-core/application.cpp b/source/modules/asura-core/application.cpp
index 0a1c1ef..0a1c1ef 100644
--- a/source/libs/asura-lib-core/application.cpp
+++ b/source/modules/asura-core/application.cpp
diff --git a/source/libs/asura-lib-core/application.h b/source/modules/asura-core/application.h
index 9606819..2285430 100644
--- a/source/libs/asura-lib-core/application.h
+++ b/source/modules/asura-core/application.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_ENGINE_APPLICATION_H__
 #define __ASURA_ENGINE_APPLICATION_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/module.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/module.h>
 #include <queue>
 
 #include "core_config.h"
diff --git a/source/libs/asura-lib-core/core_config.h b/source/modules/asura-core/core_config.h
index 06eecc7..06eecc7 100644
--- a/source/libs/asura-lib-core/core_config.h
+++ b/source/modules/asura-core/core_config.h
diff --git a/source/libs/asura-lib-core/core_module.cpp b/source/modules/asura-core/core_module.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/core_module.cpp
+++ b/source/modules/asura-core/core_module.cpp
diff --git a/source/libs/asura-lib-core/core_module.h b/source/modules/asura-core/core_module.h
index 2cded93..2cded93 100644
--- a/source/libs/asura-lib-core/core_module.h
+++ b/source/modules/asura-core/core_module.h
diff --git a/source/libs/asura-lib-core/font/glyph.cpp b/source/modules/asura-core/font/glyph.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/font/glyph.cpp
+++ b/source/modules/asura-core/font/glyph.cpp
diff --git a/source/libs/asura-lib-core/font/glyph.h b/source/modules/asura-core/font/glyph.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/font/glyph.h
+++ b/source/modules/asura-core/font/glyph.h
diff --git a/source/libs/asura-lib-core/font/string.cpp b/source/modules/asura-core/font/string.cpp
index 8c9c55a..8c9c55a 100644
--- a/source/libs/asura-lib-core/font/string.cpp
+++ b/source/modules/asura-core/font/string.cpp
diff --git a/source/libs/asura-lib-core/font/string.hpp b/source/modules/asura-core/font/string.hpp
index 226735b..226735b 100644
--- a/source/libs/asura-lib-core/font/string.hpp
+++ b/source/modules/asura-core/font/string.hpp
diff --git a/source/libs/asura-lib-core/font/string.inl b/source/modules/asura-core/font/string.inl
index ef18228..ef18228 100644
--- a/source/libs/asura-lib-core/font/string.inl
+++ b/source/modules/asura-core/font/string.inl
diff --git a/source/libs/asura-lib-core/font/ttf.cpp b/source/modules/asura-core/font/ttf.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/font/ttf.cpp
+++ b/source/modules/asura-core/font/ttf.cpp
diff --git a/source/libs/asura-lib-core/font/ttf.h b/source/modules/asura-core/font/ttf.h
index 840b63e..840b63e 100644
--- a/source/libs/asura-lib-core/font/ttf.h
+++ b/source/modules/asura-core/font/ttf.h
diff --git a/source/libs/asura-lib-core/font/utf.hpp b/source/modules/asura-core/font/utf.hpp
index 2e04ee4..2e04ee4 100644
--- a/source/libs/asura-lib-core/font/utf.hpp
+++ b/source/modules/asura-core/font/utf.hpp
diff --git a/source/libs/asura-lib-core/font/utf.inl b/source/modules/asura-core/font/utf.inl
index 69a523b..69a523b 100644
--- a/source/libs/asura-lib-core/font/utf.inl
+++ b/source/modules/asura-core/font/utf.inl
diff --git a/source/libs/asura-lib-core/graphics/binding/_canvas.cpp b/source/modules/asura-core/graphics/binding/_canvas.cpp
index 7927995..7927995 100644
--- a/source/libs/asura-lib-core/graphics/binding/_canvas.cpp
+++ b/source/modules/asura-core/graphics/binding/_canvas.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_color.cpp b/source/modules/asura-core/graphics/binding/_color.cpp
index 11e80a1..11e80a1 100644
--- a/source/libs/asura-lib-core/graphics/binding/_color.cpp
+++ b/source/modules/asura-core/graphics/binding/_color.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_color32.cpp b/source/modules/asura-core/graphics/binding/_color32.cpp
index 7095866..7095866 100644
--- a/source/libs/asura-lib-core/graphics/binding/_color32.cpp
+++ b/source/modules/asura-core/graphics/binding/_color32.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_image.cpp b/source/modules/asura-core/graphics/binding/_image.cpp
index cb008d3..cb008d3 100644
--- a/source/libs/asura-lib-core/graphics/binding/_image.cpp
+++ b/source/modules/asura-core/graphics/binding/_image.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_image_data.cpp b/source/modules/asura-core/graphics/binding/_image_data.cpp
index 3ff38f9..3ff38f9 100644
--- a/source/libs/asura-lib-core/graphics/binding/_image_data.cpp
+++ b/source/modules/asura-core/graphics/binding/_image_data.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_image_decode_task.cpp b/source/modules/asura-core/graphics/binding/_image_decode_task.cpp
index 76b544b..76b544b 100644
--- a/source/libs/asura-lib-core/graphics/binding/_image_decode_task.cpp
+++ b/source/modules/asura-core/graphics/binding/_image_decode_task.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_mesh2d.cpp b/source/modules/asura-core/graphics/binding/_mesh2d.cpp
index 07e9f12..07e9f12 100644
--- a/source/libs/asura-lib-core/graphics/binding/_mesh2d.cpp
+++ b/source/modules/asura-core/graphics/binding/_mesh2d.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_shader.cpp b/source/modules/asura-core/graphics/binding/_shader.cpp
index a06e54b..a06e54b 100644
--- a/source/libs/asura-lib-core/graphics/binding/_shader.cpp
+++ b/source/modules/asura-core/graphics/binding/_shader.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_sprite_batch.cpp b/source/modules/asura-core/graphics/binding/_sprite_batch.cpp
index 8556c02..8556c02 100644
--- a/source/libs/asura-lib-core/graphics/binding/_sprite_batch.cpp
+++ b/source/modules/asura-core/graphics/binding/_sprite_batch.cpp
diff --git a/source/libs/asura-lib-core/graphics/binding/_window.cpp b/source/modules/asura-core/graphics/binding/_window.cpp
index fc74d6c..fc74d6c 100644
--- a/source/libs/asura-lib-core/graphics/binding/_window.cpp
+++ b/source/modules/asura-core/graphics/binding/_window.cpp
diff --git a/source/libs/asura-lib-core/graphics/blend_mode.h b/source/modules/asura-core/graphics/blend_mode.h
index 775cc45..775cc45 100644
--- a/source/libs/asura-lib-core/graphics/blend_mode.h
+++ b/source/modules/asura-core/graphics/blend_mode.h
diff --git a/source/libs/asura-lib-core/graphics/canvas.cpp b/source/modules/asura-core/graphics/canvas.cpp
index 61787b6..61787b6 100644
--- a/source/libs/asura-lib-core/graphics/canvas.cpp
+++ b/source/modules/asura-core/graphics/canvas.cpp
diff --git a/source/libs/asura-lib-core/graphics/canvas.h b/source/modules/asura-core/graphics/canvas.h
index 5b188ca..7e7b2fd 100644
--- a/source/libs/asura-lib-core/graphics/canvas.h
+++ b/source/modules/asura-core/graphics/canvas.h
@@ -1,9 +1,9 @@
 #ifndef __ASURA_ENGINE_CANVAS_H__
 #define __ASURA_ENGINE_CANVAS_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/math/vector2.hpp>
 
 #include "gl.h"
 #include "texture.h"
diff --git a/source/libs/asura-lib-core/graphics/color.cpp b/source/modules/asura-core/graphics/color.cpp
index 4d3691e..4d3691e 100644
--- a/source/libs/asura-lib-core/graphics/color.cpp
+++ b/source/modules/asura-core/graphics/color.cpp
diff --git a/source/libs/asura-lib-core/graphics/color.h b/source/modules/asura-core/graphics/color.h
index 607314b..d0d0751 100644
--- a/source/libs/asura-lib-core/graphics/color.h
+++ b/source/modules/asura-core/graphics/color.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_COLOR_H__
 #define __ASURA_ENGINE_COLOR_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../core_config.h"
 
diff --git a/source/libs/asura-lib-core/graphics/color32.cpp b/source/modules/asura-core/graphics/color32.cpp
index 0ebc77c..0ebc77c 100644
--- a/source/libs/asura-lib-core/graphics/color32.cpp
+++ b/source/modules/asura-core/graphics/color32.cpp
diff --git a/source/libs/asura-lib-core/graphics/color32.h b/source/modules/asura-core/graphics/color32.h
index c64a9b9..b18f66c 100644
--- a/source/libs/asura-lib-core/graphics/color32.h
+++ b/source/modules/asura-core/graphics/color32.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_COLOR32_H__
 #define __ASURA_ENGINE_COLOR32_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../core_config.h"
 
diff --git a/source/libs/asura-lib-core/graphics/color_palette.h b/source/modules/asura-core/graphics/color_palette.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/color_palette.h
+++ b/source/modules/asura-core/graphics/color_palette.h
diff --git a/source/libs/asura-lib-core/graphics/gif.cpp b/source/modules/asura-core/graphics/gif.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/gif.cpp
+++ b/source/modules/asura-core/graphics/gif.cpp
diff --git a/source/libs/asura-lib-core/graphics/gif.h b/source/modules/asura-core/graphics/gif.h
index 8b89858..8b89858 100644
--- a/source/libs/asura-lib-core/graphics/gif.h
+++ b/source/modules/asura-core/graphics/gif.h
diff --git a/source/libs/asura-lib-core/graphics/gl.cpp b/source/modules/asura-core/graphics/gl.cpp
index 7c68c8f..7c68c8f 100644
--- a/source/libs/asura-lib-core/graphics/gl.cpp
+++ b/source/modules/asura-core/graphics/gl.cpp
diff --git a/source/libs/asura-lib-core/graphics/gl.h b/source/modules/asura-core/graphics/gl.h
index bfc60ea..bfc60ea 100644
--- a/source/libs/asura-lib-core/graphics/gl.h
+++ b/source/modules/asura-core/graphics/gl.h
diff --git a/source/libs/asura-lib-core/graphics/image.cpp b/source/modules/asura-core/graphics/image.cpp
index e704945..e704945 100644
--- a/source/libs/asura-lib-core/graphics/image.cpp
+++ b/source/modules/asura-core/graphics/image.cpp
diff --git a/source/libs/asura-lib-core/graphics/image.h b/source/modules/asura-core/graphics/image.h
index 4d9787b..29fd97c 100644
--- a/source/libs/asura-lib-core/graphics/image.h
+++ b/source/modules/asura-core/graphics/image.h
@@ -1,12 +1,12 @@
 #ifndef __ASURA_ENGINE_IMAGE_H__
 #define __ASURA_ENGINE_IMAGE_H__
 
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/io/reloadable.h>
-#include <asura-lib-utils/stringmap.hpp>
-#include <asura-lib-utils/manager.hpp>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/io/reloadable.h>
+#include <asura-utils/stringmap.hpp>
+#include <asura-utils/manager.hpp>
 
 #include "texture.h"
 #include "color.h"
diff --git a/source/libs/asura-lib-core/graphics/image_data.cpp b/source/modules/asura-core/graphics/image_data.cpp
index b79dfab..b79dfab 100644
--- a/source/libs/asura-lib-core/graphics/image_data.cpp
+++ b/source/modules/asura-core/graphics/image_data.cpp
diff --git a/source/libs/asura-lib-core/graphics/image_data.h b/source/modules/asura-core/graphics/image_data.h
index 820e276..ea1d53a 100644
--- a/source/libs/asura-lib-core/graphics/image_data.h
+++ b/source/modules/asura-core/graphics/image_data.h
@@ -3,10 +3,10 @@
 
 #include <list>
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/io/decoded_data.h>
-#include <asura-lib-utils/io/data_buffer.h>
-#include <asura-lib-utils/threading/thread.h>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/io/decoded_data.h>
+#include <asura-utils/io/data_buffer.h>
+#include <asura-utils/threading/thread.h>
 
 #include "pixel_format.h"
 #include "color.h"
diff --git a/source/libs/asura-lib-core/graphics/image_decode_task.cpp b/source/modules/asura-core/graphics/image_decode_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/image_decode_task.cpp
+++ b/source/modules/asura-core/graphics/image_decode_task.cpp
diff --git a/source/libs/asura-lib-core/graphics/image_decode_task.h b/source/modules/asura-core/graphics/image_decode_task.h
index a721b3e..ec5ed49 100644
--- a/source/libs/asura-lib-core/graphics/image_decode_task.h
+++ b/source/modules/asura-core/graphics/image_decode_task.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_IMAGE_DECODE_TASK_H__
 #define __ASURA_IMAGE_DECODE_TASK_H__
 
-#include <asura-lib-utils/threading/thread_task.h>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/threading/thread_task.h>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-core/graphics/image_decoder.h b/source/modules/asura-core/graphics/image_decoder.h
index 6f2049a..263c694 100644
--- a/source/libs/asura-lib-core/graphics/image_decoder.h
+++ b/source/modules/asura-core/graphics/image_decoder.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_IMAGE_DECODER_H__
 #define __ASURA_ENGINE_IMAGE_DECODER_H__
 
-#include <asura-lib-utils/io/data_buffer.h>
+#include <asura-utils/io/data_buffer.h>
 
 #include "image_data.h"
 
diff --git a/source/libs/asura-lib-core/graphics/mesh2d.cpp b/source/modules/asura-core/graphics/mesh2d.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/mesh2d.cpp
+++ b/source/modules/asura-core/graphics/mesh2d.cpp
diff --git a/source/libs/asura-lib-core/graphics/mesh2d.h b/source/modules/asura-core/graphics/mesh2d.h
index 48b461d..31d3629 100644
--- a/source/libs/asura-lib-core/graphics/mesh2d.h
+++ b/source/modules/asura-core/graphics/mesh2d.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_MESH2D_H__
 #define __ASURA_ENGINE_MESH2D_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-core/graphics/mesh2d_data.cpp b/source/modules/asura-core/graphics/mesh2d_data.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/mesh2d_data.cpp
+++ b/source/modules/asura-core/graphics/mesh2d_data.cpp
diff --git a/source/libs/asura-lib-core/graphics/mesh2d_data.h b/source/modules/asura-core/graphics/mesh2d_data.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/mesh2d_data.h
+++ b/source/modules/asura-core/graphics/mesh2d_data.h
diff --git a/source/libs/asura-lib-core/graphics/pixel_format.h b/source/modules/asura-core/graphics/pixel_format.h
index 8df07d5..8df07d5 100644
--- a/source/libs/asura-lib-core/graphics/pixel_format.h
+++ b/source/modules/asura-core/graphics/pixel_format.h
diff --git a/source/libs/asura-lib-core/graphics/png_decoder.cpp b/source/modules/asura-core/graphics/png_decoder.cpp
index f919090..f919090 100644
--- a/source/libs/asura-lib-core/graphics/png_decoder.cpp
+++ b/source/modules/asura-core/graphics/png_decoder.cpp
diff --git a/source/libs/asura-lib-core/graphics/png_decoder.h b/source/modules/asura-core/graphics/png_decoder.h
index bc871fa..bc871fa 100644
--- a/source/libs/asura-lib-core/graphics/png_decoder.h
+++ b/source/modules/asura-core/graphics/png_decoder.h
diff --git a/source/libs/asura-lib-core/graphics/quad.cpp b/source/modules/asura-core/graphics/quad.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/quad.cpp
+++ b/source/modules/asura-core/graphics/quad.cpp
diff --git a/source/libs/asura-lib-core/graphics/quad.h b/source/modules/asura-core/graphics/quad.h
index b7dd3d9..b7dd3d9 100644
--- a/source/libs/asura-lib-core/graphics/quad.h
+++ b/source/modules/asura-core/graphics/quad.h
diff --git a/source/libs/asura-lib-core/graphics/render_state.h b/source/modules/asura-core/graphics/render_state.h
index 4d1831c..2b1dd7f 100644
--- a/source/libs/asura-lib-core/graphics/render_state.h
+++ b/source/modules/asura-core/graphics/render_state.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_ENGINE_RENDER_STATE_H__
 #define __ASURA_ENGINE_RENDER_STATE_H__
 
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/math/transform.h>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/math/transform.h>
 
 #include "Shader.h"
 #include "blend_mode.h"
diff --git a/source/libs/asura-lib-core/graphics/render_target.cpp b/source/modules/asura-core/graphics/render_target.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/render_target.cpp
+++ b/source/modules/asura-core/graphics/render_target.cpp
diff --git a/source/libs/asura-lib-core/graphics/render_target.h b/source/modules/asura-core/graphics/render_target.h
index afa5c6a..b1a695a 100644
--- a/source/libs/asura-lib-core/graphics/render_target.h
+++ b/source/modules/asura-core/graphics/render_target.h
@@ -1,9 +1,9 @@
 #ifndef __ASURA_ENGINE_RENDERTARGET_H__
 #define __ASURA_ENGINE_RENDERTARGET_H__
 
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "texture.h"
 #include "color.h"
diff --git a/source/libs/asura-lib-core/graphics/shader.cpp b/source/modules/asura-core/graphics/shader.cpp
index 1a85866..1a85866 100644
--- a/source/libs/asura-lib-core/graphics/shader.cpp
+++ b/source/modules/asura-core/graphics/shader.cpp
diff --git a/source/libs/asura-lib-core/graphics/shader.h b/source/modules/asura-core/graphics/shader.h
index 1c81355..97e2c15 100644
--- a/source/libs/asura-lib-core/graphics/shader.h
+++ b/source/modules/asura-core/graphics/shader.h
@@ -4,14 +4,14 @@
 #include <map>
 #include <string>
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/io/reloadable.h>
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/math/vector3.hpp>
-#include <asura-lib-utils/math/vector4.h>
-#include <asura-lib-utils/math/matrix44.h>
-#include <asura-lib-utils/stringmap.hpp>
-#include <asura-lib-utils/manager.hpp>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/io/reloadable.h>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/math/vector3.hpp>
+#include <asura-utils/math/vector4.h>
+#include <asura-utils/math/matrix44.h>
+#include <asura-utils/stringmap.hpp>
+#include <asura-utils/manager.hpp>
 
 #include "color.h"
 #include "texture.h"
diff --git a/source/libs/asura-lib-core/graphics/shape.cpp b/source/modules/asura-core/graphics/shape.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/shape.cpp
+++ b/source/modules/asura-core/graphics/shape.cpp
diff --git a/source/libs/asura-lib-core/graphics/shape.h b/source/modules/asura-core/graphics/shape.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/shape.h
+++ b/source/modules/asura-core/graphics/shape.h
diff --git a/source/libs/asura-lib-core/graphics/sprite_batch.cpp b/source/modules/asura-core/graphics/sprite_batch.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/graphics/sprite_batch.cpp
+++ b/source/modules/asura-core/graphics/sprite_batch.cpp
diff --git a/source/libs/asura-lib-core/graphics/sprite_batch.h b/source/modules/asura-core/graphics/sprite_batch.h
index d8d9ca6..3143f73 100644
--- a/source/libs/asura-lib-core/graphics/sprite_batch.h
+++ b/source/modules/asura-core/graphics/sprite_batch.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_SPRITE_BATCH_H__
 #define __ASURA_ENGINE_SPRITE_BATCH_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-core/graphics/stb_decoder.cpp b/source/modules/asura-core/graphics/stb_decoder.cpp
index a13d6b8..eff2e65 100644
--- a/source/libs/asura-lib-core/graphics/stb_decoder.cpp
+++ b/source/modules/asura-core/graphics/stb_decoder.cpp
@@ -1,4 +1,4 @@
-#include <asura-lib-utils/exceptions/exception.h>
+#include <asura-utils/exceptions/exception.h>
 
 #include "stb_decoder.h"
 #include "stb/stb_image.h"
diff --git a/source/libs/asura-lib-core/graphics/stb_decoder.h b/source/modules/asura-core/graphics/stb_decoder.h
index 85bad21..85bad21 100644
--- a/source/libs/asura-lib-core/graphics/stb_decoder.h
+++ b/source/modules/asura-core/graphics/stb_decoder.h
diff --git a/source/libs/asura-lib-core/graphics/texture.cpp b/source/modules/asura-core/graphics/texture.cpp
index 6cb6497..6cb6497 100644
--- a/source/libs/asura-lib-core/graphics/texture.cpp
+++ b/source/modules/asura-core/graphics/texture.cpp
diff --git a/source/libs/asura-lib-core/graphics/texture.h b/source/modules/asura-core/graphics/texture.h
index c412b2e..81ced9f 100644
--- a/source/libs/asura-lib-core/graphics/texture.h
+++ b/source/modules/asura-core/graphics/texture.h
@@ -1,9 +1,9 @@
 #ifndef __ASURA_ENGINE_TEXTURE_H__
 #define __ASURA_ENGINE_TEXTURE_H__
 
-#include <asura-lib-utils/math/rect.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/math/rect.hpp>
+#include <asura-utils/math/vector2.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../core_config.h"
 
diff --git a/source/libs/asura-lib-core/input/clipboard.cpp b/source/modules/asura-core/input/clipboard.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/clipboard.cpp
+++ b/source/modules/asura-core/input/clipboard.cpp
diff --git a/source/libs/asura-lib-core/input/clipboard.h b/source/modules/asura-core/input/clipboard.h
index 4cecd55..4cecd55 100644
--- a/source/libs/asura-lib-core/input/clipboard.h
+++ b/source/modules/asura-core/input/clipboard.h
diff --git a/source/libs/asura-lib-core/input/cursor.cpp b/source/modules/asura-core/input/cursor.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/cursor.cpp
+++ b/source/modules/asura-core/input/cursor.cpp
diff --git a/source/libs/asura-lib-core/input/cursor.defs b/source/modules/asura-core/input/cursor.defs
index f8b8492..f8b8492 100644
--- a/source/libs/asura-lib-core/input/cursor.defs
+++ b/source/modules/asura-core/input/cursor.defs
diff --git a/source/libs/asura-lib-core/input/cursor.h b/source/modules/asura-core/input/cursor.h
index 553fda4..05503ee 100644
--- a/source/libs/asura-lib-core/input/cursor.h
+++ b/source/modules/asura-core/input/cursor.h
@@ -3,7 +3,7 @@
 
 #include <SDL2/SDL.h>
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../graphics/image_data.h"
 
diff --git a/source/libs/asura-lib-core/input/cursor_impl_sdl.cpp b/source/modules/asura-core/input/cursor_impl_sdl.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/cursor_impl_sdl.cpp
+++ b/source/modules/asura-core/input/cursor_impl_sdl.cpp
diff --git a/source/libs/asura-lib-core/input/cursor_impl_sdl.h b/source/modules/asura-core/input/cursor_impl_sdl.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/cursor_impl_sdl.h
+++ b/source/modules/asura-core/input/cursor_impl_sdl.h
diff --git a/source/libs/asura-lib-core/input/event.h b/source/modules/asura-core/input/event.h
index a24e806..a24e806 100644
--- a/source/libs/asura-lib-core/input/event.h
+++ b/source/modules/asura-core/input/event.h
diff --git a/source/libs/asura-lib-core/input/input_device.hpp b/source/modules/asura-core/input/input_device.hpp
index 46f5be8..1d08d09 100644
--- a/source/libs/asura-lib-core/input/input_device.hpp
+++ b/source/modules/asura-core/input/input_device.hpp
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_INPUT_BASE_H__
 #define __ASURA_ENGINE_INPUT_BASE_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "../core_config.h"
 #include "../singleton.hpp"
diff --git a/source/libs/asura-lib-core/input/joypad.h b/source/modules/asura-core/input/joypad.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/joypad.h
+++ b/source/modules/asura-core/input/joypad.h
diff --git a/source/libs/asura-lib-core/input/keyboard.cpp b/source/modules/asura-core/input/keyboard.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/keyboard.cpp
+++ b/source/modules/asura-core/input/keyboard.cpp
diff --git a/source/libs/asura-lib-core/input/keyboard.defs b/source/modules/asura-core/input/keyboard.defs
index 8f04dc2..8f04dc2 100644
--- a/source/libs/asura-lib-core/input/keyboard.defs
+++ b/source/modules/asura-core/input/keyboard.defs
diff --git a/source/libs/asura-lib-core/input/keyboard.h b/source/modules/asura-core/input/keyboard.h
index 1480d06..1480d06 100644
--- a/source/libs/asura-lib-core/input/keyboard.h
+++ b/source/modules/asura-core/input/keyboard.h
diff --git a/source/libs/asura-lib-core/input/mouse.cpp b/source/modules/asura-core/input/mouse.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/input/mouse.cpp
+++ b/source/modules/asura-core/input/mouse.cpp
diff --git a/source/libs/asura-lib-core/input/mouse.defs b/source/modules/asura-core/input/mouse.defs
index de1d117..de1d117 100644
--- a/source/libs/asura-lib-core/input/mouse.defs
+++ b/source/modules/asura-core/input/mouse.defs
diff --git a/source/libs/asura-lib-core/input/mouse.h b/source/modules/asura-core/input/mouse.h
index 3ab67fa..3ab67fa 100644
--- a/source/libs/asura-lib-core/input/mouse.h
+++ b/source/modules/asura-core/input/mouse.h
diff --git a/source/libs/asura-lib-core/profiler/stats.cpp b/source/modules/asura-core/profiler/stats.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/profiler/stats.cpp
+++ b/source/modules/asura-core/profiler/stats.cpp
diff --git a/source/libs/asura-lib-core/profiler/stats.h b/source/modules/asura-core/profiler/stats.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/profiler/stats.h
+++ b/source/modules/asura-core/profiler/stats.h
diff --git a/source/libs/asura-lib-core/threading/coroutine.cpp b/source/modules/asura-core/threading/coroutine.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/coroutine.cpp
+++ b/source/modules/asura-core/threading/coroutine.cpp
diff --git a/source/libs/asura-lib-core/threading/coroutine.h b/source/modules/asura-core/threading/coroutine.h
index 1ac6b21..1ac6b21 100644
--- a/source/libs/asura-lib-core/threading/coroutine.h
+++ b/source/modules/asura-core/threading/coroutine.h
diff --git a/source/libs/asura-lib-core/threading/thread.cpp b/source/modules/asura-core/threading/thread.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread.cpp
+++ b/source/modules/asura-core/threading/thread.cpp
diff --git a/source/libs/asura-lib-core/threading/thread.h b/source/modules/asura-core/threading/thread.h
index f4d3b48..f4d3b48 100644
--- a/source/libs/asura-lib-core/threading/thread.h
+++ b/source/modules/asura-core/threading/thread.h
diff --git a/source/libs/asura-lib-core/threading/thread_impl_posix.cpp b/source/modules/asura-core/threading/thread_impl_posix.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_posix.cpp
+++ b/source/modules/asura-core/threading/thread_impl_posix.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_impl_posix.h b/source/modules/asura-core/threading/thread_impl_posix.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_posix.h
+++ b/source/modules/asura-core/threading/thread_impl_posix.h
diff --git a/source/libs/asura-lib-core/threading/thread_impl_sdl.cpp b/source/modules/asura-core/threading/thread_impl_sdl.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_sdl.cpp
+++ b/source/modules/asura-core/threading/thread_impl_sdl.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_impl_sdl.h b/source/modules/asura-core/threading/thread_impl_sdl.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_sdl.h
+++ b/source/modules/asura-core/threading/thread_impl_sdl.h
diff --git a/source/libs/asura-lib-core/threading/thread_impl_std.cpp b/source/modules/asura-core/threading/thread_impl_std.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_std.cpp
+++ b/source/modules/asura-core/threading/thread_impl_std.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_impl_std.h b/source/modules/asura-core/threading/thread_impl_std.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_std.h
+++ b/source/modules/asura-core/threading/thread_impl_std.h
diff --git a/source/libs/asura-lib-core/threading/thread_impl_win32.cpp b/source/modules/asura-core/threading/thread_impl_win32.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_win32.cpp
+++ b/source/modules/asura-core/threading/thread_impl_win32.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_impl_win32.h b/source/modules/asura-core/threading/thread_impl_win32.h
index 5d854cc..5d854cc 100644
--- a/source/libs/asura-lib-core/threading/thread_impl_win32.h
+++ b/source/modules/asura-core/threading/thread_impl_win32.h
diff --git a/source/libs/asura-lib-core/threading/thread_task.cpp b/source/modules/asura-core/threading/thread_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/threading/thread_task.cpp
+++ b/source/modules/asura-core/threading/thread_task.cpp
diff --git a/source/libs/asura-lib-core/threading/thread_task.h b/source/modules/asura-core/threading/thread_task.h
index 19eb113..19eb113 100644
--- a/source/libs/asura-lib-core/threading/thread_task.h
+++ b/source/modules/asura-core/threading/thread_task.h
diff --git a/source/libs/asura-lib-core/time/timer.cpp b/source/modules/asura-core/time/timer.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/time/timer.cpp
+++ b/source/modules/asura-core/time/timer.cpp
diff --git a/source/libs/asura-lib-core/time/timer.h b/source/modules/asura-core/time/timer.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/time/timer.h
+++ b/source/modules/asura-core/time/timer.h
diff --git a/source/libs/asura-lib-core/type.h b/source/modules/asura-core/type.h
index 88848d5..88848d5 100644
--- a/source/libs/asura-lib-core/type.h
+++ b/source/modules/asura-core/type.h
diff --git a/source/libs/asura-lib-core/window/window.cpp b/source/modules/asura-core/window/window.cpp
index 83a4f53..83a4f53 100644
--- a/source/libs/asura-lib-core/window/window.cpp
+++ b/source/modules/asura-core/window/window.cpp
diff --git a/source/libs/asura-lib-core/window/window.h b/source/modules/asura-core/window/window.h
index 39db73e..052e1ee 100644
--- a/source/libs/asura-lib-core/window/window.h
+++ b/source/modules/asura-core/window/window.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_ENGINE_WINDOW_H__
 #define __ASURA_ENGINE_WINDOW_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
-#include <asura-lib-utils/math/vector2.hpp>
+#include <asura-utils/scripting/portable.hpp>
+#include <asura-utils/math/vector2.hpp>
 
 #include "../graphics/render_state.h"
 #include "../graphics/render_target.h"
diff --git a/source/libs/asura-lib-core/window/window_impl_glew.cpp b/source/modules/asura-core/window/window_impl_glew.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_glew.cpp
+++ b/source/modules/asura-core/window/window_impl_glew.cpp
diff --git a/source/libs/asura-lib-core/window/window_impl_glew.h b/source/modules/asura-core/window/window_impl_glew.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_glew.h
+++ b/source/modules/asura-core/window/window_impl_glew.h
diff --git a/source/libs/asura-lib-core/window/window_impl_glut.cpp b/source/modules/asura-core/window/window_impl_glut.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_glut.cpp
+++ b/source/modules/asura-core/window/window_impl_glut.cpp
diff --git a/source/libs/asura-lib-core/window/window_impl_glut.h b/source/modules/asura-core/window/window_impl_glut.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_glut.h
+++ b/source/modules/asura-core/window/window_impl_glut.h
diff --git a/source/libs/asura-lib-core/window/window_impl_sdl.cpp b/source/modules/asura-core/window/window_impl_sdl.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_sdl.cpp
+++ b/source/modules/asura-core/window/window_impl_sdl.cpp
diff --git a/source/libs/asura-lib-core/window/window_impl_sdl.h b/source/modules/asura-core/window/window_impl_sdl.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-core/window/window_impl_sdl.h
+++ b/source/modules/asura-core/window/window_impl_sdl.h
diff --git a/source/libs/asura-lib-framework/compile.bat b/source/modules/asura-framework/compile.bat
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/compile.bat
+++ b/source/modules/asura-framework/compile.bat
diff --git a/source/libs/asura-lib-framework/compile.sh b/source/modules/asura-framework/compile.sh
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/compile.sh
+++ b/source/modules/asura-framework/compile.sh
diff --git a/source/libs/asura-lib-framework/main.cpp b/source/modules/asura-framework/main.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/main.cpp
+++ b/source/modules/asura-framework/main.cpp
diff --git a/source/libs/asura-lib-framework/scripts/ai/behavior_tree.lua b/source/modules/asura-framework/scripts/ai/behavior_tree.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/ai/behavior_tree.lua
+++ b/source/modules/asura-framework/scripts/ai/behavior_tree.lua
diff --git a/source/libs/asura-lib-framework/scripts/ai/state_graph.lua b/source/modules/asura-framework/scripts/ai/state_graph.lua
index 4f563dc..4f563dc 100644
--- a/source/libs/asura-lib-framework/scripts/ai/state_graph.lua
+++ b/source/modules/asura-framework/scripts/ai/state_graph.lua
diff --git a/source/libs/asura-lib-framework/scripts/ai/state_machine.lua b/source/modules/asura-framework/scripts/ai/state_machine.lua
index 6dc5e14..6dc5e14 100644
--- a/source/libs/asura-lib-framework/scripts/ai/state_machine.lua
+++ b/source/modules/asura-framework/scripts/ai/state_machine.lua
diff --git a/source/libs/asura-lib-framework/scripts/audio/sound.lua b/source/modules/asura-framework/scripts/audio/sound.lua
index d7dea4f..d7dea4f 100644
--- a/source/libs/asura-lib-framework/scripts/audio/sound.lua
+++ b/source/modules/asura-framework/scripts/audio/sound.lua
diff --git a/source/libs/asura-lib-framework/scripts/audio/source.lua b/source/modules/asura-framework/scripts/audio/source.lua
index 7dec511..7dec511 100644
--- a/source/libs/asura-lib-framework/scripts/audio/source.lua
+++ b/source/modules/asura-framework/scripts/audio/source.lua
diff --git a/source/libs/asura-lib-framework/scripts/class.lua b/source/modules/asura-framework/scripts/class.lua
index 6392483..6392483 100644
--- a/source/libs/asura-lib-framework/scripts/class.lua
+++ b/source/modules/asura-framework/scripts/class.lua
diff --git a/source/libs/asura-lib-framework/scripts/component.lua b/source/modules/asura-framework/scripts/component.lua
index b560bd3..b560bd3 100644
--- a/source/libs/asura-lib-framework/scripts/component.lua
+++ b/source/modules/asura-framework/scripts/component.lua
diff --git a/source/libs/asura-lib-framework/scripts/entity.lua b/source/modules/asura-framework/scripts/entity.lua
index ea8e14d..ea8e14d 100644
--- a/source/libs/asura-lib-framework/scripts/entity.lua
+++ b/source/modules/asura-framework/scripts/entity.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/animation_loader.lua b/source/modules/asura-framework/scripts/filesystem/animation_loader.lua
index 9c57c43..9c57c43 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/animation_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/animation_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/asset.lua b/source/modules/asura-framework/scripts/filesystem/asset.lua
index 7cf3905..7cf3905 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/asset.lua
+++ b/source/modules/asura-framework/scripts/filesystem/asset.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/entity_loader.lua b/source/modules/asura-framework/scripts/filesystem/entity_loader.lua
index 39ae0d9..39ae0d9 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/entity_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/entity_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/image_loader.lua b/source/modules/asura-framework/scripts/filesystem/image_loader.lua
index 6b0bef7..6b0bef7 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/image_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/image_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/loader.lua b/source/modules/asura-framework/scripts/filesystem/loader.lua
index e192e30..e192e30 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/material_loader.lua b/source/modules/asura-framework/scripts/filesystem/material_loader.lua
index 07ca4e9..07ca4e9 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/material_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/material_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/path_loader.lua b/source/modules/asura-framework/scripts/filesystem/path_loader.lua
index 986e42c..986e42c 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/path_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/path_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/scene_loader.lua b/source/modules/asura-framework/scripts/filesystem/scene_loader.lua
index 45731f8..45731f8 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/scene_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/scene_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/script_loader.lua b/source/modules/asura-framework/scripts/filesystem/script_loader.lua
index e93d903..e93d903 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/script_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/script_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/shader_loader.lua b/source/modules/asura-framework/scripts/filesystem/shader_loader.lua
index 12d88bb..12d88bb 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/shader_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/shader_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/filesystem/statemap_loader.lua b/source/modules/asura-framework/scripts/filesystem/statemap_loader.lua
index e52e086..e52e086 100644
--- a/source/libs/asura-lib-framework/scripts/filesystem/statemap_loader.lua
+++ b/source/modules/asura-framework/scripts/filesystem/statemap_loader.lua
diff --git a/source/libs/asura-lib-framework/scripts/framework.lua b/source/modules/asura-framework/scripts/framework.lua
index 4643221..4643221 100644
--- a/source/libs/asura-lib-framework/scripts/framework.lua
+++ b/source/modules/asura-framework/scripts/framework.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/animation.lua b/source/modules/asura-framework/scripts/graphics/animation.lua
index 285adaa..285adaa 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/animation.lua
+++ b/source/modules/asura-framework/scripts/graphics/animation.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/animator.lua b/source/modules/asura-framework/scripts/graphics/animator.lua
index fd2f979..fd2f979 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/animator.lua
+++ b/source/modules/asura-framework/scripts/graphics/animator.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/camera.lua b/source/modules/asura-framework/scripts/graphics/camera.lua
index a989de6..a989de6 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/camera.lua
+++ b/source/modules/asura-framework/scripts/graphics/camera.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/canvas.lua b/source/modules/asura-framework/scripts/graphics/canvas.lua
index ce2ca20..ce2ca20 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/canvas.lua
+++ b/source/modules/asura-framework/scripts/graphics/canvas.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/default_shaders.lua b/source/modules/asura-framework/scripts/graphics/default_shaders.lua
index bd54cb9..bd54cb9 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/default_shaders.lua
+++ b/source/modules/asura-framework/scripts/graphics/default_shaders.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/image.lua b/source/modules/asura-framework/scripts/graphics/image.lua
index f5ebaa2..f5ebaa2 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/image.lua
+++ b/source/modules/asura-framework/scripts/graphics/image.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/material.lua b/source/modules/asura-framework/scripts/graphics/material.lua
index 5a6e5bd..5a6e5bd 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/material.lua
+++ b/source/modules/asura-framework/scripts/graphics/material.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/material_manager.lua b/source/modules/asura-framework/scripts/graphics/material_manager.lua
index 086a5db..086a5db 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/material_manager.lua
+++ b/source/modules/asura-framework/scripts/graphics/material_manager.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/mesh2d.lua b/source/modules/asura-framework/scripts/graphics/mesh2d.lua
index 05b2e2e..05b2e2e 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/mesh2d.lua
+++ b/source/modules/asura-framework/scripts/graphics/mesh2d.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/mesh2d_renderer.lua b/source/modules/asura-framework/scripts/graphics/mesh2d_renderer.lua
index 09c8c98..09c8c98 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/mesh2d_renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/mesh2d_renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/particle_system.lua b/source/modules/asura-framework/scripts/graphics/particle_system.lua
index 065a845..065a845 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/particle_system.lua
+++ b/source/modules/asura-framework/scripts/graphics/particle_system.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/renderer.lua b/source/modules/asura-framework/scripts/graphics/renderer.lua
index 92a6409..92a6409 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/shader.lua b/source/modules/asura-framework/scripts/graphics/shader.lua
index c411619..c411619 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/shader.lua
+++ b/source/modules/asura-framework/scripts/graphics/shader.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/shaderHelper.lua b/source/modules/asura-framework/scripts/graphics/shaderHelper.lua
index b1b42a6..b1b42a6 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/shaderHelper.lua
+++ b/source/modules/asura-framework/scripts/graphics/shaderHelper.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/shape.lua b/source/modules/asura-framework/scripts/graphics/shape.lua
index 51ea8c3..51ea8c3 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/shape.lua
+++ b/source/modules/asura-framework/scripts/graphics/shape.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/shape_renderer.lua b/source/modules/asura-framework/scripts/graphics/shape_renderer.lua
index 80b48b8..80b48b8 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/shape_renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/shape_renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/sprite.lua b/source/modules/asura-framework/scripts/graphics/sprite.lua
index 9bf05f4..9bf05f4 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/sprite.lua
+++ b/source/modules/asura-framework/scripts/graphics/sprite.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/sprite_batch_renderer.lua b/source/modules/asura-framework/scripts/graphics/sprite_batch_renderer.lua
index 9ec73d2..9ec73d2 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/sprite_batch_renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/sprite_batch_renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/graphics/sprite_renderer.lua b/source/modules/asura-framework/scripts/graphics/sprite_renderer.lua
index 0a41e08..0a41e08 100644
--- a/source/libs/asura-lib-framework/scripts/graphics/sprite_renderer.lua
+++ b/source/modules/asura-framework/scripts/graphics/sprite_renderer.lua
diff --git a/source/libs/asura-lib-framework/scripts/gui/button.lua b/source/modules/asura-framework/scripts/gui/button.lua
index b122931..b122931 100644
--- a/source/libs/asura-lib-framework/scripts/gui/button.lua
+++ b/source/modules/asura-framework/scripts/gui/button.lua
diff --git a/source/libs/asura-lib-framework/scripts/gui/text.lua b/source/modules/asura-framework/scripts/gui/text.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/gui/text.lua
+++ b/source/modules/asura-framework/scripts/gui/text.lua
diff --git a/source/libs/asura-lib-framework/scripts/gui/widget.lua b/source/modules/asura-framework/scripts/gui/widget.lua
index 430ade0..430ade0 100644
--- a/source/libs/asura-lib-framework/scripts/gui/widget.lua
+++ b/source/modules/asura-framework/scripts/gui/widget.lua
diff --git a/source/libs/asura-lib-framework/scripts/managers/scene_manager.lua b/source/modules/asura-framework/scripts/managers/scene_manager.lua
index 7886dc6..7886dc6 100644
--- a/source/libs/asura-lib-framework/scripts/managers/scene_manager.lua
+++ b/source/modules/asura-framework/scripts/managers/scene_manager.lua
diff --git a/source/libs/asura-lib-framework/scripts/managers/sprite_manager.lua b/source/modules/asura-framework/scripts/managers/sprite_manager.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/managers/sprite_manager.lua
+++ b/source/modules/asura-framework/scripts/managers/sprite_manager.lua
diff --git a/source/libs/asura-lib-framework/scripts/math/curve.lua b/source/modules/asura-framework/scripts/math/curve.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/math/curve.lua
+++ b/source/modules/asura-framework/scripts/math/curve.lua
diff --git a/source/libs/asura-lib-framework/scripts/path/path.lua b/source/modules/asura-framework/scripts/path/path.lua
index 1fc9b3a..1fc9b3a 100644
--- a/source/libs/asura-lib-framework/scripts/path/path.lua
+++ b/source/modules/asura-framework/scripts/path/path.lua
diff --git a/source/libs/asura-lib-framework/scripts/path/path_calculator.lua b/source/modules/asura-framework/scripts/path/path_calculator.lua
index d44da08..d44da08 100644
--- a/source/libs/asura-lib-framework/scripts/path/path_calculator.lua
+++ b/source/modules/asura-framework/scripts/path/path_calculator.lua
diff --git a/source/libs/asura-lib-framework/scripts/path/path_manager.lua b/source/modules/asura-framework/scripts/path/path_manager.lua
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-framework/scripts/path/path_manager.lua
+++ b/source/modules/asura-framework/scripts/path/path_manager.lua
diff --git a/source/libs/asura-lib-framework/scripts/scene.lua b/source/modules/asura-framework/scripts/scene.lua
index 11ac86c..11ac86c 100644
--- a/source/libs/asura-lib-framework/scripts/scene.lua
+++ b/source/modules/asura-framework/scripts/scene.lua
diff --git a/source/libs/asura-lib-framework/scripts/transform.lua b/source/modules/asura-framework/scripts/transform.lua
index 1d34ae6..1d34ae6 100644
--- a/source/libs/asura-lib-framework/scripts/transform.lua
+++ b/source/modules/asura-framework/scripts/transform.lua
diff --git a/source/libs/asura-lib-json/json.cpp b/source/modules/asura-json/json.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-json/json.cpp
+++ b/source/modules/asura-json/json.cpp
diff --git a/source/libs/asura-lib-json/json.h b/source/modules/asura-json/json.h
index 2bdaf53..2bdaf53 100644
--- a/source/libs/asura-lib-json/json.h
+++ b/source/modules/asura-json/json.h
diff --git a/source/libs/asura-lib-json/json_module.cpp b/source/modules/asura-json/json_module.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-json/json_module.cpp
+++ b/source/modules/asura-json/json_module.cpp
diff --git a/source/libs/asura-lib-json/json_module.h b/source/modules/asura-json/json_module.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-json/json_module.h
+++ b/source/modules/asura-json/json_module.h
diff --git a/source/libs/asura-lib-openal/sound.cpp b/source/modules/asura-openal/sound.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-openal/sound.cpp
+++ b/source/modules/asura-openal/sound.cpp
diff --git a/source/libs/asura-lib-openal/sound.h b/source/modules/asura-openal/sound.h
index 6c2d7c2..2b0eab0 100644
--- a/source/libs/asura-lib-openal/sound.h
+++ b/source/modules/asura-openal/sound.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_SOUND_H__
 #define __ASURA_ENGINE_SOUND_H__
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-openal/sound_decode_task.cpp b/source/modules/asura-openal/sound_decode_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-openal/sound_decode_task.cpp
+++ b/source/modules/asura-openal/sound_decode_task.cpp
diff --git a/source/libs/asura-lib-openal/sound_decode_task.h b/source/modules/asura-openal/sound_decode_task.h
index d39013f..9587276 100644
--- a/source/libs/asura-lib-openal/sound_decode_task.h
+++ b/source/modules/asura-openal/sound_decode_task.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_OPENAL_SOUND_DECODER_TASK_H__
 #define __ASURA_OPENAL_SOUND_DECODER_TASK_H__
 
-#include <asura-lib-utils/threading/thread_task.h>
+#include <asura-utils/threading/thread_task.h>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-openal/sound_decoder.cpp b/source/modules/asura-openal/sound_decoder.cpp
index ad9f761..ad9f761 100644
--- a/source/libs/asura-lib-openal/sound_decoder.cpp
+++ b/source/modules/asura-openal/sound_decoder.cpp
diff --git a/source/libs/asura-lib-openal/sound_decoder.h b/source/modules/asura-openal/sound_decoder.h
index 2a3f087..e28a5a9 100644
--- a/source/libs/asura-lib-openal/sound_decoder.h
+++ b/source/modules/asura-openal/sound_decoder.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_ENGINE_SOUND_DECODER_H__
 #define __ASURA_ENGINE_SOUND_DECODER_H__
 
-#include <asura-lib-utils/io/data_buffer.h>
+#include <asura-utils/io/data_buffer.h>
 
 #include "sound.h"
 
diff --git a/source/libs/asura-lib-utils/exceptions/exception.cpp b/source/modules/asura-utils/exceptions/exception.cpp
index dbb36ca..dbb36ca 100644
--- a/source/libs/asura-lib-utils/exceptions/exception.cpp
+++ b/source/modules/asura-utils/exceptions/exception.cpp
diff --git a/source/libs/asura-lib-utils/exceptions/exception.h b/source/modules/asura-utils/exceptions/exception.h
index 57c9ed6..57c9ed6 100644
--- a/source/libs/asura-lib-utils/exceptions/exception.h
+++ b/source/modules/asura-utils/exceptions/exception.h
diff --git a/source/libs/asura-lib-utils/io/binding/_compressor.cpp b/source/modules/asura-utils/io/binding/_compressor.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/io/binding/_compressor.cpp
+++ b/source/modules/asura-utils/io/binding/_compressor.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_data_buffer.cpp b/source/modules/asura-utils/io/binding/_data_buffer.cpp
index cd73b31..cd73b31 100644
--- a/source/libs/asura-lib-utils/io/binding/_data_buffer.cpp
+++ b/source/modules/asura-utils/io/binding/_data_buffer.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_file.cpp b/source/modules/asura-utils/io/binding/_file.cpp
index c44bc90..c44bc90 100644
--- a/source/libs/asura-lib-utils/io/binding/_file.cpp
+++ b/source/modules/asura-utils/io/binding/_file.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_file_data.cpp b/source/modules/asura-utils/io/binding/_file_data.cpp
index 09a0643..09a0643 100644
--- a/source/libs/asura-lib-utils/io/binding/_file_data.cpp
+++ b/source/modules/asura-utils/io/binding/_file_data.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_file_system.cpp b/source/modules/asura-utils/io/binding/_file_system.cpp
index 3843451..3843451 100644
--- a/source/libs/asura-lib-utils/io/binding/_file_system.cpp
+++ b/source/modules/asura-utils/io/binding/_file_system.cpp
diff --git a/source/libs/asura-lib-utils/io/binding/_io_task.cpp b/source/modules/asura-utils/io/binding/_io_task.cpp
index b3c5988..b3c5988 100644
--- a/source/libs/asura-lib-utils/io/binding/_io_task.cpp
+++ b/source/modules/asura-utils/io/binding/_io_task.cpp
diff --git a/source/libs/asura-lib-utils/io/compressor.cpp b/source/modules/asura-utils/io/compressor.cpp
index 095eff4..095eff4 100644
--- a/source/libs/asura-lib-utils/io/compressor.cpp
+++ b/source/modules/asura-utils/io/compressor.cpp
diff --git a/source/libs/asura-lib-utils/io/compressor.h b/source/modules/asura-utils/io/compressor.h
index 30a074c..30a074c 100644
--- a/source/libs/asura-lib-utils/io/compressor.h
+++ b/source/modules/asura-utils/io/compressor.h
diff --git a/source/libs/asura-lib-utils/io/data_buffer.cpp b/source/modules/asura-utils/io/data_buffer.cpp
index 5049b38..5049b38 100644
--- a/source/libs/asura-lib-utils/io/data_buffer.cpp
+++ b/source/modules/asura-utils/io/data_buffer.cpp
diff --git a/source/libs/asura-lib-utils/io/data_buffer.h b/source/modules/asura-utils/io/data_buffer.h
index 445bdf4..445bdf4 100644
--- a/source/libs/asura-lib-utils/io/data_buffer.h
+++ b/source/modules/asura-utils/io/data_buffer.h
diff --git a/source/libs/asura-lib-utils/io/decoded_data.cpp b/source/modules/asura-utils/io/decoded_data.cpp
index 358a7a5..358a7a5 100644
--- a/source/libs/asura-lib-utils/io/decoded_data.cpp
+++ b/source/modules/asura-utils/io/decoded_data.cpp
diff --git a/source/libs/asura-lib-utils/io/decoded_data.h b/source/modules/asura-utils/io/decoded_data.h
index e201e91..e201e91 100644
--- a/source/libs/asura-lib-utils/io/decoded_data.h
+++ b/source/modules/asura-utils/io/decoded_data.h
diff --git a/source/libs/asura-lib-utils/io/file.cpp b/source/modules/asura-utils/io/file.cpp
index 0ff8c90..ed95436 100644
--- a/source/libs/asura-lib-utils/io/file.cpp
+++ b/source/modules/asura-utils/io/file.cpp
@@ -1,6 +1,6 @@
 #include <physfs/physfs.h>
 
-#include <asura-lib-utils/exceptions/exception.h>
+#include <asura-utils/exceptions/exception.h>
 
 #include "file.h"
 
diff --git a/source/libs/asura-lib-utils/io/file.h b/source/modules/asura-utils/io/file.h
index 56077e0..56077e0 100644
--- a/source/libs/asura-lib-utils/io/file.h
+++ b/source/modules/asura-utils/io/file.h
diff --git a/source/libs/asura-lib-utils/io/file_data.cpp b/source/modules/asura-utils/io/file_data.cpp
index 92333cf..92333cf 100644
--- a/source/libs/asura-lib-utils/io/file_data.cpp
+++ b/source/modules/asura-utils/io/file_data.cpp
diff --git a/source/libs/asura-lib-utils/io/file_data.h b/source/modules/asura-utils/io/file_data.h
index 9aa0e3b..cd69477 100644
--- a/source/libs/asura-lib-utils/io/file_data.h
+++ b/source/modules/asura-utils/io/file_data.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "data_buffer.h"
 
diff --git a/source/libs/asura-lib-utils/io/file_system.cpp b/source/modules/asura-utils/io/file_system.cpp
index 20f3cb2..20f3cb2 100644
--- a/source/libs/asura-lib-utils/io/file_system.cpp
+++ b/source/modules/asura-utils/io/file_system.cpp
diff --git a/source/libs/asura-lib-utils/io/file_system.h b/source/modules/asura-utils/io/file_system.h
index 849cbb6..849cbb6 100644
--- a/source/libs/asura-lib-utils/io/file_system.h
+++ b/source/modules/asura-utils/io/file_system.h
diff --git a/source/libs/asura-lib-utils/io/io_batch_task.cpp b/source/modules/asura-utils/io/io_batch_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/io/io_batch_task.cpp
+++ b/source/modules/asura-utils/io/io_batch_task.cpp
diff --git a/source/libs/asura-lib-utils/io/io_batch_task.h b/source/modules/asura-utils/io/io_batch_task.h
index c0be921..c0be921 100644
--- a/source/libs/asura-lib-utils/io/io_batch_task.h
+++ b/source/modules/asura-utils/io/io_batch_task.h
diff --git a/source/libs/asura-lib-utils/io/io_task.cpp b/source/modules/asura-utils/io/io_task.cpp
index 361b9c5..361b9c5 100644
--- a/source/libs/asura-lib-utils/io/io_task.cpp
+++ b/source/modules/asura-utils/io/io_task.cpp
diff --git a/source/libs/asura-lib-utils/io/io_task.h b/source/modules/asura-utils/io/io_task.h
index 8f04142..8f04142 100644
--- a/source/libs/asura-lib-utils/io/io_task.h
+++ b/source/modules/asura-utils/io/io_task.h
diff --git a/source/libs/asura-lib-utils/io/reloadable.h b/source/modules/asura-utils/io/reloadable.h
index 22a721c..22a721c 100644
--- a/source/libs/asura-lib-utils/io/reloadable.h
+++ b/source/modules/asura-utils/io/reloadable.h
diff --git a/source/libs/asura-lib-utils/manager.hpp b/source/modules/asura-utils/manager.hpp
index 7b4e272..7b4e272 100644
--- a/source/libs/asura-lib-utils/manager.hpp
+++ b/source/modules/asura-utils/manager.hpp
diff --git a/source/libs/asura-lib-utils/math/curve.cpp b/source/modules/asura-utils/math/curve.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/curve.cpp
+++ b/source/modules/asura-utils/math/curve.cpp
diff --git a/source/libs/asura-lib-utils/math/curve.h b/source/modules/asura-utils/math/curve.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/curve.h
+++ b/source/modules/asura-utils/math/curve.h
diff --git a/source/libs/asura-lib-utils/math/functions.cpp b/source/modules/asura-utils/math/functions.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/functions.cpp
+++ b/source/modules/asura-utils/math/functions.cpp
diff --git a/source/libs/asura-lib-utils/math/functions.h b/source/modules/asura-utils/math/functions.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/functions.h
+++ b/source/modules/asura-utils/math/functions.h
diff --git a/source/libs/asura-lib-utils/math/matrix44.cpp b/source/modules/asura-utils/math/matrix44.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/matrix44.cpp
+++ b/source/modules/asura-utils/math/matrix44.cpp
diff --git a/source/libs/asura-lib-utils/math/matrix44.h b/source/modules/asura-utils/math/matrix44.h
index 4ab3c0b..4ab3c0b 100644
--- a/source/libs/asura-lib-utils/math/matrix44.h
+++ b/source/modules/asura-utils/math/matrix44.h
diff --git a/source/libs/asura-lib-utils/math/quaternion.cpp b/source/modules/asura-utils/math/quaternion.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/quaternion.cpp
+++ b/source/modules/asura-utils/math/quaternion.cpp
diff --git a/source/libs/asura-lib-utils/math/quaternion.h b/source/modules/asura-utils/math/quaternion.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/quaternion.h
+++ b/source/modules/asura-utils/math/quaternion.h
diff --git a/source/libs/asura-lib-utils/math/ranged_value.cpp b/source/modules/asura-utils/math/ranged_value.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/ranged_value.cpp
+++ b/source/modules/asura-utils/math/ranged_value.cpp
diff --git a/source/libs/asura-lib-utils/math/ranged_value.h b/source/modules/asura-utils/math/ranged_value.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/ranged_value.h
+++ b/source/modules/asura-utils/math/ranged_value.h
diff --git a/source/libs/asura-lib-utils/math/rect.hpp b/source/modules/asura-utils/math/rect.hpp
index 1751634..1751634 100644
--- a/source/libs/asura-lib-utils/math/rect.hpp
+++ b/source/modules/asura-utils/math/rect.hpp
diff --git a/source/libs/asura-lib-utils/math/rect.inl b/source/modules/asura-utils/math/rect.inl
index 891a3f8..891a3f8 100644
--- a/source/libs/asura-lib-utils/math/rect.inl
+++ b/source/modules/asura-utils/math/rect.inl
diff --git a/source/libs/asura-lib-utils/math/transform.cpp b/source/modules/asura-utils/math/transform.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/math/transform.cpp
+++ b/source/modules/asura-utils/math/transform.cpp
diff --git a/source/libs/asura-lib-utils/math/transform.h b/source/modules/asura-utils/math/transform.h
index be4c850..be4c850 100644
--- a/source/libs/asura-lib-utils/math/transform.h
+++ b/source/modules/asura-utils/math/transform.h
diff --git a/source/libs/asura-lib-utils/math/vector2.hpp b/source/modules/asura-utils/math/vector2.hpp
index df78255..df78255 100644
--- a/source/libs/asura-lib-utils/math/vector2.hpp
+++ b/source/modules/asura-utils/math/vector2.hpp
diff --git a/source/libs/asura-lib-utils/math/vector2.inl b/source/modules/asura-utils/math/vector2.inl
index 9e131a7..9e131a7 100644
--- a/source/libs/asura-lib-utils/math/vector2.inl
+++ b/source/modules/asura-utils/math/vector2.inl
diff --git a/source/libs/asura-lib-utils/math/vector3.hpp b/source/modules/asura-utils/math/vector3.hpp
index 2b23406..2b23406 100644
--- a/source/libs/asura-lib-utils/math/vector3.hpp
+++ b/source/modules/asura-utils/math/vector3.hpp
diff --git a/source/libs/asura-lib-utils/math/vector3.inl b/source/modules/asura-utils/math/vector3.inl
index 3a2aa93..3a2aa93 100644
--- a/source/libs/asura-lib-utils/math/vector3.inl
+++ b/source/modules/asura-utils/math/vector3.inl
diff --git a/source/libs/asura-lib-utils/math/vector4.h b/source/modules/asura-utils/math/vector4.h
index 13a9d8a..13a9d8a 100644
--- a/source/libs/asura-lib-utils/math/vector4.h
+++ b/source/modules/asura-utils/math/vector4.h
diff --git a/source/libs/asura-lib-utils/math/vector4.inl b/source/modules/asura-utils/math/vector4.inl
index 025bfcc..025bfcc 100644
--- a/source/libs/asura-lib-utils/math/vector4.inl
+++ b/source/modules/asura-utils/math/vector4.inl
diff --git a/source/libs/asura-lib-utils/module.h b/source/modules/asura-utils/module.h
index b22c68c..b22c68c 100644
--- a/source/libs/asura-lib-utils/module.h
+++ b/source/modules/asura-utils/module.h
diff --git a/source/libs/asura-lib-utils/scripting/lua_env.h b/source/modules/asura-utils/scripting/lua_env.h
index e2fc4fc..e2fc4fc 100644
--- a/source/libs/asura-lib-utils/scripting/lua_env.h
+++ b/source/modules/asura-utils/scripting/lua_env.h
diff --git a/source/libs/asura-lib-utils/scripting/portable.hpp b/source/modules/asura-utils/scripting/portable.hpp
index 5badf8d..5badf8d 100644
--- a/source/libs/asura-lib-utils/scripting/portable.hpp
+++ b/source/modules/asura-utils/scripting/portable.hpp
diff --git a/source/libs/asura-lib-utils/singleton.hpp b/source/modules/asura-utils/singleton.hpp
index 0d2777e..0d2777e 100644
--- a/source/libs/asura-lib-utils/singleton.hpp
+++ b/source/modules/asura-utils/singleton.hpp
diff --git a/source/libs/asura-lib-utils/stringmap.cpp b/source/modules/asura-utils/stringmap.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/stringmap.cpp
+++ b/source/modules/asura-utils/stringmap.cpp
diff --git a/source/libs/asura-lib-utils/stringmap.hpp b/source/modules/asura-utils/stringmap.hpp
index ddba128..ddba128 100644
--- a/source/libs/asura-lib-utils/stringmap.hpp
+++ b/source/modules/asura-utils/stringmap.hpp
diff --git a/source/libs/asura-lib-utils/threading/binding/_coroutine.cpp b/source/modules/asura-utils/threading/binding/_coroutine.cpp
index 7f74cca..7f74cca 100644
--- a/source/libs/asura-lib-utils/threading/binding/_coroutine.cpp
+++ b/source/modules/asura-utils/threading/binding/_coroutine.cpp
diff --git a/source/libs/asura-lib-utils/threading/binding/_thread.cpp b/source/modules/asura-utils/threading/binding/_thread.cpp
index a5aff03..a5aff03 100644
--- a/source/libs/asura-lib-utils/threading/binding/_thread.cpp
+++ b/source/modules/asura-utils/threading/binding/_thread.cpp
diff --git a/source/libs/asura-lib-utils/threading/coroutine.cpp b/source/modules/asura-utils/threading/coroutine.cpp
index 9f65c5f..9f65c5f 100644
--- a/source/libs/asura-lib-utils/threading/coroutine.cpp
+++ b/source/modules/asura-utils/threading/coroutine.cpp
diff --git a/source/libs/asura-lib-utils/threading/coroutine.h b/source/modules/asura-utils/threading/coroutine.h
index 01af654..01af654 100644
--- a/source/libs/asura-lib-utils/threading/coroutine.h
+++ b/source/modules/asura-utils/threading/coroutine.h
diff --git a/source/libs/asura-lib-utils/threading/mutex.cpp b/source/modules/asura-utils/threading/mutex.cpp
index 663ac28..ffe67f6 100644
--- a/source/libs/asura-lib-utils/threading/mutex.cpp
+++ b/source/modules/asura-utils/threading/mutex.cpp
@@ -1,4 +1,4 @@
-#include <asura-lib-utils/exceptions/exception.h>
+#include <asura-utils/exceptions/exception.h>
 
 #include "mutex.h"
 
diff --git a/source/libs/asura-lib-utils/threading/mutex.h b/source/modules/asura-utils/threading/mutex.h
index 7e7d877..a3fbea5 100644
--- a/source/libs/asura-lib-utils/threading/mutex.h
+++ b/source/modules/asura-utils/threading/mutex.h
@@ -1,7 +1,7 @@
 #ifndef __ASURA_MUTEX_H__
 #define __ASURA_MUTEX_H__
 
-#include <asura-lib-utils/type.h>
+#include <asura-utils/type.h>
 
 #include "../utils_config.h"
 
diff --git a/source/libs/asura-lib-utils/threading/semaphore.cpp b/source/modules/asura-utils/threading/semaphore.cpp
index d59ec78..12d4aab 100644
--- a/source/libs/asura-lib-utils/threading/semaphore.cpp
+++ b/source/modules/asura-utils/threading/semaphore.cpp
@@ -27,7 +27,7 @@ namespace AsuraEngine
 #ifdef ASURA_THREAD_WIN32 
 			try_create_semaphore(SemaphoreWin32);
 #endif
-			ASSERT(mImpl);
+			//ASSERT(mImpl);
 		}
 
 		Semaphore::~Semaphore()
diff --git a/source/libs/asura-lib-utils/threading/semaphore.h b/source/modules/asura-utils/threading/semaphore.h
index 80773d8..80773d8 100644
--- a/source/libs/asura-lib-utils/threading/semaphore.h
+++ b/source/modules/asura-utils/threading/semaphore.h
diff --git a/source/libs/asura-lib-utils/threading/task.cpp b/source/modules/asura-utils/threading/task.cpp
index 2e84ed4..2e84ed4 100644
--- a/source/libs/asura-lib-utils/threading/task.cpp
+++ b/source/modules/asura-utils/threading/task.cpp
diff --git a/source/libs/asura-lib-utils/threading/task.h b/source/modules/asura-utils/threading/task.h
index fb7aa5f..3b3a79c 100644
--- a/source/libs/asura-lib-utils/threading/task.h
+++ b/source/modules/asura-utils/threading/task.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_THRAD_TASK_H__
 #define __ASURA_THRAD_TASK_H__
 
-#include <asura-lib-utils/type.h>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/type.h>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-utils/threading/thread.cpp b/source/modules/asura-utils/threading/thread.cpp
index 0f4f5da..0f4f5da 100644
--- a/source/libs/asura-lib-utils/threading/thread.cpp
+++ b/source/modules/asura-utils/threading/thread.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread.h b/source/modules/asura-utils/threading/thread.h
index 0e75770..340fca3 100644
--- a/source/libs/asura-lib-utils/threading/thread.h
+++ b/source/modules/asura-utils/threading/thread.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <queue>
 
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/scripting/portable.hpp>
 
 #include "task.h"
 #include "mutex.h"
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp b/source/modules/asura-utils/threading/thread_impl_posix.cpp
index d2ad7af..d2ad7af 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp
+++ b/source/modules/asura-utils/threading/thread_impl_posix.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_posix.h b/source/modules/asura-utils/threading/thread_impl_posix.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_posix.h
+++ b/source/modules/asura-utils/threading/thread_impl_posix.h
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp b/source/modules/asura-utils/threading/thread_impl_sdl.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp
+++ b/source/modules/asura-utils/threading/thread_impl_sdl.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_sdl.h b/source/modules/asura-utils/threading/thread_impl_sdl.h
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_sdl.h
+++ b/source/modules/asura-utils/threading/thread_impl_sdl.h
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_std.cpp b/source/modules/asura-utils/threading/thread_impl_std.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_std.cpp
+++ b/source/modules/asura-utils/threading/thread_impl_std.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_std.h b/source/modules/asura-utils/threading/thread_impl_std.h
index 0e7d3da..0e7d3da 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_std.h
+++ b/source/modules/asura-utils/threading/thread_impl_std.h
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp b/source/modules/asura-utils/threading/thread_impl_win32.cpp
index 6871c2d..6871c2d 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp
+++ b/source/modules/asura-utils/threading/thread_impl_win32.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_impl_win32.h b/source/modules/asura-utils/threading/thread_impl_win32.h
index a22aeef..a22aeef 100644
--- a/source/libs/asura-lib-utils/threading/thread_impl_win32.h
+++ b/source/modules/asura-utils/threading/thread_impl_win32.h
diff --git a/source/libs/asura-lib-utils/threading/thread_task.cpp b/source/modules/asura-utils/threading/thread_task.cpp
index e69de29..e69de29 100644
--- a/source/libs/asura-lib-utils/threading/thread_task.cpp
+++ b/source/modules/asura-utils/threading/thread_task.cpp
diff --git a/source/libs/asura-lib-utils/threading/thread_task.h b/source/modules/asura-utils/threading/thread_task.h
index 1ea0a1a..6592191 100644
--- a/source/libs/asura-lib-utils/threading/thread_task.h
+++ b/source/modules/asura-utils/threading/thread_task.h
@@ -1,8 +1,8 @@
 #ifndef __ASURA_THRAD_TASK_H__
 #define __ASURA_THRAD_TASK_H__
 
-#include <asura-lib-utils/type.h>
-#include <asura-lib-utils/scripting/portable.hpp>
+#include <asura-utils/type.h>
+#include <asura-utils/scripting/portable.hpp>
 
 namespace AsuraEngine
 {
diff --git a/source/libs/asura-lib-utils/type.h b/source/modules/asura-utils/type.h
index 1ed2d42..1ed2d42 100644
--- a/source/libs/asura-lib-utils/type.h
+++ b/source/modules/asura-utils/type.h
diff --git a/source/libs/asura-lib-utils/utils.h b/source/modules/asura-utils/utils.h
index ce1c6a1..ce1c6a1 100644
--- a/source/libs/asura-lib-utils/utils.h
+++ b/source/modules/asura-utils/utils.h
diff --git a/source/libs/asura-lib-utils/utils_config.h b/source/modules/asura-utils/utils_config.h
index 02837dc..02837dc 100644
--- a/source/libs/asura-lib-utils/utils_config.h
+++ b/source/modules/asura-utils/utils_config.h
diff --git a/source/libs/asura-lib-utils/utils_module.cpp b/source/modules/asura-utils/utils_module.cpp
index 61780e6..61780e6 100644
--- a/source/libs/asura-lib-utils/utils_module.cpp
+++ b/source/modules/asura-utils/utils_module.cpp
diff --git a/source/libs/asura-lib-utils/utils_module.h b/source/modules/asura-utils/utils_module.h
index e802730..e802730 100644
--- a/source/libs/asura-lib-utils/utils_module.h
+++ b/source/modules/asura-utils/utils_module.h
diff --git a/source/tests/05-physfs/main.cpp b/source/tests/05-physfs/main.cpp
index 4400c44..0ddade0 100644
--- a/source/tests/05-physfs/main.cpp
+++ b/source/tests/05-physfs/main.cpp
@@ -1,6 +1,6 @@
 #include <string>
 
-#include <asura-lib-utils/utils.h>
+#include <asura-utils/utils.h>
 
 using namespace std;
 using namespace AEScripting;