72 files changed, 142 insertions, 142 deletions

diff --git a/src/libjin-lua/modules/ai/je_lua_ai.cpp b/src/libjin-lua/modules/ai/l_ai.cpp
index 4afd625..4afd625 100644
--- a/src/libjin-lua/modules/ai/je_lua_ai.cpp
+++ b/src/libjin-lua/modules/ai/l_ai.cpp
diff --git a/src/libjin-lua/modules/ai/je_lua_ai.h b/src/libjin-lua/modules/ai/l_ai.h
index 9e1a8ae..919c0a3 100644
--- a/src/libjin-lua/modules/ai/je_lua_ai.h
+++ b/src/libjin-lua/modules/ai/l_ai.h
@@ -1,8 +1,8 @@
 #ifndef __JE_LUA_AI_H__
 #define __JE_LUA_AI_H__
 
-#include "je_lua_behavior_tree.h"
-#include "je_lua_state_machine.h"
+#include "l_behavior_tree.h"
+#include "l_state_machine.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin-lua/modules/ai/je_lua_behavior_tree.cpp b/src/libjin-lua/modules/ai/l_behavior_tree.cpp
index 20e8e55..20e8e55 100644
--- a/src/libjin-lua/modules/ai/je_lua_behavior_tree.cpp
+++ b/src/libjin-lua/modules/ai/l_behavior_tree.cpp
diff --git a/src/libjin-lua/modules/ai/je_lua_behavior_tree.h b/src/libjin-lua/modules/ai/l_behavior_tree.h
index 083d12b..083d12b 100644
--- a/src/libjin-lua/modules/ai/je_lua_behavior_tree.h
+++ b/src/libjin-lua/modules/ai/l_behavior_tree.h
diff --git a/src/libjin-lua/modules/ai/je_lua_state_machine.cpp b/src/libjin-lua/modules/ai/l_state_machine.cpp
index 06338b8..1825de5 100644
--- a/src/libjin-lua/modules/ai/je_lua_state_machine.cpp
+++ b/src/libjin-lua/modules/ai/l_state_machine.cpp
@@ -1,4 +1,4 @@
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
 using namespace JinEngine::AI;
diff --git a/src/libjin-lua/modules/ai/je_lua_state_machine.h b/src/libjin-lua/modules/ai/l_state_machine.h
index 3c78f75..3c78f75 100644
--- a/src/libjin-lua/modules/ai/je_lua_state_machine.h
+++ b/src/libjin-lua/modules/ai/l_state_machine.h
diff --git a/src/libjin-lua/modules/audio/je_lua_audio.cpp b/src/libjin-lua/modules/audio/l_audio.cpp
index d5cfb43..9ad4228 100644
--- a/src/libjin-lua/modules/audio/je_lua_audio.cpp
+++ b/src/libjin-lua/modules/audio/l_audio.cpp
@@ -1,7 +1,7 @@
 #include "common/je_lua.h"
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
-#include "je_lua_source.h"
+#include "l_source.h"
 
 using namespace JinEngine::Audio;
 using namespace JinEngine::Audio::SDL;
diff --git a/src/libjin-lua/modules/audio/je_lua_audio.h b/src/libjin-lua/modules/audio/l_audio.h
index 6b4669a..c025fdf 100644
--- a/src/libjin-lua/modules/audio/je_lua_audio.h
+++ b/src/libjin-lua/modules/audio/l_audio.h
@@ -1,7 +1,7 @@
 #ifndef __JE_LUA_AUDIO_H__
 #define __JE_LUA_AUDIO_H__
 
-#include "je_lua_audio.h"
+#include "l_audio.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin-lua/modules/audio/je_lua_source.cpp b/src/libjin-lua/modules/audio/l_source.cpp
index 8c9e247..72af871 100644
--- a/src/libjin-lua/modules/audio/je_lua_source.cpp
+++ b/src/libjin-lua/modules/audio/l_source.cpp
@@ -1,6 +1,6 @@
 #include "libjin/jin.h"
 #include "common/je_lua.h"
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 
 using namespace JinEngine::Audio;
 
