diff --git a/demo/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from demo/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/cppjieba/CMakeLists.txt b/src/cppjieba/CMakeLists.txt
similarity index 99%
rename from cppjieba/CMakeLists.txt
rename to src/cppjieba/CMakeLists.txt
index 03d0ae0..897d1e2 100644
--- a/cppjieba/CMakeLists.txt
+++ b/src/cppjieba/CMakeLists.txt
@@ -6,6 +6,5 @@ ADD_LIBRARY(cppjieba SHARED ${LIBCPPJIEBA_SRC})
 
 SET_TARGET_PROPERTIES(cppjieba PROPERTIES VERSION 1.2 SOVERSION 1)
 
-
 INSTALL(TARGETS cppjieba LIBRARY DESTINATION lib/CppJieba)
 INSTALL(FILES ChineseFilter.hpp HMMSegment.h KeyWordExt.h MPSegment.h structs.h Trie.h globals.h          ISegment.hpp  MixSegment.h  SegmentBase.hpp  TransCode.hpp  DESTINATION include/CppJieba)
diff --git a/cppjieba/ChineseFilter.hpp b/src/cppjieba/ChineseFilter.hpp
similarity index 100%
rename from cppjieba/ChineseFilter.hpp
rename to src/cppjieba/ChineseFilter.hpp
diff --git a/cppjieba/HMMSegment.cpp b/src/cppjieba/HMMSegment.cpp
similarity index 100%
rename from cppjieba/HMMSegment.cpp
rename to src/cppjieba/HMMSegment.cpp
diff --git a/cppjieba/HMMSegment.h b/src/cppjieba/HMMSegment.h
similarity index 100%
rename from cppjieba/HMMSegment.h
rename to src/cppjieba/HMMSegment.h
diff --git a/cppjieba/ISegment.hpp b/src/cppjieba/ISegment.hpp
similarity index 100%
rename from cppjieba/ISegment.hpp
rename to src/cppjieba/ISegment.hpp
diff --git a/cppjieba/KeyWordExt.cpp b/src/cppjieba/KeyWordExt.cpp
similarity index 100%
rename from cppjieba/KeyWordExt.cpp
rename to src/cppjieba/KeyWordExt.cpp
diff --git a/cppjieba/KeyWordExt.h b/src/cppjieba/KeyWordExt.h
similarity index 100%
rename from cppjieba/KeyWordExt.h
rename to src/cppjieba/KeyWordExt.h
diff --git a/cppjieba/MPSegment.cpp b/src/cppjieba/MPSegment.cpp
similarity index 100%
rename from cppjieba/MPSegment.cpp
rename to src/cppjieba/MPSegment.cpp
diff --git a/cppjieba/MPSegment.h b/src/cppjieba/MPSegment.h
similarity index 100%
rename from cppjieba/MPSegment.h
rename to src/cppjieba/MPSegment.h
diff --git a/cppjieba/MixSegment.cpp b/src/cppjieba/MixSegment.cpp
similarity index 100%
rename from cppjieba/MixSegment.cpp
rename to src/cppjieba/MixSegment.cpp
diff --git a/cppjieba/MixSegment.h b/src/cppjieba/MixSegment.h
similarity index 100%
rename from cppjieba/MixSegment.h
rename to src/cppjieba/MixSegment.h
diff --git a/cppjieba/SegmentBase.hpp b/src/cppjieba/SegmentBase.hpp
similarity index 100%
rename from cppjieba/SegmentBase.hpp
rename to src/cppjieba/SegmentBase.hpp
diff --git a/cppjieba/TransCode.hpp b/src/cppjieba/TransCode.hpp
similarity index 100%
rename from cppjieba/TransCode.hpp
rename to src/cppjieba/TransCode.hpp
diff --git a/cppjieba/Trie.cpp b/src/cppjieba/Trie.cpp
similarity index 100%
rename from cppjieba/Trie.cpp
rename to src/cppjieba/Trie.cpp
diff --git a/cppjieba/Trie.h b/src/cppjieba/Trie.h
similarity index 100%
rename from cppjieba/Trie.h
rename to src/cppjieba/Trie.h
diff --git a/cppjieba/globals.h b/src/cppjieba/globals.h
similarity index 100%
rename from cppjieba/globals.h
rename to src/cppjieba/globals.h
diff --git a/cppjieba/structs.h b/src/cppjieba/structs.h
similarity index 100%
rename from cppjieba/structs.h
rename to src/cppjieba/structs.h
diff --git a/husky/CMakeLists.txt b/src/husky/CMakeLists.txt
similarity index 100%
rename from husky/CMakeLists.txt
rename to src/husky/CMakeLists.txt
diff --git a/husky/Daemon.cpp b/src/husky/Daemon.cpp
similarity index 100%
rename from husky/Daemon.cpp
rename to src/husky/Daemon.cpp
diff --git a/husky/Daemon.h b/src/husky/Daemon.h
similarity index 100%
rename from husky/Daemon.h
rename to src/husky/Daemon.h
diff --git a/husky/HttpReqInfo.hpp b/src/husky/HttpReqInfo.hpp
similarity index 100%
rename from husky/HttpReqInfo.hpp
rename to src/husky/HttpReqInfo.hpp
diff --git a/husky/ServerFrame.cpp b/src/husky/ServerFrame.cpp
similarity index 100%
rename from husky/ServerFrame.cpp
rename to src/husky/ServerFrame.cpp
diff --git a/husky/ServerFrame.h b/src/husky/ServerFrame.h
similarity index 100%
rename from husky/ServerFrame.h
rename to src/husky/ServerFrame.h
diff --git a/husky/ThreadManager.hpp b/src/husky/ThreadManager.hpp
similarity index 100%
rename from husky/ThreadManager.hpp
rename to src/husky/ThreadManager.hpp
diff --git a/husky/globals.h b/src/husky/globals.h
similarity index 100%
rename from husky/globals.h
rename to src/husky/globals.h
diff --git a/demo/keywordext.cpp b/src/keywordext.cpp
similarity index 100%
rename from demo/keywordext.cpp
rename to src/keywordext.cpp
diff --git a/limonp/ArgvContext.hpp b/src/limonp/ArgvContext.hpp
similarity index 100%
rename from limonp/ArgvContext.hpp
rename to src/limonp/ArgvContext.hpp
diff --git a/limonp/CMakeLists.txt b/src/limonp/CMakeLists.txt
similarity index 100%
rename from limonp/CMakeLists.txt
rename to src/limonp/CMakeLists.txt
diff --git a/limonp/MysqlClient.hpp b/src/limonp/MysqlClient.hpp
similarity index 100%
rename from limonp/MysqlClient.hpp
rename to src/limonp/MysqlClient.hpp
diff --git a/limonp/cast_functs.hpp b/src/limonp/cast_functs.hpp
similarity index 100%
rename from limonp/cast_functs.hpp
rename to src/limonp/cast_functs.hpp
diff --git a/limonp/config.hpp b/src/limonp/config.hpp
similarity index 100%
rename from limonp/config.hpp
rename to src/limonp/config.hpp
diff --git a/limonp/io_functs.hpp b/src/limonp/io_functs.hpp
similarity index 100%
rename from limonp/io_functs.hpp
rename to src/limonp/io_functs.hpp
diff --git a/limonp/logger.hpp b/src/limonp/logger.hpp
similarity index 100%
rename from limonp/logger.hpp
rename to src/limonp/logger.hpp
diff --git a/limonp/macro_def.hpp b/src/limonp/macro_def.hpp
similarity index 100%
rename from limonp/macro_def.hpp
rename to src/limonp/macro_def.hpp
diff --git a/limonp/map_functs.hpp b/src/limonp/map_functs.hpp
similarity index 100%
rename from limonp/map_functs.hpp
rename to src/limonp/map_functs.hpp
diff --git a/limonp/str_functs.hpp b/src/limonp/str_functs.hpp
similarity index 100%
rename from limonp/str_functs.hpp
rename to src/limonp/str_functs.hpp
diff --git a/demo/segment.cpp b/src/segment.cpp
similarity index 100%
rename from demo/segment.cpp
rename to src/segment.cpp
diff --git a/demo/server.cpp b/src/server.cpp
similarity index 100%
rename from demo/server.cpp
rename to src/server.cpp
diff --git a/demo/testlines.utf8 b/src/testlines.utf8
similarity index 100%
rename from demo/testlines.utf8
rename to src/testlines.utf8