diff --git a/YACReaderLibrary/server/server.pri b/YACReaderLibrary/server/server.pri
index f2850fba..e0f715b5 100644
--- a/YACReaderLibrary/server/server.pri
+++ b/YACReaderLibrary/server/server.pri
@@ -88,11 +88,8 @@ SOURCES += \
     $$PWD/controllers/v2/comicfullinfocontroller_v2.cpp \
     $$PWD/controllers/v2/readinglistinfocontroller_v2.cpp \
     $$PWD/controllers/v2/taginfocontroller_v2.cpp
-	
-
-#include(lib/logging/logging.pri)
-include(lib/httpserver/httpserver.pri)
-include(lib/templateengine/templateengine.pri)
 
+include(../../third_party/QtWebApp/httpserver/httpserver.pri)
+include(../../third_party/QtWebApp/templateengine/templateengine.pri)
 
 DEFINES += SERVER_VERSION_NUMBER=\\\"2.0\\\"
diff --git a/YACReaderLibrary/server/lib/.clang-format b/third_party/QtWebApp/.clang-format
similarity index 100%
rename from YACReaderLibrary/server/lib/.clang-format
rename to third_party/QtWebApp/.clang-format
diff --git a/YACReaderLibrary/server/lib/httpserver/httpconnectionhandler.cpp b/third_party/QtWebApp/httpserver/httpconnectionhandler.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpconnectionhandler.cpp
rename to third_party/QtWebApp/httpserver/httpconnectionhandler.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httpconnectionhandler.h b/third_party/QtWebApp/httpserver/httpconnectionhandler.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpconnectionhandler.h
rename to third_party/QtWebApp/httpserver/httpconnectionhandler.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httpconnectionhandlerpool.cpp b/third_party/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpconnectionhandlerpool.cpp
rename to third_party/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httpconnectionhandlerpool.h b/third_party/QtWebApp/httpserver/httpconnectionhandlerpool.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpconnectionhandlerpool.h
rename to third_party/QtWebApp/httpserver/httpconnectionhandlerpool.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httpcookie.cpp b/third_party/QtWebApp/httpserver/httpcookie.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpcookie.cpp
rename to third_party/QtWebApp/httpserver/httpcookie.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httpcookie.h b/third_party/QtWebApp/httpserver/httpcookie.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpcookie.h
rename to third_party/QtWebApp/httpserver/httpcookie.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httpglobal.cpp b/third_party/QtWebApp/httpserver/httpglobal.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpglobal.cpp
rename to third_party/QtWebApp/httpserver/httpglobal.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httpglobal.h b/third_party/QtWebApp/httpserver/httpglobal.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpglobal.h
rename to third_party/QtWebApp/httpserver/httpglobal.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httplistener.cpp b/third_party/QtWebApp/httpserver/httplistener.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httplistener.cpp
rename to third_party/QtWebApp/httpserver/httplistener.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httplistener.h b/third_party/QtWebApp/httpserver/httplistener.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httplistener.h
rename to third_party/QtWebApp/httpserver/httplistener.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httprequest.cpp b/third_party/QtWebApp/httpserver/httprequest.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httprequest.cpp
rename to third_party/QtWebApp/httpserver/httprequest.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httprequest.h b/third_party/QtWebApp/httpserver/httprequest.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httprequest.h
rename to third_party/QtWebApp/httpserver/httprequest.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httprequesthandler.cpp b/third_party/QtWebApp/httpserver/httprequesthandler.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httprequesthandler.cpp
rename to third_party/QtWebApp/httpserver/httprequesthandler.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httprequesthandler.h b/third_party/QtWebApp/httpserver/httprequesthandler.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httprequesthandler.h
rename to third_party/QtWebApp/httpserver/httprequesthandler.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httpresponse.cpp b/third_party/QtWebApp/httpserver/httpresponse.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpresponse.cpp
rename to third_party/QtWebApp/httpserver/httpresponse.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httpresponse.h b/third_party/QtWebApp/httpserver/httpresponse.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpresponse.h
rename to third_party/QtWebApp/httpserver/httpresponse.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httpserver.pri b/third_party/QtWebApp/httpserver/httpserver.pri
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpserver.pri
rename to third_party/QtWebApp/httpserver/httpserver.pri
diff --git a/YACReaderLibrary/server/lib/httpserver/httpsession.cpp b/third_party/QtWebApp/httpserver/httpsession.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpsession.cpp
rename to third_party/QtWebApp/httpserver/httpsession.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httpsession.h b/third_party/QtWebApp/httpserver/httpsession.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpsession.h
rename to third_party/QtWebApp/httpserver/httpsession.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httpsessionstore.cpp b/third_party/QtWebApp/httpserver/httpsessionstore.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpsessionstore.cpp
rename to third_party/QtWebApp/httpserver/httpsessionstore.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/httpsessionstore.h b/third_party/QtWebApp/httpserver/httpsessionstore.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/httpsessionstore.h
rename to third_party/QtWebApp/httpserver/httpsessionstore.h
diff --git a/YACReaderLibrary/server/lib/httpserver/staticfilecontroller.cpp b/third_party/QtWebApp/httpserver/staticfilecontroller.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/staticfilecontroller.cpp
rename to third_party/QtWebApp/httpserver/staticfilecontroller.cpp
diff --git a/YACReaderLibrary/server/lib/httpserver/staticfilecontroller.h b/third_party/QtWebApp/httpserver/staticfilecontroller.h
similarity index 100%
rename from YACReaderLibrary/server/lib/httpserver/staticfilecontroller.h
rename to third_party/QtWebApp/httpserver/staticfilecontroller.h
diff --git a/YACReaderLibrary/server/lib/logging/dualfilelogger.cpp b/third_party/QtWebApp/logging/dualfilelogger.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/dualfilelogger.cpp
rename to third_party/QtWebApp/logging/dualfilelogger.cpp
diff --git a/YACReaderLibrary/server/lib/logging/dualfilelogger.h b/third_party/QtWebApp/logging/dualfilelogger.h
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/dualfilelogger.h
rename to third_party/QtWebApp/logging/dualfilelogger.h
diff --git a/YACReaderLibrary/server/lib/logging/filelogger.cpp b/third_party/QtWebApp/logging/filelogger.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/filelogger.cpp
rename to third_party/QtWebApp/logging/filelogger.cpp
diff --git a/YACReaderLibrary/server/lib/logging/filelogger.h b/third_party/QtWebApp/logging/filelogger.h
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/filelogger.h
rename to third_party/QtWebApp/logging/filelogger.h
diff --git a/YACReaderLibrary/server/lib/logging/logger.cpp b/third_party/QtWebApp/logging/logger.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/logger.cpp
rename to third_party/QtWebApp/logging/logger.cpp
diff --git a/YACReaderLibrary/server/lib/logging/logger.h b/third_party/QtWebApp/logging/logger.h
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/logger.h
rename to third_party/QtWebApp/logging/logger.h
diff --git a/YACReaderLibrary/server/lib/logging/logging.pri b/third_party/QtWebApp/logging/logging.pri
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/logging.pri
rename to third_party/QtWebApp/logging/logging.pri
diff --git a/YACReaderLibrary/server/lib/logging/logglobal.h b/third_party/QtWebApp/logging/logglobal.h
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/logglobal.h
rename to third_party/QtWebApp/logging/logglobal.h
diff --git a/YACReaderLibrary/server/lib/logging/logmessage.cpp b/third_party/QtWebApp/logging/logmessage.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/logmessage.cpp
rename to third_party/QtWebApp/logging/logmessage.cpp
diff --git a/YACReaderLibrary/server/lib/logging/logmessage.h b/third_party/QtWebApp/logging/logmessage.h
similarity index 100%
rename from YACReaderLibrary/server/lib/logging/logmessage.h
rename to third_party/QtWebApp/logging/logmessage.h
diff --git a/YACReaderLibrary/server/lib/templateengine/template.cpp b/third_party/QtWebApp/templateengine/template.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/templateengine/template.cpp
rename to third_party/QtWebApp/templateengine/template.cpp
diff --git a/YACReaderLibrary/server/lib/templateengine/template.h b/third_party/QtWebApp/templateengine/template.h
similarity index 100%
rename from YACReaderLibrary/server/lib/templateengine/template.h
rename to third_party/QtWebApp/templateengine/template.h
diff --git a/YACReaderLibrary/server/lib/templateengine/templatecache.cpp b/third_party/QtWebApp/templateengine/templatecache.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/templateengine/templatecache.cpp
rename to third_party/QtWebApp/templateengine/templatecache.cpp
diff --git a/YACReaderLibrary/server/lib/templateengine/templatecache.h b/third_party/QtWebApp/templateengine/templatecache.h
similarity index 100%
rename from YACReaderLibrary/server/lib/templateengine/templatecache.h
rename to third_party/QtWebApp/templateengine/templatecache.h
diff --git a/YACReaderLibrary/server/lib/templateengine/templateengine.pri b/third_party/QtWebApp/templateengine/templateengine.pri
similarity index 100%
rename from YACReaderLibrary/server/lib/templateengine/templateengine.pri
rename to third_party/QtWebApp/templateengine/templateengine.pri
diff --git a/YACReaderLibrary/server/lib/templateengine/templateglobal.h b/third_party/QtWebApp/templateengine/templateglobal.h
similarity index 100%
rename from YACReaderLibrary/server/lib/templateengine/templateglobal.h
rename to third_party/QtWebApp/templateengine/templateglobal.h
diff --git a/YACReaderLibrary/server/lib/templateengine/templateloader.cpp b/third_party/QtWebApp/templateengine/templateloader.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/templateengine/templateloader.cpp
rename to third_party/QtWebApp/templateengine/templateloader.cpp
diff --git a/YACReaderLibrary/server/lib/templateengine/templateloader.h b/third_party/QtWebApp/templateengine/templateloader.h
similarity index 100%
rename from YACReaderLibrary/server/lib/templateengine/templateloader.h
rename to third_party/QtWebApp/templateengine/templateloader.h