diff --git a/Android/app/src/main/cpp/test_server.cpp b/Android/app/src/main/cpp/test_server.cpp
index 05fb596d..5c17b097 100644
--- a/Android/app/src/main/cpp/test_server.cpp
+++ b/Android/app/src/main/cpp/test_server.cpp
@@ -41,7 +41,7 @@
 #include "Rtsp/RtspSession.h"
 #include "Rtmp/RtmpSession.h"
 #include "Shell/ShellSession.h"
-#include "RtmpMuxer/FlvMuxer.h"
+#include "Rtmp/FlvMuxer.h"
 #include "Player/PlayerProxy.h"
 #include "Http/WebSocketSession.h"
 
diff --git a/server/main.cpp b/server/main.cpp
index d6cfe252..e796d065 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -40,7 +40,7 @@
 #include "Rtsp/RtspSession.h"
 #include "Rtmp/RtmpSession.h"
 #include "Shell/ShellSession.h"
-#include "RtmpMuxer/FlvMuxer.h"
+#include "Rtmp/FlvMuxer.h"
 #include "Player/PlayerProxy.h"
 #include "Http/WebSocketSession.h"
 #include "WebApi.h"
diff --git a/src/Common/MultiMediaSourceMuxer.h b/src/Common/MultiMediaSourceMuxer.h
index 5c43f82b..c6c51772 100644
--- a/src/Common/MultiMediaSourceMuxer.h
+++ b/src/Common/MultiMediaSourceMuxer.h
@@ -27,8 +27,8 @@
 #ifndef ZLMEDIAKIT_MULTIMEDIASOURCEMUXER_H
 #define ZLMEDIAKIT_MULTIMEDIASOURCEMUXER_H
 
