diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 71a1a99..5f346f4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,14 +1,52 @@
 option(CM_UTIL_SUPPORT_XML "Build XML Parse module." ON)
 
 if(CM_UTIL_SUPPORT_XML)
-    add_subdirectory(xml)
+    SET(XML_PARSE_SOURCE    ${CMUTIL_ROOT_INCLUDE_PATH}/hgl/util/xml/XMLParse.h
+                            xml/XMLParseClass.cpp)
+
+    SOURCE_GROUP("XML" FILES ${XML_PARSE_SOURCE})
+
+    IF(WIN32)
+        SET(EXPAT_SOURCE_PATH ${CMUTIL_ROOT_3RDPTY_PATH}/expat/expat/lib)
+
+        include_directories(${EXPAT_SOURCE_PATH})
+
+        SET(EXPAT_SOURCE
+            ${EXPAT_SOURCE_PATH}/xmlparse.c
+            ${EXPAT_SOURCE_PATH}/xmlrole.c
+            ${EXPAT_SOURCE_PATH}/xmltok.c
+            ${EXPAT_SOURCE_PATH}/xmltok_impl.c
+            ${EXPAT_SOURCE_PATH}/xmltok_ns.c)
+
+        SOURCE_GROUP("XML\\Expat" FILES ${EXPAT_SOURCE})
+
+        SET(XML_PARSE_SOURCE ${XML_PARSE_SOURCE} ${EXPAT_SOURCE})
+    ENDIF(WIN32)
 endif(CM_UTIL_SUPPORT_XML)
 
 option(CM_UTIL_SUPPORT_JSON "Build JSON Parse/make module." ON)
 
-if(CM_UTIL_SUPPORT_JSON)
-    add_subdirectory(json)
-endif(CM_UTIL_SUPPORT_JSON)
+IF(CM_UTIL_SUPPORT_JSON)
+    set(JSON_TOOL_SOURCE ${CMUTIL_ROOT_INCLUDE_PATH}/hgl/util/json/JsonTool.h
+                         json/JsonTool.cpp)
+
+    SOURCE_GROUP("JSON" FILES ${JSON_TOOL_SOURCE})
+
+    IF(WIN32)
+        SET(JSONCPP_PATH ${CMUTIL_ROOT_3RDPTY_PATH}/jsoncpp)
+
+        include_directories(${JSONCPP_PATH}/include)
+        include_directories(${JSONCPP_PATH}/src/lib_json)
+
+        SET(JSONCPP_SOURCE  ${JSONCPP_PATH}/src/lib_json/json_reader.cpp
+                            ${JSONCPP_PATH}/src/lib_json/json_value.cpp
+                            ${JSONCPP_PATH}/src/lib_json/json_writer.cpp)
+
+        SOURCE_GROUP("JSON\\jsoncpp" FILES ${JSONCPP_SOURCE})
+
+        SET(JSON_TOOL_SOURCE ${JSON_TOOL_SOURCE} ${JSONCPP_SOURCE})
+    ENDIF(WIN32)
+ENDIF(CM_UTIL_SUPPORT_JSON)
 
 SET(CMD_SOURCE  ${CMUTIL_ROOT_INCLUDE_PATH}/hgl/util/cmd/CmdParse.h
                 cmd/CmdParse.cpp)
@@ -19,6 +57,9 @@ SET(CMD_SOURCE  ${CMUTIL_ROOT_INCLUDE_PATH}/hgl/util/cmd/CmdParse.h
 SOURCE_GROUP("Command Line" FILES ${CMD_SOURCE})
 #SOURCE_GROUP("Time" FILES ${TIME_SOURCE})
 
-add_cm_library(CMUtil "CM/Util" ${CMD_SOURCE} 
-#								${TIME_SOURCE}
-								)
+add_cm_library(CMUtil "CM"	${CMD_SOURCE}
+#							${TIME_SOURCE}
+
+                            ${XML_PARSE_SOURCE}
+                            ${JSON_TOOL_SOURCE}
+                           )
diff --git a/src/json/CMakeLists.txt b/src/json/CMakeLists.txt
deleted file mode 100644
index 56150c9..0000000
--- a/src/json/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-set(JSON_TOOL_HEADER_FILES ${CMUTIL_ROOT_INCLUDE_PATH}/hgl/util/json/JsonTool.h)
-
-set(JSON_TOOL_SOURCE_FILES JsonTool.cpp)
-SOURCE_GROUP("JSON" FILES JsonTool.cpp)
-
-IF(WIN32)
-    SET(JSONCPP_PATH ${CMUTIL_ROOT_3RDPTY_PATH}/jsoncpp)
-
-    include_directories(${JSONCPP_PATH}/include)
-    include_directories(${JSONCPP_PATH}/src/lib_json)
-
-    SET(JSONCPP_SOURCE  ${JSONCPP_PATH}/src/lib_json/json_reader.cpp
-                        ${JSONCPP_PATH}/src/lib_json/json_value.cpp
-                        ${JSONCPP_PATH}/src/lib_json/json_writer.cpp)
-
-    SET(JSON_TOOL_SOURCE_FILES ${JSON_TOOL_SOURCE_FILES} ${JSONCPP_SOURCE})
-
-    SOURCE_GROUP("JSON\\jsoncpp" FILES ${JSONCPP_SOURCE})
-ENDIF(WIN32)
-
-add_cm_library(CMUtil.JSON "CM/Util"	${JSON_TOOL_HEADER_FILES}
-                                        ${JSON_TOOL_SOURCE_FILES})
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
deleted file mode 100644
index c59d5c8..0000000
--- a/src/xml/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-SET(XML_PARSE_SOURCE	${CMUTIL_ROOT_INCLUDE_PATH}/hgl/util/xml/XMLParse.h
-						XMLParseClass.cpp)
-
-SOURCE_GROUP("XML" FILES XMLParseClass.cpp)
-
-IF(WIN32)
-    SET(EXPAT_SOURCE_PATH ${CMUTIL_ROOT_3RDPTY_PATH}/expat/expat/lib)
-
-    include_directories(${EXPAT_SOURCE_PATH})
-
-    SET(EXPAT_SOURCE
-        ${EXPAT_SOURCE_PATH}/xmlparse.c
-        ${EXPAT_SOURCE_PATH}/xmlrole.c
-        ${EXPAT_SOURCE_PATH}/xmltok.c
-        ${EXPAT_SOURCE_PATH}/xmltok_impl.c
-        ${EXPAT_SOURCE_PATH}/xmltok_ns.c)
-
-    SET(XML_PARSE_SOURCE ${XML_PARSE_SOURCE} ${EXPAT_SOURCE})
-
-    SOURCE_GROUP("XML\\Expat" FILES ${EXPAT_SOURCE})
-ENDIF(WIN32)
-
-add_cm_library(CMUtil.XML "CM/Util" ${XML_PARSE_SOURCE})