diff --git a/trunk/configure b/trunk/configure
index b0c552132..78b7b869e 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -124,8 +124,16 @@ fi
 #Core Module
 MODULE_ID="CORE" 
 MODULE_DEPENDS=() 
+ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
+MODULE_FILES=("srs_core")
+MODULE_DIR="src/core" . auto/modules.sh
+CORE_OBJS="${MODULE_OBJS[@]}"
+#
+#App Module
+MODULE_ID="APP" 
+MODULE_DEPENDS=("CORE") 
 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
-MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server" 
+MODULE_FILES=("srs_core_log" "srs_core_server" 
         "srs_core_error" "srs_core_conn" "srs_core_client" 
         "srs_core_rtmp" "srs_core_socket" "srs_core_buffer"
         "srs_core_autofree" "srs_core_protocol" "srs_core_amf0"
@@ -135,11 +143,11 @@ MODULE_FILES=("srs_core" "srs_core_log" "srs_core_server"
         "srs_core_hls" "srs_core_forward" "srs_core_encoder"
         "srs_core_http" "srs_core_thread" "srs_core_bandwidth")
 MODULE_DIR="src/app" . auto/modules.sh
-CORE_OBJS="${MODULE_OBJS[@]}"
+APP_OBJS="${MODULE_OBJS[@]}"
 #
 #Main Module
 MODULE_ID="MAIN" 
-MODULE_DEPENDS=("CORE")
+MODULE_DEPENDS=("CORE" "APP")
 ModuleLibIncs=(${LibSTRoot} ${SRS_OBJS})
 MODULE_FILES=("srs_main_server" "srs_main_bandcheck")
 MODULE_DIR="src/main" . auto/modules.sh
@@ -155,7 +163,7 @@ MAIN_ENTRANCES=("srs_main_server" "srs_main_bandcheck")
 # all depends libraries
 ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile})
 # all depends objects
-MODULE_OBJS="${CORE_OBJS[@]} ${CONFIG_OBJS[@]} ${PROTOCOL_OBJS[@]} ${MAIN_OBJS[@]}"
+MODULE_OBJS="${CORE_OBJS[@]} ${APP_OBJS[@]} ${MAIN_OBJS[@]}"
 LINK_OPTIONS="-ldl"
 #
 # srs:
diff --git a/trunk/src/app/srs_core.cpp b/trunk/src/core/srs_core.cpp
similarity index 95%
rename from trunk/src/app/srs_core.cpp
rename to trunk/src/core/srs_core.cpp
index 05a80f45a..4d2cfbf66 100644
--- a/trunk/src/app/srs_core.cpp
+++ b/trunk/src/core/srs_core.cpp
@@ -23,12 +23,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <srs_core.hpp>
 
+#include <string.h>
 #include <sys/time.h>
 #include <netdb.h>
 #include <arpa/inet.h>
 
-#include <srs_core_log.hpp>
-
 static int64_t _srs_system_time_us_cache = 0;
 
 int64_t srs_get_system_time_ms()
@@ -73,7 +72,6 @@ std::string srs_dns_resolve(std::string host)
     
     hostent* answer = gethostbyname(host.c_str());
     if (answer == NULL) {
-        srs_error("dns resolve host %s error.", host.c_str());
         return "";
     }
     
@@ -81,7 +79,6 @@ std::string srs_dns_resolve(std::string host)
     memset(ipv4, 0, sizeof(ipv4));
     for (int i = 0; i < answer->h_length; i++) {
         inet_ntop(AF_INET, answer->h_addr_list[i], ipv4, sizeof(ipv4));
-        srs_info("dns resolve host %s to %s.", host.c_str(), ipv4);
         break;
     }
     
diff --git a/trunk/src/app/srs_core.hpp b/trunk/src/core/srs_core.hpp
similarity index 100%
rename from trunk/src/app/srs_core.hpp
rename to trunk/src/core/srs_core.hpp
diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp
index e415e216a..860556546 100755
--- a/trunk/src/srs/srs.upp
+++ b/trunk/src/srs/srs.upp
@@ -4,9 +4,10 @@ file
     ..\main\srs_main_bandcheck.cpp,
     auto readonly separator,
     ..\..\objs\srs_auto_headers.hpp,
+    core readonly separator,
+    ..\core\srs_core.hpp,
+    ..\core\srs_core.cpp,
     app readonly separator,
-    ..\app\srs_core.hpp,
-    ..\app\srs_core.cpp,
     ..\app\srs_core_amf0.hpp,
     ..\app\srs_core_amf0.cpp,
     ..\app\srs_core_autofree.hpp,