diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandler.cpp b/YACReaderLibrary/server/lib/httpserver/httpconnectionhandler.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandler.cpp
rename to YACReaderLibrary/server/lib/httpserver/httpconnectionhandler.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandler.h b/YACReaderLibrary/server/lib/httpserver/httpconnectionhandler.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandler.h
rename to YACReaderLibrary/server/lib/httpserver/httpconnectionhandler.h
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandlerpool.cpp b/YACReaderLibrary/server/lib/httpserver/httpconnectionhandlerpool.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandlerpool.cpp
rename to YACReaderLibrary/server/lib/httpserver/httpconnectionhandlerpool.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandlerpool.h b/YACReaderLibrary/server/lib/httpserver/httpconnectionhandlerpool.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpconnectionhandlerpool.h
rename to YACReaderLibrary/server/lib/httpserver/httpconnectionhandlerpool.h
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpcookie.cpp b/YACReaderLibrary/server/lib/httpserver/httpcookie.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpcookie.cpp
rename to YACReaderLibrary/server/lib/httpserver/httpcookie.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpcookie.h b/YACReaderLibrary/server/lib/httpserver/httpcookie.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpcookie.h
rename to YACReaderLibrary/server/lib/httpserver/httpcookie.h
diff --git a/YACReaderLibrary/server/lib/httpserver/httpglobal.cpp b/YACReaderLibrary/server/lib/httpserver/httpglobal.cpp
new file mode 100644
index 00000000..dfdf9cd4
--- /dev/null
+++ b/YACReaderLibrary/server/lib/httpserver/httpglobal.cpp
@@ -0,0 +1,7 @@
+#include "httpglobal.h"
+
+const char* getQtWebAppLibVersion()
+{
+    return "1.5.3";
+}
+
diff --git a/YACReaderLibrary/server/lib/httpserver/httpglobal.h b/YACReaderLibrary/server/lib/httpserver/httpglobal.h
new file mode 100644
index 00000000..a4ccbd3e
--- /dev/null
+++ b/YACReaderLibrary/server/lib/httpserver/httpglobal.h
@@ -0,0 +1,27 @@
+/**
+  @file
+  @author Stefan Frings
+*/
+
+#ifndef HTTPGLOBAL_H
+#define HTTPGLOBAL_H
+
+#include <QtGlobal>
+
+// This is specific to Windows dll's
+#if defined(Q_OS_WIN)
+    #if defined(QTWEBAPPLIB_EXPORT)
+        #define DECLSPEC Q_DECL_EXPORT
+    #elif defined(QTWEBAPPLIB_IMPORT)
+        #define DECLSPEC Q_DECL_IMPORT
+    #endif
+#endif
+#if !defined(DECLSPEC)
+    #define DECLSPEC
+#endif
+
+/** Get the library version number */
+DECLSPEC const char* getQtWebAppLibVersion();
+
+#endif // HTTPGLOBAL_H
+
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httplistener.cpp b/YACReaderLibrary/server/lib/httpserver/httplistener.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httplistener.cpp
rename to YACReaderLibrary/server/lib/httpserver/httplistener.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httplistener.h b/YACReaderLibrary/server/lib/httpserver/httplistener.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httplistener.h
rename to YACReaderLibrary/server/lib/httpserver/httplistener.h
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httprequest.cpp b/YACReaderLibrary/server/lib/httpserver/httprequest.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httprequest.cpp
rename to YACReaderLibrary/server/lib/httpserver/httprequest.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httprequest.h b/YACReaderLibrary/server/lib/httpserver/httprequest.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httprequest.h
rename to YACReaderLibrary/server/lib/httpserver/httprequest.h
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httprequesthandler.cpp b/YACReaderLibrary/server/lib/httpserver/httprequesthandler.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httprequesthandler.cpp
rename to YACReaderLibrary/server/lib/httpserver/httprequesthandler.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httprequesthandler.h b/YACReaderLibrary/server/lib/httpserver/httprequesthandler.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httprequesthandler.h
rename to YACReaderLibrary/server/lib/httpserver/httprequesthandler.h
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpresponse.cpp b/YACReaderLibrary/server/lib/httpserver/httpresponse.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpresponse.cpp
rename to YACReaderLibrary/server/lib/httpserver/httpresponse.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpresponse.h b/YACReaderLibrary/server/lib/httpserver/httpresponse.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpresponse.h
rename to YACReaderLibrary/server/lib/httpserver/httpresponse.h
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/bfHttpServer.pri b/YACReaderLibrary/server/lib/httpserver/httpserver.pri
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/bfHttpServer.pri
rename to YACReaderLibrary/server/lib/httpserver/httpserver.pri
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpsession.cpp b/YACReaderLibrary/server/lib/httpserver/httpsession.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpsession.cpp
rename to YACReaderLibrary/server/lib/httpserver/httpsession.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpsession.h b/YACReaderLibrary/server/lib/httpserver/httpsession.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpsession.h
rename to YACReaderLibrary/server/lib/httpserver/httpsession.h
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpsessionstore.cpp b/YACReaderLibrary/server/lib/httpserver/httpsessionstore.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpsessionstore.cpp
rename to YACReaderLibrary/server/lib/httpserver/httpsessionstore.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpsessionstore.h b/YACReaderLibrary/server/lib/httpserver/httpsessionstore.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/httpsessionstore.h
rename to YACReaderLibrary/server/lib/httpserver/httpsessionstore.h
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp b/YACReaderLibrary/server/lib/httpserver/staticfilecontroller.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.cpp
rename to YACReaderLibrary/server/lib/httpserver/staticfilecontroller.cpp
diff --git a/YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.h b/YACReaderLibrary/server/lib/httpserver/staticfilecontroller.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfHttpServer/staticfilecontroller.h
rename to YACReaderLibrary/server/lib/httpserver/staticfilecontroller.h
diff --git a/YACReaderLibrary/server/lib/bfLogging/dualfilelogger.cpp b/YACReaderLibrary/server/lib/logging/dualfilelogger.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/dualfilelogger.cpp
rename to YACReaderLibrary/server/lib/logging/dualfilelogger.cpp
diff --git a/YACReaderLibrary/server/lib/bfLogging/dualfilelogger.h b/YACReaderLibrary/server/lib/logging/dualfilelogger.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/dualfilelogger.h
rename to YACReaderLibrary/server/lib/logging/dualfilelogger.h
diff --git a/YACReaderLibrary/server/lib/bfLogging/filelogger.cpp b/YACReaderLibrary/server/lib/logging/filelogger.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/filelogger.cpp
rename to YACReaderLibrary/server/lib/logging/filelogger.cpp
diff --git a/YACReaderLibrary/server/lib/bfLogging/filelogger.h b/YACReaderLibrary/server/lib/logging/filelogger.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/filelogger.h
rename to YACReaderLibrary/server/lib/logging/filelogger.h
diff --git a/YACReaderLibrary/server/lib/bfLogging/logger.cpp b/YACReaderLibrary/server/lib/logging/logger.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/logger.cpp
rename to YACReaderLibrary/server/lib/logging/logger.cpp
diff --git a/YACReaderLibrary/server/lib/bfLogging/logger.h b/YACReaderLibrary/server/lib/logging/logger.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/logger.h
rename to YACReaderLibrary/server/lib/logging/logger.h
diff --git a/YACReaderLibrary/server/lib/bfLogging/bfLogging.pri b/YACReaderLibrary/server/lib/logging/logging.pri
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/bfLogging.pri
rename to YACReaderLibrary/server/lib/logging/logging.pri
diff --git a/YACReaderLibrary/server/lib/logging/logglobal.h b/YACReaderLibrary/server/lib/logging/logglobal.h
new file mode 100644
index 00000000..47b2151e
--- /dev/null
+++ b/YACReaderLibrary/server/lib/logging/logglobal.h
@@ -0,0 +1,24 @@
+/**
+  @file
+  @author Stefan Frings
+*/
+
+#ifndef LOGGLOBAL_H
+#define LOGGLOBAL_H
+
+#include <QtGlobal>
+
+// This is specific to Windows dll's
+#if defined(Q_OS_WIN)
+    #if defined(QTWEBAPPLIB_EXPORT)
+        #define DECLSPEC Q_DECL_EXPORT
+    #elif defined(QTWEBAPPLIB_IMPORT)
+        #define DECLSPEC Q_DECL_IMPORT
+    #endif
+#endif
+#if !defined(DECLSPEC)
+    #define DECLSPEC
+#endif
+
+#endif // LOGGLOBAL_H
+
diff --git a/YACReaderLibrary/server/lib/bfLogging/logmessage.cpp b/YACReaderLibrary/server/lib/logging/logmessage.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/logmessage.cpp
rename to YACReaderLibrary/server/lib/logging/logmessage.cpp
diff --git a/YACReaderLibrary/server/lib/bfLogging/logmessage.h b/YACReaderLibrary/server/lib/logging/logmessage.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfLogging/logmessage.h
rename to YACReaderLibrary/server/lib/logging/logmessage.h
diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/template.cpp b/YACReaderLibrary/server/lib/templateengine/template.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfTemplateEngine/template.cpp
rename to YACReaderLibrary/server/lib/templateengine/template.cpp
diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/template.h b/YACReaderLibrary/server/lib/templateengine/template.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfTemplateEngine/template.h
rename to YACReaderLibrary/server/lib/templateengine/template.h
diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/templatecache.cpp b/YACReaderLibrary/server/lib/templateengine/templatecache.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfTemplateEngine/templatecache.cpp
rename to YACReaderLibrary/server/lib/templateengine/templatecache.cpp
diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/templatecache.h b/YACReaderLibrary/server/lib/templateengine/templatecache.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfTemplateEngine/templatecache.h
rename to YACReaderLibrary/server/lib/templateengine/templatecache.h
diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/bfTemplateEngine.pri b/YACReaderLibrary/server/lib/templateengine/templateengine.pri
similarity index 100%
rename from YACReaderLibrary/server/lib/bfTemplateEngine/bfTemplateEngine.pri
rename to YACReaderLibrary/server/lib/templateengine/templateengine.pri
diff --git a/YACReaderLibrary/server/lib/templateengine/templateglobal.h b/YACReaderLibrary/server/lib/templateengine/templateglobal.h
new file mode 100644
index 00000000..c15ffda7
--- /dev/null
+++ b/YACReaderLibrary/server/lib/templateengine/templateglobal.h
@@ -0,0 +1,24 @@
+/**
+  @file
+  @author Stefan Frings
+*/
+
+#ifndef TEMPLATEGLOBAL_H
+#define TEMPLATEGLOBAL_H
+
+#include <QtGlobal>
+
+// This is specific to Windows dll's
+#if defined(Q_OS_WIN)
+    #if defined(QTWEBAPPLIB_EXPORT)
+        #define DECLSPEC Q_DECL_EXPORT
+    #elif defined(QTWEBAPPLIB_IMPORT)
+        #define DECLSPEC Q_DECL_IMPORT
+    #endif
+#endif
+#if !defined(DECLSPEC)
+    #define DECLSPEC
+#endif
+
+#endif // TEMPLATEGLOBAL_H
+
diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp b/YACReaderLibrary/server/lib/templateengine/templateloader.cpp
similarity index 100%
rename from YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp
rename to YACReaderLibrary/server/lib/templateengine/templateloader.cpp
diff --git a/YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.h b/YACReaderLibrary/server/lib/templateengine/templateloader.h
similarity index 100%
rename from YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.h
rename to YACReaderLibrary/server/lib/templateengine/templateloader.h
diff --git a/YACReaderLibrary/server/server.pri b/YACReaderLibrary/server/server.pri
index 5b903135..b47413c6 100644
--- a/YACReaderLibrary/server/server.pri
+++ b/YACReaderLibrary/server/server.pri
@@ -41,8 +41,8 @@ SOURCES += \
     $$PWD/controllers/foldercontentcontroller.cpp \
     $$PWD/controllers/tagscontroller.cpp
 	
-include(lib/bfLogging/bfLogging.pri)
-include(lib/bfHttpServer/bfHttpServer.pri)
-include(lib/bfTemplateEngine/bfTemplateEngine.pri)
+include(lib/logging/logging.pri)
+include(lib/httpserver/httpserver.pri)
+include(lib/templateengine/templateengine.pri)
 
 DEFINES += SERVER_VERSION_NUMBER=\\\"2.0\\\"