diff --git a/SnakeClient/Client/Client.pri b/SnakeClient/Client/Client.pri
deleted file mode 100644
index 2c81c4b..0000000
--- a/SnakeClient/Client/Client.pri
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright (C) 2018 - 2019 QuasarApp.
-# Distributed under the lgplv3 software license, see the accompanying
-# Everyone is permitted to copy and distribute verbatim copies
-# of this license document, but changing it is not allowed.
-#
-
-!isEmpty(SERVER_LIB):error("Client.pri already included")
-CLIENT_LIB = 1
-
-#DEPENDS
-CONFIG(release, debug|release): {
- CLIENT_LIB_OUTPUT_DIR="$$PWD/build/release"
-} else {
- CLIENT_LIB_OUTPUT_DIR="$$PWD/build/debug"
-}
-
-LIBS += -L$$CLIENT_LIB_OUTPUT_DIR -lClient
-
-include($$PWD/../../QuasarAppLib/QuasarLib.pri)
-include($$PWD/../../SnakeUtils/SnakeUtils.pri)
-include($$PWD/../../SnakeServer/ClientProtocol/ClientProtocol.pri)
-
-INCLUDEPATH += "$$PWD"
-INCLUDEPATH += "$$PWD/front-end"
-INCLUDEPATH += "$$PWD/back-end"
-#INCLUDEPATH += "$$PWD/back-end/ProfileViewItems"
-
-
-
-
diff --git a/SnakeClient/Client/Client.pro b/SnakeClient/Client/Client.pro
deleted file mode 100644
index 157e338..0000000
--- a/SnakeClient/Client/Client.pro
+++ /dev/null
@@ -1,101 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2019-07-28T12:59:54
-#
-#-------------------------------------------------
-
-
-TARGET = Client
-TEMPLATE = lib
-
-DEFINES += CLIENT_LIBRARY
-
-QT += quick concurrent
-CONFIG += c++17
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which has been marked as deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-
-HEADERS += \
- back-end/ProfileViewItems/mainmenumodel.h \
- back-end/ProfileViewItems/playerclientdata.h \
- back-end/asyncimageresponse.h \
- back-end/baseclass.h \
- back-end/clientapp.h \
- back-end/head.h \
- back-end/imageprovider.h \
- back-end/snake.h \
- back-end/controller.h \
- back-end/ProfileViewItems/userview.h \
- back-end/world.h \
- back-end/itemworld.h \
- back-end/box.h \
- back-end/guiobject.h \
- back-end/guiobjectfactory.h \
- back-end/diff.h \
- back-end/background.h \
- back-end/backgrounditem.h \
- client_global.h
-
-
-SOURCES += \
- back-end/ProfileViewItems/mainmenumodel.cpp \
- back-end/ProfileViewItems/playerclientdata.cpp \
- back-end/asyncimageresponse.cpp \
- back-end/baseclass.cpp \
- back-end/clientapp.cpp \
- back-end/head.cpp \
- back-end/imageprovider.cpp \
- back-end/snake.cpp \
- back-end/controller.cpp \
- back-end/ProfileViewItems/userview.cpp \
- back-end/world.cpp \
- back-end/itemworld.cpp \
- back-end/box.cpp \
- back-end/guiobject.cpp \
- back-end/guiobjectfactory.cpp \
- back-end/diff.cpp \
- back-end/background.cpp \
- back-end/backgrounditem.cpp
-
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-
-RESOURCES += qml.qrc
-
-
-CONFIG(release, debug|release): {
- DESTDIR = $$PWD/build/release
-
-} else {
- DESTDIR = $$PWD/build/debug
-}
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
-include($$PWD/../../QuasarAppLib/QuasarLib.pri)
-include($$PWD/../../SnakeUtils/SnakeUtils.pri)
-include($$PWD/../../SnakeServer/ClientProtocol/ClientProtocol.pri)
-
-win32:RC_ICONS += img/icon.ico
diff --git a/SnakeClient/Client/client_global.h b/SnakeClient/Client/client_global.h
deleted file mode 100644
index fa07045..0000000
--- a/SnakeClient/Client/client_global.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef CLIENT_GLOBAL_H
-#define CLIENT_GLOBAL_H
-
-#include <QtCore/qglobal.h>
-
-#if defined(CLIENT_LIBRARY)
-# define CLIENTSHARED_EXPORT Q_DECL_EXPORT
-#else
-# define CLIENTSHARED_EXPORT Q_DECL_IMPORT
-#endif
-
-#endif // CLIENT_GLOBAL_H
diff --git a/SnakeClient/SnakeApp/SnakeApp.pro b/SnakeClient/SnakeApp/SnakeApp.pro
index 2fd7e8f..1c4bb7b 100644
--- a/SnakeClient/SnakeApp/SnakeApp.pro
+++ b/SnakeClient/SnakeApp/SnakeApp.pro
@@ -1,4 +1,4 @@
-QT += quick
+QT += quick concurrent
CONFIG += c++17
# The following define makes your compiler emit warnings if you use
@@ -13,7 +13,25 @@ DEFINES += QT_DEPRECATED_WARNINGS
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
- main.cpp
+ back-end/ProfileViewItems/mainmenumodel.cpp \
+ back-end/ProfileViewItems/playerclientdata.cpp \
+ back-end/ProfileViewItems/userview.cpp \
+ back-end/asyncimageresponse.cpp \
+ back-end/background.cpp \
+ back-end/backgrounditem.cpp \
+ back-end/baseclass.cpp \
+ back-end/box.cpp \
+ back-end/clientapp.cpp \
+ back-end/controller.cpp \
+ back-end/diff.cpp \
+ back-end/guiobject.cpp \
+ back-end/guiobjectfactory.cpp \
+ back-end/head.cpp \
+ back-end/imageprovider.cpp \
+ back-end/itemworld.cpp \
+ back-end/snake.cpp \
+ back-end/world.cpp \
+ back-end/main.cpp
TARGET = Snake
@@ -32,18 +50,27 @@ QML_IMPORT_PATH =
# Additional import path used to resolve QML modules just for Qt Quick Designer
QML_DESIGNER_IMPORT_PATH =
-include($$PWD/../Client/Client.pri)
+include($$PWD/../../QuasarAppLib/QuasarLib.pri)
+include($$PWD/../../SnakeUtils/SnakeUtils.pri)
+include($$PWD/../../SnakeServer/ClientProtocol/ClientProtocol.pri)
DISTFILES += \
android/AndroidManifest.xml \
android/AndroidManifest.xml \
+ android/AndroidManifest.xml \
+ android/build.gradle \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.jar \
android/gradle/wrapper/gradle-wrapper.jar \
+ android/gradle/wrapper/gradle-wrapper.jar \
+ android/gradle/wrapper/gradle-wrapper.properties \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew \
android/gradlew \
+ android/gradlew \
android/gradlew.bat \
+ android/gradlew.bat \
+ android/res/values/libs.xml \
android/res/values/libs.xml \
android/res/values/libs.xml \
android/build.gradle \
@@ -52,3 +79,26 @@ DISTFILES += \
front-end/PagePopUp.qml
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+
+RESOURCES += \
+ qml.qrc
+
+HEADERS += \
+ back-end/ProfileViewItems/mainmenumodel.h \
+ back-end/ProfileViewItems/playerclientdata.h \
+ back-end/ProfileViewItems/userview.h \
+ back-end/asyncimageresponse.h \
+ back-end/background.h \
+ back-end/backgrounditem.h \
+ back-end/baseclass.h \
+ back-end/box.h \
+ back-end/clientapp.h \
+ back-end/controller.h \
+ back-end/diff.h \
+ back-end/guiobject.h \
+ back-end/guiobjectfactory.h \
+ back-end/head.h \
+ back-end/imageprovider.h \
+ back-end/itemworld.h \
+ back-end/snake.h \
+ back-end/world.h
diff --git a/SnakeClient/SnakeApp/android/AndroidManifest.xml b/SnakeClient/SnakeApp/android/AndroidManifest.xml
index 924b9b4..586d919 100644
--- a/SnakeClient/SnakeApp/android/AndroidManifest.xml
+++ b/SnakeClient/SnakeApp/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+<manifest package="quasar.app.snake" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="-- %%INSERT_APP_NAME%% --" android:icon="@drawable/icon">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="-- %%INSERT_APP_NAME%% --" android:screenOrientation="landscape" android:launchMode="singleTop" android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
<intent-filter>
diff --git a/SnakeClient/Client/back-end/ProfileViewItems/mainmenumodel.cpp b/SnakeClient/SnakeApp/back-end/ProfileViewItems/mainmenumodel.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/ProfileViewItems/mainmenumodel.cpp
rename to SnakeClient/SnakeApp/back-end/ProfileViewItems/mainmenumodel.cpp
diff --git a/SnakeClient/Client/back-end/ProfileViewItems/mainmenumodel.h b/SnakeClient/SnakeApp/back-end/ProfileViewItems/mainmenumodel.h
similarity index 100%
rename from SnakeClient/Client/back-end/ProfileViewItems/mainmenumodel.h
rename to SnakeClient/SnakeApp/back-end/ProfileViewItems/mainmenumodel.h
diff --git a/SnakeClient/Client/back-end/ProfileViewItems/playerclientdata.cpp b/SnakeClient/SnakeApp/back-end/ProfileViewItems/playerclientdata.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/ProfileViewItems/playerclientdata.cpp
rename to SnakeClient/SnakeApp/back-end/ProfileViewItems/playerclientdata.cpp
diff --git a/SnakeClient/Client/back-end/ProfileViewItems/playerclientdata.h b/SnakeClient/SnakeApp/back-end/ProfileViewItems/playerclientdata.h
similarity index 100%
rename from SnakeClient/Client/back-end/ProfileViewItems/playerclientdata.h
rename to SnakeClient/SnakeApp/back-end/ProfileViewItems/playerclientdata.h
diff --git a/SnakeClient/Client/back-end/ProfileViewItems/userview.cpp b/SnakeClient/SnakeApp/back-end/ProfileViewItems/userview.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/ProfileViewItems/userview.cpp
rename to SnakeClient/SnakeApp/back-end/ProfileViewItems/userview.cpp
diff --git a/SnakeClient/Client/back-end/ProfileViewItems/userview.h b/SnakeClient/SnakeApp/back-end/ProfileViewItems/userview.h
similarity index 100%
rename from SnakeClient/Client/back-end/ProfileViewItems/userview.h
rename to SnakeClient/SnakeApp/back-end/ProfileViewItems/userview.h
diff --git a/SnakeClient/Client/back-end/asyncimageresponse.cpp b/SnakeClient/SnakeApp/back-end/asyncimageresponse.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/asyncimageresponse.cpp
rename to SnakeClient/SnakeApp/back-end/asyncimageresponse.cpp
diff --git a/SnakeClient/Client/back-end/asyncimageresponse.h b/SnakeClient/SnakeApp/back-end/asyncimageresponse.h
similarity index 100%
rename from SnakeClient/Client/back-end/asyncimageresponse.h
rename to SnakeClient/SnakeApp/back-end/asyncimageresponse.h
diff --git a/SnakeClient/Client/back-end/background.cpp b/SnakeClient/SnakeApp/back-end/background.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/background.cpp
rename to SnakeClient/SnakeApp/back-end/background.cpp
diff --git a/SnakeClient/Client/back-end/background.h b/SnakeClient/SnakeApp/back-end/background.h
similarity index 100%
rename from SnakeClient/Client/back-end/background.h
rename to SnakeClient/SnakeApp/back-end/background.h
diff --git a/SnakeClient/Client/back-end/backgrounditem.cpp b/SnakeClient/SnakeApp/back-end/backgrounditem.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/backgrounditem.cpp
rename to SnakeClient/SnakeApp/back-end/backgrounditem.cpp
diff --git a/SnakeClient/Client/back-end/backgrounditem.h b/SnakeClient/SnakeApp/back-end/backgrounditem.h
similarity index 100%
rename from SnakeClient/Client/back-end/backgrounditem.h
rename to SnakeClient/SnakeApp/back-end/backgrounditem.h
diff --git a/SnakeClient/Client/back-end/baseclass.cpp b/SnakeClient/SnakeApp/back-end/baseclass.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/baseclass.cpp
rename to SnakeClient/SnakeApp/back-end/baseclass.cpp
diff --git a/SnakeClient/Client/back-end/baseclass.h b/SnakeClient/SnakeApp/back-end/baseclass.h
similarity index 100%
rename from SnakeClient/Client/back-end/baseclass.h
rename to SnakeClient/SnakeApp/back-end/baseclass.h
diff --git a/SnakeClient/Client/back-end/box.cpp b/SnakeClient/SnakeApp/back-end/box.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/box.cpp
rename to SnakeClient/SnakeApp/back-end/box.cpp
diff --git a/SnakeClient/Client/back-end/box.h b/SnakeClient/SnakeApp/back-end/box.h
similarity index 100%
rename from SnakeClient/Client/back-end/box.h
rename to SnakeClient/SnakeApp/back-end/box.h
diff --git a/SnakeClient/Client/back-end/clientapp.cpp b/SnakeClient/SnakeApp/back-end/clientapp.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/clientapp.cpp
rename to SnakeClient/SnakeApp/back-end/clientapp.cpp
diff --git a/SnakeClient/Client/back-end/clientapp.h b/SnakeClient/SnakeApp/back-end/clientapp.h
similarity index 80%
rename from SnakeClient/Client/back-end/clientapp.h
rename to SnakeClient/SnakeApp/back-end/clientapp.h
index 76278a1..a4ff8a8 100644
--- a/SnakeClient/Client/back-end/clientapp.h
+++ b/SnakeClient/SnakeApp/back-end/clientapp.h
@@ -3,11 +3,10 @@
#include "controller.h"
#include "diff.h"
-#include "client_global.h"
class QQmlApplicationEngine;
-class CLIENTSHARED_EXPORT ClientApp
+class ClientApp
{
private:
Controller contr;
diff --git a/SnakeClient/Client/back-end/controller.cpp b/SnakeClient/SnakeApp/back-end/controller.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/controller.cpp
rename to SnakeClient/SnakeApp/back-end/controller.cpp
diff --git a/SnakeClient/Client/back-end/controller.h b/SnakeClient/SnakeApp/back-end/controller.h
similarity index 95%
rename from SnakeClient/Client/back-end/controller.h
rename to SnakeClient/SnakeApp/back-end/controller.h
index 3146250..968da5a 100644
--- a/SnakeClient/Client/back-end/controller.h
+++ b/SnakeClient/SnakeApp/back-end/controller.h
@@ -7,11 +7,10 @@
#include "diff.h"
#include "snake.h"
#include "world.h"
-#include "client_global.h"
class MainMenuModel;
-class CLIENTSHARED_EXPORT Controller : public QObject
+class Controller : public QObject
{
Q_OBJECT
diff --git a/SnakeClient/Client/back-end/diff.cpp b/SnakeClient/SnakeApp/back-end/diff.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/diff.cpp
rename to SnakeClient/SnakeApp/back-end/diff.cpp
diff --git a/SnakeClient/Client/back-end/diff.h b/SnakeClient/SnakeApp/back-end/diff.h
similarity index 87%
rename from SnakeClient/Client/back-end/diff.h
rename to SnakeClient/SnakeApp/back-end/diff.h
index 8449044..7733e7b 100644
--- a/SnakeClient/Client/back-end/diff.h
+++ b/SnakeClient/SnakeApp/back-end/diff.h
@@ -2,9 +2,8 @@
#define DIFF_H
#include <QObject>
-#include "client_global.h"
-class CLIENTSHARED_EXPORT Diff
+class Diff
{
Q_GADGET
private:
diff --git a/SnakeClient/Client/back-end/guiobject.cpp b/SnakeClient/SnakeApp/back-end/guiobject.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/guiobject.cpp
rename to SnakeClient/SnakeApp/back-end/guiobject.cpp
diff --git a/SnakeClient/Client/back-end/guiobject.h b/SnakeClient/SnakeApp/back-end/guiobject.h
similarity index 95%
rename from SnakeClient/Client/back-end/guiobject.h
rename to SnakeClient/SnakeApp/back-end/guiobject.h
index cc33d5e..dc903ef 100644
--- a/SnakeClient/Client/back-end/guiobject.h
+++ b/SnakeClient/SnakeApp/back-end/guiobject.h
@@ -5,9 +5,8 @@
#include "QObject"
#include <QRectF>
-#include "client_global.h"
-class CLIENTSHARED_EXPORT GuiObject:public QObject, public BaseClass
+class GuiObject:public QObject, public BaseClass
{
Q_OBJECT
// @todo: add color
diff --git a/SnakeClient/Client/back-end/guiobjectfactory.cpp b/SnakeClient/SnakeApp/back-end/guiobjectfactory.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/guiobjectfactory.cpp
rename to SnakeClient/SnakeApp/back-end/guiobjectfactory.cpp
diff --git a/SnakeClient/Client/back-end/guiobjectfactory.h b/SnakeClient/SnakeApp/back-end/guiobjectfactory.h
similarity index 100%
rename from SnakeClient/Client/back-end/guiobjectfactory.h
rename to SnakeClient/SnakeApp/back-end/guiobjectfactory.h
diff --git a/SnakeClient/Client/back-end/head.cpp b/SnakeClient/SnakeApp/back-end/head.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/head.cpp
rename to SnakeClient/SnakeApp/back-end/head.cpp
diff --git a/SnakeClient/Client/back-end/head.h b/SnakeClient/SnakeApp/back-end/head.h
similarity index 100%
rename from SnakeClient/Client/back-end/head.h
rename to SnakeClient/SnakeApp/back-end/head.h
diff --git a/SnakeClient/Client/back-end/imageprovider.cpp b/SnakeClient/SnakeApp/back-end/imageprovider.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/imageprovider.cpp
rename to SnakeClient/SnakeApp/back-end/imageprovider.cpp
diff --git a/SnakeClient/Client/back-end/imageprovider.h b/SnakeClient/SnakeApp/back-end/imageprovider.h
similarity index 100%
rename from SnakeClient/Client/back-end/imageprovider.h
rename to SnakeClient/SnakeApp/back-end/imageprovider.h
diff --git a/SnakeClient/Client/back-end/itemworld.cpp b/SnakeClient/SnakeApp/back-end/itemworld.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/itemworld.cpp
rename to SnakeClient/SnakeApp/back-end/itemworld.cpp
diff --git a/SnakeClient/Client/back-end/itemworld.h b/SnakeClient/SnakeApp/back-end/itemworld.h
similarity index 100%
rename from SnakeClient/Client/back-end/itemworld.h
rename to SnakeClient/SnakeApp/back-end/itemworld.h
diff --git a/SnakeClient/SnakeApp/main.cpp b/SnakeClient/SnakeApp/back-end/main.cpp
similarity index 100%
rename from SnakeClient/SnakeApp/main.cpp
rename to SnakeClient/SnakeApp/back-end/main.cpp
diff --git a/SnakeClient/Client/back-end/snake.cpp b/SnakeClient/SnakeApp/back-end/snake.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/snake.cpp
rename to SnakeClient/SnakeApp/back-end/snake.cpp
diff --git a/SnakeClient/Client/back-end/snake.h b/SnakeClient/SnakeApp/back-end/snake.h
similarity index 100%
rename from SnakeClient/Client/back-end/snake.h
rename to SnakeClient/SnakeApp/back-end/snake.h
diff --git a/SnakeClient/Client/back-end/world.cpp b/SnakeClient/SnakeApp/back-end/world.cpp
similarity index 100%
rename from SnakeClient/Client/back-end/world.cpp
rename to SnakeClient/SnakeApp/back-end/world.cpp
diff --git a/SnakeClient/Client/back-end/world.h b/SnakeClient/SnakeApp/back-end/world.h
similarity index 100%
rename from SnakeClient/Client/back-end/world.h
rename to SnakeClient/SnakeApp/back-end/world.h
diff --git a/SnakeClient/Client/front-end/About.qml b/SnakeClient/SnakeApp/front-end/About.qml
similarity index 100%
rename from SnakeClient/Client/front-end/About.qml
rename to SnakeClient/SnakeApp/front-end/About.qml
diff --git a/SnakeClient/Client/front-end/AboutPage.qml b/SnakeClient/SnakeApp/front-end/AboutPage.qml
similarity index 100%
rename from SnakeClient/Client/front-end/AboutPage.qml
rename to SnakeClient/SnakeApp/front-end/AboutPage.qml
diff --git a/SnakeClient/Client/front-end/BasePopUp.qml b/SnakeClient/SnakeApp/front-end/BasePopUp.qml
similarity index 100%
rename from SnakeClient/Client/front-end/BasePopUp.qml
rename to SnakeClient/SnakeApp/front-end/BasePopUp.qml
diff --git a/SnakeClient/Client/front-end/GraphicItem.qml b/SnakeClient/SnakeApp/front-end/GraphicItem.qml
similarity index 100%
rename from SnakeClient/Client/front-end/GraphicItem.qml
rename to SnakeClient/SnakeApp/front-end/GraphicItem.qml
diff --git a/SnakeClient/Client/front-end/ImageView.qml b/SnakeClient/SnakeApp/front-end/ImageView.qml
similarity index 100%
rename from SnakeClient/Client/front-end/ImageView.qml
rename to SnakeClient/SnakeApp/front-end/ImageView.qml
diff --git a/SnakeClient/Client/front-end/MainMenu.qml b/SnakeClient/SnakeApp/front-end/MainMenu.qml
similarity index 100%
rename from SnakeClient/Client/front-end/MainMenu.qml
rename to SnakeClient/SnakeApp/front-end/MainMenu.qml
diff --git a/SnakeClient/Client/front-end/NotificationForm.qml b/SnakeClient/SnakeApp/front-end/NotificationForm.qml
similarity index 100%
rename from SnakeClient/Client/front-end/NotificationForm.qml
rename to SnakeClient/SnakeApp/front-end/NotificationForm.qml
diff --git a/SnakeClient/Client/front-end/PagePopUp.qml b/SnakeClient/SnakeApp/front-end/PagePopUp.qml
similarity index 100%
rename from SnakeClient/Client/front-end/PagePopUp.qml
rename to SnakeClient/SnakeApp/front-end/PagePopUp.qml
diff --git a/SnakeClient/Client/front-end/PropertyView.qml b/SnakeClient/SnakeApp/front-end/PropertyView.qml
similarity index 100%
rename from SnakeClient/Client/front-end/PropertyView.qml
rename to SnakeClient/SnakeApp/front-end/PropertyView.qml
diff --git a/SnakeClient/Client/front-end/Scene.qml b/SnakeClient/SnakeApp/front-end/Scene.qml
similarity index 100%
rename from SnakeClient/Client/front-end/Scene.qml
rename to SnakeClient/SnakeApp/front-end/Scene.qml
diff --git a/SnakeClient/Client/front-end/SelectLevelScene.qml b/SnakeClient/SnakeApp/front-end/SelectLevelScene.qml
similarity index 100%
rename from SnakeClient/Client/front-end/SelectLevelScene.qml
rename to SnakeClient/SnakeApp/front-end/SelectLevelScene.qml
diff --git a/SnakeClient/Client/front-end/SnakeItem.qml b/SnakeClient/SnakeApp/front-end/SnakeItem.qml
similarity index 100%
rename from SnakeClient/Client/front-end/SnakeItem.qml
rename to SnakeClient/SnakeApp/front-end/SnakeItem.qml
diff --git a/SnakeClient/Client/front-end/TextInput.qml b/SnakeClient/SnakeApp/front-end/TextInput.qml
similarity index 100%
rename from SnakeClient/Client/front-end/TextInput.qml
rename to SnakeClient/SnakeApp/front-end/TextInput.qml
diff --git a/SnakeClient/Client/front-end/UserView.qml b/SnakeClient/SnakeApp/front-end/UserView.qml
similarity index 100%
rename from SnakeClient/Client/front-end/UserView.qml
rename to SnakeClient/SnakeApp/front-end/UserView.qml
diff --git a/SnakeClient/Client/front-end/main.qml b/SnakeClient/SnakeApp/front-end/main.qml
similarity index 87%
rename from SnakeClient/Client/front-end/main.qml
rename to SnakeClient/SnakeApp/front-end/main.qml
index 5ab61b1..af46324 100644
--- a/SnakeClient/Client/front-end/main.qml
+++ b/SnakeClient/SnakeApp/front-end/main.qml
@@ -1,6 +1,6 @@
-import QtQuick 2.9
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.2
+import QtQuick 2.12
+import QtQuick.Window 2.12
+import QtQuick.Controls 2.12
ApplicationWindow {
id: mainWindow;
diff --git a/SnakeClient/Client/img/Settings-icon.png b/SnakeClient/SnakeApp/img/Settings-icon.png
similarity index 100%
rename from SnakeClient/Client/img/Settings-icon.png
rename to SnakeClient/SnakeApp/img/Settings-icon.png
diff --git a/SnakeClient/Client/img/asphalt.jpg b/SnakeClient/SnakeApp/img/asphalt.jpg
similarity index 100%
rename from SnakeClient/Client/img/asphalt.jpg
rename to SnakeClient/SnakeApp/img/asphalt.jpg
diff --git a/SnakeClient/Client/img/box-texture.png b/SnakeClient/SnakeApp/img/box-texture.png
similarity index 100%
rename from SnakeClient/Client/img/box-texture.png
rename to SnakeClient/SnakeApp/img/box-texture.png
diff --git a/SnakeClient/Client/img/cogs-solid.svg b/SnakeClient/SnakeApp/img/cogs-solid.svg
similarity index 100%
rename from SnakeClient/Client/img/cogs-solid.svg
rename to SnakeClient/SnakeApp/img/cogs-solid.svg
diff --git a/SnakeClient/Client/img/defaultSnake.png b/SnakeClient/SnakeApp/img/defaultSnake.png
similarity index 100%
rename from SnakeClient/Client/img/defaultSnake.png
rename to SnakeClient/SnakeApp/img/defaultSnake.png
diff --git a/SnakeClient/Client/img/defaultUser.png b/SnakeClient/SnakeApp/img/defaultUser.png
similarity index 100%
rename from SnakeClient/Client/img/defaultUser.png
rename to SnakeClient/SnakeApp/img/defaultUser.png
diff --git a/SnakeClient/Client/img/icon.ico b/SnakeClient/SnakeApp/img/icon.ico
similarity index 100%
rename from SnakeClient/Client/img/icon.ico
rename to SnakeClient/SnakeApp/img/icon.ico
diff --git a/SnakeClient/Client/img/logo.png b/SnakeClient/SnakeApp/img/logo.png
similarity index 100%
rename from SnakeClient/Client/img/logo.png
rename to SnakeClient/SnakeApp/img/logo.png
diff --git a/SnakeClient/Client/img/up.svg b/SnakeClient/SnakeApp/img/up.svg
similarity index 100%
rename from SnakeClient/Client/img/up.svg
rename to SnakeClient/SnakeApp/img/up.svg
diff --git a/SnakeClient/Client/qml.qrc b/SnakeClient/SnakeApp/qml.qrc
similarity index 100%
rename from SnakeClient/Client/qml.qrc
rename to SnakeClient/SnakeApp/qml.qrc
diff --git a/SnakeClient/Client/qtquickcontrols2.conf b/SnakeClient/SnakeApp/qtquickcontrols2.conf
similarity index 100%
rename from SnakeClient/Client/qtquickcontrols2.conf
rename to SnakeClient/SnakeApp/qtquickcontrols2.conf
diff --git a/SnakeClient/SnakeApp/snake.pro b/SnakeClient/SnakeApp/snake.pro
deleted file mode 100644
index fd5eb4f..0000000
--- a/SnakeClient/SnakeApp/snake.pro
+++ /dev/null
@@ -1,79 +0,0 @@
-QT += quick
-CONFIG += c++17
-
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
-
-SOURCES += \
- back-end/main.cpp \
- back-end/baseclass.cpp \
- back-end/head.cpp \
- back-end/snake.cpp \
- back-end/controller.cpp \
- back-end/world.cpp \
- back-end/itemworld.cpp \
- back-end/box.cpp \
- back-end/guiobject.cpp \
- back-end/guiobjectfactory.cpp \
- back-end/diff.cpp \
- back-end/background.cpp \
- back-end/backgrounditem.cpp
-
-RESOURCES += qml.qrc
-
-
-CONFIG(release, debug|release): {
- DESTDIR = $$PWD/build/release
-
-} else {
- DESTDIR = $$PWD/build/debug
-}
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
-include($$PWD/../QuasarAppLib/QuasarLib.pri)
-include($$PWD/../SnakeUtils/SnakeUtils.pri)
-
-install_data.files += $$QUASARAPP_LIB_OUTPUT_DIR/$$libfiletype
-install_data.files += $$DESTDIR/$$runfiletype
-
-
-HEADERS += \
- back-end/baseclass.h \
- back-end/head.h \
- back-end/snake.h \
- back-end/controller.h \
- back-end/world.h \
- back-end/itemworld.h \
- back-end/box.h \
- back-end/guiobject.h \
- back-end/guiobjectfactory.h \
- back-end/diff.h \
- back-end/background.h \
- back-end/backgrounditem.h
-
-DISTFILES += \
- android/AndroidManifest.xml \
- android/gradle/wrapper/gradle-wrapper.jar \
- android/gradlew \
- android/res/values/libs.xml \
- android/build.gradle \
- android/gradle/wrapper/gradle-wrapper.properties \
- android/gradlew.bat \
- front-end/PagePopUp.qml
-
-ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
-
-win32:RC_ICONS += img/icon.ico
diff --git a/SnakeClient/SnakeClient.pro b/SnakeClient/SnakeClient.pro
index e6aab8c..fb9ca15 100644
--- a/SnakeClient/SnakeClient.pro
+++ b/SnakeClient/SnakeClient.pro
@@ -2,5 +2,4 @@ TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS += \
- Client \
SnakeApp
diff --git a/SnakeServer/ClientProtocol/ClientProtocol.pro b/SnakeServer/ClientProtocol/ClientProtocol.pro
index b65a805..f7b8129 100644
--- a/SnakeServer/ClientProtocol/ClientProtocol.pro
+++ b/SnakeServer/ClientProtocol/ClientProtocol.pro
@@ -14,6 +14,7 @@
QT -= gui
QT += network
+CONFIG += c++14
TARGET = ClientProtocol
TEMPLATE = lib