diff --git a/Das Schmalter App/Qt-Code/DasSchmalter.pro b/DasSchmalterApp/Qt-Code/DasSchmalter.pro
similarity index 87%
rename from Das Schmalter App/Qt-Code/DasSchmalter.pro
rename to DasSchmalterApp/Qt-Code/DasSchmalter.pro
index c7fd8fd..f78325f 100644
--- a/Das Schmalter App/Qt-Code/DasSchmalter.pro	
+++ b/DasSchmalterApp/Qt-Code/DasSchmalter.pro
@@ -1,4 +1,4 @@
-QT += quick quick quickcontrols2
+QT += quick qml quickcontrols2
 CONFIG += c++11
 
 # The following define makes your compiler emit warnings if you use
@@ -32,3 +32,10 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 
 HEADERS += \
     appsettings.h
+
+DISTFILES += \
+    android-sources/AndroidManifest.xml
+
+android {
+    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
+}
diff --git a/DasSchmalterApp/Qt-Code/android-sources/AndroidManifest.xml b/DasSchmalterApp/Qt-Code/android-sources/AndroidManifest.xml
new file mode 100755
index 0000000..bb7c3fd
--- /dev/null
+++ b/DasSchmalterApp/Qt-Code/android-sources/AndroidManifest.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<manifest package="com.dasschmalter.dasschmalterapp" 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="DasSchmalter" 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="DasSchmalter" android:screenOrientation="unspecified" android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+
+            <!-- Application arguments -->
+            <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
+            <!-- Application arguments -->
+
+            <meta-data android:name="android.app.lib_name" android:value="DasSchmalter"/>
+            <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
+            <meta-data android:name="android.app.repository" android:value="default"/>
+            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
+            <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
+            <!-- Deploy Qt libs as part of package -->
+            <meta-data android:name="android.app.bundle_local_qt_libs" android:value="1"/>
+            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
+            <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
+            <!-- Run with local libs -->
+            <meta-data android:name="android.app.use_local_qt_libs" android:value="1"/>
+            <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
+            <meta-data android:name="android.app.load_local_libs" android:value="plugins/platforms/android/libqtforandroid.so:plugins/bearer/libqandroidbearer.so:lib/libQt5QuickParticles.so"/>
+            <meta-data android:name="android.app.load_local_jars" android:value="jar/QtAndroid.jar:jar/QtAndroidBearer.jar"/>
+            <meta-data android:name="android.app.static_init_classes" android:value=""/>
+            <!-- Used to specify custom system library path to run with local system libs -->
+            <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
+            <!--  Messages maps -->
+            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
+            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
+            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
+            <!--  Messages maps -->
+
+            <!-- Splash screen -->
+            <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
+            <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
+            <!-- Splash screen -->
+
+            <!-- Background running -->
+            <!-- Warning: changing this value to true may cause unexpected crashes if the
+                          application still try to draw after
+                          "applicationStateChanged(Qt::ApplicationSuspended)"
+                          signal is sent! -->
+            <meta-data android:name="android.app.background_running" android:value="false"/>
+            <!-- Background running -->
+
+            <!-- auto screen scale factor -->
+            <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
+            <!-- auto screen scale factor -->
+
+            <!-- extract android style -->
+            <!-- available android:values :
+                * full - useful QWidget & Quick Controls 1 apps
+                * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
+                * none - useful for apps that don't use any of the above Qt modules
+                -->
+            <meta-data android:name="android.app.extract_android_style" android:value="full"/>
+            <!-- extract android style -->
+    </activity>
+
+    <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
+
+    </application>
+
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="16"/>
+    <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
+
+    <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
+         Remove the comment if you do not require these default permissions. -->
+        <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+
+
+    <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
+         Remove the comment if you do not require these default features. -->
+        <uses-feature android:glEsVersion="0x00020000" android:required="true"/>
+
+</manifest>
diff --git a/DasSchmalterApp/Qt-Code/android-sources/res/drawable-hdpi/icon.png b/DasSchmalterApp/Qt-Code/android-sources/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000..901757b
Binary files /dev/null and b/DasSchmalterApp/Qt-Code/android-sources/res/drawable-hdpi/icon.png differ
diff --git a/DasSchmalterApp/Qt-Code/android-sources/res/drawable-ldpi/icon.png b/DasSchmalterApp/Qt-Code/android-sources/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000..901757b
Binary files /dev/null and b/DasSchmalterApp/Qt-Code/android-sources/res/drawable-ldpi/icon.png differ
diff --git a/DasSchmalterApp/Qt-Code/android-sources/res/drawable-mdpi/icon.png b/DasSchmalterApp/Qt-Code/android-sources/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000..901757b
Binary files /dev/null and b/DasSchmalterApp/Qt-Code/android-sources/res/drawable-mdpi/icon.png differ
diff --git a/Das Schmalter App/Qt-Code/appsettings.cpp b/DasSchmalterApp/Qt-Code/appsettings.cpp
similarity index 100%
rename from Das Schmalter App/Qt-Code/appsettings.cpp
rename to DasSchmalterApp/Qt-Code/appsettings.cpp
diff --git a/Das Schmalter App/Qt-Code/appsettings.h b/DasSchmalterApp/Qt-Code/appsettings.h
similarity index 100%
rename from Das Schmalter App/Qt-Code/appsettings.h
rename to DasSchmalterApp/Qt-Code/appsettings.h
diff --git a/Das Schmalter App/Qt-Code/main.cpp b/DasSchmalterApp/Qt-Code/main.cpp
similarity index 71%
rename from Das Schmalter App/Qt-Code/main.cpp
rename to DasSchmalterApp/Qt-Code/main.cpp
index 5ac3b7a..764e366 100644
--- a/Das Schmalter App/Qt-Code/main.cpp	
+++ b/DasSchmalterApp/Qt-Code/main.cpp
@@ -1,7 +1,18 @@
+#include <QQuickStyle>
+#include <QStandardPaths>
+#include <QtNetwork>
+#include <QQmlApplicationEngine>
+#include <QFile>
+#include <QDesktopServices>
+
+#include <QtCore/QUrl>
+#include <QtCore/QCommandLineOption>
+#include <QtCore/QCommandLineParser>
 #include <QGuiApplication>