diff --git a/src/libjin-lua/modules/audio/je_lua_source.h b/src/libjin-lua/modules/audio/l_source.h
index f7e6b48..f7e6b48 100644
--- a/src/libjin-lua/modules/audio/je_lua_source.h
+++ b/src/libjin-lua/modules/audio/l_source.h
diff --git a/src/libjin-lua/modules/bit/je_lua_bit.cpp b/src/libjin-lua/modules/bit/l_bit.cpp
index 9484743..43be892 100644
--- a/src/libjin-lua/modules/bit/je_lua_bit.cpp
+++ b/src/libjin-lua/modules/bit/l_bit.cpp
@@ -1,4 +1,4 @@
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 #include "common/je_lua.h"
 #include "libjin/jin.h"
 
diff --git a/src/libjin-lua/modules/bit/je_lua_bit.h b/src/libjin-lua/modules/bit/l_bit.h
index 21cf064..21cf064 100644
--- a/src/libjin-lua/modules/bit/je_lua_bit.h
+++ b/src/libjin-lua/modules/bit/l_bit.h
diff --git a/src/libjin-lua/modules/core/je_lua_core.cpp b/src/libjin-lua/modules/core/l_core.cpp
index 956ffbe..68b8156 100644
--- a/src/libjin-lua/modules/core/je_lua_core.cpp
+++ b/src/libjin-lua/modules/core/l_core.cpp
@@ -1,4 +1,4 @@
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 #include "common/je_lua.h"
 #include "libjin/jin.h"
 
diff --git a/src/libjin-lua/modules/core/je_lua_core.h b/src/libjin-lua/modules/core/l_core.h
index 037ac4b..037ac4b 100644
--- a/src/libjin-lua/modules/core/je_lua_core.h
+++ b/src/libjin-lua/modules/core/l_core.h
diff --git a/src/libjin-lua/modules/event/je_lua_event.cpp b/src/libjin-lua/modules/event/l_event.cpp
index 8a550d6..8287238 100644
--- a/src/libjin-lua/modules/event/je_lua_event.cpp
+++ b/src/libjin-lua/modules/event/l_event.cpp
@@ -1,7 +1,7 @@
 /**
 * Event module 
 */
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 #include "common/je_lua.h"
 #include "libjin/jin.h"
 
diff --git a/src/libjin-lua/modules/event/je_lua_event.h b/src/libjin-lua/modules/event/l_event.h
index 7a75459..7a75459 100644
--- a/src/libjin-lua/modules/event/je_lua_event.h
+++ b/src/libjin-lua/modules/event/l_event.h
diff --git a/src/libjin-lua/modules/filesystem/je_lua_filesystem.cpp b/src/libjin-lua/modules/filesystem/l_filesystem.cpp
index e73d1ad..b297c8d 100644
--- a/src/libjin-lua/modules/filesystem/je_lua_filesystem.cpp
+++ b/src/libjin-lua/modules/filesystem/l_filesystem.cpp
@@ -1,4 +1,4 @@
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 #include "common/je_lua.h"
 #include "libjin/jin.h"
 #include <string>
