diff --git a/trunk/auto/rename.sh b/trunk/auto/rename.sh
deleted file mode 100755
index 07ce59bbc..000000000
--- a/trunk/auto/rename.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-from=$1
-to=$2
-echo "rename from $from to $to"
diff --git a/trunk/configure b/trunk/configure
index 6f6d4950e..47aaa79d9 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -125,7 +125,7 @@ fi
 MODULE_ID="CORE" 
 MODULE_DEPENDS=() 
 ModuleLibIncs=(${SRS_OBJS})
-MODULE_FILES=("srs_core")
+MODULE_FILES=("srs_core" "srs_core_autofree")
 MODULE_DIR="src/core" . auto/modules.sh
 CORE_OBJS="${MODULE_OBJS[@]}"
 #
@@ -136,7 +136,7 @@ ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
 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"
+        "srs_core_protocol" "srs_core_amf0"
         "srs_core_stream" "srs_core_source" "srs_core_codec"
         "srs_core_handshake" "srs_core_pithy_print"
         "srs_core_config" "srs_core_refer" "srs_core_reload"
diff --git a/trunk/src/app/srs_core_autofree.cpp b/trunk/src/core/srs_core_autofree.cpp
similarity index 100%
rename from trunk/src/app/srs_core_autofree.cpp
rename to trunk/src/core/srs_core_autofree.cpp
diff --git a/trunk/src/app/srs_core_autofree.hpp b/trunk/src/core/srs_core_autofree.hpp
similarity index 100%
rename from trunk/src/app/srs_core_autofree.hpp
rename to trunk/src/core/srs_core_autofree.hpp
diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp
index e61b00d6f..d819d9424 100755
--- a/trunk/src/srs/srs.upp
+++ b/trunk/src/srs/srs.upp
@@ -7,11 +7,11 @@ file
     core readonly separator,
     ..\core\srs_core.hpp,
     ..\core\srs_core.cpp,
+    ..\core\srs_core_autofree.hpp,
+    ..\core\srs_core_autofree.cpp,
     app readonly separator,
     ..\app\srs_core_amf0.hpp,
     ..\app\srs_core_amf0.cpp,
-    ..\app\srs_core_autofree.hpp,
-    ..\app\srs_core_autofree.cpp,
     ..\app\srs_core_bandwidth.hpp,
     ..\app\srs_core_bandwidth.cpp,
     ..\app\srs_core_buffer.hpp,