+#include <QStyleHints>
+#include <QScreen>
 #include <QQmlApplicationEngine>
 #include <QtQml/QQmlContext>
-#include <QQuickStyle>
 
 #include "appsettings.h"
 
diff --git a/Das Schmalter App/Qt-Code/main.qml b/DasSchmalterApp/Qt-Code/main.qml
similarity index 99%
rename from Das Schmalter App/Qt-Code/main.qml
rename to DasSchmalterApp/Qt-Code/main.qml
index f9389c4..c349152 100644
--- a/Das Schmalter App/Qt-Code/main.qml	
+++ b/DasSchmalterApp/Qt-Code/main.qml
@@ -6,7 +6,7 @@ Window {
     visible: true
     width: 640
     height: 480
-    title: qsTr("Das Schmalter")
+    title: qsTr("DasSchmalter")
 
     Page {
         id: app
diff --git a/Das Schmalter App/Qt-Code/off.png b/DasSchmalterApp/Qt-Code/off.png
similarity index 100%
rename from Das Schmalter App/Qt-Code/off.png
rename to DasSchmalterApp/Qt-Code/off.png
diff --git a/Das Schmalter App/Qt-Code/on0.png b/DasSchmalterApp/Qt-Code/on0.png
similarity index 100%
rename from Das Schmalter App/Qt-Code/on0.png
rename to DasSchmalterApp/Qt-Code/on0.png
diff --git a/Das Schmalter App/Qt-Code/on1.png b/DasSchmalterApp/Qt-Code/on1.png
similarity index 100%
rename from Das Schmalter App/Qt-Code/on1.png
rename to DasSchmalterApp/Qt-Code/on1.png
diff --git a/Das Schmalter App/Qt-Code/on2.png b/DasSchmalterApp/Qt-Code/on2.png
similarity index 100%
rename from Das Schmalter App/Qt-Code/on2.png
rename to DasSchmalterApp/Qt-Code/on2.png
diff --git a/Das Schmalter App/Qt-Code/on3.png b/DasSchmalterApp/Qt-Code/on3.png
similarity index 100%
rename from Das Schmalter App/Qt-Code/on3.png
rename to DasSchmalterApp/Qt-Code/on3.png
diff --git a/Das Schmalter App/Qt-Code/on4.png b/DasSchmalterApp/Qt-Code/on4.png
similarity index 100%
rename from Das Schmalter App/Qt-Code/on4.png
rename to DasSchmalterApp/Qt-Code/on4.png
diff --git a/Das Schmalter App/Qt-Code/on5.png b/DasSchmalterApp/Qt-Code/on5.png
similarity index 100%
rename from Das Schmalter App/Qt-Code/on5.png
rename to DasSchmalterApp/Qt-Code/on5.png
diff --git a/Das Schmalter App/Qt-Code/qml.qrc b/DasSchmalterApp/Qt-Code/qml.qrc
similarity index 100%
rename from Das Schmalter App/Qt-Code/qml.qrc
rename to DasSchmalterApp/Qt-Code/qml.qrc
diff --git a/Das Schmalter App/Qt-Code/shared.qrc b/DasSchmalterApp/Qt-Code/shared.qrc
similarity index 100%
rename from Das Schmalter App/Qt-Code/shared.qrc
rename to DasSchmalterApp/Qt-Code/shared.qrc
diff --git a/DasSchmalterApp/Qt-Code/shared/icons/favicon.png b/DasSchmalterApp/Qt-Code/shared/icons/favicon.png
new file mode 100644
index 0000000..901757b
Binary files /dev/null and b/DasSchmalterApp/Qt-Code/shared/icons/favicon.png differ
diff --git a/DasSchmalterApp/Qt-Code/shared/icons/favicon.xcf b/DasSchmalterApp/Qt-Code/shared/icons/favicon.xcf
new file mode 100644
index 0000000..2161ec3
Binary files /dev/null and b/DasSchmalterApp/Qt-Code/shared/icons/favicon.xcf differ
diff --git a/Das Schmalter App/README.md b/DasSchmalterApp/README.md
similarity index 100%
rename from Das Schmalter App/README.md
rename to DasSchmalterApp/README.md
diff --git a/Das Schmalter App/Release/Android/DasSmalter-ARMv7.apk b/DasSchmalterApp/Release/Android/DasSmalter-ARMv7.apk
similarity index 55%
rename from Das Schmalter App/Release/Android/DasSmalter-ARMv7.apk
rename to DasSchmalterApp/Release/Android/DasSmalter-ARMv7.apk
index 4a1b915..738a8bb 100644
Binary files a/Das Schmalter App/Release/Android/DasSmalter-ARMv7.apk and b/DasSchmalterApp/Release/Android/DasSmalter-ARMv7.apk differ