diff --git a/src/libjin-lua/modules/filesystem/je_lua_filesystem.h b/src/libjin-lua/modules/filesystem/l_filesystem.h
index 1e1ff23..1e1ff23 100644
--- a/src/libjin-lua/modules/filesystem/je_lua_filesystem.h
+++ b/src/libjin-lua/modules/filesystem/l_filesystem.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_animation.cpp b/src/libjin-lua/modules/graphics/l_animation.cpp
index 5cd3b1f..0bf133f 100644
--- a/src/libjin-lua/modules/graphics/je_lua_animation.cpp
+++ b/src/libjin-lua/modules/graphics/l_animation.cpp
@@ -1,13 +1,13 @@
 #include "libjin/jin.h"
 
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 
-#include "je_lua_sprite.h"
-#include "je_lua_canvas.h"
-#include "je_lua_texture.h"
-#include "je_lua_shader.h"
-#include "je_lua_animation.h"
+#include "l_sprite.h"
+#include "l_canvas.h"
+#include "l_texture.h"
+#include "l_shader.h"
+#include "l_animation.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics;
diff --git a/src/libjin-lua/modules/graphics/je_lua_animation.h b/src/libjin-lua/modules/graphics/l_animation.h
index 1b32ec3..1b32ec3 100644
--- a/src/libjin-lua/modules/graphics/je_lua_animation.h
+++ b/src/libjin-lua/modules/graphics/l_animation.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_animator.cpp b/src/libjin-lua/modules/graphics/l_animator.cpp
index 94c61b5..7927ca4 100644
--- a/src/libjin-lua/modules/graphics/je_lua_animator.cpp
+++ b/src/libjin-lua/modules/graphics/l_animator.cpp
@@ -1,13 +1,13 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
-#include "je_lua_sprite.h"
-#include "je_lua_canvas.h"
-#include "je_lua_texture.h"
-#include "je_lua_shader.h"
-#include "je_lua_animator.h"
-#include "je_lua_animation.h"
+#include "l_sprite.h"
+#include "l_canvas.h"
+#include "l_texture.h"
+#include "l_shader.h"
+#include "l_animator.h"
+#include "l_animation.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics;
diff --git a/src/libjin-lua/modules/graphics/je_lua_animator.h b/src/libjin-lua/modules/graphics/l_animator.h
index 0292a77..0292a77 100644
--- a/src/libjin-lua/modules/graphics/je_lua_animator.h
+++ b/src/libjin-lua/modules/graphics/l_animator.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_bitmap.cpp b/src/libjin-lua/modules/graphics/l_bitmap.cpp
index 553c786..c081cef 100644
--- a/src/libjin-lua/modules/graphics/je_lua_bitmap.cpp
+++ b/src/libjin-lua/modules/graphics/l_bitmap.cpp
@@ -1,8 +1,8 @@
-#include "common/je_lua_common.h"
-#include "common/je_lua_object.h"
+#include "common/l_common.h"
+#include "common/l_object.h"
 
 #include "libjin/jin.h"
-#include "je_lua_bitmap.h"
+#include "l_bitmap.h"
 
 using namespace JinEngine::Graphics;
 
diff --git a/src/libjin-lua/modules/graphics/je_lua_bitmap.h b/src/libjin-lua/modules/graphics/l_bitmap.h
index b463d83..b463d83 100644
--- a/src/libjin-lua/modules/graphics/je_lua_bitmap.h
+++ b/src/libjin-lua/modules/graphics/l_bitmap.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_canvas.cpp b/src/libjin-lua/modules/graphics/l_canvas.cpp
index 97b3c96..3979085 100644
--- a/src/libjin-lua/modules/graphics/je_lua_canvas.cpp
+++ b/src/libjin-lua/modules/graphics/l_canvas.cpp
@@ -1,7 +1,7 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
-#include "je_lua_canvas.h"
+#include "l_canvas.h"
 
 using namespace JinEngine::Graphics;
 
diff --git a/src/libjin-lua/modules/graphics/je_lua_canvas.h b/src/libjin-lua/modules/graphics/l_canvas.h
index d1fa885..d1fa885 100644
--- a/src/libjin-lua/modules/graphics/je_lua_canvas.h
+++ b/src/libjin-lua/modules/graphics/l_canvas.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_graphics.cpp b/src/libjin-lua/modules/graphics/l_graphics.cpp
index 96577f5..950554a 100644
--- a/src/libjin-lua/modules/graphics/je_lua_graphics.cpp
+++ b/src/libjin-lua/modules/graphics/l_graphics.cpp
@@ -2,25 +2,25 @@
 #include <fstream>
 
 #include "libjin/jin.h"
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
-
-#include "je_lua_canvas.h"
-#include "je_lua_sprite.h"
-#include "je_lua_spritesheet.h"
-#include "je_lua_bitmap.h"
-#include "je_lua_mesh.h"
-#include "je_lua_ttf.h"
-#include "je_lua_ttf_data.h"
-#include "je_lua_texture.h"
-#include "je_lua_shader.h"
-#include "je_lua_text.h"
-#include "je_lua_texture_font.h"
-#include "je_lua_page.h"
-#include "je_lua_sprite.h"
-#include "je_lua_animation.h"
-#include "je_lua_animator.h"
-#include "je_lua_particle_system.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
+
+#include "l_canvas.h"
+#include "l_sprite.h"
+#include "l_spritesheet.h"
+#include "l_bitmap.h"
+#include "l_mesh.h"
+#include "l_ttf.h"
+#include "l_ttf_data.h"
+#include "l_texture.h"
+#include "l_shader.h"
+#include "l_text.h"
+#include "l_texture_font.h"
+#include "l_page.h"
+#include "l_sprite.h"
+#include "l_animation.h"
+#include "l_animator.h"
+#include "l_particle_system.h"
 
 using namespace std;
 using namespace JinEngine;
