*去掉文件前缀je_

140 files changed, 366 insertions, 366 deletions

diff --git a/src/libjin/ai/ai.h b/src/libjin/ai/ai.h
new file mode 100644
index 0000000..60a9e04
--- /dev/null
+++ b/src/libjin/ai/ai.h
@@ -0,0 +1,8 @@
+#ifndef __JE_AI_H__
+#define __JE_AI_H__
+
+// Decision Making
+#include "state_machine.h"
+#include "behavior_tree.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/ai/je_behavior_tree.cpp b/src/libjin/ai/behavior_tree.cpp
index e69de29..e69de29 100644
--- a/src/libjin/ai/je_behavior_tree.cpp
+++ b/src/libjin/ai/behavior_tree.cpp
diff --git a/src/libjin/ai/je_behavior_tree.h b/src/libjin/ai/behavior_tree.h
index 982e89e..eb36e9f 100644
--- a/src/libjin/ai/je_behavior_tree.h
+++ b/src/libjin/ai/behavior_tree.h
@@ -1,7 +1,7 @@
 #ifndef __JE_BEHAVIOR_TREE_H__
 #define __JE_BEHAVIOR_TREE_H__
 
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_ai)
 
 #include <functional>
diff --git a/src/libjin/ai/je_ai.h b/src/libjin/ai/je_ai.h
deleted file mode 100644
index aeaa183..0000000
--- a/src/libjin/ai/je_ai.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __JE_AI_H__
-#define __JE_AI_H__
-
-// Decision Making
-#include "je_state_machine.h"
-#include "je_behavior_tree.h"
-
-#endif
\ No newline at end of file
diff --git a/src/libjin/ai/je_state_machine.cpp b/src/libjin/ai/state_machine.cpp
index 6208265..cefd0b9 100644
--- a/src/libjin/ai/je_state_machine.cpp
+++ b/src/libjin/ai/state_machine.cpp
@@ -1,6 +1,6 @@
-#include "je_state_machine.h"
+#include "state_machine.h"
 
-#include "../utils/je_log.h"
+#include "../utils/log.h"
 
 using namespace std;
 
diff --git a/src/libjin/ai/je_state_machine.h b/src/libjin/ai/state_machine.h
index c928989..d70563d 100644
--- a/src/libjin/ai/je_state_machine.h
+++ b/src/libjin/ai/state_machine.h
@@ -1,16 +1,16 @@
 #ifndef __JE_STATE_MACHINE_H__
 #define __JE_STATE_MACHINE_H__
 
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_ai)
 
 #include <map>
 #include <vector>
 #include <functional>
 
-#include "../common/je_temporary.h"
-#include "../common/je_types.h"
-#include "../common/je_object.h"
+#include "../common/temporary.h"
+#include "../common/types.h"
+#include "../common/object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/audio/SDL/je_sdl_audio.cpp b/src/libjin/audio/SDL/sdl_audio.cpp
index f401502..4c4bcc2 100644
--- a/src/libjin/audio/SDL/je_sdl_audio.cpp
+++ b/src/libjin/audio/SDL/sdl_audio.cpp
@@ -1,13 +1,13 @@
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_audio) && (jin_audio == jin_audio_sdl)
 
 #include <iostream>
 
-#include "../../math/je_math.h"
-#include "../../utils/je_log.h"
+#include "../../math/math.h"
+#include "../../utils/log.h"
 
-#include "je_sdl_audio.h"
-#include "je_sdl_source.h"
+#include "sdl_audio.h"
+#include "sdl_source.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/audio/SDL/je_sdl_audio.h b/src/libjin/audio/SDL/sdl_audio.h
index 5db1698..4808118 100644
--- a/src/libjin/audio/SDL/je_sdl_audio.h
+++ b/src/libjin/audio/SDL/sdl_audio.h
@@ -1,13 +1,13 @@
 #ifndef __JE_AUDIO_SDL_H__
 #define __JE_AUDIO_SDL_H__
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_audio) && (jin_audio == jin_audio_sdl)
 
 #include <vector>
 
-#include "../je_audio_manager.h"
+#include "../audio_manager.h"
 
-#include "je_sdl_source.h"
+#include "sdl_source.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/audio/SDL/je_sdl_source.cpp b/src/libjin/audio/SDL/sdl_source.cpp
index 39472fd..eae3eec 100644
--- a/src/libjin/audio/SDL/je_sdl_source.cpp
+++ b/src/libjin/audio/SDL/sdl_source.cpp
@@ -1,4 +1,4 @@
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_audio) && (jin_audio == jin_audio_sdl)
 
 #include <exception>
@@ -9,11 +9,11 @@
 #include "stb/stb_vorbis.c"
 #include "wav/wav.h"
 
-#include "../../math/je_math.h"
-#include "../../utils/je_macros.h"
+#include "../../math/math.h"
+#include "../../utils/macros.h"
 
-#include "je_sdl_audio.h"
-#include "je_sdl_source.h"
+#include "sdl_audio.h"
+#include "sdl_source.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/audio/SDL/je_sdl_source.h b/src/libjin/audio/SDL/sdl_source.h
index 3f1c10f..967b0c2 100644
--- a/src/libjin/audio/SDL/je_sdl_source.h
+++ b/src/libjin/audio/SDL/sdl_source.h
@@ -1,6 +1,6 @@
 #ifndef __JE_SOURCE_SDL_H__
 #define __JE_SOURCE_SDL_H__
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_audio) && (jin_audio == jin_audio_sdl)
 
 #include <vector>
@@ -8,7 +8,7 @@
 #include <stack>
 #include <exception>
 
-#include "../je_source.h"
+#include "../source.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/audio/je_audio_manager.cpp b/src/libjin/audio/audio_manager.cpp
index 1fdc6ef..dc0e9e2 100644
--- a/src/libjin/audio/je_audio_manager.cpp
+++ b/src/libjin/audio/audio_manager.cpp
@@ -1,8 +1,8 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if jin_audio
 
 #include "SDL2/SDL.h"
-#include "je_audio_manager.h"
+#include "audio_manager.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/audio/je_audio_manager.h b/src/libjin/audio/audio_manager.h
index cc6d65b..52757ba 100644
--- a/src/libjin/audio/je_audio_manager.h
+++ b/src/libjin/audio/audio_manager.h
@@ -1,11 +1,11 @@
 #ifndef __JE_AUDIO_H__
 #define __JE_AUDIO_H__
 
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_audio)
 
-#include "../utils/je_macros.h"
-#include "../common/je_subsystem.hpp"
+#include "../utils/macros.h"
+#include "../common/subsystem.hpp"
 
 #include "SDL2/SDL.h"
 
diff --git a/src/libjin/audio/je_source.cpp b/src/libjin/audio/source.cpp
index 382e820..289072e 100644
--- a/src/libjin/audio/je_source.cpp
+++ b/src/libjin/audio/source.cpp
@@ -1,9 +1,9 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_audio)
 
 #include <cstring>
 
-#include "je_source.h"
+#include "source.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/audio/je_source.h b/src/libjin/audio/source.h
index fd78be5..f3b749d 100644
--- a/src/libjin/audio/je_source.h
+++ b/src/libjin/audio/source.h
@@ -1,9 +1,9 @@
 #ifndef __JE_AUDIO_SOURCE_H__
 #define __JE_AUDIO_SOURCE_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_audio) 
 
-#include "../common/je_object.h"
+#include "../common/object.h"
 
 #include "SDL2/SDL.h"
 
diff --git a/src/libjin/common/je_array.hpp b/src/libjin/common/array.hpp
index 8a5cbf1..8a5cbf1 100644
--- a/src/libjin/common/je_array.hpp
+++ b/src/libjin/common/array.hpp
diff --git a/src/libjin/common/common.h b/src/libjin/common/common.h
new file mode 100644
index 0000000..6ca4dfd
--- /dev/null
+++ b/src/libjin/common/common.h
@@ -0,0 +1,8 @@
+#ifndef __JE_COMMON_H__
+#define __JE_COMMON_H__
+
+#include "exception.h"
+#include "array.hpp"
+#include "string.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/common/je_exception.cpp b/src/libjin/common/exception.cpp
index 5489a42..dc4e6ac 100644
--- a/src/libjin/common/je_exception.cpp
+++ b/src/libjin/common/exception.cpp
@@ -1,6 +1,6 @@
 #include <stdarg.h>
 
