diff --git a/server-sdk.pro b/server-sdk.pro
index da91e5a..b5eb118 100644
--- a/server-sdk.pro
+++ b/server-sdk.pro
@@ -14,6 +14,7 @@ OTHER_FILES += \
     scripts/* \
     doc/Doxy* \
     doc/pages/* \
-    server-sdk.pri \
+    serversdk.pri \
+    serversdkint.pri \
 
 message($$OUT_ROOT)
diff --git a/serversdk.pri b/serversdk.pri
index a5056a6..f55e356 100644
--- a/serversdk.pri
+++ b/serversdk.pri
@@ -18,7 +18,7 @@ ROOT_OUT=$$replace(OUT_PWD, $$SUBPATH, "")
 #message("SUBPATH        :" $$SUBPATH)
 #message("ROOT_OUT       :" $$ROOT_OUT)
 
-SDKDIR=$$ROOT_OUT/src/serversdk
+SDKDIR=$$ROOT_OUT/server-sdk/src/serversdk
 
 
 win32:CONFIG(release, debug|release): LIBS += -L$$SDKDIR/release/ -lserversdk
@@ -26,8 +26,8 @@ else:win32:CONFIG(debug, debug|release): LIBS += -L$$SDKDIR/debug/ -lserversdk
 else:unix: LIBS += -L$$SDKDIR/ -lserversdk
 
 
-INCLUDEPATH += $$PWD/src/
-DEPENDPATH += $$PWD/src/serversdk
+INCLUDEPATH += $$PWD/server-sdk/src/
+DEPENDPATH += $$PWD/server-sdk/src/serversdk
 
 win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$SDKDIR/release/libserversdk.a
 else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$SDKDIR/debug/libserversdk.a
diff --git a/serversdkint.pri b/serversdkint.pri
new file mode 100644
index 0000000..a5056a6
--- /dev/null
+++ b/serversdkint.pri
@@ -0,0 +1,36 @@
+# Getting 'subpath'
+#
+#  in: /Users/fbucek/Documents/Spaceti/common/server-sdk/src/testapp
+# out: /src/testapp
+SUBPATH=$$_PRO_FILE_PWD_
+SUBPATH=$$replace(SUBPATH, $$PWD, "")
+
+# Getting 'base root output'
+#
+#  in: /Users/fbucek/_temp_/build-server-sdk-5_9_8-Debug/src/testapp
+# out: /Users/fbucek/_temp_/build-server-sdk-5_9_8-Debug
+ROOT_OUT=$$OUT_PWD
+ROOT_OUT=$$replace(OUT_PWD, $$SUBPATH, "")
+
+#message("OUT_PWD        :" $$OUT_PWD)
+#message("PWD            :" $$PWD)
+#message("_PRO_FILE_PWD_ :" $$_PRO_FILE_PWD_)
+#message("SUBPATH        :" $$SUBPATH)
+#message("ROOT_OUT       :" $$ROOT_OUT)
+
+SDKDIR=$$ROOT_OUT/src/serversdk
+
+
+win32:CONFIG(release, debug|release): LIBS += -L$$SDKDIR/release/ -lserversdk
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$SDKDIR/debug/ -lserversdk
+else:unix: LIBS += -L$$SDKDIR/ -lserversdk
+
+
+INCLUDEPATH += $$PWD/src/
+DEPENDPATH += $$PWD/src/serversdk
+
+win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$SDKDIR/release/libserversdk.a
+else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$SDKDIR/debug/libserversdk.a
+else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$SDKDIR/release/serversdk.lib
+else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$SDKDIR/debug/serversdk.lib
+else:unix: PRE_TARGETDEPS += $$SDKDIR/libserversdk.a
diff --git a/src/testapp/testapp.pro b/src/testapp/testapp.pro
index 2435d3a..03fae3a 100644
--- a/src/testapp/testapp.pro
+++ b/src/testapp/testapp.pro
@@ -4,7 +4,4 @@ QT += core sql network
 
 SOURCES += main.cpp
 
-OUTBASE=$$OUT_PWD
-
-SERVERRELATIVE="../.."
-include(../../serversdk.pri) #serversdk/serversdk.pri)
+include(../../serversdkint.pri)
diff --git a/test/unittests/unittests.pro b/test/unittests/unittests.pro
index 8596bae..b1783a9 100644
--- a/test/unittests/unittests.pro
+++ b/test/unittests/unittests.pro
@@ -6,4 +6,4 @@ SOURCES += \
 HEADERS += \
     tst_request.h
 
-include(../../serversdk.pri)
+include(../../serversdkint.pri)