diff --git a/src/libjin-lua/modules/graphics/je_lua_graphics.h b/src/libjin-lua/modules/graphics/l_graphics.h
index 02a2c63..02a2c63 100644
--- a/src/libjin-lua/modules/graphics/je_lua_graphics.h
+++ b/src/libjin-lua/modules/graphics/l_graphics.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_mesh.cpp b/src/libjin-lua/modules/graphics/l_mesh.cpp
index fc42096..73e0024 100644
--- a/src/libjin-lua/modules/graphics/je_lua_mesh.cpp
+++ b/src/libjin-lua/modules/graphics/l_mesh.cpp
@@ -1,8 +1,8 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
-#include "je_lua_mesh.h"
-#include "je_lua_texture.h"
+#include "l_mesh.h"
+#include "l_texture.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics;
diff --git a/src/libjin-lua/modules/graphics/je_lua_mesh.h b/src/libjin-lua/modules/graphics/l_mesh.h
index b3fa00e..b3fa00e 100644
--- a/src/libjin-lua/modules/graphics/je_lua_mesh.h
+++ b/src/libjin-lua/modules/graphics/l_mesh.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_page.cpp b/src/libjin-lua/modules/graphics/l_page.cpp
index 8b4043e..b7aeb95 100644
--- a/src/libjin-lua/modules/graphics/je_lua_page.cpp
+++ b/src/libjin-lua/modules/graphics/l_page.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
 using namespace JinEngine::Graphics;
diff --git a/src/libjin-lua/modules/graphics/je_lua_page.h b/src/libjin-lua/modules/graphics/l_page.h
index e4a21a3..e4a21a3 100644
--- a/src/libjin-lua/modules/graphics/je_lua_page.h
+++ b/src/libjin-lua/modules/graphics/l_page.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_particle_system.cpp b/src/libjin-lua/modules/graphics/l_particle_system.cpp
index 70511f7..5830221 100644
--- a/src/libjin-lua/modules/graphics/je_lua_particle_system.cpp
+++ b/src/libjin-lua/modules/graphics/l_particle_system.cpp
@@ -1,11 +1,11 @@
 #include <vector>
 
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
-#include "je_lua_sprite.h"
-#include "je_lua_particle_system.h"
+#include "l_sprite.h"
+#include "l_particle_system.h"
 
 using namespace std;
 using namespace JinEngine::Math;
diff --git a/src/libjin-lua/modules/graphics/je_lua_particle_system.h b/src/libjin-lua/modules/graphics/l_particle_system.h
index b75b569..b75b569 100644
--- a/src/libjin-lua/modules/graphics/je_lua_particle_system.h
+++ b/src/libjin-lua/modules/graphics/l_particle_system.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_shader.cpp b/src/libjin-lua/modules/graphics/l_shader.cpp
index 9505444..bdf82b4 100644
--- a/src/libjin-lua/modules/graphics/je_lua_shader.cpp
+++ b/src/libjin-lua/modules/graphics/l_shader.cpp
@@ -1,10 +1,10 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
-#include "je_lua_shader.h"
-#include "je_lua_canvas.h"
-#include "je_lua_texture.h"
+#include "l_shader.h"
+#include "l_canvas.h"
+#include "l_texture.h"
 
 using namespace JinEngine::Graphics;
 using namespace JinEngine::Graphics::Shaders;
diff --git a/src/libjin-lua/modules/graphics/je_lua_shader.h b/src/libjin-lua/modules/graphics/l_shader.h
index 5a84372..5a84372 100644
--- a/src/libjin-lua/modules/graphics/je_lua_shader.h
+++ b/src/libjin-lua/modules/graphics/l_shader.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_sprite.cpp b/src/libjin-lua/modules/graphics/l_sprite.cpp
index f48e32d..1469042 100644
--- a/src/libjin-lua/modules/graphics/je_lua_sprite.cpp
+++ b/src/libjin-lua/modules/graphics/l_sprite.cpp
@@ -1,11 +1,11 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
-#include "je_lua_sprite.h"
-#include "je_lua_canvas.h"
-#include "je_lua_texture.h"
-#include "je_lua_shader.h"
+#include "l_sprite.h"
+#include "l_canvas.h"
+#include "l_texture.h"
+#include "l_shader.h"
 
 using namespace JinEngine::Math;
 using namespace JinEngine::Graphics;
