diff --git a/app/build.gradle b/QuasselDroidNG/build.gradle
similarity index 62%
rename from app/build.gradle
rename to QuasselDroidNG/build.gradle
index 8995b18329a7b6dd73cdb356f73af03fdd1d10ff..934d869e4f4c32b627e9a5639bbdfbe791cef6db 100644
--- a/app/build.gradle
+++ b/QuasselDroidNG/build.gradle
@@ -13,18 +13,37 @@ android {
         minSdkVersion 16
         targetSdkVersion 23
         versionCode 1
-        versionName "1.0"
+        versionName "0.1.0"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            
+            applicationVariants.all { variant ->
+                variant.outputs.each { output ->
+                    output.outputFile = new File(output.outputFile.parent, output.outputFile.name.replace(".apk", "-" + defaultConfig.versionName + "-build" + versionCode + ".apk"))
+                }
+            }
         }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_7
     }
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES.txt'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/notice.txt'
+        exclude 'META-INF/license.txt'
+        exclude 'META-INF/dependencies.txt'
+        exclude 'META-INF/LGPL2.1'
+    }
 }
 
 if(project.hasProperty("Android.signing")
@@ -39,6 +58,7 @@ dependencies {
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.google.guava:guava:19.0'
     compile 'joda-time:joda-time:2.9.1'
+    compile 'org.joda:joda-convert:1.8'
     compile 'de.greenrobot:eventbus:2.4.0'
     compile 'com.bignerdranch.android:expandablerecyclerview:2.0.4'
     compile('com.mikepenz:materialdrawer:5.0.0.fastAdapter.b5-SNAPSHOT@aar') {
diff --git a/QuasselDroidNG/proguard-rules.pro b/QuasselDroidNG/proguard-rules.pro
new file mode 100644
index 0000000000000000000000000000000000000000..45dc58a590cb45b0e593be5df3121c9fa250adc1
--- /dev/null
+++ b/QuasselDroidNG/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /opt/android-sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/app/src/main/AndroidManifest.xml b/QuasselDroidNG/src/main/AndroidManifest.xml
similarity index 100%
rename from app/src/main/AndroidManifest.xml
rename to QuasselDroidNG/src/main/AndroidManifest.xml
diff --git a/app/src/main/java/de/kuschku/libquassel/BusProvider.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/BusProvider.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/BusProvider.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/BusProvider.java
diff --git a/app/src/main/java/de/kuschku/libquassel/Client.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/Client.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/Client.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/Client.java
diff --git a/app/src/main/java/de/kuschku/libquassel/ClientData.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/ClientData.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/ClientData.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/ClientData.java
diff --git a/app/src/main/java/de/kuschku/libquassel/CoreConnection.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/CoreConnection.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/CoreConnection.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/CoreConnection.java
diff --git a/app/src/main/java/de/kuschku/libquassel/IProtocolHandler.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/IProtocolHandler.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/IProtocolHandler.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/IProtocolHandler.java
diff --git a/app/src/main/java/de/kuschku/libquassel/ProtocolHandler.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/ProtocolHandler.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/ProtocolHandler.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/ProtocolHandler.java
diff --git a/app/src/main/java/de/kuschku/libquassel/backlogmanagers/BacklogManager.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/backlogmanagers/BacklogManager.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/backlogmanagers/BacklogManager.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/backlogmanagers/BacklogManager.java
diff --git a/app/src/main/java/de/kuschku/libquassel/backlogmanagers/SimpleBacklogManager.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/backlogmanagers/SimpleBacklogManager.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/backlogmanagers/SimpleBacklogManager.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/backlogmanagers/SimpleBacklogManager.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/BacklogReceivedEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/BacklogReceivedEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/BacklogReceivedEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/BacklogReceivedEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/BufferUpdatedEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/BufferUpdatedEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/BufferUpdatedEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/BufferUpdatedEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/BuffersChangedEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/BuffersChangedEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/BuffersChangedEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/BuffersChangedEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/ConnectionChangeEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/ConnectionChangeEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/ConnectionChangeEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/ConnectionChangeEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/CoreSetupFailedEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/CoreSetupFailedEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/CoreSetupFailedEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/CoreSetupFailedEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/CoreSetupSuccessfulEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/CoreSetupSuccessfulEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/CoreSetupSuccessfulEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/CoreSetupSuccessfulEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/GeneralErrorEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/GeneralErrorEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/GeneralErrorEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/GeneralErrorEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/HandshakeFailedEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/HandshakeFailedEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/HandshakeFailedEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/HandshakeFailedEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/LoginFailedEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/LoginFailedEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/LoginFailedEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/LoginFailedEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/LoginSuccessfulEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/LoginSuccessfulEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/LoginSuccessfulEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/LoginSuccessfulEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/events/StatusMessageEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/StatusMessageEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/events/StatusMessageEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/events/StatusMessageEvent.java
diff --git a/app/src/main/java/de/kuschku/libquassel/exceptions/SyncInvocationException.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/exceptions/SyncInvocationException.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/exceptions/SyncInvocationException.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/exceptions/SyncInvocationException.java
diff --git a/app/src/main/java/de/kuschku/libquassel/exceptions/UnknownTypeException.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/exceptions/UnknownTypeException.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/exceptions/UnknownTypeException.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/exceptions/UnknownTypeException.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/FunctionType.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/FunctionType.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/FunctionType.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/FunctionType.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/FunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/FunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/FunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/FunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/InitDataFunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/InitDataFunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/InitDataFunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/InitDataFunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/InitRequestFunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedInitDataFunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedInitDataFunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedInitDataFunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedInitDataFunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedRpcCallFunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/PackedSyncFunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedInitDataFunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedInitDataFunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedInitDataFunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedInitDataFunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedRpcCallFunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/serializers/UnpackedSyncFunctionSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/HandshakeFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/HandshakeFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/HandshakeFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/HandshakeFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/InitDataFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/InitDataFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/InitDataFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/InitDataFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/InitRequestFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/InitRequestFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/InitRequestFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/InitRequestFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/PackedFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/PackedFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/PackedFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/PackedFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/PackedInitDataFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/PackedInitDataFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/PackedInitDataFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/PackedInitDataFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/RpcCallFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/RpcCallFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/RpcCallFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/RpcCallFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/SerializedFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/SerializedFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/SerializedFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/SerializedFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/SyncFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/SyncFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/SyncFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/SyncFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/UnpackedFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/UnpackedFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/UnpackedFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/UnpackedFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/functions/types/UnpackedInitDataFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/UnpackedInitDataFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/functions/types/UnpackedInitDataFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/functions/types/UnpackedInitDataFunction.java
diff --git a/app/src/main/java/de/kuschku/libquassel/localtypes/Buffer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/Buffer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/localtypes/Buffer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/Buffer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/localtypes/Buffers.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/Buffers.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/localtypes/Buffers.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/Buffers.java
diff --git a/app/src/main/java/de/kuschku/libquassel/localtypes/ChannelBuffer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/ChannelBuffer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/localtypes/ChannelBuffer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/ChannelBuffer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/localtypes/QueryBuffer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/QueryBuffer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/localtypes/QueryBuffer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/QueryBuffer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/localtypes/StatusBuffer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/StatusBuffer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/localtypes/StatusBuffer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/localtypes/StatusBuffer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/message/Message.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/message/Message.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/message/Message.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/message/Message.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/MessageTypeRegistry.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitAckSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitRejectSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientInitSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginAckSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginAckSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginAckSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginAckSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginRejectSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ClientLoginSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupAckSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupAckSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupAckSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupAckSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupDataSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/CoreSetupRejectSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/NetworkServerSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/ObjectSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ObjectSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/ObjectSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/ObjectSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SessionInitSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionStateSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SessionStateSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/SessionStateSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SessionStateSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/SetupDataInitializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/StorageBackendSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/serializers/StringObjectMapSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/StringObjectMapSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/serializers/StringObjectMapSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/serializers/StringObjectMapSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/ClientInit.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInit.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/ClientInit.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInit.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/ClientInitAck.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInitAck.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/ClientInitAck.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInitAck.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/ClientInitReject.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInitReject.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/ClientInitReject.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientInitReject.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/ClientLogin.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLogin.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/ClientLogin.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLogin.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginAck.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginAck.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginAck.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginAck.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginReject.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginReject.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginReject.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/ClientLoginReject.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupAck.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupAck.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupAck.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupAck.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupData.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupData.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupData.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupData.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupReject.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupReject.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupReject.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/CoreSetupReject.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/NetworkServer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/NetworkServer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/NetworkServer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/NetworkServer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/SessionInit.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SessionInit.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/SessionInit.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SessionInit.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/SessionState.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SessionState.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/SessionState.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SessionState.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/SetupData.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SetupData.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/SetupData.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/SetupData.java
diff --git a/app/src/main/java/de/kuschku/libquassel/objects/types/StorageBackend.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/StorageBackend.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/objects/types/StorageBackend.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/objects/types/StorageBackend.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/QMetaType.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/QMetaType.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/QMetaType.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/QMetaType.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/QMetaTypeRegistry.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/QMetaTypeRegistry.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/QMetaTypeRegistry.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/QMetaTypeRegistry.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/BoolSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/BoolSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/BoolSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/BoolSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/BufferInfoSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/BufferInfoSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/BufferInfoSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/BufferInfoSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteArraySerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteArraySerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteArraySerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteArraySerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ByteSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/CharSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/CharSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/CharSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/CharSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/DateTimeSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/DateTimeSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/DateTimeSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/DateTimeSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/IntSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/IntSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/IntSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/IntSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/LongSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/LongSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/LongSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/LongSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/MessageSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/MessageSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/MessageSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/MessageSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/PrimitiveSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/PrimitiveSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/PrimitiveSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/PrimitiveSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/ProtocolSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ProtocolSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/ProtocolSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ProtocolSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/ShortSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ShortSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/ShortSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/ShortSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/StringListSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/StringListSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/StringListSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/StringListSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/StringSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/StringSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/StringSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/StringSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/TimeSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/TimeSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/TimeSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/TimeSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/UserTypeSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/UserTypeSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/UserTypeSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/UserTypeSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantListSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantListSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantListSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantListSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantMapSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantMapSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantMapSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantMapSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantVariantListSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantVariantListSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantVariantListSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VariantVariantListSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/serializers/VoidSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VoidSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/serializers/VoidSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/serializers/VoidSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/types/BufferInfo.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/BufferInfo.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/types/BufferInfo.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/BufferInfo.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/types/Protocol.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/Protocol.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/types/Protocol.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/Protocol.java
diff --git a/app/src/main/java/de/kuschku/libquassel/primitives/types/QVariant.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/QVariant.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/primitives/types/QVariant.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/primitives/types/QVariant.java
diff --git a/app/src/main/java/de/kuschku/libquassel/protocols/DatastreamPeer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/DatastreamPeer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/protocols/DatastreamPeer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/DatastreamPeer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/protocols/LegacyPeer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/LegacyPeer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/protocols/LegacyPeer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/LegacyPeer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/protocols/RemotePeer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/RemotePeer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/protocols/RemotePeer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/protocols/RemotePeer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/Syncable.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/Syncable.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/Syncable.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/Syncable.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/SyncableRegistry.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/SyncableRegistry.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/SyncableRegistry.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/SyncableRegistry.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferSyncerSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferSyncerSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferSyncerSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferSyncerSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewConfigSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewConfigSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewConfigSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewConfigSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewManagerSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewManagerSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewManagerSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/BufferViewManagerSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/serializers/IdentitySerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IdentitySerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/serializers/IdentitySerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IdentitySerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcChannelSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcChannelSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcChannelSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcChannelSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcUserSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcUserSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcUserSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/IrcUserSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/serializers/NetworkSerializer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/NetworkSerializer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/serializers/NetworkSerializer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/serializers/NetworkSerializer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/BufferSyncer.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferSyncer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/types/BufferSyncer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferSyncer.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java
similarity index 94%
rename from app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java
index 79f102c7d46ca983f8325ae55717a2ab27d63ff6..5cc17b730cc7d8d69a8874e6f8e8140d67d3c5fa 100644
--- a/app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java
+++ b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewConfig.java
@@ -1,5 +1,7 @@
 package de.kuschku.libquassel.syncables.types;
 
+import android.util.Log;
+
 import java.util.List;
 
 import de.kuschku.libquassel.BusProvider;
@@ -165,4 +167,13 @@ public class BufferViewConfig extends SyncableObject {
         addBuffer(bufferId, position);
         sync("addBuffer", new Object[] {bufferId, position});
     }
+
+    public void removeBuffer(int bufferId) {
+        if (BufferList.contains(bufferId)) BufferList.remove(BufferList.indexOf(bufferId));
+    }
+
+    public void SYNC_removeBuffer(int bufferId) {
+        removeBuffer(bufferId);
+        sync("removeBuffer", new Object[] {bufferId});
+    }
 }
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewManager.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewManager.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewManager.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/BufferViewManager.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/Identity.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/Identity.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/types/Identity.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/Identity.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/IrcChannel.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/IrcChannel.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/types/IrcChannel.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/IrcChannel.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/IrcUser.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/IrcUser.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/types/IrcUser.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/IrcUser.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/Network.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/Network.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/types/Network.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/Network.java
diff --git a/app/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java b/QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java
similarity index 100%
rename from app/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java
rename to QuasselDroidNG/src/main/java/de/kuschku/libquassel/syncables/types/SyncableObject.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/BufferViewManagerChangedEvent.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/BufferViewManagerChangedEvent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/BufferViewManagerChangedEvent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/BufferViewManagerChangedEvent.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ClientBackgroundThread.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ClientBackgroundThread.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ClientBackgroundThread.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ClientBackgroundThread.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/QuasselService.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/QuasselService.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/QuasselService.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/QuasselService.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/BufferDrawerItem.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/BufferDrawerItem.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/BufferDrawerItem.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/BufferDrawerItem.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/ChatMessageRenderer.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/ChatMessageRenderer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/ChatMessageRenderer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/ChatMessageRenderer.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MessageAdapter.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/MessageAdapter.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/MessageAdapter.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/MessageAdapter.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MessageViewHolder.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/MessageViewHolder.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/MessageViewHolder.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/MessageViewHolder.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/NetworkDrawerItem.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/NetworkDrawerItem.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/ui/NetworkDrawerItem.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/ui/NetworkDrawerItem.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/CompatibilityUtils.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/CompatibilityUtils.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/CompatibilityUtils.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/CompatibilityUtils.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/DateFormatHelper.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/DateFormatHelper.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/DateFormatHelper.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/DateFormatHelper.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/IrcFormatHelper.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/IrcFormatHelper.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/IrcFormatHelper.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/IrcFormatHelper.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/IrcUserUtils.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/IrcUserUtils.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/IrcUserUtils.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/IrcUserUtils.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ServerAddress.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/ServerAddress.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ServerAddress.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/ServerAddress.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/SpanFormatter.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/SpanFormatter.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/SpanFormatter.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/SpanFormatter.java
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/util/ThemeUtil.java b/QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/ThemeUtil.java
similarity index 100%
rename from app/src/main/java/de/kuschku/quasseldroid_ng/util/ThemeUtil.java
rename to QuasselDroidNG/src/main/java/de/kuschku/quasseldroid_ng/util/ThemeUtil.java
diff --git a/app/src/main/java/de/kuschku/util/ReflectionUtils.java b/QuasselDroidNG/src/main/java/de/kuschku/util/ReflectionUtils.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/ReflectionUtils.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/ReflectionUtils.java
diff --git a/app/src/main/java/de/kuschku/util/annotationbind/Binder.java b/QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/Binder.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/annotationbind/Binder.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/Binder.java
diff --git a/app/src/main/java/de/kuschku/util/annotationbind/Color.java b/QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/Color.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/annotationbind/Color.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/annotationbind/Color.java
diff --git a/app/src/main/java/de/kuschku/util/backports/Absent.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Absent.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/Absent.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/Absent.java
diff --git a/app/src/main/java/de/kuschku/util/backports/BinaryFunction.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/BinaryFunction.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/BinaryFunction.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/BinaryFunction.java
diff --git a/app/src/main/java/de/kuschku/util/backports/Consumer.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Consumer.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/Consumer.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/Consumer.java
diff --git a/app/src/main/java/de/kuschku/util/backports/ICollector.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/ICollector.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/ICollector.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/ICollector.java
diff --git a/app/src/main/java/de/kuschku/util/backports/Optional.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Optional.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/Optional.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/Optional.java
diff --git a/app/src/main/java/de/kuschku/util/backports/Optionals.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Optionals.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/Optionals.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/Optionals.java
diff --git a/app/src/main/java/de/kuschku/util/backports/Present.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Present.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/Present.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/Present.java
diff --git a/app/src/main/java/de/kuschku/util/backports/Stream.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/Stream.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/Stream.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/Stream.java
diff --git a/app/src/main/java/de/kuschku/util/backports/collectors/Collectors.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/Collectors.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/collectors/Collectors.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/Collectors.java
diff --git a/app/src/main/java/de/kuschku/util/backports/collectors/ListCollector.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/ListCollector.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/collectors/ListCollector.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/ListCollector.java
diff --git a/app/src/main/java/de/kuschku/util/backports/collectors/MapCollector.java b/QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/MapCollector.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/backports/collectors/MapCollector.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/backports/collectors/MapCollector.java
diff --git a/app/src/main/java/de/kuschku/util/niohelpers/Helper.java b/QuasselDroidNG/src/main/java/de/kuschku/util/niohelpers/Helper.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/niohelpers/Helper.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/niohelpers/Helper.java
diff --git a/app/src/main/java/de/kuschku/util/niohelpers/WrappedChannel.java b/QuasselDroidNG/src/main/java/de/kuschku/util/niohelpers/WrappedChannel.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/niohelpers/WrappedChannel.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/niohelpers/WrappedChannel.java
diff --git a/app/src/main/java/de/kuschku/util/observablelists/AutoScroller.java b/QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/AutoScroller.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/observablelists/AutoScroller.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/AutoScroller.java
diff --git a/app/src/main/java/de/kuschku/util/observablelists/ContentComparable.java b/QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/ContentComparable.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/observablelists/ContentComparable.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/ContentComparable.java
diff --git a/app/src/main/java/de/kuschku/util/observablelists/ObservableList.java b/QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/ObservableList.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/observablelists/ObservableList.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/ObservableList.java
diff --git a/app/src/main/java/de/kuschku/util/observablelists/ObservableSortedList.java b/QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/ObservableSortedList.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/observablelists/ObservableSortedList.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/ObservableSortedList.java
diff --git a/app/src/main/java/de/kuschku/util/observablelists/RecyclerViewAdapterCallback.java b/QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/RecyclerViewAdapterCallback.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/observablelists/RecyclerViewAdapterCallback.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/RecyclerViewAdapterCallback.java
diff --git a/app/src/main/java/de/kuschku/util/observablelists/UICallback.java b/QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/UICallback.java
similarity index 100%
rename from app/src/main/java/de/kuschku/util/observablelists/UICallback.java
rename to QuasselDroidNG/src/main/java/de/kuschku/util/observablelists/UICallback.java
diff --git a/app/src/main/res/drawable-hdpi/.directory b/QuasselDroidNG/src/main/res/drawable-hdpi/.directory
similarity index 100%
rename from app/src/main/res/drawable-hdpi/.directory
rename to QuasselDroidNG/src/main/res/drawable-hdpi/.directory
diff --git a/app/src/main/res/drawable-hdpi/ic_send.png b/QuasselDroidNG/src/main/res/drawable-hdpi/ic_send.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_send.png
rename to QuasselDroidNG/src/main/res/drawable-hdpi/ic_send.png
diff --git a/app/src/main/res/drawable-hdpi/ic_server_dark.png b/QuasselDroidNG/src/main/res/drawable-hdpi/ic_server_dark.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_server_dark.png
rename to QuasselDroidNG/src/main/res/drawable-hdpi/ic_server_dark.png
diff --git a/app/src/main/res/drawable-hdpi/ic_server_light.png b/QuasselDroidNG/src/main/res/drawable-hdpi/ic_server_light.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_server_light.png
rename to QuasselDroidNG/src/main/res/drawable-hdpi/ic_server_light.png
diff --git a/app/src/main/res/drawable-hdpi/ic_status.png b/QuasselDroidNG/src/main/res/drawable-hdpi/ic_status.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_status.png
rename to QuasselDroidNG/src/main/res/drawable-hdpi/ic_status.png
diff --git a/app/src/main/res/drawable-hdpi/ic_status_channel.png b/QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_channel.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_status_channel.png
rename to QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_channel.png
diff --git a/app/src/main/res/drawable-hdpi/ic_status_channel_offline.png b/QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_channel_offline.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_status_channel_offline.png
rename to QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_channel_offline.png
diff --git a/app/src/main/res/drawable-hdpi/ic_status_offline.png b/QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_offline.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_status_offline.png
rename to QuasselDroidNG/src/main/res/drawable-hdpi/ic_status_offline.png
diff --git a/app/src/main/res/drawable-mdpi/.directory b/QuasselDroidNG/src/main/res/drawable-mdpi/.directory
similarity index 100%
rename from app/src/main/res/drawable-mdpi/.directory
rename to QuasselDroidNG/src/main/res/drawable-mdpi/.directory
diff --git a/app/src/main/res/drawable-mdpi/ic_send.png b/QuasselDroidNG/src/main/res/drawable-mdpi/ic_send.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_send.png
rename to QuasselDroidNG/src/main/res/drawable-mdpi/ic_send.png
diff --git a/app/src/main/res/drawable-mdpi/ic_server_dark.png b/QuasselDroidNG/src/main/res/drawable-mdpi/ic_server_dark.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_server_dark.png
rename to QuasselDroidNG/src/main/res/drawable-mdpi/ic_server_dark.png
diff --git a/app/src/main/res/drawable-mdpi/ic_server_light.png b/QuasselDroidNG/src/main/res/drawable-mdpi/ic_server_light.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_server_light.png
rename to QuasselDroidNG/src/main/res/drawable-mdpi/ic_server_light.png
diff --git a/app/src/main/res/drawable-mdpi/ic_status.png b/QuasselDroidNG/src/main/res/drawable-mdpi/ic_status.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_status.png
rename to QuasselDroidNG/src/main/res/drawable-mdpi/ic_status.png
diff --git a/app/src/main/res/drawable-mdpi/ic_status_channel.png b/QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_channel.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_status_channel.png
rename to QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_channel.png
diff --git a/app/src/main/res/drawable-mdpi/ic_status_channel_offline.png b/QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_channel_offline.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_status_channel_offline.png
rename to QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_channel_offline.png
diff --git a/app/src/main/res/drawable-mdpi/ic_status_offline.png b/QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_offline.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_status_offline.png
rename to QuasselDroidNG/src/main/res/drawable-mdpi/ic_status_offline.png
diff --git a/app/src/main/res/drawable-nodpi/bg.png b/QuasselDroidNG/src/main/res/drawable-nodpi/bg.png
similarity index 100%
rename from app/src/main/res/drawable-nodpi/bg.png
rename to QuasselDroidNG/src/main/res/drawable-nodpi/bg.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_send.png b/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_send.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_send.png
rename to QuasselDroidNG/src/main/res/drawable-xhdpi/ic_send.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_server_dark.png b/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_server_dark.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_server_dark.png
rename to QuasselDroidNG/src/main/res/drawable-xhdpi/ic_server_dark.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_server_light.png b/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_server_light.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_server_light.png
rename to QuasselDroidNG/src/main/res/drawable-xhdpi/ic_server_light.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_status.png b/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_status.png
rename to QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_status_channel.png b/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_channel.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_status_channel.png
rename to QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_channel.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_status_channel_offline.png b/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_channel_offline.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_status_channel_offline.png
rename to QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_channel_offline.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_status_offline.png b/QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_offline.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_status_offline.png
rename to QuasselDroidNG/src/main/res/drawable-xhdpi/ic_status_offline.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_send.png b/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_send.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_send.png
rename to QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_send.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_server_dark.png b/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_server_dark.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_server_dark.png
rename to QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_server_dark.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_server_light.png b/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_server_light.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_server_light.png
rename to QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_server_light.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_status.png b/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_status.png
rename to QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_status_channel.png b/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_channel.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_status_channel.png
rename to QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_channel.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_status_channel_offline.png b/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_channel_offline.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_status_channel_offline.png
rename to QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_channel_offline.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_status_offline.png b/QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_offline.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_status_offline.png
rename to QuasselDroidNG/src/main/res/drawable-xxhdpi/ic_status_offline.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_send.png b/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_send.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_send.png
rename to QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_send.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_server_dark.png b/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_server_dark.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_server_dark.png
rename to QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_server_dark.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_server_light.png b/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_server_light.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_server_light.png
rename to QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_server_light.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_status.png b/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_status.png
rename to QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_status_channel.png b/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_channel.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_status_channel.png
rename to QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_channel.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_status_channel_offline.png b/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_channel_offline.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_status_channel_offline.png
rename to QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_channel_offline.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_status_offline.png b/QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_offline.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_status_offline.png
rename to QuasselDroidNG/src/main/res/drawable-xxxhdpi/ic_status_offline.png
diff --git a/app/src/main/res/layout/activity_main.xml b/QuasselDroidNG/src/main/res/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to QuasselDroidNG/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/content_main.xml b/QuasselDroidNG/src/main/res/layout/content_main.xml
similarity index 100%
rename from app/src/main/res/layout/content_main.xml
rename to QuasselDroidNG/src/main/res/layout/content_main.xml
diff --git a/app/src/main/res/layout/core_dialog.xml b/QuasselDroidNG/src/main/res/layout/core_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/core_dialog.xml
rename to QuasselDroidNG/src/main/res/layout/core_dialog.xml
diff --git a/app/src/main/res/layout/login_dialog.xml b/QuasselDroidNG/src/main/res/layout/login_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/login_dialog.xml
rename to QuasselDroidNG/src/main/res/layout/login_dialog.xml
diff --git a/app/src/main/res/layout/slider_main.xml b/QuasselDroidNG/src/main/res/layout/slider_main.xml
similarity index 100%
rename from app/src/main/res/layout/slider_main.xml
rename to QuasselDroidNG/src/main/res/layout/slider_main.xml
diff --git a/app/src/main/res/layout/widget_chatmessage.xml b/QuasselDroidNG/src/main/res/layout/widget_chatmessage.xml
similarity index 100%
rename from app/src/main/res/layout/widget_chatmessage.xml
rename to QuasselDroidNG/src/main/res/layout/widget_chatmessage.xml
diff --git a/app/src/main/res/menu/menu_main2.xml b/QuasselDroidNG/src/main/res/menu/menu_main2.xml
similarity index 100%
rename from app/src/main/res/menu/menu_main2.xml
rename to QuasselDroidNG/src/main/res/menu/menu_main2.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/QuasselDroidNG/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to QuasselDroidNG/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/QuasselDroidNG/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to QuasselDroidNG/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/QuasselDroidNG/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to QuasselDroidNG/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/QuasselDroidNG/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to QuasselDroidNG/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/QuasselDroidNG/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to QuasselDroidNG/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/QuasselDroidNG/src/main/res/values-w820dp/dimens.xml
similarity index 100%
rename from app/src/main/res/values-w820dp/dimens.xml
rename to QuasselDroidNG/src/main/res/values-w820dp/dimens.xml
diff --git a/app/src/main/res/values/attrs.xml b/QuasselDroidNG/src/main/res/values/attrs.xml
similarity index 100%
rename from app/src/main/res/values/attrs.xml
rename to QuasselDroidNG/src/main/res/values/attrs.xml
diff --git a/app/src/main/res/values/colors.xml b/QuasselDroidNG/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to QuasselDroidNG/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/dimens.xml b/QuasselDroidNG/src/main/res/values/dimens.xml
similarity index 100%
rename from app/src/main/res/values/dimens.xml
rename to QuasselDroidNG/src/main/res/values/dimens.xml
diff --git a/app/src/main/res/values/ids.xml b/QuasselDroidNG/src/main/res/values/ids.xml
similarity index 100%
rename from app/src/main/res/values/ids.xml
rename to QuasselDroidNG/src/main/res/values/ids.xml
diff --git a/app/src/main/res/values/strings.xml b/QuasselDroidNG/src/main/res/values/strings.xml
similarity index 100%
rename from app/src/main/res/values/strings.xml
rename to QuasselDroidNG/src/main/res/values/strings.xml
diff --git a/app/src/main/res/values/styles.xml b/QuasselDroidNG/src/main/res/values/styles.xml
similarity index 100%
rename from app/src/main/res/values/styles.xml
rename to QuasselDroidNG/src/main/res/values/styles.xml
diff --git a/app/src/main/res/values/themes.xml b/QuasselDroidNG/src/main/res/values/themes.xml
similarity index 100%
rename from app/src/main/res/values/themes.xml
rename to QuasselDroidNG/src/main/res/values/themes.xml
diff --git a/settings.gradle b/settings.gradle
index e7b4def49cb53d9aa04228dd3edb14c9e635e003..a85e224b04883ccccaa0dd681074fb199fde2db4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':QuasselDroidNG'