-#include "je_exception.h"
+#include "exception.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/common/je_exception.h b/src/libjin/common/exception.h
index 71caa5a..0dee14c 100644
--- a/src/libjin/common/je_exception.h
+++ b/src/libjin/common/exception.h
@@ -4,7 +4,7 @@
 #include <exception>
 #include <string>
 
-#include "je_object.h"
+#include "object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/common/je_common.h b/src/libjin/common/je_common.h
deleted file mode 100644
index a34268a..0000000
--- a/src/libjin/common/je_common.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __JE_COMMON_H__
-#define __JE_COMMON_H__
-
-#include "je_exception.h"
-#include "je_array.hpp"
-#include "je_string.h"
-
-#endif
\ No newline at end of file
diff --git a/src/libjin/common/je_noncopyable.h b/src/libjin/common/noncopyable.h
index dab74a4..ddde7a1 100644
--- a/src/libjin/common/je_noncopyable.h
+++ b/src/libjin/common/noncopyable.h
@@ -1,7 +1,7 @@
 #ifndef __JE_NONCOPYABLE_H__
 #define __JE_NONCOPYABLE_H__
 
-#include "je_object.h"
+#include "object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/common/je_object.h b/src/libjin/common/object.h
index 581500f..581500f 100644
--- a/src/libjin/common/je_object.h
+++ b/src/libjin/common/object.h
diff --git a/src/libjin/common/je_pool.hpp b/src/libjin/common/pool.hpp
index 0758b97..356ff87 100644
--- a/src/libjin/common/je_pool.hpp
+++ b/src/libjin/common/pool.hpp
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <iostream>
 
-#include "je_types.h"
+#include "types.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/common/je_singleton.hpp b/src/libjin/common/singleton.hpp
index 51dc9c5..015c9b0 100644
--- a/src/libjin/common/je_singleton.hpp
+++ b/src/libjin/common/singleton.hpp
@@ -1,8 +1,8 @@
 #ifndef __JE_SINGLETON_H__
 #define __JE_SINGLETON_H__
 
-#include "je_object.h"
-#include "je_exception.h"
+#include "object.h"
+#include "exception.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/common/je_string.h b/src/libjin/common/string.h
index 4e46f17..4e46f17 100644
--- a/src/libjin/common/je_string.h
+++ b/src/libjin/common/string.h
diff --git a/src/libjin/common/je_stringmap.hpp b/src/libjin/common/stringmap.hpp
index b4cdccf..1db798e 100644
--- a/src/libjin/common/je_stringmap.hpp
+++ b/src/libjin/common/stringmap.hpp
@@ -1,7 +1,7 @@
 #ifndef __JE_COMMON_SREINGMAP_H__
 #define __JE_COMMON_SREINGMAP_H__
 
-#include "je_object.h"
+#include "object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/common/je_subsystem.hpp b/src/libjin/common/subsystem.hpp
index 8f682ef..9828c40 100644
--- a/src/libjin/common/je_subsystem.hpp
+++ b/src/libjin/common/subsystem.hpp
@@ -1,9 +1,9 @@
 #ifndef __JE_COMMON_SUBSYSTEM_H__
 #define __JE_COMMON_SUBSYSTEM_H__
 
-#include "../utils/je_macros.h"
+#include "../utils/macros.h"
 
-#include "je_singleton.hpp"
+#include "singleton.hpp"
 
 namespace JinEngine
 {
diff --git a/src/libjin/common/je_temporary.h b/src/libjin/common/temporary.h
index b89a601..3f02b2b 100644
--- a/src/libjin/common/je_temporary.h
+++ b/src/libjin/common/temporary.h
@@ -1,7 +1,7 @@
 #ifndef __JE_TEMPORARY_H__
 #define __JE_TEMPORARY_H__
 
-#include "je_object.h"
+#include "object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/common/je_types.h b/src/libjin/common/types.h
index e31ce5e..e31ce5e 100644
--- a/src/libjin/common/je_types.h
+++ b/src/libjin/common/types.h
diff --git a/src/libjin/core/je_configuration.h b/src/libjin/core/configuration.h
index 40956b5..40956b5 100644
--- a/src/libjin/core/je_configuration.h
+++ b/src/libjin/core/configuration.h
diff --git a/src/libjin/core/je_version.h b/src/libjin/core/version.h
index b5fe379..b5fe379 100644
--- a/src/libjin/core/je_version.h
+++ b/src/libjin/core/version.h
diff --git a/src/libjin/filesystem/je_asset_database.cpp b/src/libjin/filesystem/asset_database.cpp
index 1203643..e532f41 100644
--- a/src/libjin/filesystem/je_asset_database.cpp
+++ b/src/libjin/filesystem/asset_database.cpp
@@ -1,13 +1,13 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_filesystem)
 
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>  /* defines FILENAME_MAX */
 
-#include "../common/je_exception.h"
+#include "../common/exception.h"
 
-#include "je_asset_database.h"
+#include "asset_database.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/filesystem/je_asset_database.h b/src/libjin/filesystem/asset_database.h
index 82d5ab4..2d7d5a3 100644
--- a/src/libjin/filesystem/je_asset_database.h
+++ b/src/libjin/filesystem/asset_database.h
@@ -1,14 +1,14 @@
 #ifndef __JE_ASSET_DATABASE_H__
 #define __JE_ASSET_DATABASE_H__
 
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_filesystem)
 
 #include <vector>
 
 #include "smount/smount.h"
 
-#include "je_buffer.h"
+#include "buffer.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/filesystem/je_buffer.h b/src/libjin/filesystem/buffer.h
index b3c6612..2b5be6a 100644
--- a/src/libjin/filesystem/je_buffer.h
+++ b/src/libjin/filesystem/buffer.h
@@ -1,14 +1,14 @@
 #ifndef __JE_BUFFER_H__
 #define __JE_BUFFER_H__
 
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_filesystem)
 
 #include <string.h>
 #include <stdlib.h>
 
-#include "../common/je_temporary.h"
-#include "../common/je_types.h"
+#include "../common/temporary.h"
+#include "../common/types.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/game/je_application.cpp b/src/libjin/game/application.cpp
index 24629d4..e67231f 100644
--- a/src/libjin/game/je_application.cpp
+++ b/src/libjin/game/application.cpp
@@ -1,15 +1,15 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_game)
 
 #include <iostream>
 
-#include "../time/je_timer.h"
-#include "../input/je_event.h"
-#include "../graphics/je_window.h"
-#include "../graphics/je_gl.h"
-#include "../math/je_math.h"
+#include "../time/timer.h"
+#include "../input/event.h"
+#include "../graphics/window.h"
+#include "../graphics/gl.h"
+#include "../math/math.h"
 
-#include "je_application.h"
+#include "application.h"
 
 using namespace JinEngine::Graphics;
 using namespace JinEngine::Input;
diff --git a/src/libjin/game/je_application.h b/src/libjin/game/application.h
index 6eb8af2..4c4f48b 100644
--- a/src/libjin/game/je_application.h
+++ b/src/libjin/game/application.h
@@ -1,12 +1,12 @@
 #ifndef __JE_CORE_GAME_H__
 #define __JE_CORE_GAME_H__
 
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_game)
 
-#include "../common/je_subsystem.hpp"
-#include "../utils/je_macros.h"
-#include "../input/je_Event.h"
+#include "../common/subsystem.hpp"
+#include "../utils/macros.h"
+#include "../input/Event.h"
 
 #include "SDL2/SDL.h"
 
diff --git a/src/libjin/game/je_gameobject.cpp b/src/libjin/game/gameobject.cpp
index 731f3a7..b17c93c 100644
--- a/src/libjin/game/je_gameobject.cpp
+++ b/src/libjin/game/gameobject.cpp
@@ -1,4 +1,4 @@
-#include "je_gameobject.h"
+#include "gameobject.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/game/je_gameobject.h b/src/libjin/game/gameobject.h
index e434caf..7cb0de2 100644
--- a/src/libjin/game/je_gameobject.h
+++ b/src/libjin/game/gameobject.h
@@ -1,15 +1,15 @@
 #ifndef __JE_GAME_OBJECT_H__
 #define __JE_GAME_OBJECT_H__
 
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_game)
 
 #include <list>
 #include <map>
 #include <set>
 
