12 files changed, 21 insertions, 17 deletions

diff --git a/src/libjin/Common/Array.hpp b/src/libjin/Common/je_array.hpp
index 45082db..eadd36f 100644
--- a/src/libjin/Common/Array.hpp
+++ b/src/libjin/Common/je_array.hpp
@@ -3,7 +3,6 @@
 
 namespace jin
 {
-    
     /* �Զ��ͷŶ��ڴ����ջ�ϴ����Ķ�̬���� */
     template<typename T>
     class Array
@@ -62,15 +61,19 @@ namespace jin
         }
 
     private:
-        /**
-        * http://blog.jobbole.com/106923/
-        * new ���ڴ洴���������
-        * 1. ���� new �����ڴ�
-        * 2. ���ù��캯��
-        *
-        * new, delete�������ڷ�����ͷ��ڴ棬�������������
-        */
+        /// 
+        /// http://blog.jobbole.com/106923/
+        /// new ���ڴ洴���������
+        /// 1. ���� new �����ڴ�
+        /// 2. ���ù��캯��
+        /// 
+        /// new, delete�������ڷ�����ͷ��ڴ棬�������������
+        /// 
         void* operator new(size_t t);
+
+        /// 
+        /// Disable delete.
+        /// 
         void operator delete(void* ptr);
 
         T * data;
@@ -78,6 +81,6 @@ namespace jin
 
     };
 
-}
+} // namespace jin
 
 #endif
\ No newline at end of file
diff --git a/src/libjin/Common/common.h b/src/libjin/Common/je_common.h
index 9586c82..63528b0 100644
--- a/src/libjin/Common/common.h
+++ b/src/libjin/Common/je_common.h
@@ -1,6 +1,6 @@
 #ifndef __LIBJIN_COMMON_H
 #define __LIBJIN_COMMON_H
 
-#include "Array.hpp"
+#include "je_array.hpp"
 
 #endif
\ No newline at end of file
diff --git a/src/libjin/Common/Exception.cpp b/src/libjin/Common/je_exception.cpp
index e69de29..e69de29 100644
--- a/src/libjin/Common/Exception.cpp
+++ b/src/libjin/Common/je_exception.cpp
diff --git a/src/libjin/Common/Exception.h b/src/libjin/Common/je_exception.h
index e69de29..e69de29 100644
--- a/src/libjin/Common/Exception.h
+++ b/src/libjin/Common/je_exception.h
diff --git a/src/libjin/Common/Object.cpp b/src/libjin/Common/je_object.cpp
index 6c3b667..e3b4ca5 100644
--- a/src/libjin/Common/Object.cpp
+++ b/src/libjin/Common/je_object.cpp
@@ -1,5 +1,5 @@
 // LOVE
-#include "Object.h"
+#include "je_object.h"
 
 namespace jin
 {
diff --git a/src/libjin/Common/Object.h b/src/libjin/Common/je_object.h
index c4bf225..c4bf225 100644
--- a/src/libjin/Common/Object.h
+++ b/src/libjin/Common/je_object.h
diff --git a/src/libjin/Common/Singleton.hpp b/src/libjin/Common/je_singleton.hpp
index 12b1450..12b1450 100644
--- a/src/libjin/Common/Singleton.hpp
+++ b/src/libjin/Common/je_singleton.hpp
diff --git a/src/libjin/Common/StringMap.hpp b/src/libjin/Common/je_stringmap.hpp
index 641e32d..641e32d 100644
--- a/src/libjin/Common/StringMap.hpp
+++ b/src/libjin/Common/je_stringmap.hpp
diff --git a/src/libjin/Common/Subsystem.hpp b/src/libjin/Common/je_subsystem.hpp
index 293b88d..2875058 100644
--- a/src/libjin/Common/Subsystem.hpp
+++ b/src/libjin/Common/je_subsystem.hpp
@@ -1,8 +1,9 @@
 #ifndef __LIBJIN_COMMON_SUBSYSTEM_H
 #define __LIBJIN_COMMON_SUBSYSTEM_H
 
-#include "singleton.hpp"
-#include "../utils/macros.h"
+#include "../utils/je_macros.h"
+
+#include "je_singleton.hpp"
 
 namespace jin
 {
diff --git a/src/libjin/Common/types.h b/src/libjin/Common/je_types.h
index 2d257c3..2d257c3 100644
--- a/src/libjin/Common/types.h
+++ b/src/libjin/Common/je_types.h
diff --git a/src/libjin/Common/utf8.cpp b/src/libjin/Common/je_utf8.cpp
index b912a51..de539c7 100644
--- a/src/libjin/Common/utf8.cpp
+++ b/src/libjin/Common/je_utf8.cpp
@@ -1,7 +1,7 @@
-#include "../configuration.h"
+#include "../core/je_configuration.h"
 #if LIBJIN_OS == LIBJIN_WINDOWS
 
-#include "utf8.h"
+#include "je_utf8.h"
 
 namespace jin
 {
diff --git a/src/libjin/Common/utf8.h b/src/libjin/Common/je_utf8.h
index 9abb916..0193abd 100644
--- a/src/libjin/Common/utf8.h
+++ b/src/libjin/Common/je_utf8.h
@@ -1,7 +1,7 @@
 #ifndef __LIBJIN_COMMON_UTF8_H
 #define __LIBJIN_COMMON_UTF8_H
 
-#include "../configuration.h"
+#include "../core/je_configuration.h"
 #if LIBJIN_OS == LIBJIN_WINDOWS
 
 #include <string>