diff --git a/server-sdk.pri b/server-sdk.pri
deleted file mode 100644
index 88783ab..0000000
--- a/server-sdk.pri
+++ /dev/null
@@ -1 +0,0 @@
-include(src/core/core.pri)
diff --git a/server-sdk.pro b/server-sdk.pro
index 2bc1ef2..e3855b2 100644
--- a/server-sdk.pro
+++ b/server-sdk.pro
@@ -11,3 +11,4 @@ OTHER_FILES += \
     scripts/* \
     doc/Doxy* \
     doc/pages/* \
+    server-sdk.pri \
diff --git a/src/lib/lib.pro b/src/lib/lib.pro
index 34e1b7e..eec2897 100644
--- a/src/lib/lib.pro
+++ b/src/lib/lib.pro
@@ -2,4 +2,4 @@ TEMPLATE = lib
 
 QT += core sql network
 
-include(../core/core.pri)
+include(../serversdk/serversdk.pri)
diff --git a/src/core/compression.cpp b/src/serversdk/compression.cpp
similarity index 100%
rename from src/core/compression.cpp
rename to src/serversdk/compression.cpp
diff --git a/src/core/compression.h b/src/serversdk/compression.h
similarity index 100%
rename from src/core/compression.h
rename to src/serversdk/compression.h
diff --git a/src/core/core.cpp b/src/serversdk/core.cpp
similarity index 100%
rename from src/core/core.cpp
rename to src/serversdk/core.cpp
diff --git a/src/core/core.h b/src/serversdk/core.h
similarity index 90%
rename from src/core/core.h
rename to src/serversdk/core.h
index 4ed67fc..f626317 100644
--- a/src/core/core.h
+++ b/src/serversdk/core.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "core/logger.h"
+#include "serversdk/logger.h"
 
 // Qt
 #include <QtCore>
diff --git a/src/core/databasemanager.cpp b/src/serversdk/databasemanager.cpp
similarity index 100%
rename from src/core/databasemanager.cpp
rename to src/serversdk/databasemanager.cpp
diff --git a/src/core/databasemanager.h b/src/serversdk/databasemanager.h
similarity index 100%
rename from src/core/databasemanager.h
rename to src/serversdk/databasemanager.h
diff --git a/src/core/logger.cpp b/src/serversdk/logger.cpp
similarity index 100%
rename from src/core/logger.cpp
rename to src/serversdk/logger.cpp
diff --git a/src/core/logger.h b/src/serversdk/logger.h
similarity index 100%
rename from src/core/logger.h
rename to src/serversdk/logger.h
diff --git a/src/core/loggermessage.cpp b/src/serversdk/loggermessage.cpp
similarity index 100%
rename from src/core/loggermessage.cpp
rename to src/serversdk/loggermessage.cpp
diff --git a/src/core/loggermessage.h b/src/serversdk/loggermessage.h
similarity index 100%
rename from src/core/loggermessage.h
rename to src/serversdk/loggermessage.h
diff --git a/src/core/request.cpp b/src/serversdk/request.cpp
similarity index 100%
rename from src/core/request.cpp
rename to src/serversdk/request.cpp
diff --git a/src/core/request.h b/src/serversdk/request.h
similarity index 100%
rename from src/core/request.h
rename to src/serversdk/request.h
diff --git a/src/core/requestmanager.cpp b/src/serversdk/requestmanager.cpp
similarity index 100%
rename from src/core/requestmanager.cpp
rename to src/serversdk/requestmanager.cpp
diff --git a/src/core/requestmanager.h b/src/serversdk/requestmanager.h
similarity index 100%
rename from src/core/requestmanager.h
rename to src/serversdk/requestmanager.h
diff --git a/src/core/core.pri b/src/serversdk/serversdk.pri
similarity index 93%
rename from src/core/core.pri
rename to src/serversdk/serversdk.pri
index da112a9..691ecee 100644
--- a/src/core/core.pri
+++ b/src/serversdk/serversdk.pri
@@ -1,7 +1,6 @@
 INCLUDEPATH += $$PWD/..
 CONFIG += c++14
-#SRC_DIR = $$PWD
-message($$PWD)
+
 SOURCES += \
     $$PWD/core.cpp \
     $$PWD/databasemanager.cpp \
@@ -18,6 +17,5 @@ HEADERS += \
     $$PWD/requestmanager.h \
     $$PWD/request.h \
 
-
 # TODO: implement zlib compression
 # include (zlib.pri)
diff --git a/src/core/zlib.pri b/src/serversdk/zlib.pri
similarity index 100%
rename from src/core/zlib.pri
rename to src/serversdk/zlib.pri
diff --git a/src/testapp/main.cpp b/src/testapp/main.cpp
index 04f0c35..bae6db8 100644
--- a/src/testapp/main.cpp
+++ b/src/testapp/main.cpp
@@ -1,4 +1,4 @@
-#include "core/core.h"
+#include "serversdk/core.h"
 
 #include <QCoreApplication>
 #include <QCommandLineParser>
diff --git a/src/testapp/testapp.pro b/src/testapp/testapp.pro
index cc10148..6d684a1 100644
--- a/src/testapp/testapp.pro
+++ b/src/testapp/testapp.pro
@@ -4,4 +4,4 @@ QT += core sql network
 
 SOURCES += main.cpp
 
-include(../core/core.pri)
+include(../serversdk/server-sdk.pri)
diff --git a/test/unittests/tst_request.cpp b/test/unittests/tst_request.cpp
index 5d7a2bc..878e2ad 100644
--- a/test/unittests/tst_request.cpp
+++ b/test/unittests/tst_request.cpp
@@ -1,6 +1,6 @@
 #include "tst_request.h"
 
-#include "core/request.h"
+#include "serversdk/request.h"
 
 namespace core {
 
diff --git a/test/unittests/unittests.pro b/test/unittests/unittests.pro
index 82c1469..cb6d623 100644
--- a/test/unittests/unittests.pro
+++ b/test/unittests/unittests.pro
@@ -6,9 +6,4 @@ SOURCES += \
 HEADERS += \
     tst_request.h
 
-include(../../src/core/core.pri)
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
+include(../../src/serversdk/serversdk.pri)