diff --git a/src/libjin-lua/modules/graphics/je_lua_sprite.h b/src/libjin-lua/modules/graphics/l_sprite.h
index 02c44bf..02c44bf 100644
--- a/src/libjin-lua/modules/graphics/je_lua_sprite.h
+++ b/src/libjin-lua/modules/graphics/l_sprite.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_spritesheet.cpp b/src/libjin-lua/modules/graphics/l_spritesheet.cpp
index a1a2c59..e8400c3 100644
--- a/src/libjin-lua/modules/graphics/je_lua_spritesheet.cpp
+++ b/src/libjin-lua/modules/graphics/l_spritesheet.cpp
@@ -1,10 +1,10 @@
 #include <vector>
 
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
-#include "je_lua_sprite.h"
-#include "je_lua_spritesheet.h"
+#include "l_sprite.h"
+#include "l_spritesheet.h"
 
 using namespace std;
 using namespace JinEngine::Math;
diff --git a/src/libjin-lua/modules/graphics/je_lua_spritesheet.h b/src/libjin-lua/modules/graphics/l_spritesheet.h
index bcae60b..bcae60b 100644
--- a/src/libjin-lua/modules/graphics/je_lua_spritesheet.h
+++ b/src/libjin-lua/modules/graphics/l_spritesheet.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_text.cpp b/src/libjin-lua/modules/graphics/l_text.cpp
index 0afbceb..b634947 100644
--- a/src/libjin-lua/modules/graphics/je_lua_text.cpp
+++ b/src/libjin-lua/modules/graphics/l_text.cpp
@@ -1,5 +1,5 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
 using namespace  JinEngine::Graphics;
diff --git a/src/libjin-lua/modules/graphics/je_lua_text.h b/src/libjin-lua/modules/graphics/l_text.h
index dfcc9cc..dfcc9cc 100644
--- a/src/libjin-lua/modules/graphics/je_lua_text.h
+++ b/src/libjin-lua/modules/graphics/l_text.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_texture.cpp b/src/libjin-lua/modules/graphics/l_texture.cpp
index b03b999..efef2cb 100644
--- a/src/libjin-lua/modules/graphics/je_lua_texture.cpp
+++ b/src/libjin-lua/modules/graphics/l_texture.cpp
@@ -1,7 +1,7 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
-#include "je_lua_texture.h"
+#include "l_texture.h"
 
 using namespace JinEngine::Graphics;
 
diff --git a/src/libjin-lua/modules/graphics/je_lua_texture.h b/src/libjin-lua/modules/graphics/l_texture.h
index c8bb71c..c8bb71c 100644
--- a/src/libjin-lua/modules/graphics/je_lua_texture.h
+++ b/src/libjin-lua/modules/graphics/l_texture.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_texture_font.cpp b/src/libjin-lua/modules/graphics/l_texture_font.cpp
index 6cbf7ca..d9801ef 100644
--- a/src/libjin-lua/modules/graphics/je_lua_texture_font.cpp
+++ b/src/libjin-lua/modules/graphics/l_texture_font.cpp
@@ -1,9 +1,9 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
-#include "je_lua_page.h"
-#include "je_lua_text.h"
+#include "l_page.h"
+#include "l_text.h"
 
 using namespace JinEngine::Graphics;
 using namespace JinEngine::Graphics::Fonts;
diff --git a/src/libjin-lua/modules/graphics/je_lua_texture_font.h b/src/libjin-lua/modules/graphics/l_texture_font.h
index d1fffe5..d1fffe5 100644
--- a/src/libjin-lua/modules/graphics/je_lua_texture_font.h
+++ b/src/libjin-lua/modules/graphics/l_texture_font.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_ttf.cpp b/src/libjin-lua/modules/graphics/l_ttf.cpp
index ead46de..cc9db8e 100644
--- a/src/libjin-lua/modules/graphics/je_lua_ttf.cpp
+++ b/src/libjin-lua/modules/graphics/l_ttf.cpp
@@ -1,9 +1,9 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
-#include "je_lua_page.h"
-#include "je_lua_text.h"
+#include "l_page.h"
+#include "l_text.h"
 
 using namespace JinEngine::Graphics;
 using namespace JinEngine::Graphics::Fonts;