-#include "../common/je_object.h"
-#include "../math/je_transform.h"
+#include "../common/object.h"
+#include "../math/transform.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/animations/je_animation.cpp b/src/libjin/graphics/animations/animation.cpp
index 3168026..168c3e3 100644
--- a/src/libjin/graphics/animations/je_animation.cpp
+++ b/src/libjin/graphics/animations/animation.cpp
@@ -1,5 +1,5 @@
-#include "../../math/je_vector2.hpp"
-#include "je_animation.h"
+#include "../../math/vector2.hpp"
+#include "animation.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/animations/je_animation.h b/src/libjin/graphics/animations/animation.h
index fd22049..72565fc 100644
--- a/src/libjin/graphics/animations/je_animation.h
+++ b/src/libjin/graphics/animations/animation.h
@@ -4,9 +4,9 @@
 #include <vector>
 #include <string>
 
-#include "../../common/je_object.h"
+#include "../../common/object.h"
 
-#include "../je_sprite.h"
+#include "../sprite.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/animations/je_animator.cpp b/src/libjin/graphics/animations/animator.cpp
index 1e25639..8db3bc2 100644
--- a/src/libjin/graphics/animations/je_animator.cpp
+++ b/src/libjin/graphics/animations/animator.cpp
@@ -1,5 +1,5 @@
-#include "../../math/je_vector2.hpp"
-#include "je_animator.h"
+#include "../../math/vector2.hpp"
+#include "animator.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/animations/je_animator.h b/src/libjin/graphics/animations/animator.h
index e2369cf..263c7cb 100644
--- a/src/libjin/graphics/animations/je_animator.h
+++ b/src/libjin/graphics/animations/animator.h
@@ -3,10 +3,10 @@
 
 #include <string>
 
-#include "../../common/je_object.h"
-#include "../../utils/je_log.h"
+#include "../../common/object.h"
+#include "../../utils/log.h"
 
-#include "je_animation.h"
+#include "animation.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_bitmap.cpp b/src/libjin/graphics/bitmap.cpp
index eadd6d1..cae6f0b 100644
--- a/src/libjin/graphics/je_bitmap.cpp
+++ b/src/libjin/graphics/bitmap.cpp
@@ -1,11 +1,11 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb/stb_image.h"
 
-#include "../common/je_exception.h"
-#include "../filesystem/je_asset_database.h"
-#include "../math/je_math.h"
+#include "../common/exception.h"
+#include "../filesystem/asset_database.h"
+#include "../math/math.h"
 
-#include "je_bitmap.h"
+#include "bitmap.h"
 
 using namespace JinEngine::Filesystem;
 using namespace JinEngine::Math;
diff --git a/src/libjin/graphics/je_bitmap.h b/src/libjin/graphics/bitmap.h
index ad4ab05..17dca40 100644
--- a/src/libjin/graphics/je_bitmap.h
+++ b/src/libjin/graphics/bitmap.h
@@ -1,14 +1,14 @@
 #ifndef __JE_BITMAP_H__
 #define __JE_BITMAP_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <functional>
 
-#include "../common/je_types.h"
-#include "../math/je_vector2.hpp"
+#include "../common/types.h"
+#include "../math/vector2.hpp"
 
-#include "je_color.h"
+#include "color.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_canvas.cpp b/src/libjin/graphics/canvas.cpp
index bb1e2a9..db02110 100644
--- a/src/libjin/graphics/je_canvas.cpp
+++ b/src/libjin/graphics/canvas.cpp
@@ -1,9 +1,9 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "../utils/je_macros.h"
-#include "je_canvas.h" 
-#include "je_window.h"
+#include "../utils/macros.h"
+#include "canvas.h" 
+#include "window.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_canvas.h b/src/libjin/graphics/canvas.h
index dc0a59e..302764a 100644
--- a/src/libjin/graphics/je_canvas.h
+++ b/src/libjin/graphics/canvas.h
@@ -1,9 +1,9 @@
 #ifndef __JE_CANVAS_H__
 #define __JE_CANVAS_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "je_graphic.h"
+#include "graphic.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_color.cpp b/src/libjin/graphics/color.cpp
index ea936fa..92f61c6 100644
--- a/src/libjin/graphics/je_color.cpp
+++ b/src/libjin/graphics/color.cpp
@@ -1,4 +1,4 @@
-#include "je_color.h"
+#include "color.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_color.h b/src/libjin/graphics/color.h
index 96120e3..0f7d6dd 100644
--- a/src/libjin/graphics/je_color.h
+++ b/src/libjin/graphics/color.h
@@ -3,13 +3,13 @@
 */
 #ifndef __JE_COLOR_H__
 #define __JE_COLOR_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "../math/je_math.h"
+#include "../math/math.h"
 