-#include "RtspMuxer/RtspMediaSourceMuxer.h"
-#include "RtmpMuxer/RtmpMediaSourceMuxer.h"
+#include "Rtsp/RtspMediaSourceMuxer.h"
+#include "Rtmp/RtmpMediaSourceMuxer.h"
 #include "MediaFile/MediaRecorder.h"
 
 class MultiMediaSourceMuxer : public FrameWriterInterface{
diff --git a/src/RtmpMuxer/AACRtmpCodec.cpp b/src/Extension/AACRtmpCodec.cpp
similarity index 100%
rename from src/RtmpMuxer/AACRtmpCodec.cpp
rename to src/Extension/AACRtmpCodec.cpp
diff --git a/src/RtmpMuxer/AACRtmpCodec.h b/src/Extension/AACRtmpCodec.h
similarity index 99%
rename from src/RtmpMuxer/AACRtmpCodec.h
rename to src/Extension/AACRtmpCodec.h
index f213cea2..661a37a1 100644
--- a/src/RtmpMuxer/AACRtmpCodec.h
+++ b/src/Extension/AACRtmpCodec.h
@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_AACRTMPCODEC_H
 #define ZLMEDIAKIT_AACRTMPCODEC_H
 
-#include "RtmpCodec.h"
+#include "Rtmp/RtmpCodec.h"
 #include "Extension/Track.h"
 #include "Extension/AAC.h"
 
diff --git a/src/RtspMuxer/AACRtpCodec.cpp b/src/Extension/AACRtpCodec.cpp
similarity index 100%
rename from src/RtspMuxer/AACRtpCodec.cpp
rename to src/Extension/AACRtpCodec.cpp
diff --git a/src/RtspMuxer/AACRtpCodec.h b/src/Extension/AACRtpCodec.h
similarity index 99%
rename from src/RtspMuxer/AACRtpCodec.h
rename to src/Extension/AACRtpCodec.h
index 1bc6d9c0..14cfdd30 100644
--- a/src/RtspMuxer/AACRtpCodec.h
+++ b/src/Extension/AACRtpCodec.h
@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_AACRTPCODEC_H
 #define ZLMEDIAKIT_AACRTPCODEC_H
 
-#include "RtpCodec.h"
+#include "Rtsp/RtpCodec.h"
 #include "Extension/AAC.h"
 namespace mediakit{
 /**
diff --git a/src/Extension/Factory.cpp b/src/Extension/Factory.cpp
index ce8b9b05..1160b9de 100644
--- a/src/Extension/Factory.cpp
+++ b/src/Extension/Factory.cpp
@@ -25,11 +25,11 @@
  */
 
 #include "Factory.h"
-#include "RtmpMuxer/H264RtmpCodec.h"
-#include "RtmpMuxer/AACRtmpCodec.h"
-#include "RtspMuxer/H264RtpCodec.h"
-#include "RtspMuxer/AACRtpCodec.h"
-#include "RtspMuxer/H265RtpCodec.h"
+#include "H264RtmpCodec.h"
+#include "AACRtmpCodec.h"
+#include "H264RtpCodec.h"
+#include "AACRtpCodec.h"
+#include "H265RtpCodec.h"
 
 namespace mediakit{
 
diff --git a/src/Extension/Factory.h b/src/Extension/Factory.h
index a69e83be..b32fe54a 100644
--- a/src/Extension/Factory.h
+++ b/src/Extension/Factory.h
@@ -30,8 +30,8 @@
 #include <string>
 #include "Rtmp/amf.h"
 #include "Extension/Track.h"
-#include "RtspMuxer/RtpCodec.h"
-#include "RtmpMuxer/RtmpCodec.h"
+#include "Rtsp/RtpCodec.h"
+#include "Rtmp/RtmpCodec.h"
 
 using namespace std;
 using namespace toolkit;
diff --git a/src/RtmpMuxer/H264RtmpCodec.cpp b/src/Extension/H264RtmpCodec.cpp
similarity index 100%
rename from src/RtmpMuxer/H264RtmpCodec.cpp
rename to src/Extension/H264RtmpCodec.cpp
diff --git a/src/RtmpMuxer/H264RtmpCodec.h b/src/Extension/H264RtmpCodec.h
similarity index 99%
rename from src/RtmpMuxer/H264RtmpCodec.h
rename to src/Extension/H264RtmpCodec.h
index 03c83f1f..e4bd4bbe 100644
--- a/src/RtmpMuxer/H264RtmpCodec.h
+++ b/src/Extension/H264RtmpCodec.h
@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_H264RTMPCODEC_H
 #define ZLMEDIAKIT_H264RTMPCODEC_H
 
-#include "RtmpCodec.h"
+#include "Rtmp/RtmpCodec.h"
 #include "Extension/Track.h"
 #include "Util/ResourcePool.h"
 #include "Extension/H264.h"
diff --git a/src/RtspMuxer/H264RtpCodec.cpp b/src/Extension/H264RtpCodec.cpp
similarity index 100%
rename from src/RtspMuxer/H264RtpCodec.cpp
rename to src/Extension/H264RtpCodec.cpp
diff --git a/src/RtspMuxer/H264RtpCodec.h b/src/Extension/H264RtpCodec.h
similarity index 99%
rename from src/RtspMuxer/H264RtpCodec.h
rename to src/Extension/H264RtpCodec.h
index ca3bc4f2..4719fe3a 100644
--- a/src/RtspMuxer/H264RtpCodec.h
+++ b/src/Extension/H264RtpCodec.h
@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_H264RTPCODEC_H
 #define ZLMEDIAKIT_H264RTPCODEC_H
 
-#include "RtpCodec.h"
+#include "Rtsp/RtpCodec.h"
 #include "Util/ResourcePool.h"
 #include "Extension/H264.h"
 using namespace toolkit;
diff --git a/src/RtspMuxer/H265RtpCodec.cpp b/src/Extension/H265RtpCodec.cpp
similarity index 100%
rename from src/RtspMuxer/H265RtpCodec.cpp
rename to src/Extension/H265RtpCodec.cpp
diff --git a/src/RtspMuxer/H265RtpCodec.h b/src/Extension/H265RtpCodec.h
similarity index 99%
rename from src/RtspMuxer/H265RtpCodec.h
rename to src/Extension/H265RtpCodec.h
index f2756873..9c42937b 100644
--- a/src/RtspMuxer/H265RtpCodec.h
+++ b/src/Extension/H265RtpCodec.h
@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_H265RTPCODEC_H
 #define ZLMEDIAKIT_H265RTPCODEC_H
 
-#include "RtpCodec.h"
+#include "Rtsp/RtpCodec.h"
 #include "Util/ResourcePool.h"
 #include "Extension/H265.h"
 
diff --git a/src/Http/HttpSession.h b/src/Http/HttpSession.h
index 51171250..f710c4c3 100644
--- a/src/Http/HttpSession.h
+++ b/src/Http/HttpSession.h
@@ -32,7 +32,7 @@
 #include "Network/TcpSession.h"
 #include "Network/TcpServer.h"
 #include "Rtmp/RtmpMediaSource.h"
-#include "RtmpMuxer/FlvMuxer.h"
+#include "Rtmp/FlvMuxer.h"
 #include "HttpRequestSplitter.h"
 #include "WebSocketSplitter.h"
 #include "HttpCookieManager.h"
diff --git a/src/RtmpMuxer/FlvMuxer.cpp b/src/Rtmp/FlvMuxer.cpp
similarity index 100%
rename from src/RtmpMuxer/FlvMuxer.cpp
rename to src/Rtmp/FlvMuxer.cpp
diff --git a/src/RtmpMuxer/FlvMuxer.h b/src/Rtmp/FlvMuxer.h
similarity index 100%
rename from src/RtmpMuxer/FlvMuxer.h
rename to src/Rtmp/FlvMuxer.h
diff --git a/src/RtmpMuxer/RtmpCodec.h b/src/Rtmp/RtmpCodec.h
similarity index 100%
rename from src/RtmpMuxer/RtmpCodec.h
rename to src/Rtmp/RtmpCodec.h
diff --git a/src/RtmpMuxer/RtmpDemuxer.cpp b/src/Rtmp/RtmpDemuxer.cpp
similarity index 100%
rename from src/RtmpMuxer/RtmpDemuxer.cpp
rename to src/Rtmp/RtmpDemuxer.cpp
diff --git a/src/RtmpMuxer/RtmpDemuxer.h b/src/Rtmp/RtmpDemuxer.h
similarity index 100%
rename from src/RtmpMuxer/RtmpDemuxer.h
rename to src/Rtmp/RtmpDemuxer.h
diff --git a/src/Rtmp/RtmpMediaSource.h b/src/Rtmp/RtmpMediaSource.h
index 459c9283..9d3f4d20 100644
--- a/src/Rtmp/RtmpMediaSource.h
+++ b/src/Rtmp/RtmpMediaSource.h
@@ -34,7 +34,7 @@
 #include <unordered_map>
 #include "amf.h"
 #include "Rtmp.h"
-#include "RtmpMuxer/RtmpDemuxer.h"
+#include "RtmpDemuxer.h"
 #include "Common/config.h"
 #include "Common/MediaSource.h"
 #include "Util/util.h"
diff --git a/src/RtmpMuxer/RtmpMediaSourceMuxer.h b/src/Rtmp/RtmpMediaSourceMuxer.h
similarity index 98%
rename from src/RtmpMuxer/RtmpMediaSourceMuxer.h
rename to src/Rtmp/RtmpMediaSourceMuxer.h
index d9b712b4..2887fe6f 100644
--- a/src/RtmpMuxer/RtmpMediaSourceMuxer.h
+++ b/src/Rtmp/RtmpMediaSourceMuxer.h
@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_RTMPMEDIASOURCEMUXER_H
 #define ZLMEDIAKIT_RTMPMEDIASOURCEMUXER_H
 
-#include "RtmpMuxer/RtmpMuxer.h"
+#include "RtmpMuxer.h"
 #include "Rtmp/RtmpMediaSource.h"
 
 namespace mediakit {
diff --git a/src/RtmpMuxer/RtmpMuxer.cpp b/src/Rtmp/RtmpMuxer.cpp
similarity index 100%
rename from src/RtmpMuxer/RtmpMuxer.cpp
rename to src/Rtmp/RtmpMuxer.cpp
diff --git a/src/RtmpMuxer/RtmpMuxer.h b/src/Rtmp/RtmpMuxer.h
similarity index 100%
rename from src/RtmpMuxer/RtmpMuxer.h
rename to src/Rtmp/RtmpMuxer.h
diff --git a/src/Rtmp/RtmpPlayerImp.h b/src/Rtmp/RtmpPlayerImp.h
index 7a46d294..6774e076 100644
--- a/src/Rtmp/RtmpPlayerImp.h
+++ b/src/Rtmp/RtmpPlayerImp.h
@@ -32,7 +32,7 @@
 #include "Common/config.h"
 #include "RtmpPlayer.h"
 #include "RtmpMediaSource.h"
-#include "RtmpMuxer/RtmpDemuxer.h"
+#include "RtmpDemuxer.h"
 #include "Poller/Timer.h"
 #include "Util/TimeTicker.h"
 using namespace toolkit;
diff --git a/src/Rtmp/RtmpToRtspMediaSource.h b/src/Rtmp/RtmpToRtspMediaSource.h
index aa258c90..22dfd076 100644
--- a/src/Rtmp/RtmpToRtspMediaSource.h
+++ b/src/Rtmp/RtmpToRtspMediaSource.h
@@ -37,9 +37,9 @@
 #include "amf.h"
 #include "Rtmp.h"
 #include "RtmpMediaSource.h"
-#include "RtmpMuxer/RtmpDemuxer.h"
+#include "RtmpDemuxer.h"
 #include "MediaFile/MediaRecorder.h"
-#include "RtspMuxer/RtspMediaSourceMuxer.h"
+#include "Rtsp/RtspMediaSourceMuxer.h"
 using namespace std;
 using namespace toolkit;
 
diff --git a/src/RtspMuxer/RtpCodec.cpp b/src/Rtsp/RtpCodec.cpp
similarity index 100%
rename from src/RtspMuxer/RtpCodec.cpp
rename to src/Rtsp/RtpCodec.cpp
diff --git a/src/RtspMuxer/RtpCodec.h b/src/Rtsp/RtpCodec.h
similarity index 100%
rename from src/RtspMuxer/RtpCodec.h
rename to src/Rtsp/RtpCodec.h
diff --git a/src/Rtsp/RtpReceiver.h b/src/Rtsp/RtpReceiver.h
index a4a7c807..5ebac35f 100644
--- a/src/Rtsp/RtpReceiver.h
+++ b/src/Rtsp/RtpReceiver.h
@@ -31,7 +31,7 @@
 #include <map>
 #include <string>
 #include <memory>
-#include "RtspMuxer/RtpCodec.h"
+#include "RtpCodec.h"
 #include "RtspMediaSource.h"
 
 using namespace std;
diff --git a/src/RtspMuxer/RtspDemuxer.cpp b/src/Rtsp/RtspDemuxer.cpp
similarity index 100%
rename from src/RtspMuxer/RtspDemuxer.cpp
rename to src/Rtsp/RtspDemuxer.cpp
diff --git a/src/RtspMuxer/RtspDemuxer.h b/src/Rtsp/RtspDemuxer.h
similarity index 98%
rename from src/RtspMuxer/RtspDemuxer.h
rename to src/Rtsp/RtspDemuxer.h
index d2836d2c..a6e692bb 100644
--- a/src/RtspMuxer/RtspDemuxer.h
+++ b/src/Rtsp/RtspDemuxer.h
@@ -30,7 +30,7 @@
 #include <unordered_map>
 #include "Player/PlayerBase.h"
 #include "Util/TimeTicker.h"
-#include "RtspMuxer/RtpCodec.h"
+#include "RtpCodec.h"
 
 using namespace std;
 using namespace toolkit;
diff --git a/src/Rtsp/RtspMediaSource.h b/src/Rtsp/RtspMediaSource.h
index 5778ef15..ef888ff7 100644
--- a/src/Rtsp/RtspMediaSource.h
+++ b/src/Rtsp/RtspMediaSource.h
@@ -34,7 +34,7 @@
 #include <unordered_map>
 #include "Common/config.h"
 #include "Common/MediaSource.h"
-#include "RtspMuxer/RtpCodec.h"
+#include "RtpCodec.h"
 
 #include "Util/logger.h"
 #include "Util/RingBuffer.h"
diff --git a/src/RtspMuxer/RtspMediaSourceMuxer.h b/src/Rtsp/RtspMediaSourceMuxer.h
similarity index 98%
rename from src/RtspMuxer/RtspMediaSourceMuxer.h
rename to src/Rtsp/RtspMediaSourceMuxer.h
index 4bb1904e..f4637942 100644
--- a/src/RtspMuxer/RtspMediaSourceMuxer.h
+++ b/src/Rtsp/RtspMediaSourceMuxer.h
@@ -27,7 +27,7 @@
 #ifndef ZLMEDIAKIT_RTSPMEDIASOURCEMUXER_H
 #define ZLMEDIAKIT_RTSPMEDIASOURCEMUXER_H
 
-#include "RtspMuxer/RtspMuxer.h"
+#include "RtspMuxer.h"
 #include "Rtsp/RtspMediaSource.h"
 
 namespace mediakit {
diff --git a/src/RtspMuxer/RtspMuxer.cpp b/src/Rtsp/RtspMuxer.cpp
similarity index 100%
rename from src/RtspMuxer/RtspMuxer.cpp
rename to src/Rtsp/RtspMuxer.cpp
diff --git a/src/RtspMuxer/RtspMuxer.h b/src/Rtsp/RtspMuxer.h
similarity index 100%
rename from src/RtspMuxer/RtspMuxer.h
rename to src/Rtsp/RtspMuxer.h
diff --git a/src/Rtsp/RtspPlayerImp.h b/src/Rtsp/RtspPlayerImp.h
index 82525746..68bf53cc 100644
--- a/src/Rtsp/RtspPlayerImp.h
+++ b/src/Rtsp/RtspPlayerImp.h
@@ -32,7 +32,7 @@
 #include <functional>
 #include "Common/config.h"
 #include "RtspPlayer.h"
-#include "RtspMuxer/RtspDemuxer.h"
+#include "RtspDemuxer.h"
 #include "Poller/Timer.h"
 #include "Util/TimeTicker.h"
 
diff --git a/src/Rtsp/RtspToRtmpMediaSource.h b/src/Rtsp/RtspToRtmpMediaSource.h
index a724e8cb..1c1531cb 100644
--- a/src/Rtsp/RtspToRtmpMediaSource.h
+++ b/src/Rtsp/RtspToRtmpMediaSource.h
@@ -31,8 +31,8 @@
 #include "RtspMediaSource.h"
 #include "MediaFile/MediaRecorder.h"
 #include "Rtmp/RtmpMediaSource.h"
-#include "RtspMuxer/RtspDemuxer.h"
-#include "RtmpMuxer/RtmpMediaSourceMuxer.h"
+#include "RtspDemuxer.h"
+#include "Rtmp/RtmpMediaSourceMuxer.h"
 
 using namespace toolkit;
 
diff --git a/tests/test_server.cpp b/tests/test_server.cpp
index 6416f685..df30a0c8 100644
--- a/tests/test_server.cpp
+++ b/tests/test_server.cpp
@@ -41,7 +41,7 @@
 #include "Rtsp/RtspSession.h"
 #include "Rtmp/RtmpSession.h"
 #include "Shell/ShellSession.h"
-#include "RtmpMuxer/FlvMuxer.h"
+#include "Rtmp/FlvMuxer.h"
 #include "Player/PlayerProxy.h"
 #include "Http/WebSocketSession.h"