diff --git a/src/libjin-lua/modules/graphics/je_lua_ttf.h b/src/libjin-lua/modules/graphics/l_ttf.h
index bfe503d..bfe503d 100644
--- a/src/libjin-lua/modules/graphics/je_lua_ttf.h
+++ b/src/libjin-lua/modules/graphics/l_ttf.h
diff --git a/src/libjin-lua/modules/graphics/je_lua_ttf_data.cpp b/src/libjin-lua/modules/graphics/l_ttf_data.cpp
index e251ac8..1c8c653 100644
--- a/src/libjin-lua/modules/graphics/je_lua_ttf_data.cpp
+++ b/src/libjin-lua/modules/graphics/l_ttf_data.cpp
@@ -1,9 +1,9 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
-#include "je_lua_ttf.h"
-#include "je_lua_ttf_data.h"
+#include "l_ttf.h"
+#include "l_ttf_data.h"
 
 using namespace JinEngine::Graphics;
 using namespace JinEngine::Graphics::Fonts;
diff --git a/src/libjin-lua/modules/graphics/je_lua_ttf_data.h b/src/libjin-lua/modules/graphics/l_ttf_data.h
index 1fd832d..1fd832d 100644
--- a/src/libjin-lua/modules/graphics/je_lua_ttf_data.h
+++ b/src/libjin-lua/modules/graphics/l_ttf_data.h
diff --git a/src/libjin-lua/modules/je_lua_modules.h b/src/libjin-lua/modules/je_lua_modules.h
deleted file mode 100644
index afe0a82..0000000
--- a/src/libjin-lua/modules/je_lua_modules.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __JE_LUA_MODULES_H__
-#define __JE_LUA_MODULES_H__
-
-#include "ai/je_lua_ai.h"
-#include "audio/je_lua_audio.h"
-#include "bit/je_lua_bit.h"
-#include "core/je_lua_core.h"
-#include "event/je_lua_event.h"
-#include "filesystem/je_lua_filesystem.h"
-#include "graphics/je_lua_graphics.h"
-#include "joypad/je_lua_joypad.h"
-#include "keyboard/je_lua_keyboard.h"
-#include "math/je_lua_math.h"
-#include "mouse/je_lua_mouse.h"
-#include "net/je_lua_net.h"
-#include "thread/je_lua_thread.h"
-#include "time/je_lua_time.h"
-
-#endif
\ No newline at end of file
diff --git a/src/libjin-lua/modules/joypad/je_lua_joypad.cpp b/src/libjin-lua/modules/joypad/l_joypad.cpp
index a3623ae..a955978 100644
--- a/src/libjin-lua/modules/joypad/je_lua_joypad.cpp
+++ b/src/libjin-lua/modules/joypad/l_joypad.cpp
@@ -1,5 +1,5 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
 
 namespace JinEngine