-#include "../common/je_types.h"
-#include "../utils/je_endian.h"
+#include "../common/types.h"
+#include "../utils/endian.h"
 
 namespace JinEngine 
 {
diff --git a/src/libjin/graphics/fonts/je_decoder.cpp b/src/libjin/graphics/fonts/decoder.cpp
index a7f4f32..5c74258 100644
--- a/src/libjin/graphics/fonts/je_decoder.cpp
+++ b/src/libjin/graphics/fonts/decoder.cpp
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include "je_decoder.h"
+#include "decoder.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_decoder.h b/src/libjin/graphics/fonts/decoder.h
index 43fa155..8ff7bd7 100644
--- a/src/libjin/graphics/fonts/je_decoder.h
+++ b/src/libjin/graphics/fonts/decoder.h
@@ -3,9 +3,9 @@
 
 #include <vector>
 
-#include "../../common/je_object.h"
+#include "../../common/object.h"
 
-#include "je_text.h"
+#include "text.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_font.h b/src/libjin/graphics/fonts/font.h
index 9c231de..166cd6b 100644
--- a/src/libjin/graphics/fonts/je_font.h
+++ b/src/libjin/graphics/fonts/font.h
@@ -3,9 +3,9 @@
 
 #include <vector>
 
-#include "../je_renderable.h"
+#include "../renderable.h"
 
-#include "je_text.h"
+#include "text.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_page.h b/src/libjin/graphics/fonts/page.h
index d831691..75f1840 100644
--- a/src/libjin/graphics/fonts/je_page.h
+++ b/src/libjin/graphics/fonts/page.h
@@ -1,9 +1,9 @@
 #ifndef __JE_PAGE_H__
 #define __JE_PAGE_H__
 
-#include "../../math/je_vector2.hpp"
+#include "../../math/vector2.hpp"
 
-#include "je_font.h"
+#include "font.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_text.cpp b/src/libjin/graphics/fonts/text.cpp
index f9909a6..9684b81 100644
--- a/src/libjin/graphics/fonts/je_text.cpp
+++ b/src/libjin/graphics/fonts/text.cpp
@@ -1,7 +1,7 @@
 #include <cstring>
 
-#include "je_text.h"
-#include "je_decoder.h"
+#include "text.h"
+#include "decoder.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_text.h b/src/libjin/graphics/fonts/text.h
index 6837bfc..c3bb8db 100644
--- a/src/libjin/graphics/fonts/je_text.h
+++ b/src/libjin/graphics/fonts/text.h
@@ -3,7 +3,7 @@
 
 #include <vector>
 
-#include "../../common/je_object.h"
+#include "../../common/object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_texture_font.cpp b/src/libjin/graphics/fonts/texture_font.cpp
index 542fe7d..31e5293 100644
--- a/src/libjin/graphics/fonts/je_texture_font.cpp
+++ b/src/libjin/graphics/fonts/texture_font.cpp
@@ -1,10 +1,10 @@
 #include <vector>
 
-#include "../../math/je_vector2.hpp"
+#include "../../math/vector2.hpp"
 
-#include "../shaders/je_shader.h"
+#include "../shaders/shader.h"
 
-#include "je_texture_font.h"
+#include "texture_font.h"
 
 using namespace std;
 using namespace JinEngine::Math;
diff --git a/src/libjin/graphics/fonts/je_texture_font.h b/src/libjin/graphics/fonts/texture_font.h
index 9192276..1d7f0d2 100644
--- a/src/libjin/graphics/fonts/je_texture_font.h
+++ b/src/libjin/graphics/fonts/texture_font.h
@@ -4,14 +4,14 @@
 #include <map>
 #include <vector>
 
-#include "../../math/je_vector4.hpp"
+#include "../../math/vector4.hpp"
 
-#include "../je_graphic.h"
-#include "../je_bitmap.h"
+#include "../graphic.h"
+#include "../bitmap.h"
 
-#include "je_page.h"
-#include "je_font.h"
-#include "je_text.h"
+#include "page.h"
+#include "font.h"
+#include "text.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/fonts/je_ttf.cpp b/src/libjin/graphics/fonts/ttf.cpp
index d145395..f47e7e4 100644
--- a/src/libjin/graphics/fonts/je_ttf.cpp
+++ b/src/libjin/graphics/fonts/ttf.cpp
@@ -1,16 +1,16 @@
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <stdio.h>
 
-#include "../../common/je_array.hpp"
+#include "../../common/array.hpp"
 
-#include "../je_gl.h"
-#include "../je_color.h"
-#include "../shaders/je_shader.h"
+#include "../gl.h"
+#include "../color.h"
+#include "../shaders/shader.h"
 
-#include "je_ttf.h"
-#include "je_page.h"
+#include "ttf.h"
+#include "page.h"
 
 #define STB_TRUETYPE_IMPLEMENTATION
 #include "stb/stb_truetype.h"
@@ -134,7 +134,7 @@ namespace JinEngine
             // TTF
             //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include "../shaders/built-in/je_font.shader.h"
+#include "../shaders/built-in/font.shader.h"
 
             using namespace std;
             using namespace JinEngine::Math;
diff --git a/src/libjin/graphics/fonts/je_ttf.h b/src/libjin/graphics/fonts/ttf.h
index feabf33..8439cd7 100644
--- a/src/libjin/graphics/fonts/je_ttf.h
+++ b/src/libjin/graphics/fonts/ttf.h
@@ -1,6 +1,6 @@
 #ifndef __JE_TTF_H__
 #define __JE_TTF_H__
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <vector>
@@ -8,14 +8,14 @@
 
 #include "stb/stb_truetype.h"
 
-#include "../../math/je_quad.h"
+#include "../../math/quad.h"
 
-#include "../je_color.h"
-#include "../je_graphic.h"
+#include "../color.h"
+#include "../graphic.h"
 
-#include "je_page.h"
-#include "je_font.h"
-#include "je_text.h"
+#include "page.h"
+#include "font.h"
+#include "text.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_gl.cpp b/src/libjin/graphics/gl.cpp
index 1783ef1..a5d1043 100644
--- a/src/libjin/graphics/je_gl.cpp
+++ b/src/libjin/graphics/gl.cpp
@@ -1,13 +1,13 @@
 #define OGL2D_IMPLEMENT
-#include "../utils/je_log.h"
-
-#include "je_gl.h"
-#include "je_color.h"
-#include "je_canvas.h"
-#include "je_texture.h"
-#include "je_window.h"
-#include "shaders/je_shader.h"
-#include "fonts/je_font.h"
+#include "../utils/log.h"
+
+#include "gl.h"
+#include "color.h"
+#include "canvas.h"
+#include "texture.h"
+#include "window.h"
+#include "shaders/shader.h"
+#include "fonts/font.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics;
diff --git a/src/libjin/graphics/je_gl.h b/src/libjin/graphics/gl.h
index 6f88ba1..7876ffd 100644
--- a/src/libjin/graphics/je_gl.h
+++ b/src/libjin/graphics/gl.h
@@ -3,13 +3,13 @@
 
 #include <vector>
 
-#include "../math/je_matrix.h"
-#include "../math/je_transform.h"
+#include "../math/matrix.h"
+#include "../math/transform.h"
 
 //#include "GLee/GLee.h"
 #include "glad/glad.h"
 
-#include "je_color.h"
+#include "color.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/graphic.cpp
index e097230..7659e4e 100644
--- a/src/libjin/graphics/je_graphic.cpp
+++ b/src/libjin/graphics/graphic.cpp
@@ -1,13 +1,13 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <stdlib.h>
 
-#include "../math/je_matrix.h"
-#include "../math/je_vector2.hpp"
+#include "../math/matrix.h"
+#include "../math/vector2.hpp"
 
-#include "shaders/je_shader.h"
-#include "je_graphic.h"
+#include "shaders/shader.h"
+#include "graphic.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics::Shaders;
diff --git a/src/libjin/graphics/je_graphic.h b/src/libjin/graphics/graphic.h
index 92c7c46..ac2bc0e 100644
--- a/src/libjin/graphics/je_graphic.h
+++ b/src/libjin/graphics/graphic.h
@@ -1,16 +1,16 @@
 #ifndef __JE_GRAPHIC_H__
 #define __JE_GRAPHIC_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "../common/je_object.h"
-#include "../math/je_quad.h"
-#include "../math/je_vector2.hpp"
-#include "../math/je_transform.h"
+#include "../common/object.h"
+#include "../math/quad.h"
+#include "../math/vector2.hpp"
+#include "../math/transform.h"
 
-#include "je_renderable.h"
-#include "je_gl.h"
-#include "je_bitmap.h"
+#include "renderable.h"
+#include "gl.h"
+#include "bitmap.h"
 
 namespace JinEngine 
 {
diff --git a/src/libjin/graphics/graphics.h b/src/libjin/graphics/graphics.h
new file mode 100644
index 0000000..f3b0f45
--- /dev/null
+++ b/src/libjin/graphics/graphics.h
@@ -0,0 +1,29 @@
+#ifndef __JE_GRAPHICS_H__
+#define __JE_GRAPHICS_H__
+#include "../core/configuration.h"
+#if defined(jin_graphics)
+
+#include "canvas.h"
+#include "color.h"
+#include "shapes.h"
+#include "texture.h"
+#include "window.h"
+#include "bitmap.h"
+#include "image.h"
+#include "sprite.h"
+#include "sprite_sheet.h"
+#include "mesh.h"
+
+#include "shaders/shader.h"
+
+#include "fonts/ttf.h"
+#include "fonts/text.h"
+#include "fonts/texture_font.h"
+
+#include "particles/particle_system.h"
+
+#include "animations/animation.h"
+#include "animations/animator.h"
+
+#endif // defined(jin_graphics)
+#endif // __JE_GRAPHICS_H__
\ No newline at end of file
diff --git a/src/libjin/graphics/je_image.cpp b/src/libjin/graphics/image.cpp
index 98f6fcf..42d717d 100644
--- a/src/libjin/graphics/je_image.cpp
+++ b/src/libjin/graphics/image.cpp
@@ -1,8 +1,8 @@
-#include "../filesystem/je_asset_database.h"
+#include "../filesystem/asset_database.h"
 
 #include "stb/stb_image.h"
 
-#include "je_image.h"
+#include "image.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_image.h b/src/libjin/graphics/image.h
index f23e8c6..05a40e1 100644
--- a/src/libjin/graphics/je_image.h
+++ b/src/libjin/graphics/image.h
@@ -1,7 +1,7 @@
 #ifndef __JE_IMAGE_H__
 #define __JE_IMAGE_H__
 
-#include "je_bitmap.h"
+#include "bitmap.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_graphics.h b/src/libjin/graphics/je_graphics.h
deleted file mode 100644
index 519c5d0..0000000
--- a/src/libjin/graphics/je_graphics.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __JE_GRAPHICS_H__
-#define __JE_GRAPHICS_H__
-#include "../core/je_configuration.h"
-#if defined(jin_graphics)
-
-#include "je_canvas.h"
-#include "je_color.h"
-#include "je_shapes.h"
-#include "je_texture.h"
-#include "je_window.h"
-#include "je_bitmap.h"
-#include "je_image.h"
-#include "je_sprite.h"
-#include "je_sprite_sheet.h"
-#include "je_mesh.h"
-
-#include "shaders/je_shader.h"
-
-#include "fonts/je_ttf.h"
-#include "fonts/je_text.h"
-#include "fonts/je_texture_font.h"
-
-#include "particles/je_particle_system.h"
-
-#include "animations/je_animation.h"
-#include "animations/je_animator.h"
-
-#endif // defined(jin_graphics)
-#endif // __JE_GRAPHICS_H__
\ No newline at end of file
diff --git a/src/libjin/graphics/je_mesh.cpp b/src/libjin/graphics/mesh.cpp
index dc67f1e..71ebf62 100644
--- a/src/libjin/graphics/je_mesh.cpp
+++ b/src/libjin/graphics/mesh.cpp
@@ -1,7 +1,7 @@
-#include "../math/je_math.h"
+#include "../math/math.h"
 
-#include "je_mesh.h"
-#include "shaders/je_shader.h"
+#include "mesh.h"
+#include "shaders/shader.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics::Shaders;
diff --git a/src/libjin/graphics/je_mesh.h b/src/libjin/graphics/mesh.h
index 1dbf3a4..d17fcea 100644
--- a/src/libjin/graphics/je_mesh.h
+++ b/src/libjin/graphics/mesh.h
@@ -3,10 +3,10 @@
 
 #include <vector>
 
-#include "../math/je_bbox.h"
+#include "../math/bbox.h"
 
-#include "je_vertex.h"
-#include "je_graphic.h"
+#include "vertex.h"
+#include "graphic.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle.cpp b/src/libjin/graphics/particles/particle.cpp
index c6bbf42..74600e0 100644
--- a/src/libjin/graphics/particles/je_particle.cpp
+++ b/src/libjin/graphics/particles/particle.cpp
@@ -1,11 +1,11 @@
-#include "../../utils/je_log.h"
-#include "../../common/je_array.hpp"
-#include "../../math/je_math.h"
-#include "../../math/je_random.h"
+#include "../../utils/log.h"
+#include "../../common/array.hpp"
+#include "../../math/math.h"
+#include "../../math/random.h"
 
-#include "../je_sprite.h"
+#include "../sprite.h"
 
-#include "je_particle.h"
+#include "particle.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/particles/je_particle.h b/src/libjin/graphics/particles/particle.h
index 2b5966b..081ad26 100644
--- a/src/libjin/graphics/particles/je_particle.h
+++ b/src/libjin/graphics/particles/particle.h
@@ -1,14 +1,14 @@
 #ifndef __JE_PARTICLE_H__
 #define __JE_PARTICLE_H__
 
-#include "../../game/je_gameobject.h"
-#include "../../math/je_ranged_value.h"
-#include "../../math/je_transform.h"
-#include "../../math/je_vector2.hpp"
-#include "../../math/je_percentage.h"
-
-#include "../je_color.h"
-#include "../je_sprite.h"
+#include "../../game/gameobject.h"
+#include "../../math/ranged_value.h"
+#include "../../math/transform.h"
+#include "../../math/vector2.hpp"
+#include "../../math/percentage.h"
+
+#include "../color.h"
+#include "../sprite.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle_emitter.cpp b/src/libjin/graphics/particles/particle_emitter.cpp
index 644fd6e..725b826 100644
--- a/src/libjin/graphics/particles/je_particle_emitter.cpp
+++ b/src/libjin/graphics/particles/particle_emitter.cpp
@@ -1,9 +1,9 @@
 #include <time.h>
 
-#include "../../math/je_random.h"
+#include "../../math/random.h"
 
-#include "je_particle_emitter.h"
-#include "je_particle_system.h"
+#include "particle_emitter.h"
+#include "particle_system.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/particles/je_particle_emitter.h b/src/libjin/graphics/particles/particle_emitter.h
index 03f83be..9f9465a 100644
--- a/src/libjin/graphics/particles/je_particle_emitter.h
+++ b/src/libjin/graphics/particles/particle_emitter.h
@@ -1,10 +1,10 @@
 #ifndef __JE_PARTICLE_EMITTER_H__
 #define __JE_PARTICLE_EMITTER_H__
 
-#include "../../common/je_temporary.h"
-#include "../../math/je_vector2.hpp"
+#include "../../common/temporary.h"
+#include "../../math/vector2.hpp"
 
-#include "je_particle.h"
+#include "particle.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle_pool.h b/src/libjin/graphics/particles/particle_pool.h
index 46cd73a..618a965 100644
--- a/src/libjin/graphics/particles/je_particle_pool.h
+++ b/src/libjin/graphics/particles/particle_pool.h
@@ -1,9 +1,9 @@
 #ifndef __JE_PARTICLE_BATCH_H__
 #define __JE_PARTICLE_BATCH_H__
 
-#include "../../common/je_pool.hpp"
+#include "../../common/pool.hpp"
 
-#include "je_particle.h"
+#include "particle.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle_system.cpp b/src/libjin/graphics/particles/particle_system.cpp
index ec25163..984f42b 100644
--- a/src/libjin/graphics/particles/je_particle_system.cpp
+++ b/src/libjin/graphics/particles/particle_system.cpp
@@ -1,8 +1,8 @@
 #include <stdarg.h>
 
-#include "../../utils/je_log.h"
+#include "../../utils/log.h"
 
-#include "je_particle_system.h"
+#include "particle_system.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/particles/je_particle_system.h b/src/libjin/graphics/particles/particle_system.h
index 4734313..83351a9 100644
--- a/src/libjin/graphics/particles/je_particle_system.h
+++ b/src/libjin/graphics/particles/particle_system.h
@@ -3,14 +3,14 @@
 
 #include <vector>
 
-#include "../../common/je_temporary.h"
-#include "../../game/je_gameobject.h"
+#include "../../common/temporary.h"
+#include "../../game/gameobject.h"
 
-#include "../je_sprite.h"
+#include "../sprite.h"
 
-#include "je_particle_emitter.h"
-#include "je_particle_pool.h"
-#include "je_particle.h"
+#include "particle_emitter.h"
+#include "particle_pool.h"
+#include "particle.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_renderable.h b/src/libjin/graphics/renderable.h
index ca9888e..ca9888e 100644
--- a/src/libjin/graphics/je_renderable.h
+++ b/src/libjin/graphics/renderable.h
diff --git a/src/libjin/graphics/shaders/built-in/je_default.shader.h b/src/libjin/graphics/shaders/built-in/default.shader.h
index 3f57c44..3f57c44 100644
--- a/src/libjin/graphics/shaders/built-in/je_default.shader.h
+++ b/src/libjin/graphics/shaders/built-in/default.shader.h
diff --git a/src/libjin/graphics/shaders/built-in/je_font.shader.h b/src/libjin/graphics/shaders/built-in/font.shader.h
index e04c225..e04c225 100644
--- a/src/libjin/graphics/shaders/built-in/je_font.shader.h
+++ b/src/libjin/graphics/shaders/built-in/font.shader.h
diff --git a/src/libjin/graphics/shaders/built-in/je_texture.shader.h b/src/libjin/graphics/shaders/built-in/texture.shader.h
index d1fc86f..d1fc86f 100644
--- a/src/libjin/graphics/shaders/built-in/je_texture.shader.h
+++ b/src/libjin/graphics/shaders/built-in/texture.shader.h
diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.cpp b/src/libjin/graphics/shaders/jsl_compiler.cpp
index 4b48a85..44908e8 100644
--- a/src/libjin/graphics/shaders/je_jsl_compiler.cpp
+++ b/src/libjin/graphics/shaders/jsl_compiler.cpp
@@ -1,10 +1,10 @@
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
-#include "../../common/je_string.h"
-#include "../../Filesystem/je_buffer.h"
+#include "../../common/string.h"
+#include "../../Filesystem/buffer.h"
 
-#include "je_jsl_compiler.h"
+#include "jsl_compiler.h"
 
 using namespace std;
 using namespace JinEngine::Filesystem;
diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.h b/src/libjin/graphics/shaders/jsl_compiler.h
index c61e152..ad3bdbb 100644
--- a/src/libjin/graphics/shaders/je_jsl_compiler.h
+++ b/src/libjin/graphics/shaders/jsl_compiler.h
@@ -1,13 +1,13 @@
 #ifndef __JE_JSL_COMPILER_H__
 #define __JE_JSL_COMPILER_H__
 
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #include <string>
 
-#include "../../common/je_string.h"
-#include "../../common/je_singleton.hpp"
+#include "../../common/string.h"
+#include "../../common/singleton.hpp"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/shaders/je_shader.cpp b/src/libjin/graphics/shaders/shader.cpp
index 65ad8c7..c7f6f11 100644
--- a/src/libjin/graphics/shaders/je_shader.cpp
+++ b/src/libjin/graphics/shaders/shader.cpp
@@ -1,18 +1,18 @@
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #include <iostream>
 
-#include "../../time/je_timer.h"
-#include "../../filesystem/je_buffer.h"
-#include "../../utils/je_log.h"
-#include "../../utils/je_macros.h"
+#include "../../time/timer.h"
+#include "../../filesystem/buffer.h"
+#include "../../utils/log.h"
+#include "../../utils/macros.h"
 
-#include "../je_gl.h"
-#include "../je_window.h"
+#include "../gl.h"
+#include "../window.h"
 
-#include "je_jsl_compiler.h"
-#include "je_shader.h"
+#include "jsl_compiler.h"
+#include "shader.h"
 
 using namespace std;
 using namespace JinEngine::Filesystem;
@@ -31,7 +31,7 @@ namespace JinEngine
             // SHADER_FORMAT_SIZE
             // formatShader
             // 
-            #include "built-in/je_default.shader.h"
+            #include "built-in/default.shader.h"
 
             // 
             // https://stackoverflow.com/questions/27941496/use-sampler-without-passing-through-value
diff --git a/src/libjin/graphics/shaders/je_shader.h b/src/libjin/graphics/shaders/shader.h
index 240f24f..e8756ac 100644
--- a/src/libjin/graphics/shaders/je_shader.h
+++ b/src/libjin/graphics/shaders/shader.h
@@ -1,19 +1,19 @@
 #ifndef __JE_SHADER_H__
 #define __JE_SHADER_H__
 
-#include "../../core/je_configuration.h"
+#include "../../core/configuration.h"
 #if defined(jin_graphics) && (jin_graphics & jin_graphics_shader)
 
 #include <string>
 #include <map>
 
-#include "../../common/je_string.h"
+#include "../../common/string.h"
 
-#include "../je_color.h"
-#include "../je_texture.h"
-#include "../je_canvas.h"
+#include "../color.h"
+#include "../texture.h"
+#include "../canvas.h"
 
-#include "je_jsl_compiler.h"
+#include "jsl_compiler.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_shapes.cpp b/src/libjin/graphics/shapes.cpp
index 493e173..23fc888 100644
--- a/src/libjin/graphics/je_shapes.cpp
+++ b/src/libjin/graphics/shapes.cpp
@@ -1,13 +1,13 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <string>
 
-#include "../math/je_matrix.h"
-#include "../math/je_constant.h"
+#include "../math/matrix.h"
+#include "../math/constant.h"
 
-#include "shaders/je_shader.h"
-#include "je_shapes.h" 
+#include "shaders/shader.h"
+#include "shapes.h" 
 
 using namespace JinEngine::Graphics::Shaders;
 
diff --git a/src/libjin/graphics/je_shapes.h b/src/libjin/graphics/shapes.h
index dcc134d..6c25eeb 100644
--- a/src/libjin/graphics/je_shapes.h
+++ b/src/libjin/graphics/shapes.h
@@ -1,11 +1,11 @@
 #ifndef __JE_GEOMETRY_H__
 #define __JE_GEOMETRY_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "je_color.h"
-#include "je_canvas.h"
-#include "je_texture.h"
+#include "color.h"
+#include "canvas.h"
+#include "texture.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_sprite.cpp b/src/libjin/graphics/sprite.cpp
index bddb353..d74c1ef 100644
--- a/src/libjin/graphics/je_sprite.cpp
+++ b/src/libjin/graphics/sprite.cpp
@@ -1,5 +1,5 @@
-#include "je_graphic.h"
-#include "je_sprite.h"
+#include "graphic.h"
+#include "sprite.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics;
diff --git a/src/libjin/graphics/je_sprite.h b/src/libjin/graphics/sprite.h
index fe38a4a..2acebe0 100644
--- a/src/libjin/graphics/je_sprite.h
+++ b/src/libjin/graphics/sprite.h
@@ -1,12 +1,12 @@
 #ifndef __JE_SPRITE_H__
 #define __JE_SPRITE_H__
 
-#include "../common/je_types.h"
-#include "../math/je_vector2.hpp"
+#include "../common/types.h"
+#include "../math/vector2.hpp"
 
-#include "je_color.h"
-#include "je_graphic.h"
-#include "je_renderable.h"
+#include "color.h"
+#include "graphic.h"
+#include "renderable.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_sprite_batch.cpp b/src/libjin/graphics/sprite_batch.cpp
index f339715..82e480f 100644
--- a/src/libjin/graphics/je_sprite_batch.cpp
+++ b/src/libjin/graphics/sprite_batch.cpp
@@ -1,4 +1,4 @@
-#include "je_sprite_batch.h"
+#include "sprite_batch.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_sprite_batch.h b/src/libjin/graphics/sprite_batch.h
index a8109cc..0aad172 100644
--- a/src/libjin/graphics/je_sprite_batch.h
+++ b/src/libjin/graphics/sprite_batch.h
@@ -1,10 +1,10 @@
 #ifndef __JE_GRAPHICS_SPRITE_BATCH_H__
 #define __JE_GRAPHICS_SPRITE_BATCH_H__
 
-#include "../common/je_object.h"
+#include "../common/object.h"
 
-#include "shaders/je_shader.h"
-#include "je_renderable.h"
+#include "shaders/shader.h"
+#include "renderable.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_sprite_sheet.cpp b/src/libjin/graphics/sprite_sheet.cpp
index 6129da7..24ec4fd 100644
--- a/src/libjin/graphics/je_sprite_sheet.cpp
+++ b/src/libjin/graphics/sprite_sheet.cpp
@@ -1,8 +1,8 @@
 #include <vector>
 
-#include "../math/je_quad.h"
+#include "../math/quad.h"
 
-#include "je_sprite_sheet.h"
+#include "sprite_sheet.h"
 
 using namespace std;
 
diff --git a/src/libjin/graphics/je_sprite_sheet.h b/src/libjin/graphics/sprite_sheet.h
index a71ea04..eb50b2c 100644
--- a/src/libjin/graphics/je_sprite_sheet.h
+++ b/src/libjin/graphics/sprite_sheet.h
@@ -3,9 +3,9 @@
 
 #include <vector>
 
-#include "../math/je_quad.h"
+#include "../math/quad.h"
 
-#include "je_sprite.h"
+#include "sprite.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_texture.cpp b/src/libjin/graphics/texture.cpp
index c83e776..ba8a33a 100644
--- a/src/libjin/graphics/je_texture.cpp
+++ b/src/libjin/graphics/texture.cpp
@@ -1,12 +1,12 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <fstream>
 
-#include "../utils/je_utils.h"
-#include "../math/je_math.h"
+#include "../utils/utils.h"
+#include "../math/math.h"
 
-#include "je_texture.h"
+#include "texture.h"
 
 using namespace JinEngine::Math;
 
diff --git a/src/libjin/graphics/je_texture.h b/src/libjin/graphics/texture.h
index 6b8fa54..7bba557 100644
--- a/src/libjin/graphics/je_texture.h
+++ b/src/libjin/graphics/texture.h
@@ -1,11 +1,11 @@
 #ifndef __JE_TEXTURE_H__
 #define __JE_TEXTURE_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
-#include "je_color.h"
-#include "je_graphic.h"
-#include "je_bitmap.h"
+#include "color.h"
+#include "graphic.h"
+#include "bitmap.h"
 
 namespace JinEngine 
 { 
diff --git a/src/libjin/graphics/je_vertex.h b/src/libjin/graphics/vertex.h
index d2b482c..192117e 100644
--- a/src/libjin/graphics/je_vertex.h
+++ b/src/libjin/graphics/vertex.h
@@ -1,9 +1,9 @@
 #ifndef __JE_MATH_VERTEX_H__
 #define __JE_MATH_VERTEX_H__
 
-#include "../math/je_vector2.hpp"
+#include "../math/vector2.hpp"
 
-#include "je_color.h"
+#include "color.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/graphics/je_window.cpp b/src/libjin/graphics/window.cpp
index fcca1b7..5701772 100644
--- a/src/libjin/graphics/je_window.cpp
+++ b/src/libjin/graphics/window.cpp
@@ -1,17 +1,17 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include <iostream>
 
-#include "../common/je_exception.h"
-#include "../utils/je_utils.h"
-#include "../audio/sdl/je_sdl_audio.h"
-#include "../utils/je_log.h"
+#include "../common/exception.h"
+#include "../utils/utils.h"
+#include "../audio/sdl/sdl_audio.h"
+#include "../utils/log.h"
 
-#include "shaders/je_shader.h"
-#include "je_window.h"
-#include "je_gl.h"
-#include "je_canvas.h"
+#include "shaders/shader.h"
+#include "window.h"
+#include "gl.h"
+#include "canvas.h"
 
 using namespace JinEngine::Graphics::Shaders;
 
diff --git a/src/libjin/graphics/je_window.h b/src/libjin/graphics/window.h
index f9fe5df..c279e9b 100644
--- a/src/libjin/graphics/je_window.h
+++ b/src/libjin/graphics/window.h
@@ -1,13 +1,13 @@
 #ifndef __JE_RENDER_WINDOW
 #define __JE_RENDER_WINDOW
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_graphics)
 
 #include "SDL2/SDL.h"
 
-#include "../utils/je_utils.h"
-#include "../math/je_vector2.hpp"
-#include "../common/je_subsystem.hpp"
+#include "../utils/utils.h"
+#include "../math/vector2.hpp"
+#include "../common/subsystem.hpp"
 
 namespace JinEngine
 {
diff --git a/src/libjin/input/je_event.cpp b/src/libjin/input/event.cpp
index 318ce59..566eaf4 100644
--- a/src/libjin/input/je_event.cpp
+++ b/src/libjin/input/event.cpp
@@ -1,6 +1,6 @@
 #include "SDL2\SDL.h"
 
-#include "je_event.h"
+#include "event.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/input/je_event.h b/src/libjin/input/event.h
index 7a90334..f13f1d4 100644
--- a/src/libjin/input/je_event.h
+++ b/src/libjin/input/event.h
@@ -1,6 +1,6 @@
 #ifndef __JE_EVENT_H__
 #define __JE_EVENT_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_input)   
 
 namespace JinEngine
diff --git a/src/libjin/input/input.h b/src/libjin/input/input.h
new file mode 100644
index 0000000..ccd8d0b
--- /dev/null
+++ b/src/libjin/input/input.h
@@ -0,0 +1,9 @@
+#ifndef __JE_INPUT_H__
+#define __JE_INPUT_H__
+
+#include "event.h"
+#include "keyboard.h"
+#include "mouse.h"
+#include "joypad.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin/input/je_input.h b/src/libjin/input/je_input.h
deleted file mode 100644
index 2abee0a..0000000
--- a/src/libjin/input/je_input.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __JE_INPUT_H__
-#define __JE_INPUT_H__
-
-#include "je_event.h"
-#include "je_keyboard.h"
-#include "je_mouse.h"
-#include "je_joypad.h"
-
-#endif
\ No newline at end of file
diff --git a/src/libjin/input/je_joypad.cpp b/src/libjin/input/joypad.cpp
index e69de29..e69de29 100644
--- a/src/libjin/input/je_joypad.cpp
+++ b/src/libjin/input/joypad.cpp
diff --git a/src/libjin/input/je_joypad.h b/src/libjin/input/joypad.h
index fb5dc38..fb5dc38 100644
--- a/src/libjin/input/je_joypad.h
+++ b/src/libjin/input/joypad.h
diff --git a/src/libjin/input/je_keyboard.cpp b/src/libjin/input/keyboard.cpp
index e69de29..e69de29 100644
--- a/src/libjin/input/je_keyboard.cpp
+++ b/src/libjin/input/keyboard.cpp
diff --git a/src/libjin/input/je_keyboard.h b/src/libjin/input/keyboard.h
index ffaad66..ffaad66 100644
--- a/src/libjin/input/je_keyboard.h
+++ b/src/libjin/input/keyboard.h
diff --git a/src/libjin/input/je_mouse.cpp b/src/libjin/input/mouse.cpp
index edd3cf5..4971137 100644
--- a/src/libjin/input/je_mouse.cpp
+++ b/src/libjin/input/mouse.cpp
@@ -1,9 +1,9 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_input)    
 
 #include "SDL.h"
 
-#include "je_mouse.h"
+#include "mouse.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/input/je_mouse.h b/src/libjin/input/mouse.h
index f05f3bf..feb982b 100644
--- a/src/libjin/input/je_mouse.h
+++ b/src/libjin/input/mouse.h
@@ -1,9 +1,9 @@
 #ifndef __JE_MOUSE_H__
 #define __JE_MOUSE_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_input)
 
-#include "../common/je_singleton.hpp"
+#include "../common/singleton.hpp"
 
 namespace JinEngine
 {
diff --git a/src/libjin/jin.h b/src/libjin/jin.h
index 8164511..9040bbc 100644
--- a/src/libjin/jin.h
+++ b/src/libjin/jin.h
@@ -1,21 +1,21 @@
 #ifndef __JE_H__
 #define __JE_H__
 
-#include "core/je_configuration.h"
+#include "core/configuration.h"
 
-#include "utils/je_utils.h"
+#include "utils/utils.h"
 #if jin_audio == jin_audio_sdl
-    #include "audio/sdl/je_sdl_audio.h"
+    #include "audio/sdl/sdl_audio.h"
 #endif
-#include "game/je_application.h"
-#include "filesystem/je_asset_database.h"
-#include "filesystem/je_buffer.h"
-#include "input/je_input.h"
-#include "net/je_net_manager.h"
-#include "graphics/je_graphics.h"
-#include "time/je_timer.h"
-#include "threads/je_thread.h"
-#include "common/je_common.h"
-#include "ai/je_ai.h"
+#include "game/application.h"
+#include "filesystem/asset_database.h"
+#include "filesystem/buffer.h"
+#include "input/input.h"
+#include "net/net_manager.h"
+#include "graphics/graphics.h"
+#include "time/timer.h"
+#include "threads/thread.h"
+#include "common/common.h"
+#include "ai/ai.h"
 
 #endif // __JE_H__
\ No newline at end of file
diff --git a/src/libjin/math/je_bbox.h b/src/libjin/math/bbox.h
index ce88080..ce88080 100644
--- a/src/libjin/math/je_bbox.h
+++ b/src/libjin/math/bbox.h
diff --git a/src/libjin/math/je_bezier_curve.cpp b/src/libjin/math/bezier_curve.cpp
index e69de29..e69de29 100644
--- a/src/libjin/math/je_bezier_curve.cpp
+++ b/src/libjin/math/bezier_curve.cpp
diff --git a/src/libjin/math/je_bezier_curve.h b/src/libjin/math/bezier_curve.h
index 6925baf..6925baf 100644
--- a/src/libjin/math/je_bezier_curve.h
+++ b/src/libjin/math/bezier_curve.h
diff --git a/src/libjin/math/je_constant.h b/src/libjin/math/constant.h
index 45577e7..45577e7 100644
--- a/src/libjin/math/je_constant.h
+++ b/src/libjin/math/constant.h
diff --git a/src/libjin/math/je_ellipse.cpp b/src/libjin/math/ellipse.cpp
index e69de29..e69de29 100644
--- a/src/libjin/math/je_ellipse.cpp
+++ b/src/libjin/math/ellipse.cpp
diff --git a/src/libjin/math/je_ellipse.h b/src/libjin/math/ellipse.h
index e69de29..e69de29 100644
--- a/src/libjin/math/je_ellipse.h
+++ b/src/libjin/math/ellipse.h
diff --git a/src/libjin/math/je_math.h b/src/libjin/math/math.h
index 4036696..79ed4c8 100644
--- a/src/libjin/math/je_math.h
+++ b/src/libjin/math/math.h
@@ -1,9 +1,9 @@
 #ifndef __JE_UTILS_MATH_H__
 #define __JE_UTILS_MATH_H__
 
-#include "je_constant.h"
-#include "je_matrix.h"
-#include "je_quad.h"
+#include "constant.h"
+#include "matrix.h"
+#include "quad.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/math/je_matrix.cpp b/src/libjin/math/matrix.cpp
index ad7d1e5..d9324df 100644
--- a/src/libjin/math/je_matrix.cpp
+++ b/src/libjin/math/matrix.cpp
@@ -1,6 +1,6 @@
-#include "../graphics/je_vertex.h"
+#include "../graphics/vertex.h"
 
-#include "je_matrix.h"
+#include "matrix.h"
 
 #include <cstring> // memcpy
 #include <cmath>
diff --git a/src/libjin/math/je_matrix.h b/src/libjin/math/matrix.h
index 7955de1..7955de1 100644
--- a/src/libjin/math/je_matrix.h
+++ b/src/libjin/math/matrix.h
diff --git a/src/libjin/math/je_percentage.h b/src/libjin/math/percentage.h
index 2440072..a9fdc4e 100644
--- a/src/libjin/math/je_percentage.h
+++ b/src/libjin/math/percentage.h
@@ -1,7 +1,7 @@
 #ifndef __JE_PERCENTAGE_H__
 #define __JE_PERCENTAGE_H__
 
-#include "je_math.h"
+#include "math.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/math/je_quad.h b/src/libjin/math/quad.h
index 5bda125..5bda125 100644
--- a/src/libjin/math/je_quad.h
+++ b/src/libjin/math/quad.h
diff --git a/src/libjin/math/je_random.cpp b/src/libjin/math/random.cpp
index b9313d2..5f3b28c 100644
--- a/src/libjin/math/je_random.cpp
+++ b/src/libjin/math/random.cpp
@@ -1,6 +1,6 @@
 #include <math.h>
-#include "je_math.h"
-#include "je_random.h"
+#include "math.h"
+#include "random.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/math/je_random.h b/src/libjin/math/random.h
index 0f53155..1eb22c4 100644
--- a/src/libjin/math/je_random.h
+++ b/src/libjin/math/random.h
@@ -1,7 +1,7 @@
 #ifndef __JE_RANDOM_H__
 #define __JE_RANDOM_H__
 
-#include "../common/je_types.h"
+#include "../common/types.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/math/je_ranged_value.cpp b/src/libjin/math/ranged_value.cpp
index b28e72b..1a14467 100644
--- a/src/libjin/math/je_ranged_value.cpp
+++ b/src/libjin/math/ranged_value.cpp
@@ -1,4 +1,4 @@
-#include "je_ranged_value.h"
+#include "ranged_value.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/math/je_ranged_value.h b/src/libjin/math/ranged_value.h
index 4749e91..5a4c35d 100644
--- a/src/libjin/math/je_ranged_value.h
+++ b/src/libjin/math/ranged_value.h
@@ -1,7 +1,7 @@
 #ifndef __JE_RANGED_VALUE_H__
 #define __JE_RANGED_VALUE_H__
 
-#include "../common/je_types.h"
+#include "../common/types.h"
 
 #include <vector>
 
diff --git a/src/libjin/math/je_transform.cpp b/src/libjin/math/transform.cpp
index 95ca14d..84c8327 100644
--- a/src/libjin/math/je_transform.cpp
+++ b/src/libjin/math/transform.cpp
@@ -1,4 +1,4 @@
-#include "je_transform.h"
+#include "transform.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/math/je_transform.h b/src/libjin/math/transform.h
index 35a1a13..3f3c199 100644
--- a/src/libjin/math/je_transform.h
+++ b/src/libjin/math/transform.h
@@ -1,8 +1,8 @@
 #ifndef __JE_TRANSFORM_H__
 #define __JE_TRANSFORM_H__
 
-#include "je_matrix.h"
-#include "je_vector2.hpp"
+#include "matrix.h"
+#include "vector2.hpp"
 
 namespace JinEngine
 {
diff --git a/src/libjin/math/je_vector2.hpp b/src/libjin/math/vector2.hpp
index 6115a63..6115a63 100644
--- a/src/libjin/math/je_vector2.hpp
+++ b/src/libjin/math/vector2.hpp
diff --git a/src/libjin/math/je_vector3.hpp b/src/libjin/math/vector3.hpp
index 3c800b6..3c800b6 100644
--- a/src/libjin/math/je_vector3.hpp
+++ b/src/libjin/math/vector3.hpp
diff --git a/src/libjin/math/je_vector4.hpp b/src/libjin/math/vector4.hpp
index b544126..b544126 100644
--- a/src/libjin/math/je_vector4.hpp
+++ b/src/libjin/math/vector4.hpp
diff --git a/src/libjin/net/je_net_manager.cpp b/src/libjin/net/net_manager.cpp
index 553f9cb..632219c 100644
--- a/src/libjin/net/je_net_manager.cpp
+++ b/src/libjin/net/net_manager.cpp
@@ -1,4 +1,4 @@
-#include "je_net_manager.h"
+#include "net_manager.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/net/je_net_manager.h b/src/libjin/net/net_manager.h
index 1271e37..36238f8 100644
--- a/src/libjin/net/je_net_manager.h
+++ b/src/libjin/net/net_manager.h
@@ -1,11 +1,11 @@
 #ifndef __JE_NET_H__
 #define __JE_NET_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_net)
 
-#include "../common/je_subsystem.hpp"
+#include "../common/subsystem.hpp"
 
-#include "je_socket.h"
+#include "socket.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/net/je_socket.cpp b/src/libjin/net/socket.cpp
index 68f9aed..3d59a57 100644
--- a/src/libjin/net/je_socket.cpp
+++ b/src/libjin/net/socket.cpp
@@ -1,4 +1,4 @@
-#include "je_socket.h"
+#include "socket.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/net/je_socket.h b/src/libjin/net/socket.h
index 00e91de..1562272 100644
--- a/src/libjin/net/je_socket.h
+++ b/src/libjin/net/socket.h
@@ -1,9 +1,9 @@
 #ifndef __JE_NET_SOCKET_H__
 #define __JE_NET_SOCKET_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_net)
 
-#include "../common/je_object.h"
+#include "../common/object.h"
 
 #include "tekcos/tekcos.h"
 
diff --git a/src/libjin/threads/je_thread.cpp b/src/libjin/threads/thread.cpp
index 6a8a7eb..1c35efb 100644
--- a/src/libjin/threads/je_thread.cpp
+++ b/src/libjin/threads/thread.cpp
@@ -1,7 +1,7 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_thread)
 
-#include "je_thread.h"
+#include "thread.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/threads/je_thread.h b/src/libjin/threads/thread.h
index ab13215..2b7ee35 100644
--- a/src/libjin/threads/je_thread.h
+++ b/src/libjin/threads/thread.h
@@ -1,6 +1,6 @@
 #ifndef __JE_THREAD_H__
 #define __JE_THREAD_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_thread)
 
 #include <string>
diff --git a/src/libjin/time/je_timer.cpp b/src/libjin/time/timer.cpp
index ef5a040..32b2f57 100644
--- a/src/libjin/time/je_timer.cpp
+++ b/src/libjin/time/timer.cpp
@@ -1,7 +1,7 @@
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_time)
 
-#include "je_timer.h"
+#include "timer.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/time/je_timer.h b/src/libjin/time/timer.h
index 95c1925..48e51ba 100644
--- a/src/libjin/time/je_timer.h
+++ b/src/libjin/time/timer.h
@@ -1,6 +1,6 @@
 #ifndef __JE_TIMER_H__
 #define __JE_TIMER_H__
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 #if defined(jin_time)
 
 #include <vector>
@@ -8,7 +8,7 @@
 
 #include "SDL2/SDL.h"
 
-#include "../common/je_object.h"
+#include "../common/object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin/utils/je_endian.h b/src/libjin/utils/endian.h
index db8c8fd..db8c8fd 100644
--- a/src/libjin/utils/je_endian.h
+++ b/src/libjin/utils/endian.h
diff --git a/src/libjin/utils/je_log.cpp b/src/libjin/utils/log.cpp
index e369e14..560afa8 100644
--- a/src/libjin/utils/je_log.cpp
+++ b/src/libjin/utils/log.cpp
@@ -1,5 +1,5 @@
 #define LOGHELPER_IMPLEMENT
-#include "je_log.h"
+#include "log.h"
 
 #define hasbit(flag, bit) ((flag & bit) == bit)
 
diff --git a/src/libjin/utils/je_log.h b/src/libjin/utils/log.h
index 3d34943..11b4897 100644
--- a/src/libjin/utils/je_log.h
+++ b/src/libjin/utils/log.h
@@ -6,7 +6,7 @@
 #include <fstream>
 #include <stdarg.h>
 
-#include "../core/je_configuration.h"
+#include "../core/configuration.h"
 
 class Loghelper
 {
diff --git a/src/libjin/utils/je_macros.h b/src/libjin/utils/macros.h
index 6e4e7a9..6e4e7a9 100644
--- a/src/libjin/utils/je_macros.h
+++ b/src/libjin/utils/macros.h
diff --git a/src/libjin/utils/je_unittest.cpp b/src/libjin/utils/unittest.cpp
index 294351b..83af6ce 100644
--- a/src/libjin/utils/je_unittest.cpp
+++ b/src/libjin/utils/unittest.cpp
@@ -1,4 +1,4 @@
-#include "je_utils.h"
+#include "utils.h"
 #if UNITTEST
 
 #include <iostream>
diff --git a/src/libjin/utils/je_utils.h b/src/libjin/utils/utils.h
index a77c126..693cff1 100644
--- a/src/libjin/utils/je_utils.h
+++ b/src/libjin/utils/utils.h
@@ -1,8 +1,8 @@
 #ifndef __JE_UTILS_H__
 #define __JE_UTILS_H__
 
-#include "je_macros.h"
-#include "je_endian.h"
+#include "macros.h"
+#include "endian.h"
 
 #define UNITTEST 0