diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e102af9..93359f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,9 +3,7 @@ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 
 ADD_EXECUTABLE(cjsegment segment.cpp)
 ADD_EXECUTABLE(cjserver server.cpp)
-TARGET_LINK_LIBRARIES(cjserver husky pthread)
-
-LINK_DIRECTORIES(Husky)
+TARGET_LINK_LIBRARIES(cjserver pthread)
 
 INSTALL(TARGETS cjsegment RUNTIME DESTINATION bin)
 INSTALL(TARGETS cjserver RUNTIME DESTINATION bin)
diff --git a/src/Husky/HttpReqInfo.hpp b/src/Husky/HttpReqInfo.hpp
index 4df9eef..c0fa92a 100644
--- a/src/Husky/HttpReqInfo.hpp
+++ b/src/Husky/HttpReqInfo.hpp
@@ -3,7 +3,7 @@
 
 #include <iostream>
 #include <string>
-#include "Limonp/logger.hpp"
+#include "../Limonp/logger.hpp"
 
 namespace Husky
 {
diff --git a/src/server.cpp b/src/server.cpp
index 2545248..9432d60 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -5,8 +5,7 @@
 #include <string.h>
 #include "Limonp/ArgvContext.hpp"
 #include "Limonp/Config.hpp"
-#include "Husky/Daemon.h"
-#include "Husky/ServerFrame.h"
+#include "Husky/ServerFrame.hpp"
 #include "MPSegment.hpp"
 #include "HMMSegment.hpp"
 #include "MixSegment.hpp"
@@ -92,16 +91,7 @@ bool run(int argc, char** argv)
 
     ReqHandler reqHandler(dictPath, modelPath);
     ServerFrame sf(port, threadNum, &reqHandler);
-    Daemon daemon(&sf, pidFile.c_str());
-    if(arg["-k"] == "start")
-    {
-        return daemon.start();
-    }
-    else if(arg["-k"] == "stop")
-    {
-        return daemon.stop();
-    }
-    return false;
+    return sf.init() && sf.run();
 }
 
 int main(int argc, char* argv[])