14 files changed, 18 insertions, 18 deletions
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