diff --git a/modules/oop/composer.json b/modules/oop/composer.json
new file mode 100644
index 0000000..b2d2edc
--- /dev/null
+++ b/modules/oop/composer.json
@@ -0,0 +1,18 @@
+{
+  "name": "myqee/oop",
+  "description": "MyQEE OOP ORM Module",
+  "keywords": ["MyQEE", "Module"],
+  "homepage": "http://www.myqee.com/",
+  "type": "myqee-module",
+  "license": "Apache-2.0",
+  "authors": [
+    {
+      "name": "jonwang",
+      "email": "jonwang@queyang.com",
+      "homepage": "http://www.queyang.com/"
+    }
+  ],
+  "autoload": {
+    "psr-0": {"MyQEE\\Module\\OOP": "src/"}
+  }
+}
\ No newline at end of file
diff --git a/modules/oop/orm.class.php b/modules/oop/orm.class.php
index 9af3fb1..be2937b 100644
--- a/modules/oop/orm.class.php
+++ b/modules/oop/orm.class.php
@@ -4,13 +4,12 @@
  * MyQEE ORM 核心类
  *
  * @author     呼吸二氧化碳 <jonwang@myqee.com>
- * @category   MyQEE
- * @package    System
- * @subpackage Core
+ * @category   Module
+ * @package    ORM
  * @copyright  Copyright (c) 2008-2013 myqee.com
  * @license    http://www.myqee.com/license.html
  */
-abstract class Core_OOP_ORM
+abstract class Module_OOP_ORM
 {
 
     /**
diff --git a/modules/oop/orm/data.class.php b/modules/oop/orm/data.class.php
index 8add960..fd5e22e 100644
--- a/modules/oop/orm/data.class.php
+++ b/modules/oop/orm/data.class.php
@@ -4,13 +4,12 @@
  * MyQEE ORM 核心类
  *
  * @author     呼吸二氧化碳 <jonwang@myqee.com>
- * @category   MyQEE
- * @package    System
- * @subpackage Core
+ * @category   Module
+ * @package    ORM
  * @copyright  Copyright (c) 2008-2013 myqee.com
  * @license    http://www.myqee.com/license.html
  */
-class Core_OOP_ORM_Data
+class Module_OOP_ORM_Data
 {
     /**
      * ID 字段名
diff --git a/modules/oop/orm/finder/db.class.php b/modules/oop/orm/finder/db.class.php
index 2a7eb80..2cb0d0b 100644
--- a/modules/oop/orm/finder/db.class.php
+++ b/modules/oop/orm/finder/db.class.php
@@ -4,13 +4,12 @@
  * ORM 数据库核心类
  *
  * @author     呼吸二氧化碳 <jonwang@myqee.com>
- * @category   MyQEE
- * @package    System
- * @subpackage Core
+ * @category   Module
+ * @package    ORM
  * @copyright  Copyright (c) 2008-2013 myqee.com
  * @license    http://www.myqee.com/license.html
  */
-class Core_OOP_ORM_Finder_DB extends OOP_ORM
+class Module_OOP_ORM_Finder_DB extends OOP_ORM
 {
 
     /**
diff --git a/modules/oop/orm/finder/rest.class.php b/modules/oop/orm/finder/rest.class.php
index 70ab870..69856a1 100644
--- a/modules/oop/orm/finder/rest.class.php
+++ b/modules/oop/orm/finder/rest.class.php
@@ -4,13 +4,12 @@
  * MyQEE ORM REST核心类
  *
  * @author     呼吸二氧化碳 <jonwang@myqee.com>
- * @category   MyQEE
- * @package    System
- * @subpackage Core
+ * @category   Module
+ * @package    ORM
  * @copyright  Copyright (c) 2008-2013 myqee.com
  * @license    http://www.myqee.com/license.html
  */
-class Core_OOP_ORM_Finder_REST extends OOP_ORM
+class Module_OOP_ORM_Finder_REST extends OOP_ORM
 {
     /**
      * API接口地址
diff --git a/modules/oop/orm/index.class.php b/modules/oop/orm/index.class.php
index c5b1c98..e1a4a19 100644
--- a/modules/oop/orm/index.class.php
+++ b/modules/oop/orm/index.class.php
@@ -4,13 +4,12 @@
  * MyQEE ORM 索引核心类
  *
  * @author     呼吸二氧化碳 <jonwang@myqee.com>
- * @category   MyQEE
- * @package    System
- * @subpackage Core
+ * @category   Module
+ * @package    ORM
  * @copyright  Copyright (c) 2008-2013 myqee.com
  * @license    http://www.myqee.com/license.html
  */
-abstract class Core_OOP_ORM_Index
+abstract class Module_OOP_ORM_Index
 {
 
     /**
diff --git a/modules/oop/orm/parse.class.php b/modules/oop/orm/parse.class.php
index e3ff75f..ad59748 100644
--- a/modules/oop/orm/parse.class.php
+++ b/modules/oop/orm/parse.class.php
@@ -4,13 +4,12 @@
  * ORM 字段解析器
  *
  * @author     呼吸二氧化碳 <jonwang@myqee.com>
- * @category   MyQEE
- * @package    System
- * @subpackage Core
+ * @category   Module
+ * @package    ORM
  * @copyright  Copyright (c) 2008-2013 myqee.com
  * @license    http://www.myqee.com/license.html
  */
-abstract class Core_OOP_ORM_Parse
+abstract class Module_OOP_ORM_Parse
 {
 
     public function __construct()
diff --git a/modules/oop/orm/result.class.php b/modules/oop/orm/result.class.php
index 61c1718..4404b91 100644
--- a/modules/oop/orm/result.class.php
+++ b/modules/oop/orm/result.class.php
@@ -4,13 +4,12 @@
  * MyQEE ORM 核心类
  *
  * @author     呼吸二氧化碳 <jonwang@myqee.com>
- * @category   MyQEE
- * @package    System
- * @subpackage Core
+ * @category   Module
+ * @package    ORM
  * @copyright  Copyright (c) 2008-2013 myqee.com
  * @license    http://www.myqee.com/license.html
  */
-class Core_OOP_ORM_Result extends ArrayIterator
+class Module_OOP_ORM_Result extends ArrayIterator
 {
 
     /**