diff --git a/trunk/configure b/trunk/configure
index cf821e3ec..e006a1dc7 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -134,7 +134,7 @@ MODULE_ID="KERNEL"
 MODULE_DEPENDS=("CORE") 
 ModuleLibIncs=(${SRS_OBJS})
 MODULE_FILES=("srs_kernel_error" "srs_kernel_log" "srs_kernel_reload" "srs_kernel_config" 
-        "srs_kernel_stream" "srs_kernel_buffer")
+        "srs_kernel_stream" "srs_kernel_buffer" "srs_kernel_pithy_print")
 MODULE_DIR="src/kernel" . auto/modules.sh
 KERNEL_OBJS="${MODULE_OBJS[@]}"
 #
@@ -147,7 +147,7 @@ MODULE_FILES=("srs_core_server"
         "srs_core_rtmp" "srs_core_socket" 
         "srs_core_protocol" "srs_core_amf0"
          "srs_core_source" "srs_core_codec"
-        "srs_core_handshake" "srs_core_pithy_print"
+        "srs_core_handshake" 
         "srs_core_refer"
         "srs_core_hls" "srs_core_forward" "srs_core_encoder"
         "srs_core_http" "srs_core_thread" "srs_core_bandwidth"
diff --git a/trunk/src/app/srs_core_client.cpp b/trunk/src/app/srs_core_client.cpp
index cffe11ec6..bb25dd5dd 100644
--- a/trunk/src/app/srs_core_client.cpp
+++ b/trunk/src/app/srs_core_client.cpp
@@ -35,7 +35,7 @@ using namespace std;
 #include <srs_core_autofree.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_server.hpp>
-#include <srs_core_pithy_print.hpp>
+#include <srs_kernel_pithy_print.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_refer.hpp>
 #include <srs_core_hls.hpp>
diff --git a/trunk/src/app/srs_core_encoder.cpp b/trunk/src/app/srs_core_encoder.cpp
index 47f4b95df..7f65dec67 100644
--- a/trunk/src/app/srs_core_encoder.cpp
+++ b/trunk/src/app/srs_core_encoder.cpp
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_rtmp.hpp>
-#include <srs_core_pithy_print.hpp>
+#include <srs_kernel_pithy_print.hpp>
 #include <srs_core_protocol.hpp>
 
 #ifdef SRS_FFMPEG
diff --git a/trunk/src/app/srs_core_forward.cpp b/trunk/src/app/srs_core_forward.cpp
index 57d205dc2..289173bdb 100644
--- a/trunk/src/app/srs_core_forward.cpp
+++ b/trunk/src/app/srs_core_forward.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_core_protocol.hpp>
-#include <srs_core_pithy_print.hpp>
+#include <srs_kernel_pithy_print.hpp>
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_source.hpp>
diff --git a/trunk/src/app/srs_core_hls.cpp b/trunk/src/app/srs_core_hls.cpp
index d59d2a3b0..f1add824b 100644
--- a/trunk/src/app/srs_core_hls.cpp
+++ b/trunk/src/app/srs_core_hls.cpp
@@ -41,7 +41,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_core_source.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_core_rtmp.hpp>
-#include <srs_core_pithy_print.hpp>
+#include <srs_kernel_pithy_print.hpp>
 
 // max PES packets size to flush the video.
 #define SRS_HLS_AUDIO_CACHE_SIZE 512 * 1024
diff --git a/trunk/src/app/srs_core_pithy_print.cpp b/trunk/src/kernel/srs_kernel_pithy_print.cpp
similarity index 99%
rename from trunk/src/app/srs_core_pithy_print.cpp
rename to trunk/src/kernel/srs_kernel_pithy_print.cpp
index 2a09c1124..824bb179e 100644
--- a/trunk/src/app/srs_core_pithy_print.cpp
+++ b/trunk/src/kernel/srs_kernel_pithy_print.cpp
@@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <srs_core_pithy_print.hpp>
+#include <srs_kernel_pithy_print.hpp>
 
 #include <stdlib.h>
 #include <map>
diff --git a/trunk/src/app/srs_core_pithy_print.hpp b/trunk/src/kernel/srs_kernel_pithy_print.hpp
similarity index 95%
rename from trunk/src/app/srs_core_pithy_print.hpp
rename to trunk/src/kernel/srs_kernel_pithy_print.hpp
index c402f5a3c..973709e3e 100644
--- a/trunk/src/app/srs_core_pithy_print.hpp
+++ b/trunk/src/kernel/srs_kernel_pithy_print.hpp
@@ -21,11 +21,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#ifndef SRS_CORE_PITHY_PRINT_HPP
-#define SRS_CORE_PITHY_PRINT_HPP
+#ifndef SRS_KERNEL_PITHY_PRINT_HPP
+#define SRS_KERNEL_PITHY_PRINT_HPP
 
 /*
-#include <srs_core_pithy_print.hpp>
+#include <srs_kernel_pithy_print.hpp>
 */
 
 #include <srs_core.hpp>
diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp
index 95e6b1f7c..89d79a441 100755
--- a/trunk/src/srs/srs.upp
+++ b/trunk/src/srs/srs.upp
@@ -18,6 +18,8 @@ file
     ..\kernel\srs_kernel_error.cpp,
     ..\kernel\srs_kernel_log.hpp,
     ..\kernel\srs_kernel_log.cpp,
+    ..\kernel\srs_kernel_pithy_print.hpp,
+    ..\kernel\srs_kernel_pithy_print.cpp,
     ..\kernel\srs_kernel_reload.hpp,
     ..\kernel\srs_kernel_reload.cpp,
     ..\kernel\srs_kernel_stream.hpp,
@@ -45,8 +47,6 @@ file
     ..\app\srs_core_http.cpp,
     ..\app\srs_core_log_context.hpp,
     ..\app\srs_core_log_context.cpp,
-    ..\app\srs_core_pithy_print.hpp,
-    ..\app\srs_core_pithy_print.cpp,
     ..\app\srs_core_protocol.hpp,
     ..\app\srs_core_protocol.cpp,
     ..\app\srs_core_refer.hpp,