diff --git a/.gitmodules b/.gitmodules
index 33c01ac..a9f0f85 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "server-sdk"]
 	path = server-sdk
-	url = ../../common/server-sdk
+	url = git@gitea.thegolem.cz:michalks/server-sdk.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..f80fc30
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.11.0)
+project(colnodconn)
+message(">> Project colnod-connector")
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+add_subdirectory(server-sdk)
+add_subdirectory(src)
\ No newline at end of file
diff --git a/server-sdk b/server-sdk
index d4c4d75..13d09d2 160000
--- a/server-sdk
+++ b/server-sdk
@@ -1 +1 @@
-Subproject commit d4c4d75b49fe7e0399a6c4e57a7bb32f82bee59d
+Subproject commit 13d09d246cb198291ea5af00ddad3dbd724519cd
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..a256b07
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.1.0)
+project(colnod-connector VERSION 0.1.0)
+
+message(">> APP ${PROJECT_NAME} ${PROJECT_VERSION}")
+
+cmake_policy(SET CMP0063 NEW)
+cmake_policy(SET CMP0075 NEW)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt5 COMPONENTS Core REQUIRED)
+find_package(Qt5 COMPONENTS Sql REQUIRED)
+find_package(Qt5 COMPONENTS Network REQUIRED)
+
+# find all cpp files from app and colnod folders
+# app contains main()
+file(GLOB_RECURSE APP_SOURCE_FILES FILES_MATCHING PATTERN "app/*.cpp")
+# colnod contains additional files, but is part of the application executable
+# so we do not make colnod folder into separate library but include it in the final executable directly
+file(GLOB_RECURSE COLNOD_SOURCE_FILES FILES_MATCHING PATTERN "colnod/*.cpp")
+
+# creates actual cmake target seen in cmake
+add_executable(${PROJECT_NAME} ${APP_SOURCE_FILES} ${COLNOD_SOURCE_FILES})
+
+# link QT and server-sdk submodule
+target_link_libraries(${PROJECT_NAME}
+    Qt5::Core
+    Qt5::Sql
+    Qt5::Network
+    serversdk # link server-sdk git submodule
+)
+
+set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17)
+target_compile_options(${PROJECT_NAME} PUBLIC -O0 -Wall)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 3a63727..5271370 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,14 +1,13 @@
 #include <QCoreApplication>
-
-#include "syncmanager.h"
 #include <QCommandLineParser>
-#include "serversdk/requestmanager.h"
-#include "serversdk/request.h"
 
-#include "serversdk/logger.h"
-#include "serversdk/core.h"
+#include <serversdk/requestmanager.h>
+#include <serversdk/request.h>
+#include <serversdk/logger.h>
+#include <serversdk/core.h>
 
-#include "colnodapi.h"
+#include "../colnod/colnodapi.h"
+#include "../colnod/syncmanager.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/src/colnod/colnodapi.h b/src/colnod/colnodapi.h
index d105c33..30f5740 100644
--- a/src/colnod/colnodapi.h
+++ b/src/colnod/colnodapi.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "serversdk/requestmanager.h"
-#include "serversdk/request.h"
-#include "serversdk/databasetable.h"
-#include "serversdk/logger.h"
+#include <serversdk/requestmanager.h>
+#include <serversdk/request.h>
+#include <serversdk/databasetable.h>
+#include <serversdk/logger.h>
+
 #include "data.h"
 
 Q_DECLARE_LOGGING_CATEGORY(colnod)
diff --git a/src/colnod/databaseapi.h b/src/colnod/databaseapi.h
index bc9ae64..105ed41 100644
--- a/src/colnod/databaseapi.h
+++ b/src/colnod/databaseapi.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include <QSql>
+#include <QCoreApplication>
+
+#include <serversdk/databasemanager.h>
+#include <serversdk/databasetable.h>
+#include <serversdk/databaseutils.h>
+#include <serversdk/logger.h>
 
 #include "data.h"
 
-#include "serversdk/databasemanager.h"
-#include "serversdk/databasetable.h"
-#include "serversdk/databaseutils.h"
-#include "serversdk/logger.h"
-#include <QCoreApplication>
-
 Q_DECLARE_LOGGING_CATEGORY(database)
 
 
diff --git a/src/colnod/subject.h b/src/colnod/subject.h
index 6287ae4..229a53b 100644
--- a/src/colnod/subject.h
+++ b/src/colnod/subject.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <QDateTime>
-#include "serversdk/databasetable.h"
 #include <qjsondocument.h>
 #include <QJsonObject>
 
+#include <serversdk/databasetable.h>
+
 class SubjectAttribute : public serversdk::DatabaseTable {
     Q_OBJECT
     TABLE_PROPERTY(QString, id, setId, "")
diff --git a/src/colnod/token.h b/src/colnod/token.h
index 3ec1068..cf9538d 100644
--- a/src/colnod/token.h
+++ b/src/colnod/token.h
@@ -1,12 +1,13 @@
 #pragma once
 
 #include <QDateTime>
-#include "serversdk/databasetable.h"
 #include <QSqlQuery>
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 
+#include <serversdk/databasetable.h>
+
 class Token : public serversdk::DatabaseTable {
     Q_OBJECT
     TABLE_PROPERTY(QString, id, setId, QString())