diff --git a/src/libjin-lua/modules/joypad/je_lua_joypad.h b/src/libjin-lua/modules/joypad/l_joypad.h
index ec0e20f..ec0e20f 100644
--- a/src/libjin-lua/modules/joypad/je_lua_joypad.h
+++ b/src/libjin-lua/modules/joypad/l_joypad.h
diff --git a/src/libjin-lua/modules/keyboard/je_lua_keyboard.cpp b/src/libjin-lua/modules/keyboard/l_keyboard.cpp
index 93a62bd..4eba31d 100644
--- a/src/libjin-lua/modules/keyboard/je_lua_keyboard.cpp
+++ b/src/libjin-lua/modules/keyboard/l_keyboard.cpp
@@ -1,5 +1,5 @@
-#include "common/je_lua_common.h"
-#include "common/je_lua_object.h"
+#include "common/l_common.h"
+#include "common/l_object.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin-lua/modules/keyboard/je_lua_keyboard.h b/src/libjin-lua/modules/keyboard/l_keyboard.h
index bf00f83..bf00f83 100644
--- a/src/libjin-lua/modules/keyboard/je_lua_keyboard.h
+++ b/src/libjin-lua/modules/keyboard/l_keyboard.h
diff --git a/src/libjin-lua/modules/l_modules.h b/src/libjin-lua/modules/l_modules.h
new file mode 100644
index 0000000..b2636dd
--- /dev/null
+++ b/src/libjin-lua/modules/l_modules.h
@@ -0,0 +1,19 @@
+#ifndef __JE_LUA_MODULES_H__
+#define __JE_LUA_MODULES_H__
+
+#include "ai/l_ai.h"
+#include "audio/l_audio.h"
+#include "bit/l_bit.h"
+#include "core/l_core.h"
+#include "event/l_event.h"
+#include "filesystem/l_filesystem.h"
+#include "graphics/l_graphics.h"
+#include "joypad/l_joypad.h"
+#include "keyboard/l_keyboard.h"
+#include "math/l_math.h"
+#include "mouse/l_mouse.h"
+#include "net/l_net.h"
+#include "thread/l_thread.h"
+#include "time/l_time.h"
+
+#endif
\ No newline at end of file
diff --git a/src/libjin-lua/modules/math/je_lua_math.cpp b/src/libjin-lua/modules/math/l_math.cpp
index 5b320ff..f7caa16 100644
--- a/src/libjin-lua/modules/math/je_lua_math.cpp
+++ b/src/libjin-lua/modules/math/l_math.cpp
@@ -1,5 +1,5 @@
-#include "common/je_lua_common.h"
-#include "common/je_lua_object.h"
+#include "common/l_common.h"
+#include "common/l_object.h"
 #include "libjin/jin.h"
 
 namespace JinEngine
diff --git a/src/libjin-lua/modules/math/je_lua_math.h b/src/libjin-lua/modules/math/l_math.h
index 2e7010c..2e7010c 100644
--- a/src/libjin-lua/modules/math/je_lua_math.h
+++ b/src/libjin-lua/modules/math/l_math.h
diff --git a/src/libjin-lua/modules/mouse/je_lua_mouse.cpp b/src/libjin-lua/modules/mouse/l_mouse.cpp
index 222f596..f6864ee 100644
--- a/src/libjin-lua/modules/mouse/je_lua_mouse.cpp
+++ b/src/libjin-lua/modules/mouse/l_mouse.cpp
@@ -1,5 +1,5 @@
-#include "common/je_lua_common.h"
-#include "common/je_lua_object.h"
+#include "common/l_common.h"
+#include "common/l_object.h"
 #include "libjin/jin.h"
 
 using namespace JinEngine::Input;
diff --git a/src/libjin-lua/modules/mouse/je_lua_mouse.h b/src/libjin-lua/modules/mouse/l_mouse.h
index 09738f5..09738f5 100644
--- a/src/libjin-lua/modules/mouse/je_lua_mouse.h
+++ b/src/libjin-lua/modules/mouse/l_mouse.h
diff --git a/src/libjin-lua/modules/net/je_lua_buffer.cpp b/src/libjin-lua/modules/net/l_buffer.cpp
index 10e7143..546787e 100644
--- a/src/libjin-lua/modules/net/je_lua_buffer.cpp
+++ b/src/libjin-lua/modules/net/l_buffer.cpp
@@ -1,7 +1,7 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
-#include "je_lua_buffer.h"
+#include "l_buffer.h"
 
 using namespace JinEngine::Lua::Net;
 
diff --git a/src/libjin-lua/modules/net/je_lua_buffer.h b/src/libjin-lua/modules/net/l_buffer.h
index 974e23a..4ff9be6 100644
--- a/src/libjin-lua/modules/net/je_lua_buffer.h
+++ b/src/libjin-lua/modules/net/l_buffer.h
@@ -3,7 +3,7 @@
 
 #include <cstring>
 #include <cstdlib>
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin-lua/modules/net/je_lua_net.cpp b/src/libjin-lua/modules/net/l_net.cpp
index fad6fc5..5569381 100644
--- a/src/libjin-lua/modules/net/je_lua_net.cpp
+++ b/src/libjin-lua/modules/net/l_net.cpp
@@ -1,9 +1,9 @@
-#include "common/je_lua_object.h"
+#include "common/l_object.h"
 #include "libjin/jin.h"
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 
-#include "je_lua_buffer.h"
-#include "je_lua_socket.h"
+#include "l_buffer.h"
+#include "l_socket.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin-lua/modules/net/je_lua_net.h b/src/libjin-lua/modules/net/l_net.h
index 1542791..1542791 100644
--- a/src/libjin-lua/modules/net/je_lua_net.h
+++ b/src/libjin-lua/modules/net/l_net.h
diff --git a/src/libjin-lua/modules/net/je_lua_socket.cpp b/src/libjin-lua/modules/net/l_socket.cpp
index d6cfe91..1e86ea9 100644
--- a/src/libjin-lua/modules/net/je_lua_socket.cpp
+++ b/src/libjin-lua/modules/net/l_socket.cpp
@@ -1,7 +1,7 @@
-#include "common/je_lua_object.h"
-#include "common/je_lua_common.h"
+#include "common/l_object.h"
+#include "common/l_common.h"
 #include "libjin/jin.h"
