diff --git a/X64/makefile b/X64/makefile
index c2bbb9df..9a6b8c5e 100644
--- a/X64/makefile
+++ b/X64/makefile
@@ -18,8 +18,8 @@ RM := rm -rf
 -include src/Http/subdir.mk
 -include src/H264/subdir.mk
 -include src/Device/subdir.mk
+-include src/Common/subdir.mk
 -include src/Codec/subdir.mk
--include src/subdir.mk
 -include subdir.mk
 -include objects.mk
 
diff --git a/X64/sources.mk b/X64/sources.mk
index 516f19ae..a9c5d95c 100644
--- a/X64/sources.mk
+++ b/X64/sources.mk
@@ -24,6 +24,7 @@ CPP_DEPS :=
 # Every subdirectory with source files must be described here
 SUBDIRS := \
 src/Codec \
+src/Common \
 src/Device \
 src/H264 \
 src/Http \
@@ -33,6 +34,5 @@ src/RTP \
 src/Rtmp \
 src/Rtsp \
 src/Shell \
-src \
 test \
 
diff --git a/src/Common/config.cpp b/src/Common/config.cpp
index a541536b..28d6c8f8 100644
--- a/src/Common/config.cpp
+++ b/src/Common/config.cpp
@@ -1,4 +1,4 @@
-#include "config.h"
+#include "Common/config.h"
 #include "Util/util.h"
 #include "Util/onceToken.h"
 #include "Network/sockutil.h"
diff --git a/src/Device/PlayerProxy.cpp b/src/Device/PlayerProxy.cpp
index 2be2a711..5216dc95 100644
--- a/src/Device/PlayerProxy.cpp
+++ b/src/Device/PlayerProxy.cpp
@@ -5,7 +5,7 @@
  *      Author: xzl
  */
 
-#include "config.h"
+#include "Common/config.h"
 #include "PlayerProxy.h"
 #include "Util/mini.h"
 #include "Util/MD5.h"
diff --git a/src/Http/HttpSession.cpp b/src/Http/HttpSession.cpp
index ab6f2c53..5673871f 100644
--- a/src/Http/HttpSession.cpp
+++ b/src/Http/HttpSession.cpp
@@ -10,7 +10,7 @@
 #include <algorithm>
 #include <dirent.h>
 
-#include "config.h"
+#include "Common/config.h"
 #include "strCoding.h"
 #include "HttpSession.h"
 #include "Util/File.h"
diff --git a/src/Http/HttpSession.h b/src/Http/HttpSession.h
index c16f51a6..1370d6ba 100644
--- a/src/Http/HttpSession.h
+++ b/src/Http/HttpSession.h
@@ -9,7 +9,7 @@
 #define SRC_HTTP_HTTPSESSION_H_
 
 #include <functional>
-#include "config.h"
+#include "Common/config.h"
 #include "Rtsp/Rtsp.h"
 #include "Network/TcpLimitedSession.h"
 
diff --git a/src/MediaFile/HLSMaker.h b/src/MediaFile/HLSMaker.h
index d1ece54c..2041dfcf 100644
--- a/src/MediaFile/HLSMaker.h
+++ b/src/MediaFile/HLSMaker.h
@@ -9,7 +9,7 @@
 #define HLSMAKER_H_
 
 #include "TSMaker.h"
-#include "config.h"
+#include "Common/config.h"
 #include "Util/TimeTicker.h"
 #include "Util/File.h"
 #include "Util/util.h"
diff --git a/src/MediaFile/MediaReader.cpp b/src/MediaFile/MediaReader.cpp
index 6b3d746a..d6fd4d55 100644
--- a/src/MediaFile/MediaReader.cpp
+++ b/src/MediaFile/MediaReader.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "MediaReader.h"
-#include "config.h"
+#include "Common/config.h"
 #include "Util/mini.h"
 #include "Http/HttpSession.h"
 
diff --git a/src/MediaFile/MediaRecorder.cpp b/src/MediaFile/MediaRecorder.cpp
index 4e74c81e..22c7642b 100644
--- a/src/MediaFile/MediaRecorder.cpp
+++ b/src/MediaFile/MediaRecorder.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "MediaRecorder.h"
-#include "config.h"
+#include "Common/config.h"
 #include "Http/HttpSession.h"
 #include "Util/util.h"
 #include "Util/mini.h"
