diff --git a/trunk/configure b/trunk/configure
index 9950c5279..087772165 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -142,8 +142,8 @@ KERNEL_OBJS="${MODULE_OBJS[@]}"
 MODULE_ID="PROTOCOL" 
 MODULE_DEPENDS=("CORE" "KERNEL") 
 ModuleLibIncs=(${SRS_OBJS})
-MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io")
-MODULE_DIR="src/protocol" . auto/modules.sh
+MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_protocol_rtmp_stack")
+MODULE_DIR="src/pro" . auto/modules.sh
 PROTOCOL_OBJS="${MODULE_OBJS[@]}"
 #
 #App Module
@@ -151,10 +151,9 @@ MODULE_ID="APP"
 MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL") 
 ModuleLibIncs=(${LibSTRoot} ${LibHttpParserRoot} ${LibSSLRoot} ${SRS_OBJS})
 MODULE_FILES=("srs_core_server" 
-         "srs_core_conn" "srs_core_client" 
+        "srs_core_conn" "srs_core_client" 
         "srs_core_rtmp" "srs_core_socket" 
-        "srs_core_protocol" 
-         "srs_core_source" "srs_core_codec"
+        "srs_core_source" "srs_core_codec"
         "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_bandwidth.cpp b/trunk/src/app/srs_core_bandwidth.cpp
index 0e03e23ef..e643a9739 100644
--- a/trunk/src/app/srs_core_bandwidth.cpp
+++ b/trunk/src/app/srs_core_bandwidth.cpp
@@ -31,7 +31,7 @@ using namespace std;
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_autofree.hpp>
 
diff --git a/trunk/src/app/srs_core_client.cpp b/trunk/src/app/srs_core_client.cpp
index 0145f71e4..a52dba324 100644
--- a/trunk/src/app/srs_core_client.cpp
+++ b/trunk/src/app/srs_core_client.cpp
@@ -31,7 +31,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_core_rtmp.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_server.hpp>
diff --git a/trunk/src/app/srs_core_encoder.cpp b/trunk/src/app/srs_core_encoder.cpp
index 7f65dec67..6649b0ed5 100644
--- a/trunk/src/app/srs_core_encoder.cpp
+++ b/trunk/src/app/srs_core_encoder.cpp
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_config.hpp>
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_pithy_print.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 #ifdef SRS_FFMPEG
 
diff --git a/trunk/src/app/srs_core_forward.cpp b/trunk/src/app/srs_core_forward.cpp
index d2787e072..822d62ca7 100644
--- a/trunk/src/app/srs_core_forward.cpp
+++ b/trunk/src/app/srs_core_forward.cpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_error.hpp>
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_pithy_print.hpp>
 #include <srs_core_rtmp.hpp>
 #include <srs_kernel_config.hpp>
diff --git a/trunk/src/app/srs_core_hls.cpp b/trunk/src/app/srs_core_hls.cpp
index a5c0694bf..358bd9830 100644
--- a/trunk/src/app/srs_core_hls.cpp
+++ b/trunk/src/app/srs_core_hls.cpp
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_error.hpp>
 #include <srs_core_codec.hpp>
 #include <srs_protocol_amf0.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_config.hpp>
 #include <srs_core_source.hpp>
 #include <srs_core_autofree.hpp>
diff --git a/trunk/src/app/srs_core_rtmp.cpp b/trunk/src/app/srs_core_rtmp.cpp
index 27ad3dba4..a14c327e0 100644
--- a/trunk/src/app/srs_core_rtmp.cpp
+++ b/trunk/src/app/srs_core_rtmp.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_io.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_core_handshake.hpp>
diff --git a/trunk/src/app/srs_core_source.cpp b/trunk/src/app/srs_core_source.cpp
index bbcf3e983..7d7b72620 100644
--- a/trunk/src/app/srs_core_source.cpp
+++ b/trunk/src/app/srs_core_source.cpp
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 using namespace std;
 
 #include <srs_kernel_log.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_core_codec.hpp>
diff --git a/trunk/src/main/srs_main_bandcheck.cpp b/trunk/src/main/srs_main_bandcheck.cpp
index 4d5665219..7b5db1be1 100644
--- a/trunk/src/main/srs_main_bandcheck.cpp
+++ b/trunk/src/main/srs_main_bandcheck.cpp
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdlib.h>
 
 #include <srs_core_rtmp.hpp>
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_core_autofree.hpp>
diff --git a/trunk/src/protocol/srs_protocol_amf0.cpp b/trunk/src/pro/srs_protocol_amf0.cpp
similarity index 100%
rename from trunk/src/protocol/srs_protocol_amf0.cpp
rename to trunk/src/pro/srs_protocol_amf0.cpp
diff --git a/trunk/src/protocol/srs_protocol_amf0.hpp b/trunk/src/pro/srs_protocol_amf0.hpp
similarity index 100%
rename from trunk/src/protocol/srs_protocol_amf0.hpp
rename to trunk/src/pro/srs_protocol_amf0.hpp
diff --git a/trunk/src/protocol/srs_protocol_io.cpp b/trunk/src/pro/srs_protocol_io.cpp
similarity index 100%
rename from trunk/src/protocol/srs_protocol_io.cpp
rename to trunk/src/pro/srs_protocol_io.cpp
diff --git a/trunk/src/protocol/srs_protocol_io.hpp b/trunk/src/pro/srs_protocol_io.hpp
similarity index 100%
rename from trunk/src/protocol/srs_protocol_io.hpp
rename to trunk/src/pro/srs_protocol_io.hpp
diff --git a/trunk/src/app/srs_core_protocol.cpp b/trunk/src/pro/srs_protocol_rtmp_stack.cpp
similarity index 99%
rename from trunk/src/app/srs_core_protocol.cpp
rename to trunk/src/pro/srs_protocol_rtmp_stack.cpp
index 9b333d212..18b9f58e6 100644
--- a/trunk/src/app/srs_core_protocol.cpp
+++ b/trunk/src/pro/srs_protocol_rtmp_stack.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_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 
 #include <srs_kernel_log.hpp>
 #include <srs_protocol_amf0.hpp>
diff --git a/trunk/src/app/srs_core_protocol.hpp b/trunk/src/pro/srs_protocol_rtmp_stack.hpp
similarity index 99%
rename from trunk/src/app/srs_core_protocol.hpp
rename to trunk/src/pro/srs_protocol_rtmp_stack.hpp
index 8e09925bf..82dc44224 100644
--- a/trunk/src/app/srs_core_protocol.hpp
+++ b/trunk/src/pro/srs_protocol_rtmp_stack.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_PROTOCOL_HPP
-#define SRS_CORE_PROTOCOL_HPP
+#ifndef SRS_PROTOCOL_RTMP_STACK_HPP
+#define SRS_PROTOCOL_RTMP_STACK_HPP
 
 /*
-#include <srs_core_protocol.hpp>
+#include <srs_protocol_rtmp_stack.hpp>
 */
 
 #include <srs_core.hpp>
diff --git a/trunk/src/srs/srs.upp b/trunk/src/srs/srs.upp
index 126a5a7ad..6b85fcb4f 100755
--- a/trunk/src/srs/srs.upp
+++ b/trunk/src/srs/srs.upp
@@ -25,10 +25,12 @@ file
     ..\kernel\srs_kernel_stream.hpp,
     ..\kernel\srs_kernel_stream.cpp,
     protocol readonly separator,
-    ..\protocol\srs_protocol_amf0.hpp,
-    ..\protocol\srs_protocol_amf0.cpp,
-    ..\protocol\srs_protocol_io.hpp,
-    ..\protocol\srs_protocol_io.cpp,
+    ..\pro\srs_protocol_amf0.hpp,
+    ..\pro\srs_protocol_amf0.cpp,
+    ..\pro\srs_protocol_io.hpp,
+    ..\pro\srs_protocol_io.cpp,
+    ..\pro\srs_protocol_rtmp_stack.hpp,
+    ..\pro\srs_protocol_rtmp_stack.cpp,
     app readonly separator,
     ..\app\srs_core_bandwidth.hpp,
     ..\app\srs_core_bandwidth.cpp,
@@ -50,8 +52,6 @@ file
     ..\app\srs_core_http.cpp,
     ..\app\srs_core_log_context.hpp,
     ..\app\srs_core_log_context.cpp,
-    ..\app\srs_core_protocol.hpp,
-    ..\app\srs_core_protocol.cpp,
     ..\app\srs_core_refer.hpp,
     ..\app\srs_core_refer.cpp,
     ..\app\srs_core_rtmp.hpp,