diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 345092e..543c6fe 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index ba7052b..53a3fb1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index ddd20ae..cee3587 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,6 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/SLAM.iml" filepath="$PROJECT_DIR$/SLAM.iml" />
+      <module fileurl="file://$PROJECT_DIR$/Slam-Android.iml" filepath="$PROJECT_DIR$/Slam-Android.iml" />
       <module fileurl="file://$PROJECT_DIR$/mobile/mobile.iml" filepath="$PROJECT_DIR$/mobile/mobile.iml" />
     </modules>
   </component>
diff --git a/mobile/build.gradle b/mobile/build.gradle
index 130012d..ecf6845 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -19,34 +19,33 @@ android {
 }
 
 dependencies {
-    //implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:design:27.0.2'
-    implementation 'com.android.support:support-v4:27.0.2'
-    implementation 'com.android.support:support-v13:27.0.2'
-    implementation 'com.android.support:cardview-v7:27.0.2'
-    implementation 'com.android.support:recyclerview-v7:27.0.2'
-    implementation 'com.android.support:support-emoji:27.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:support-v13:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:support-emoji:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
 
     // The holy ButterKnife \o/
-    compile 'com.jakewharton:butterknife:8.8.1'
+    implementation 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
 
     // External UI
-    compile 'de.hdodenhof:circleimageview:2.0.0'
+    implementation 'de.hdodenhof:circleimageview:2.0.0'
 
     // Smack
-    compile "org.igniterealtime.smack:smack-android-extensions:$smackVersion"
-    compile "org.igniterealtime.smack:smack-omemo-signal:$smackVersion"
-    compile "org.igniterealtime.smack:smack-tcp:$smackVersion"
-    compile "org.igniterealtime.smack:smack-experimental:$smackVersion"
+    implementation "org.igniterealtime.smack:smack-android-extensions:$smackVersion"
+    implementation "org.igniterealtime.smack:smack-omemo-signal:$smackVersion"
+    implementation "org.igniterealtime.smack:smack-tcp:$smackVersion"
+    implementation "org.igniterealtime.smack:smack-experimental:$smackVersion"
 
     // SQLCipher
-    compile 'net.zetetic:android-database-sqlcipher:3.5.9@aar'
+    implementation 'net.zetetic:android-database-sqlcipher:3.5.9@aar'
 
     // Test stuff
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/mobile/src/main/java/de/vanitasvitae/slam/mvp/view/LoginActivity.java b/mobile/src/main/java/de/vanitasvitae/slam/mvp/view/LoginActivity.java
index 7252132..56f4b16 100644
--- a/mobile/src/main/java/de/vanitasvitae/slam/mvp/view/LoginActivity.java
+++ b/mobile/src/main/java/de/vanitasvitae/slam/mvp/view/LoginActivity.java
@@ -38,8 +38,8 @@ import android.widget.Toast;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import de.vanitasvitae.slam.AbstractTextWatcher;
-import de.vanitasvitae.slam.EditorActionDoneListener;
+import de.vanitasvitae.slam.util.AbstractTextWatcher;
+import de.vanitasvitae.slam.util.EditorActionDoneListener;
 import de.vanitasvitae.slam.R;
 import de.vanitasvitae.slam.mvp.PresenterFactory;
 import de.vanitasvitae.slam.mvp.view.abstr.ThemedAppCompatActivity;
diff --git a/mobile/src/main/java/de/vanitasvitae/slam/AbstractTextWatcher.java b/mobile/src/main/java/de/vanitasvitae/slam/util/AbstractTextWatcher.java
similarity index 97%
rename from mobile/src/main/java/de/vanitasvitae/slam/AbstractTextWatcher.java
rename to mobile/src/main/java/de/vanitasvitae/slam/util/AbstractTextWatcher.java
index 5c461d3..2ccb4ac 100644
--- a/mobile/src/main/java/de/vanitasvitae/slam/AbstractTextWatcher.java
+++ b/mobile/src/main/java/de/vanitasvitae/slam/util/AbstractTextWatcher.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
-package de.vanitasvitae.slam;
+package de.vanitasvitae.slam.util;
 
 import android.text.Editable;
 import android.text.TextWatcher;
diff --git a/mobile/src/main/java/de/vanitasvitae/slam/EditorActionDoneListener.java b/mobile/src/main/java/de/vanitasvitae/slam/util/EditorActionDoneListener.java
similarity index 97%
rename from mobile/src/main/java/de/vanitasvitae/slam/EditorActionDoneListener.java
rename to mobile/src/main/java/de/vanitasvitae/slam/util/EditorActionDoneListener.java
index f4ed6ed..435e808 100644
--- a/mobile/src/main/java/de/vanitasvitae/slam/EditorActionDoneListener.java
+++ b/mobile/src/main/java/de/vanitasvitae/slam/util/EditorActionDoneListener.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
-package de.vanitasvitae.slam;
+package de.vanitasvitae.slam.util;
 
 import android.view.KeyEvent;
 import android.view.inputmethod.EditorInfo;