diff --git a/src/MediaFile/Mp4Maker.cpp b/src/MediaFile/Mp4Maker.cpp
index d29b8081..9937ba32 100644
--- a/src/MediaFile/Mp4Maker.cpp
+++ b/src/MediaFile/Mp4Maker.cpp
@@ -3,7 +3,7 @@
 
 #include <netinet/in.h>
 #include <sys/stat.h>
-#include "config.h"
+#include "Common/config.h"
 #include "Mp4Maker.h"
 #include "MediaRecorder.h"
 #include "Util/File.h"
diff --git a/src/RTP/RtpMakerAAC.cpp b/src/RTP/RtpMakerAAC.cpp
index 16d0f005..6adee9d3 100644
--- a/src/RTP/RtpMakerAAC.cpp
+++ b/src/RTP/RtpMakerAAC.cpp
@@ -6,7 +6,7 @@
  */
 
 #include <netinet/in.h>
-#include "config.h"
+#include "Common/config.h"
 #include "RtpMakerAAC.h"
 #include "Util/mini.h"
 
diff --git a/src/RTP/RtpMakerH264.cpp b/src/RTP/RtpMakerH264.cpp
index 487ffdeb..b613f582 100644
--- a/src/RTP/RtpMakerH264.cpp
+++ b/src/RTP/RtpMakerH264.cpp
@@ -6,7 +6,7 @@
  */
 
 #include <netinet/in.h>
-#include "config.h"
+#include "Common/config.h"
 #include "RtpMakerH264.h"
 #include "Util/mini.h"
 
diff --git a/src/Rtmp/RtmpMediaSource.h b/src/Rtmp/RtmpMediaSource.h
index 30cdda09..5afa2cce 100644
--- a/src/Rtmp/RtmpMediaSource.h
+++ b/src/Rtmp/RtmpMediaSource.h
@@ -16,8 +16,8 @@
 #include <unordered_map>
 #include "amf.h"
 #include "Rtmp.h"
-#include "config.h"
-#include "MediaSender.h"
+#include "Common/config.h"
+#include "Common/MediaSender.h"
 #include "Util/util.h"
 #include "Util/logger.h"
 #include "Util/RingBuffer.h"
diff --git a/src/Rtmp/RtmpPlayerImp.h b/src/Rtmp/RtmpPlayerImp.h
index 836c4081..f1b5d79f 100644
--- a/src/Rtmp/RtmpPlayerImp.h
+++ b/src/Rtmp/RtmpPlayerImp.h
@@ -10,7 +10,7 @@
 
 #include <memory>
 #include <functional>
-#include "config.h"
+#include "Common/config.h"
 #include "RtmpPlayer.h"
 #include "RtmpParser.h"
 #include "Poller/Timer.h"
diff --git a/src/Rtmp/RtmpSession.h b/src/Rtmp/RtmpSession.h
index a5ee0d21..f41c7e27 100644
--- a/src/Rtmp/RtmpSession.h
+++ b/src/Rtmp/RtmpSession.h
@@ -13,7 +13,7 @@
 #include "amf.h"
 #include "Rtmp.h"
 #include "utils.h"
-#include "config.h"
+#include "Common/config.h"
 #include "RtmpProtocol.h"
 #include "RtmpToRtspMediaSource.h"
 #include "Util/util.h"
diff --git a/src/Rtmp/RtmpToRtspMediaSource.cpp b/src/Rtmp/RtmpToRtspMediaSource.cpp
index 682f4969..c08c01c0 100644
--- a/src/Rtmp/RtmpToRtspMediaSource.cpp
+++ b/src/Rtmp/RtmpToRtspMediaSource.cpp
@@ -5,7 +5,7 @@
  *      Author: xzl
  */
 
-#include "config.h"
+#include "Common/config.h"
 #include "RtmpToRtspMediaSource.h"
 #include "Util/util.h"
 #include "Device/base64.h"
diff --git a/src/Rtsp/RtpBroadCaster.h b/src/Rtsp/RtpBroadCaster.h
index a128b06b..bf1c0bbf 100644
--- a/src/Rtsp/RtpBroadCaster.h
+++ b/src/Rtsp/RtpBroadCaster.h
@@ -14,7 +14,7 @@
 #include <memory>
 #include <unordered_set>
 #include <unordered_map>
-#include "config.h"
+#include "Common/config.h"
 #include "RtspMediaSource.h"
 #include "Util/mini.h"
 #include "Network/Socket.h"