-#include "je_lua_buffer.h"
+#include "l_buffer.h"
 
 using namespace JinEngine::Net;
 using namespace JinEngine::Lua::Net;
diff --git a/src/libjin-lua/modules/net/je_lua_socket.h b/src/libjin-lua/modules/net/l_socket.h
index b33fac6..b33fac6 100644
--- a/src/libjin-lua/modules/net/je_lua_socket.h
+++ b/src/libjin-lua/modules/net/l_socket.h
diff --git a/src/libjin-lua/modules/thread/je_lua_thread.cpp b/src/libjin-lua/modules/thread/l_thread.cpp
index 2af3e53..757244a 100644
--- a/src/libjin-lua/modules/thread/je_lua_thread.cpp
+++ b/src/libjin-lua/modules/thread/l_thread.cpp
@@ -1,9 +1,9 @@
-#include "common/je_lua_object.h"
+#include "common/l_object.h"
 
 #include "libjin/jin.h"
-#include "libjin-lua/je_lua_jin.h"
-#include "common/je_lua_common.h"
-#include "je_lua_thread.h"
+#include "libjin-lua/l_jin.h"
+#include "common/l_common.h"
+#include "l_thread.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin-lua/modules/thread/je_lua_thread.h b/src/libjin-lua/modules/thread/l_thread.h
index acb4c49..8203134 100644
--- a/src/libjin-lua/modules/thread/je_lua_thread.h
+++ b/src/libjin-lua/modules/thread/l_thread.h
@@ -1,5 +1,5 @@
 #include "libjin/jin.h"
-#include "common/je_lua_common.h"
+#include "common/l_common.h"
 
 namespace JinEngine
 {
diff --git a/src/libjin-lua/modules/time/je_lua_time.cpp b/src/libjin-lua/modules/time/l_time.cpp
index b0468ec..0e39f9e 100644
--- a/src/libjin-lua/modules/time/je_lua_time.cpp
+++ b/src/libjin-lua/modules/time/l_time.cpp
@@ -1,9 +1,9 @@
 #include "SDL2/SDL.h"
-#include "common/je_lua_common.h"
-#include "common/je_lua_object.h"
+#include "common/l_common.h"
+#include "common/l_object.h"
 #include "libjin/jin.h"
 
-#include "je_lua_timer.h"
+#include "l_timer.h"
 
 using namespace JinEngine::Time;
 
diff --git a/src/libjin-lua/modules/time/je_lua_time.h b/src/libjin-lua/modules/time/l_time.h
index 3c75221..3c75221 100644
--- a/src/libjin-lua/modules/time/je_lua_time.h
+++ b/src/libjin-lua/modules/time/l_time.h
diff --git a/src/libjin-lua/modules/time/je_lua_timer.cpp b/src/libjin-lua/modules/time/l_timer.cpp
index e30baab..8886913 100644
--- a/src/libjin-lua/modules/time/je_lua_timer.cpp
+++ b/src/libjin-lua/modules/time/l_timer.cpp
@@ -1,6 +1,6 @@
-#include "common/je_lua_callback.h"
-#include "common/je_lua_common.h"
-#include "je_lua_timer.h"
+#include "common/l_callback.h"
+#include "common/l_common.h"
+#include "l_timer.h"
 
 using namespace JinEngine::Time;
 
diff --git a/src/libjin-lua/modules/time/je_lua_timer.h b/src/libjin-lua/modules/time/l_timer.h
index 35ec15d..35ec15d 100644
--- a/src/libjin-lua/modules/time/je_lua_timer.h
+++ b/src/libjin-lua/modules/time/l_timer.h