diff --git a/src/Rtsp/Rtsp.h b/src/Rtsp/Rtsp.h
index 0fe3ac91..494b597e 100644
--- a/src/Rtsp/Rtsp.h
+++ b/src/Rtsp/Rtsp.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <memory>
 #include <unordered_map>
-#include "config.h"
+#include "Common/config.h"
 
 using namespace std;
 
diff --git a/src/Rtsp/RtspMediaSource.h b/src/Rtsp/RtspMediaSource.h
index 77275d35..a9b5390a 100644
--- a/src/Rtsp/RtspMediaSource.h
+++ b/src/Rtsp/RtspMediaSource.h
@@ -13,9 +13,9 @@
 #include <memory>
 #include <functional>
 #include <unordered_map>
-#include "config.h"
 #include "Rtsp.h"
-#include "MediaSender.h"
+#include "Common/config.h"
+#include "Common/MediaSender.h"
 #include "Util/logger.h"
 #include "Util/RingBuffer.h"
 #include "Util/TimeTicker.h"
diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp
index cb5ea0bd..359a1d72 100644
--- a/src/Rtsp/RtspPlayer.cpp
+++ b/src/Rtsp/RtspPlayer.cpp
@@ -4,7 +4,7 @@
 #include <algorithm>
 #include <arpa/inet.h>
 
-#include "config.h"
+#include "Common/config.h"
 #include "RtspPlayer.h"
 #include "Device/base64.h"
 #include "H264/SPSParser.h"
diff --git a/src/Rtsp/RtspPlayerImp.h b/src/Rtsp/RtspPlayerImp.h
index c55d1d9c..e55d99a9 100644
--- a/src/Rtsp/RtspPlayerImp.h
+++ b/src/Rtsp/RtspPlayerImp.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <algorithm>
 #include <functional>
-#include "config.h"
+#include "Common/config.h"
 #include "RtpParser.h"
 #include "RtspPlayer.h"
 #include "Poller/Timer.h"
diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp
index 25ed72b4..79cf08e2 100644
--- a/src/Rtsp/RtspSession.cpp
+++ b/src/Rtsp/RtspSession.cpp
@@ -7,7 +7,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <atomic>
-#include "config.h"
+#include "Common/config.h"
 #include "UDPServer.h"
 #include "RtspSession.h"
 #include "Device/base64.h"
diff --git a/src/Rtsp/RtspSession.h b/src/Rtsp/RtspSession.h
index 67703ed6..3deceae3 100644
--- a/src/Rtsp/RtspSession.h
+++ b/src/Rtsp/RtspSession.h
@@ -12,7 +12,7 @@
 #include <set>
 #include <vector>
 #include <unordered_map>
-#include "config.h"
+#include "Common/config.h"
 #include "Rtsp.h"
 #include "RtpBroadCaster.h"
 #include "RtspMediaSource.h"
diff --git a/src/Rtsp/RtspToRtmpMediaSource.cpp b/src/Rtsp/RtspToRtmpMediaSource.cpp
index fc2e1be6..3510fa35 100644
--- a/src/Rtsp/RtspToRtmpMediaSource.cpp
+++ b/src/Rtsp/RtspToRtmpMediaSource.cpp
@@ -12,7 +12,7 @@
 #include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
-#include "config.h"
+#include "Common/config.h"
 #include "Rtmp/Rtmp.h"
 #include "RtspToRtmpMediaSource.h"
 #include "Util/util.h"
diff --git a/src/Shell/ShellSession.cpp b/src/Shell/ShellSession.cpp
index 43877993..7e78eb8c 100644
--- a/src/Shell/ShellSession.cpp
+++ b/src/Shell/ShellSession.cpp
@@ -5,7 +5,7 @@
  *      Author: xzl
  */
 
-#include "config.h"
+#include "Common/config.h"
 #include "ShellSession.h"
 #include "Util/logger.h"
 #include "Util/util.h"
diff --git a/src/Shell/ShellSession.h b/src/Shell/ShellSession.h
index 55f7bc48..cadec641 100644
--- a/src/Shell/ShellSession.h
+++ b/src/Shell/ShellSession.h
@@ -10,7 +10,7 @@
 
 #include <functional>
 #include "CMD.h"
-#include "config.h"
+#include "Common/config.h"
 #include "Util/TimeTicker.h"
 #include "Network/TcpLimitedSession.h"