diff --git a/.gitignore b/.gitignore
index fa45aab..20537be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@
 /PrototypChat/obj/Debug
 /PrototypChat/obj/Release
 /publish
+/BeWoPlanerChat/MyTestApplication
+/BeWoPlanerChat/bewoplaner-chat-android/app/*.apk
+/PrototypChat/.vs/PrototypChat/v14
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/app-release.apk b/BeWoPlanerChat/bewoplaner-chat-android/app/app-release.apk
deleted file mode 100644
index 59c1829..0000000
Binary files a/BeWoPlanerChat/bewoplaner-chat-android/app/app-release.apk and /dev/null differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
index 7655f00..c2bb883 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
@@ -30,23 +30,21 @@ android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
     defaultConfig {
-        applicationId "com.p3.bewoplanner"
+        applicationId "de.beyondsoft.ownchat"
         minSdkVersion 16
         targetSdkVersion 25
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
-
     signingConfigs {
         release {
-            storeFile file('../keystore.jks')
-            storePassword 'Qva/F637QEDfM)Z]'
-            keyAlias 'bewoplaner-chat'
-            keyPassword 'q7vWk(V&R6+NVjvg'
+            storeFile file('../ownChat.jks')
+            storePassword 'jlzvnz9e4ur3gfk6hwsw'
+            keyAlias 'ownChatKey'
+            keyPassword '6fhnfqm07tvbagm3t6k4'
         }
     }
-
     buildTypes {
         debug {
             ext.enableCrashlytics = false
@@ -61,7 +59,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
     lintOptions {
         abortOnError false
         disable 'InvalidPackage'
@@ -73,58 +70,45 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
-
     // Android support libraries
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile 'com.android.support:design:25.3.0'
-
     // Butter Knife
-    compile 'com.jakewharton:butterknife:8.4.0'
-    apt 'com.jakewharton:butterknife-compiler:8.4.0'
-
     // Dagger
-    compile 'com.google.dagger:dagger:2.7'
-    apt 'com.google.dagger:dagger-compiler:2.7'
-    provided 'javax.annotation:jsr250-api:1.0'
-
     // Rx Java
-    compile 'io.reactivex:rxjava:1.1.6'
-    compile 'io.reactivex:rxandroid:1.2.1'
-    compile 'com.jakewharton.rxbinding:rxbinding:0.4.0'
-
     // Retrofit
-    compile 'com.squareup.retrofit2:retrofit:2.1.0'
-    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
-    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
-
     // OkHttp
-    compile 'com.squareup.okhttp3:okhttp:3.4.1'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
-
     // Glide
-    compile 'com.github.bumptech.glide:glide:3.7.0'
-
     // Circle ImageView
-    compile 'de.hdodenhof:circleimageview:2.1.0'
     compile('com.crashlytics.sdk.android:crashlytics:2.6.6@aar') {
         transitive = true;
     }
-
     // Secure Preferences
-    compile 'com.scottyab:secure-preferences-lib:0.1.4'
-
     // Firebase
-    compile 'com.google.firebase:firebase-messaging:10.2.0'
-
     // emojis
-    compile 'hani.momanii.supernova_emoji_library:supernova-emoji-library:0.0.2'
-
     // circle progress
-    compile 'com.github.lzyzsd:circleprogress:1.2.1'
-
     // event bus
+    compile 'com.android.support:appcompat-v7:25.3.0'
+    compile 'com.android.support:design:25.3.0'
+    compile 'com.jakewharton:butterknife:8.4.0'
+    compile 'com.google.dagger:dagger:2.7'
+    compile 'io.reactivex:rxjava:1.1.6'
+    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    compile 'com.squareup.retrofit2:retrofit:2.1.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.1.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava:2.1.0'
+    compile 'com.squareup.okhttp3:okhttp:3.4.1'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
+    compile 'de.hdodenhof:circleimageview:2.1.0'
+    compile 'com.scottyab:secure-preferences-lib:0.1.4'
+    compile 'com.google.firebase:firebase-messaging:10.2.0'
+    compile 'hani.momanii.supernova_emoji_library:supernova-emoji-library:0.0.2'
+    compile 'com.github.lzyzsd:circleprogress:1.2.1'
     compile 'org.greenrobot:eventbus:3.0.0'
+    testCompile 'junit:junit:4.12'
+    apt 'com.jakewharton:butterknife-compiler:8.4.0'
+    apt 'com.google.dagger:dagger-compiler:2.7'
+    provided 'javax.annotation:jsr250-api:1.0'
 }
 
 task adp2upload(type: Exec, dependsOn: "build") {
@@ -133,7 +117,7 @@ task adp2upload(type: Exec, dependsOn: "build") {
         channel = "bewoplaner-chat"
         slug = "bewoplaner-chat"
         versionCode = rootProject.versionCode
-        identifier = "com.p3.bewoplaner"
+        identifier = "de.p3.bewoplaner"
         file = "build/outputs/apk/app-release.apk"
         notes = "Nightly build for BeWoPlaner Chat"
     }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/google-services.json b/BeWoPlanerChat/bewoplaner-chat-android/app/google-services.json
index 1efb1f0..25b857b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/google-services.json
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/google-services.json
@@ -10,7 +10,7 @@
       "client_info": {
         "mobilesdk_app_id": "1:1021949586645:android:113c5b5fc97fb0bb",
         "android_client_info": {
-          "package_name": "com.p3.bewoplanner"
+          "package_name": "de.beyondsoft.ownchat"
         }
       },
       "oauth_client": [
@@ -18,7 +18,7 @@
           "client_id": "1021949586645-vnidi5tjof2kgsal6qgqrbokel0q0hvi.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.p3.bewoplanner",
+            "package_name": "de.beyondsoft.ownchat",
             "certificate_hash": "349feb470feaf535c1074c91721714ced3d81f0c"
           }
         },
@@ -26,7 +26,7 @@
           "client_id": "1021949586645-ttle1pv465pp7gdigqh93futan4cmn8p.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.p3.bewoplanner",
+            "package_name": "de.beyondsoft.ownchat",
             "certificate_hash": "458abe7a8928c32f3ad3fbcc575373b613070aae"
           }
         },
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/com/p3/bewoplaner/ExampleInstrumentedTest.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/beyondsoft/ownchat/ExampleInstrumentedTest.java
similarity index 85%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/com/p3/bewoplaner/ExampleInstrumentedTest.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/beyondsoft/ownchat/ExampleInstrumentedTest.java
index 2dbe9bd..97e9f10 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/com/p3/bewoplaner/ExampleInstrumentedTest.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/beyondsoft/ownchat/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner;
+package de.beyondsoft.ownchat;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.p3.bewoplanner", appContext.getPackageName());
+        assertEquals("de.beyondsoft.ownchat", appContext.getPackageName());
     }
 }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml
index f0c4cb6..0d7b0ee 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.p3.bewoplaner">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="de.beyondsoft.ownchat">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -9,54 +10,49 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
-        android:name="com.p3.bewoplaner.BewoplanerApplication"
+        android:name="de.beyondsoft.ownchat.BewoplanerApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name="com.p3.bewoplaner.page.splash.SplashActivity"
+            android:name="de.beyondsoft.ownchat.page.splash.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.FullBackground">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name=".page.login.LoginActivity"
+            android:name="de.beyondsoft.ownchat.page.login.LoginActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.FullBackground" />
-
         <activity
-            android:name=".page.main.MainActivity"
+            android:name="de.beyondsoft.ownchat.page.main.MainActivity"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
-
         <activity
-            android:name=".page.impressum.ImpressumActivity"
+            android:name="de.beyondsoft.ownchat.page.impressum.ImpressumActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
-
         <activity
-            android:name=".page.chat.SingleChatActivity"
+            android:name="de.beyondsoft.ownchat.page.chat.SingleChatActivity"
             android:label=""
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/ChatStyle" />
-
         <activity
-            android:name=".page.chat.GroupChatActivity"
+            android:name="de.beyondsoft.ownchat.page.chat.GroupChatActivity"
             android:label=""
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:theme="@style/ChatStyle" />
-
         <activity
-            android:name=".page.chatmembers.ChatMembersActivity"
+            android:name="de.beyondsoft.ownchat.page.chatmembers.ChatMembersActivity"
             android:label=""
             android:screenOrientation="portrait"
             android:theme="@style/ChatStyle" />
@@ -65,15 +61,15 @@
             android:name="io.fabric.ApiKey"
             android:value="1dcc8d0ead50f1b328778876834fea3392c6fc22" />
 
-        <service android:name=".data.firebase.MessagingInstanceIdService">
+        <service android:name="de.beyondsoft.ownchat.data.firebase.MessagingInstanceIdService">
             <intent-filter>
                 <action android:name="com.google.firebase.INSTANCE_ID_EVENT" />
             </intent-filter>
         </service>
-
-        <service android:name=".utils.AppStoppedService" android:stopWithTask="false"/>
-
-        <service android:name=".data.firebase.HandleMessagesService">
+        <service
+            android:name="de.beyondsoft.ownchat.utils.AppStoppedService"
+            android:stopWithTask="false" />
+        <service android:name="de.beyondsoft.ownchat.data.firebase.HandleMessagesService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
@@ -90,7 +86,7 @@
         </provider>
 
         <receiver
-            android:name=".data.firebase.ReplyNotificationReceiver"
+            android:name="de.beyondsoft.ownchat.data.firebase.ReplyNotificationReceiver"
             android:enabled="true"
             android:exported="false" />
 
@@ -100,6 +96,8 @@
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_color"
             android:resource="@color/colorDefault" />
+
+        <activity android:name="de.beyondsoft.ownchat.page.fileconfirmation.FileConfirmationActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java
deleted file mode 100644
index 860be3d..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.p3.bewoplaner.data.api.common;
-
-import com.p3.bewoplaner.data.events.InvalidTokenEvent;
-import com.p3.bewoplaner.model.common.BaseResponse;
-
-import org.greenrobot.eventbus.EventBus;
-
-import rx.Observable;
-import rx.functions.Func1;
-
-/**
- * Created by laszloffiferenc on 2/21/17.
- */
-public class ErrorHandlingResponseConverter<T extends BaseResponse>
-        implements Func1<T, Observable<T>> {
-
-    @Override
-    public Observable<T> call(T t) {
-        if (!t.success) {
-            if (t.errors.token != null) {
-                EventBus.getDefault().post(new InvalidTokenEvent());
-                return Observable.error(new ErrorThrowable(ErrorType.INVALID_TOKEN, t.errors));
-            }
-            return Observable.error(new ErrorThrowable(ErrorType.DATA_INPUT, t.errors));
-        }
-        return Observable.just(t);
-    }
-}
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorType.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorType.java
deleted file mode 100644
index 48a04bc..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorType.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.p3.bewoplaner.data.api.common;
-
-/**
- * Created by laszloffiferenc on 2/21/17.
- */
-public enum ErrorType {
-
-    /**
-     * Unexpected/unknown error
-     */
-    UNKNOWN,
-    /**
-     * Wrong query parameters
-     */
-    DATA_INPUT,
-
-    /**
-     * Expired/invalid token
-     */
-    INVALID_TOKEN
-
-}
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/LoginService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/LoginService.java
deleted file mode 100644
index f6c485f..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/LoginService.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.p3.bewoplaner.data.api.services;
-
-import com.p3.bewoplaner.data.api.responses.ProfileResponse;
-
-import retrofit2.http.Field;
-import retrofit2.http.FormUrlEncoded;
-import retrofit2.http.POST;
-import rx.Observable;
-
-/**
- * Created by laszloffiferenc on 2/21/17.
- */
-public interface LoginService {
-    @FormUrlEncoded
-    @POST("api/user/login")
-    Observable<ProfileResponse> login(
-            @Field("username") String username,
-            @Field("password") String password
-    );
-}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/VoucherService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/VoucherService.java
deleted file mode 100644
index 7c92379..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/VoucherService.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.p3.bewoplaner.data.api.services;
-
-import com.google.gson.JsonObject;
-
-import retrofit2.http.GET;
-import retrofit2.http.Query;
-import rx.Observable;
-
-/**
- * Created by Rares Teodorescu on 24/03/2017.
- */
-public interface VoucherService {
-
-    @GET("voucher_check.php")
-    Observable<JsonObject> checkVoucher(
-            @Query("k") String customerId,
-            @Query("Voucher") String voucher);
-
-}
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/LogoutDirectlyEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/LogoutDirectlyEvent.java
deleted file mode 100644
index f5fe0d2..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/LogoutDirectlyEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.p3.bewoplaner.data.events;
-
-public class LogoutDirectlyEvent {
-}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/VoucherEndpoint.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/VoucherEndpoint.java
deleted file mode 100644
index f9b2197..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/VoucherEndpoint.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.p3.bewoplaner.di;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-import javax.inject.Qualifier;
-
-/**
- * Created by Rares Teodorescu on 24/03/2017.
- */
-@Qualifier
-@Retention(RetentionPolicy.SOURCE)
-public @interface VoucherEndpoint {
-}
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginModule.java
deleted file mode 100644
index 78548a4..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginModule.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.p3.bewoplaner.page.login;
-
-import com.p3.bewoplaner.data.api.services.LoginService;
-import com.p3.bewoplaner.data.api.services.RegisterService;
-import com.p3.bewoplaner.data.api.services.VoucherService;
-import com.p3.bewoplaner.di.P3DSEndpoint;
-import com.p3.bewoplaner.di.VoucherEndpoint;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
-
-import dagger.Module;
-import dagger.Provides;
-import retrofit2.Retrofit;
-
-/**
- * Created by laszloffiferenc on 2/21/17.
- */
-@Module
-public class LoginModule {
-
-    @Provides
-    @ActivityScope
-    LoginService provideLoginService(@P3DSEndpoint Retrofit retrofit) {
-        return retrofit.create(LoginService.class);
-    }
-
-    @Provides
-    @ActivityScope
-    RegisterService provideRegisterService(@P3DSEndpoint Retrofit retrofit) {
-        return retrofit.create(RegisterService.class);
-    }
-
-    @Provides
-    @ActivityScope
-    VoucherService provideVoucherService(@VoucherEndpoint Retrofit retrofit) {
-        return retrofit.create(VoucherService.class);
-    }
-}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginView.java
deleted file mode 100644
index 7c60d4f..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginView.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.p3.bewoplaner.page.login;
-
-import com.p3.bewoplaner.page.main.LogoutNavigation;
-import com.p3.bewoplaner.page.main.MainNavigation;
-import com.p3.bewoplaner.page.mvp.MVPLceView;
-
-/**
- * Created by laszloffiferenc on 2/21/17.
- */
-interface LoginView extends MVPLceView {
-    void loginSuccessful();
-
-    void setCallback(Callback callback);
-
-    void voucherIsValid();
-
-    void voucherIsNotValid();
-
-    interface Callback {
-
-        void checkVoucher(String customerId, String voucher, String password, boolean isChecked);
-
-        void tryToLogin(String email, String password);
-
-        void tryToRegisterDevice(String deviceId, String fcmToken);
-
-        void logout(String deviceId, boolean clearAllPrefs, MainNavigation mainNavigation);
-
-        void tryToLogout(String deviceId, MainNavigation mainNavigation);
-
-        void checkIfVoucherStillAvailable(LogoutNavigation logoutNavigation);
-    }
-}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/LogoutNavigation.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/LogoutNavigation.java
deleted file mode 100644
index 6a09905..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/LogoutNavigation.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.p3.bewoplaner.page.main;
-
-public interface LogoutNavigation {
-
-    void logoutDirectly();
-
-}
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/BewoplanerApplication.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/BewoplanerApplication.java
similarity index 78%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/BewoplanerApplication.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/BewoplanerApplication.java
index 0413438..09685e8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/BewoplanerApplication.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/BewoplanerApplication.java
@@ -1,11 +1,11 @@
-package com.p3.bewoplaner;
+package de.beyondsoft.ownchat;
 
 import com.crashlytics.android.Crashlytics;
-import com.p3.bewoplaner.data.firebase.MessagingInstanceIdService;
-import com.p3.bewoplaner.di.ApplicationComponent;
-import com.p3.bewoplaner.di.ApplicationModule;
-import com.p3.bewoplaner.di.DaggerApplicationComponent;
-import com.p3.bewoplaner.di.InjectionHelper;
+import de.beyondsoft.ownchat.data.firebase.MessagingInstanceIdService;
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.ApplicationModule;
+import de.beyondsoft.ownchat.di.DaggerApplicationComponent;
+import de.beyondsoft.ownchat.di.InjectionHelper;
 
 import android.app.Application;
 
@@ -22,19 +22,24 @@ public class BewoplanerApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
+
         Realm.init(this);
+
         if (!BuildConfig.DEBUG) {
             Fabric.with(this, new Crashlytics());
         }
+
         buildGraphAndInject();
         MessagingInstanceIdService.setApplicationContext(this);
     }
 
     private void buildGraphAndInject() {
         final ApplicationModule applicationModule = new ApplicationModule(this);
+
         mApplicationComponent = DaggerApplicationComponent.builder()
                 .applicationModule(applicationModule)
                 .build();
+
         mApplicationComponent.inject(this);
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/AppPrefsConstants.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/AppPrefsConstants.java
similarity index 73%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/AppPrefsConstants.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/AppPrefsConstants.java
index 7aad374..b4710e4 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/AppPrefsConstants.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/AppPrefsConstants.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data;
+package de.beyondsoft.ownchat.data;
 
 /**
  * Created by imarneanu on 2/10/17.
@@ -15,4 +15,7 @@ public interface AppPrefsConstants {
     String PHONE_NUMBER = "phone_number";
     String CHAT_OPENED = "chat_opened";
     String APP_KILLED = "app_killed";
+    String UPLOAD_MAX_SIZE = "upload_max_size";
+    String IS_EMPLOYEE = "is_employee";
+    String SHOW_LOGIN_AGAIN = "show_login_again";
 }
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/ApiModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java
similarity index 71%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/ApiModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java
index 42644a7..bef5273 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/ApiModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java
@@ -1,16 +1,15 @@
-package com.p3.bewoplaner.data.api;
+package de.beyondsoft.ownchat.data.api;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import com.p3.bewoplaner.BewoplanerApplication;
-import com.p3.bewoplaner.BuildConfig;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.di.P3DSEndpoint;
-import com.p3.bewoplaner.di.VoucherEndpoint;
-import com.p3.bewoplaner.di.scopes.ApplicationScope;
-import com.p3.bewoplaner.utils.Constants;
+import de.beyondsoft.ownchat.BewoplanerApplication;
+import de.beyondsoft.ownchat.BuildConfig;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.di.P3DSEndpoint;
+import de.beyondsoft.ownchat.di.scopes.ApplicationScope;
+import de.beyondsoft.ownchat.utils.Constants;
 
 import java.io.File;
 import java.util.concurrent.TimeUnit;
@@ -53,6 +52,7 @@ public class ApiModule {
         } else {
             interceptor.setLevel(HttpLoggingInterceptor.Level.NONE);
         }
+
         return interceptor;
     }
 
@@ -66,12 +66,15 @@ public class ApiModule {
             if (token.isSet()) {
                 builder.addHeader("Token", token.get());
             }
+
             if (customerId.isSet()) {
                 builder.addHeader("CustomerID", customerId.get());
             }
+
             if (isHeaderSet) {
                 return chain.proceed(builder.build());
             }
+
             return chain.proceed(original.newBuilder().build());
         };
     }
@@ -79,9 +82,7 @@ public class ApiModule {
     @Provides
     @ApplicationScope
     @P3DSEndpoint
-    OkHttpClient provideP3DSOkHttpClient(Cache cache,
-                                         HttpLoggingInterceptor loggingInterceptor,
-                                         Interceptor interceptor) {
+    OkHttpClient provideP3DSOkHttpClient(Cache cache, HttpLoggingInterceptor loggingInterceptor, Interceptor interceptor) {
         return new OkHttpClient.Builder()
                 .cache(cache)
                 .connectTimeout(30, TimeUnit.SECONDS)
@@ -92,17 +93,6 @@ public class ApiModule {
                 .build();
     }
 
-    @Provides
-    @ApplicationScope
-    @VoucherEndpoint
-    OkHttpClient provideVoucherkHttpClient(Cache cache,
-                                           HttpLoggingInterceptor loggingInterceptor) {
-        return new OkHttpClient.Builder()
-                .cache(cache)
-                .addInterceptor(loggingInterceptor)
-                .build();
-    }
-
     @Provides
     @ApplicationScope
     CallAdapter.Factory provideCallAdapterFactory() {
@@ -137,18 +127,4 @@ public class ApiModule {
                 .client(okHttpClient)
                 .build();
     }
-
-    @Provides
-    @ApplicationScope
-    @VoucherEndpoint
-    Retrofit provideVoucherRetrofit(@VoucherEndpoint final OkHttpClient okHttpClient,
-                                    final Converter.Factory converter,
-                                    final CallAdapter.Factory adapterFactory) {
-        return new Retrofit.Builder()
-                .baseUrl(Constants.VOUCHER_ENDPOINT)
-                .addCallAdapterFactory(adapterFactory)
-                .addConverterFactory(converter)
-                .client(okHttpClient)
-                .build();
-    }
 }
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorHandlingResponseConverter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorHandlingResponseConverter.java
new file mode 100644
index 0000000..cb725c1
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorHandlingResponseConverter.java
@@ -0,0 +1,41 @@
+package de.beyondsoft.ownchat.data.api.common;
+
+import de.beyondsoft.ownchat.data.events.InvalidTokenEvent;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
+
+import org.greenrobot.eventbus.EventBus;
+
+import rx.Observable;
+import rx.functions.Func1;
+
+/**
+ * Created by laszloffiferenc on 2/21/17.
+ */
+public class ErrorHandlingResponseConverter<T extends BaseResponse> implements Func1<T, Observable<T>> {
+
+    @Override
+    public Observable<T> call(T t) {
+        if (!t.success) {
+            if (t.errors.token != null) {
+                EventBus.getDefault().post(new InvalidTokenEvent());
+                return Observable.error(new ErrorThrowable(ErrorType.INVALID_TOKEN, t.errors));
+            }
+
+            if(t.errors.chatCodeFailed != null) {
+                return Observable.error(new ErrorThrowable(ErrorType.WRONG_CHATCODE, t.errors));
+            }
+
+            if(t.errors.chatCodeInactive != null) {
+                return Observable.error(new ErrorThrowable(ErrorType.DEACTIVATED_CHATCODE, t.errors));
+            }
+
+            if(t.errors.chatCodeTooShort != null) {
+                return Observable.error(new ErrorThrowable(ErrorType.CHATCODE_TOO_SHORT, t.errors));
+            }
+
+            return Observable.error(new ErrorThrowable(ErrorType.DATA_INPUT, t.errors));
+        }
+
+        return Observable.just(t);
+    }
+}
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorThrowable.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorThrowable.java
similarity index 82%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorThrowable.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorThrowable.java
index d288283..8bd446e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorThrowable.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorThrowable.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.api.common;
+package de.beyondsoft.ownchat.data.api.common;
 
-import com.p3.bewoplaner.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
 
 /**
  * Created by laszloffiferenc on 2/21/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorType.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorType.java
new file mode 100644
index 0000000..2005d5d
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorType.java
@@ -0,0 +1,36 @@
+package de.beyondsoft.ownchat.data.api.common;
+
+/**
+ * Created by laszloffiferenc on 2/21/17.
+ */
+public enum ErrorType {
+
+    /**
+     * Unexpected/unknown error
+     */
+    UNKNOWN,
+    /**
+     * Wrong query parameters
+     */
+    DATA_INPUT,
+
+    /**
+     * Expired/invalid token
+     */
+    INVALID_TOKEN,
+
+    /**
+     * Deactivated chat code
+     */
+    DEACTIVATED_CHATCODE,
+
+    /**
+     * Wrong chat code
+     */
+    WRONG_CHATCODE,
+
+    /**
+     * The chat code is too short
+     */
+    CHATCODE_TOO_SHORT
+}
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorUtils.java
similarity index 89%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorUtils.java
index a3e32da..c76f0c8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/common/ErrorUtils.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorUtils.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.api.common;
+package de.beyondsoft.ownchat.data.api.common;
 
 /**
  * Created by laszloffiferenc on 2/23/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/GroupResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/GroupResponse.java
similarity index 70%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/GroupResponse.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/GroupResponse.java
index 003beec..d5dea5b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/GroupResponse.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/GroupResponse.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
 
 import java.util.ArrayList;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessageResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/MessageResponse.java
similarity index 62%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessageResponse.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/MessageResponse.java
index 68c17a8..eff0b48 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessageResponse.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/MessageResponse.java
@@ -1,8 +1,9 @@
-package com.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import com.p3.bewoplaner.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
 
 /**
  * Created by Rares Teodorescu on 08/03/2017.
@@ -15,7 +16,7 @@ public class MessageResponse extends BaseResponse {
     public static class Response {
 
         @SerializedName("message")
-        public com.p3.bewoplaner.model.Message message;
+        public Message message;
     }
 
 }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessagesResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/MessagesResponse.java
similarity index 67%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessagesResponse.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/MessagesResponse.java
index 02ccdd2..91edd29 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/MessagesResponse.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/MessagesResponse.java
@@ -1,11 +1,13 @@
-package com.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import com.p3.bewoplaner.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
 
 import java.util.ArrayList;
 
+import de.beyondsoft.ownchat.model.Message;
+
 /**
  * Created by imarneanu on 3/1/17.
  */
@@ -16,7 +18,7 @@ public class MessagesResponse extends BaseResponse {
     public static class Response {
 
         @SerializedName("messages")
-        public ArrayList<com.p3.bewoplaner.model.Message> messages;
+        public ArrayList<Message> messages;
 
         @SerializedName("hasMorePages")
         public boolean hasMorePages;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/ProfileResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/ProfileResponse.java
similarity index 68%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/ProfileResponse.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/ProfileResponse.java
index fce3631..b17bb0f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/ProfileResponse.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/ProfileResponse.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import com.p3.bewoplaner.model.common.BaseResponse;
-import com.p3.bewoplaner.model.User;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.User;
 
 /**
  * Created by imarneanu on 2/23/17.
@@ -16,6 +16,5 @@ public class ProfileResponse extends BaseResponse {
 
         @SerializedName("user")
         public User user;
-
     }
 }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/RegisterResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/RegisterResponse.java
similarity index 67%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/RegisterResponse.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/RegisterResponse.java
index a1d5d8f..464491c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/RegisterResponse.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/RegisterResponse.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import com.p3.bewoplaner.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
 
 /**
  * Created by laszloffiferenc on 2/28/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/UploadImageResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/UploadImageResponse.java
similarity index 75%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/UploadImageResponse.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/UploadImageResponse.java
index eb2a513..28bfa0d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/responses/UploadImageResponse.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/responses/UploadImageResponse.java
@@ -1,7 +1,7 @@
-package com.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
-import com.p3.bewoplaner.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
 
 /**
  * Created by Vlad on 28/02/2017.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ChatService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/ChatService.java
similarity index 81%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ChatService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/ChatService.java
index 3a9f1c0..4504540 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ChatService.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/ChatService.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.data.api.services;
+package de.beyondsoft.ownchat.data.api.services;
 
-import com.p3.bewoplaner.data.api.responses.GroupResponse;
-import com.p3.bewoplaner.data.api.responses.MessageResponse;
-import com.p3.bewoplaner.data.api.responses.MessagesResponse;
+import de.beyondsoft.ownchat.data.api.responses.GroupResponse;
+import de.beyondsoft.ownchat.data.api.responses.MessageResponse;
+import de.beyondsoft.ownchat.data.api.responses.MessagesResponse;
 
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -39,5 +39,4 @@ public interface ChatService {
     Observable<MessageResponse> sendMessage(
             @Field("groupid") long groupId,
             @Field("text") String text);
-
 }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/LoginService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/LoginService.java
new file mode 100644
index 0000000..0046a6d
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/LoginService.java
@@ -0,0 +1,40 @@
+package de.beyondsoft.ownchat.data.api.services;
+
+import com.google.gson.JsonObject;
+import de.beyondsoft.ownchat.data.api.responses.ProfileResponse;
+
+import retrofit2.http.Field;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
+import retrofit2.http.Path;
+import rx.Observable;
+
+/**
+ * Created by laszloffiferenc on 2/21/17.
+ */
+public interface LoginService {
+    @FormUrlEncoded
+    @POST("api/user/login")
+    Observable<ProfileResponse> login(
+            @Field("username") String username,
+            @Field("password") String password
+    );
+
+    @FormUrlEncoded
+    @POST("api/user/loginwithchatcode")
+    Observable<ProfileResponse> loginWithChatCode(
+            @Field("username") String username,
+            @Field("password") String password,
+            @Field("chatcode") String chatcode
+    );
+
+    @GET("https://dict.ownchat.de/api/server/resolve/{type}/{customerid}")
+    Observable<JsonObject> getServiceType(@Path("type") String type, @Path("customerid") String customerId);
+
+    @GET("api/ownchat/uploadmaxsize")
+    Observable<JsonObject> getUploadMaxSize();
+
+    @GET("api/ownchat/chatcode/verify/{customerid}/{userid}/{chatcode}")
+    Observable<JsonObject> verifyChatCode(@Path("customerid") String customerid, @Path("userid") String userid, @Path("chatcode") String chatcode);
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ProfileService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/ProfileService.java
similarity index 78%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ProfileService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/ProfileService.java
index 4b9f379..9489017 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/ProfileService.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/ProfileService.java
@@ -1,7 +1,7 @@
-package com.p3.bewoplaner.data.api.services;
+package de.beyondsoft.ownchat.data.api.services;
 
-import com.p3.bewoplaner.data.api.responses.ProfileResponse;
-import com.p3.bewoplaner.data.api.responses.UploadImageResponse;
+import de.beyondsoft.ownchat.data.api.responses.ProfileResponse;
+import de.beyondsoft.ownchat.data.api.responses.UploadImageResponse;
 
 import okhttp3.MultipartBody;
 import retrofit2.http.Field;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/RegisterService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/RegisterService.java
similarity index 83%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/RegisterService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/RegisterService.java
index 58e845c..8292a08 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/api/services/RegisterService.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/RegisterService.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.api.services;
+package de.beyondsoft.ownchat.data.api.services;
 
-import com.p3.bewoplaner.data.api.responses.RegisterResponse;
+import de.beyondsoft.ownchat.data.api.responses.RegisterResponse;
 
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/GroupUpdatedEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/GroupUpdatedEvent.java
similarity index 67%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/GroupUpdatedEvent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/GroupUpdatedEvent.java
index b037468..79c1dee 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/GroupUpdatedEvent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/GroupUpdatedEvent.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.events;
+package de.beyondsoft.ownchat.data.events;
 
 /**
  * Created by Rares Teodorescu on 31/03/2017.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/InvalidTokenEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/InvalidTokenEvent.java
similarity index 67%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/InvalidTokenEvent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/InvalidTokenEvent.java
index 9af7ff6..2ff8b89 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/events/InvalidTokenEvent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/InvalidTokenEvent.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.events;
+package de.beyondsoft.ownchat.data.events;
 
 /**
  * Created by Rares Teodorescu on 27/03/2017.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/LogoutDirectlyEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/LogoutDirectlyEvent.java
new file mode 100644
index 0000000..a4b6d6f
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/LogoutDirectlyEvent.java
@@ -0,0 +1,4 @@
+package de.beyondsoft.ownchat.data.events;
+
+public class LogoutDirectlyEvent {
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/HandleMessagesService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/HandleMessagesService.java
similarity index 92%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/HandleMessagesService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/HandleMessagesService.java
index 4a9f96b..26c5b6a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/HandleMessagesService.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/HandleMessagesService.java
@@ -1,21 +1,21 @@
-package com.p3.bewoplaner.data.firebase;
+package de.beyondsoft.ownchat.data.firebase;
 
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.prefs.LongPreference;
-import com.p3.bewoplaner.data.repository.GroupRealmRepository;
-import com.p3.bewoplaner.data.repository.MessageRealmRepository;
-import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
-import com.p3.bewoplaner.di.InjectionHelper;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.main.MainActivity;
-import com.p3.bewoplaner.utils.Constants;
-import com.p3.bewoplaner.utils.LoggedOutUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.prefs.LongPreference;
+import de.beyondsoft.ownchat.data.repository.GroupRealmRepository;
+import de.beyondsoft.ownchat.data.repository.MessageRealmRepository;
+import de.beyondsoft.ownchat.data.repository.specifications.GroupByIdSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.MessageByIdSpecification;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.main.MainActivity;
+import de.beyondsoft.ownchat.utils.Constants;
+import de.beyondsoft.ownchat.utils.LoggedOutUtils;
 
 import android.app.Activity;
 import android.app.Notification;
@@ -48,7 +48,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import static android.graphics.BitmapFactory.decodeStream;
-import static com.p3.bewoplaner.utils.Constants.CHAT_IS_ALREADY_OPEN;
+import static de.beyondsoft.ownchat.utils.Constants.CHAT_IS_ALREADY_OPEN;
 
 /**
  * Created by laszloffiferenc on 3/1/17.
@@ -71,9 +71,11 @@ public class HandleMessagesService extends FirebaseMessagingService {
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
         InjectionHelper.getMessagingComponent(this).inject(HandleMessagesService.this);
+
         if (mLoggedOutUtils.checkLoggedOutPrefs()) {
             return;
         }
+
         customizeNotification(remoteMessage.getData());
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/MessagingComponent.java
similarity index 63%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/MessagingComponent.java
index 6748f0a..a4b3a09 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/MessagingComponent.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.data.firebase;
+package de.beyondsoft.ownchat.data.firebase;
 
-import com.p3.bewoplaner.di.ApplicationComponent;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
-import com.p3.bewoplaner.page.chat.ChatModule;
-import com.p3.bewoplaner.page.login.LoginModule;
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.page.chat.ChatModule;
+import de.beyondsoft.ownchat.page.login.LoginModule;
 
 import dagger.Component;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/MessagingInstanceIdService.java
similarity index 86%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/MessagingInstanceIdService.java
index 94c0b9c..01e99e9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/MessagingInstanceIdService.java
@@ -1,12 +1,12 @@
-package com.p3.bewoplaner.data.firebase;
+package de.beyondsoft.ownchat.data.firebase;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
 
-import com.p3.bewoplaner.BewoplanerApplication;
-import com.p3.bewoplaner.data.api.responses.RegisterResponse;
-import com.p3.bewoplaner.data.api.services.RegisterService;
-import com.p3.bewoplaner.di.InjectionHelper;
+import de.beyondsoft.ownchat.BewoplanerApplication;
+import de.beyondsoft.ownchat.data.api.responses.RegisterResponse;
+import de.beyondsoft.ownchat.data.api.services.RegisterService;
+import de.beyondsoft.ownchat.di.InjectionHelper;
 
 import android.provider.Settings;
 import android.util.Log;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/ReplyNotificationReceiver.java
similarity index 85%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/ReplyNotificationReceiver.java
index 974d952..9550fce 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/ReplyNotificationReceiver.java
@@ -1,23 +1,23 @@
-package com.p3.bewoplaner.data.firebase;
+package de.beyondsoft.ownchat.data.firebase;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import com.p3.bewoplaner.data.api.responses.MessageResponse;
-import com.p3.bewoplaner.data.api.services.ChatService;
-import com.p3.bewoplaner.data.prefs.LongPreference;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.data.repository.GroupRealmRepository;
-import com.p3.bewoplaner.data.repository.MessageRealmRepository;
-import com.p3.bewoplaner.data.repository.RealmProvider;
-import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
-import com.p3.bewoplaner.di.InjectionHelper;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.chat.ChatPresenter;
-import com.p3.bewoplaner.utils.Constants;
-import com.p3.bewoplaner.utils.rx.RxUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.api.common.ErrorHandlingResponseConverter;
+import de.beyondsoft.ownchat.data.api.responses.MessageResponse;
+import de.beyondsoft.ownchat.data.api.services.ChatService;
+import de.beyondsoft.ownchat.data.prefs.LongPreference;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.data.repository.GroupRealmRepository;
+import de.beyondsoft.ownchat.data.repository.MessageRealmRepository;
+import de.beyondsoft.ownchat.data.repository.RealmProvider;
+import de.beyondsoft.ownchat.data.repository.specifications.GroupByIdSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.MessageByIdSpecification;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.chat.ChatPresenter;
+import de.beyondsoft.ownchat.utils.Constants;
+import de.beyondsoft.ownchat.utils.rx.RxUtils;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -37,7 +37,7 @@ import javax.inject.Named;
 import rx.Observable;
 import rx.Subscriber;
 
-import static com.p3.bewoplaner.utils.Constants.GROUP_ID;
+import static de.beyondsoft.ownchat.utils.Constants.GROUP_ID;
 
 /**
  * Created by laszloffiferenc on 3/20/17.
@@ -91,6 +91,7 @@ public class ReplyNotificationReceiver extends BroadcastReceiver {
 
         Bundle bundle = intent.getBundleExtra(BUNDLE);
         long groupId = bundle.getLong(Constants.GROUP_ID);
+
         if (replyMessage != null && replyMessage instanceof String) {
             sendMessage(context, (String) replyMessage, (int) groupId);
         }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefs.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefs.java
similarity index 85%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefs.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefs.java
index a28eb72..25d5275 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefs.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefs.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.prefs;
+package de.beyondsoft.ownchat.data.prefs;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefsModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefsModule.java
similarity index 77%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefsModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefsModule.java
index 1d334f4..0c459fd 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/AppPrefsModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefsModule.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.data.prefs;
+package de.beyondsoft.ownchat.data.prefs;
 
-import com.p3.bewoplaner.BewoplanerApplication;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.di.scopes.ApplicationScope;
+import de.beyondsoft.ownchat.BewoplanerApplication;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.di.scopes.ApplicationScope;
 import com.securepreferences.SecurePreferences;
 
 import android.content.Context;
@@ -110,4 +110,24 @@ public class AppPrefsModule {
         return new BooleanPreference(sharedPreferences, AppPrefsConstants.APP_KILLED);
     }
 
+    @Provides
+    @ApplicationScope
+    @Named(AppPrefsConstants.UPLOAD_MAX_SIZE)
+    LongPreference provideUploadMaxSize(@AppPrefs SharedPreferences sharedPreferences) {
+        return new LongPreference(sharedPreferences, AppPrefsConstants.UPLOAD_MAX_SIZE);
+    }
+
+    @Provides
+    @ApplicationScope
+    @Named(AppPrefsConstants.IS_EMPLOYEE)
+    BooleanPreference provideIsEmployee(@AppPrefs SharedPreferences sharedPreferences) {
+        return new BooleanPreference(sharedPreferences, AppPrefsConstants.IS_EMPLOYEE);
+    }
+
+    @Provides
+    @ApplicationScope
+    @Named(AppPrefsConstants.SHOW_LOGIN_AGAIN)
+    BooleanPreference provideShowLoginAgain(@AppPrefs SharedPreferences sharedPreferences) {
+        return new BooleanPreference(sharedPreferences, AppPrefsConstants.SHOW_LOGIN_AGAIN);
+    }
 }
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BasePreference.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/BasePreference.java
similarity index 97%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BasePreference.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/BasePreference.java
index e30b1cf..72a906a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BasePreference.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/BasePreference.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.prefs;
+package de.beyondsoft.ownchat.data.prefs;
 
 import com.securepreferences.SecurePreferences;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BooleanPreference.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/BooleanPreference.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BooleanPreference.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/BooleanPreference.java
index 7b10d17..0da323d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/BooleanPreference.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/BooleanPreference.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.prefs;
+package de.beyondsoft.ownchat.data.prefs;
 
 import com.securepreferences.SecurePreferences;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/LongPreference.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/LongPreference.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/LongPreference.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/LongPreference.java
index d77b7a3..78925b1 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/LongPreference.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/LongPreference.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.prefs;
+package de.beyondsoft.ownchat.data.prefs;
 
 import android.content.SharedPreferences;
 import android.support.annotation.NonNull;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/StringPreference.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/StringPreference.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/StringPreference.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/StringPreference.java
index a9f389c..a473e1f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/prefs/StringPreference.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/StringPreference.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.prefs;
+package de.beyondsoft.ownchat.data.prefs;
 
 import android.content.SharedPreferences;
 import android.support.annotation.NonNull;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/GroupRealmRepository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/GroupRealmRepository.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/GroupRealmRepository.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/GroupRealmRepository.java
index 160ad8c..cc82922 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/GroupRealmRepository.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/GroupRealmRepository.java
@@ -1,14 +1,14 @@
-package com.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import com.p3.bewoplaner.data.repository.mapper.Mapper;
-import com.p3.bewoplaner.data.repository.models.GroupRealm;
-import com.p3.bewoplaner.data.repository.models.UserRealm;
-import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import com.p3.bewoplaner.data.repository.specifications.RealmSpecification;
-import com.p3.bewoplaner.data.repository.specifications.Specification;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.model.User;
+import de.beyondsoft.ownchat.data.repository.mapper.Mapper;
+import de.beyondsoft.ownchat.data.repository.models.GroupRealm;
+import de.beyondsoft.ownchat.data.repository.models.UserRealm;
+import de.beyondsoft.ownchat.data.repository.specifications.GroupByIdSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.RealmSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.Specification;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.model.User;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/MessageRealmRepository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/MessageRealmRepository.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/MessageRealmRepository.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/MessageRealmRepository.java
index 60a66c2..359153c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/MessageRealmRepository.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/MessageRealmRepository.java
@@ -1,11 +1,11 @@
-package com.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import com.p3.bewoplaner.data.repository.mapper.Mapper;
-import com.p3.bewoplaner.data.repository.models.MessageRealm;
-import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
-import com.p3.bewoplaner.data.repository.specifications.RealmSpecification;
-import com.p3.bewoplaner.data.repository.specifications.Specification;
-import com.p3.bewoplaner.model.Message;
+import de.beyondsoft.ownchat.data.repository.mapper.Mapper;
+import de.beyondsoft.ownchat.data.repository.models.MessageRealm;
+import de.beyondsoft.ownchat.data.repository.specifications.MessageByIdSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.RealmSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.Specification;
+import de.beyondsoft.ownchat.model.Message;
 
 import java.util.List;
 import java.util.concurrent.Callable;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmProvider.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RealmProvider.java
similarity index 89%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmProvider.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RealmProvider.java
index 2690264..502e1c6 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmProvider.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RealmProvider.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
 import io.realm.Realm;
 import io.realm.RealmConfiguration;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmWrapper.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RealmWrapper.java
similarity index 76%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmWrapper.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RealmWrapper.java
index e0a221f..a5c0c6f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RealmWrapper.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RealmWrapper.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
 import io.realm.Realm;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/Repository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/Repository.java
similarity index 82%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/Repository.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/Repository.java
index 1055ebd..4b0be1c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/Repository.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/Repository.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import com.p3.bewoplaner.data.repository.specifications.Specification;
+import de.beyondsoft.ownchat.data.repository.specifications.Specification;
 
 import java.util.List;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RepositoryModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RepositoryModule.java
similarity index 84%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RepositoryModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RepositoryModule.java
index 0f80d72..72102ba 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/RepositoryModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RepositoryModule.java
@@ -1,13 +1,13 @@
-package com.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import com.p3.bewoplaner.data.repository.mapper.Mapper;
-import com.p3.bewoplaner.data.repository.models.GroupRealm;
-import com.p3.bewoplaner.data.repository.models.MessageRealm;
-import com.p3.bewoplaner.data.repository.models.UserRealm;
-import com.p3.bewoplaner.di.scopes.ApplicationScope;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.model.User;
+import de.beyondsoft.ownchat.data.repository.mapper.Mapper;
+import de.beyondsoft.ownchat.data.repository.models.GroupRealm;
+import de.beyondsoft.ownchat.data.repository.models.MessageRealm;
+import de.beyondsoft.ownchat.data.repository.models.UserRealm;
+import de.beyondsoft.ownchat.di.scopes.ApplicationScope;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.model.User;
 
 import dagger.Module;
 import dagger.Provides;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/UserRealmRepository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/UserRealmRepository.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/UserRealmRepository.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/UserRealmRepository.java
index bcf2c05..4453b5b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/UserRealmRepository.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/UserRealmRepository.java
@@ -1,11 +1,11 @@
-package com.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import com.p3.bewoplaner.data.repository.mapper.Mapper;
-import com.p3.bewoplaner.data.repository.models.UserRealm;
-import com.p3.bewoplaner.data.repository.specifications.RealmSpecification;
-import com.p3.bewoplaner.data.repository.specifications.Specification;
-import com.p3.bewoplaner.data.repository.specifications.UserByIdSpecification;
-import com.p3.bewoplaner.model.User;
+import de.beyondsoft.ownchat.data.repository.mapper.Mapper;
+import de.beyondsoft.ownchat.data.repository.models.UserRealm;
+import de.beyondsoft.ownchat.data.repository.specifications.RealmSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.Specification;
+import de.beyondsoft.ownchat.data.repository.specifications.UserByIdSpecification;
+import de.beyondsoft.ownchat.model.User;
 
 import android.util.Log;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/mapper/Mapper.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/mapper/Mapper.java
similarity index 76%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/mapper/Mapper.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/mapper/Mapper.java
index 4f89b49..30d4819 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/mapper/Mapper.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/mapper/Mapper.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.repository.mapper;
+package de.beyondsoft.ownchat.data.repository.mapper;
 
 /**
  * Class responsible for mapping one object to another.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/GroupRealm.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/GroupRealm.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/GroupRealm.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/GroupRealm.java
index cd6b878..66b2bc0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/GroupRealm.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/GroupRealm.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.data.repository.models;
+package de.beyondsoft.ownchat.data.repository.models;
 
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.model.User;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.model.User;
 
 import java.util.ArrayList;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/MessageRealm.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/MessageRealm.java
similarity index 98%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/MessageRealm.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/MessageRealm.java
index 6474fd6..6574a6f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/MessageRealm.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/MessageRealm.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository.models;
+package de.beyondsoft.ownchat.data.repository.models;
 
-import com.p3.bewoplaner.model.Message;
+import de.beyondsoft.ownchat.model.Message;
 
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/UserRealm.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/UserRealm.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/UserRealm.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/UserRealm.java
index 86292bb..21a1f4c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/models/UserRealm.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/models/UserRealm.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository.models;
+package de.beyondsoft.ownchat.data.repository.models;
 
-import com.p3.bewoplaner.model.User;
+import de.beyondsoft.ownchat.model.User;
 
 import io.realm.RealmObject;
 import io.realm.annotations.PrimaryKey;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupByIdSpecification.java
similarity index 83%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupByIdSpecification.java
index 678b491..224422a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByIdSpecification.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupByIdSpecification.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import com.p3.bewoplaner.data.repository.models.GroupRealm;
+import de.beyondsoft.ownchat.data.repository.models.GroupRealm;
 
 import io.realm.Realm;
 import io.realm.RealmQuery;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupByNameSpecification.java
similarity index 83%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupByNameSpecification.java
index fbcb139..8bbc027 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupByNameSpecification.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupByNameSpecification.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import com.p3.bewoplaner.data.repository.models.GroupRealm;
+import de.beyondsoft.ownchat.data.repository.models.GroupRealm;
 
 import io.realm.Case;
 import io.realm.Realm;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupSpecification.java
similarity index 78%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupSpecification.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupSpecification.java
index 29cd170..5db11ab 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/GroupSpecification.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/GroupSpecification.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import com.p3.bewoplaner.data.repository.models.GroupRealm;
+import de.beyondsoft.ownchat.data.repository.models.GroupRealm;
 
 import io.realm.Realm;
 import io.realm.RealmQuery;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/MessageByGroupIdSpecification.java
similarity index 84%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/MessageByGroupIdSpecification.java
index 293361b..e440369 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByGroupIdSpecification.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/MessageByGroupIdSpecification.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import com.p3.bewoplaner.data.repository.models.MessageRealm;
+import de.beyondsoft.ownchat.data.repository.models.MessageRealm;
 
 import io.realm.Realm;
 import io.realm.RealmQuery;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/MessageByIdSpecification.java
similarity index 85%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/MessageByIdSpecification.java
index 976963b..9f2fe5a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/MessageByIdSpecification.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/MessageByIdSpecification.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import com.p3.bewoplaner.data.repository.models.MessageRealm;
+import de.beyondsoft.ownchat.data.repository.models.MessageRealm;
 
 import io.realm.Realm;
 import io.realm.RealmQuery;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/RealmSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/RealmSpecification.java
similarity index 81%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/RealmSpecification.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/RealmSpecification.java
index d17fbd7..04689d0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/RealmSpecification.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/RealmSpecification.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
 import io.realm.Realm;
 import io.realm.RealmObject;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/Specification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/Specification.java
similarity index 58%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/Specification.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/Specification.java
index bce08be..7d8f344 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/Specification.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/Specification.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
 /**
  * Created by Rares Teodorescu on 11/01/2017.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/UserByIdSpecification.java
similarity index 78%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/UserByIdSpecification.java
index cbb4b65..cff44ad 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/data/repository/specifications/UserByIdSpecification.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/specifications/UserByIdSpecification.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import com.p3.bewoplaner.data.repository.models.UserRealm;
+import de.beyondsoft.ownchat.data.repository.models.UserRealm;
 
 import io.realm.Realm;
 import io.realm.RealmQuery;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationComponent.java
similarity index 63%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationComponent.java
index 2911fb6..54341c9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationComponent.java
@@ -1,21 +1,21 @@
-package com.p3.bewoplaner.di;
+package de.beyondsoft.ownchat.di;
 
 import com.bumptech.glide.Glide;
-import com.p3.bewoplaner.BewoplanerApplication;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.api.ApiModule;
-import com.p3.bewoplaner.data.prefs.AppPrefs;
-import com.p3.bewoplaner.data.prefs.AppPrefsModule;
-import com.p3.bewoplaner.data.prefs.BooleanPreference;
-import com.p3.bewoplaner.data.prefs.LongPreference;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.data.repository.GroupRealmRepository;
-import com.p3.bewoplaner.data.repository.MessageRealmRepository;
-import com.p3.bewoplaner.data.repository.RealmProvider;
-import com.p3.bewoplaner.data.repository.RepositoryModule;
-import com.p3.bewoplaner.data.repository.UserRealmRepository;
-import com.p3.bewoplaner.di.scopes.ApplicationScope;
-import com.p3.bewoplaner.utils.SystemUtils;
+import de.beyondsoft.ownchat.BewoplanerApplication;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.api.ApiModule;
+import de.beyondsoft.ownchat.data.prefs.AppPrefs;
+import de.beyondsoft.ownchat.data.prefs.AppPrefsModule;
+import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
+import de.beyondsoft.ownchat.data.prefs.LongPreference;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.data.repository.GroupRealmRepository;
+import de.beyondsoft.ownchat.data.repository.MessageRealmRepository;
+import de.beyondsoft.ownchat.data.repository.RealmProvider;
+import de.beyondsoft.ownchat.data.repository.RepositoryModule;
+import de.beyondsoft.ownchat.data.repository.UserRealmRepository;
+import de.beyondsoft.ownchat.di.scopes.ApplicationScope;
+import de.beyondsoft.ownchat.utils.SystemUtils;
 import com.securepreferences.SecurePreferences;
 
 import android.app.NotificationManager;
@@ -38,9 +38,6 @@ public interface ApplicationComponent {
     @P3DSEndpoint
     Retrofit provideP3DSRetrofit();
 
-    @VoucherEndpoint
-    Retrofit provideVoucherRetrofit();
-
     SystemUtils provideSystemUtils();
 
     @AppPrefs
@@ -79,6 +76,15 @@ public interface ApplicationComponent {
     @Named(AppPrefsConstants.APP_KILLED)
     BooleanPreference provideAppKilled();
 
+    @Named(AppPrefsConstants.UPLOAD_MAX_SIZE)
+    LongPreference provideUploadMaxSize();
+
+    @Named(AppPrefsConstants.IS_EMPLOYEE)
+    BooleanPreference provideIsEmployee();
+
+    @Named(AppPrefsConstants.SHOW_LOGIN_AGAIN)
+    BooleanPreference provideShowLoginAgain();
+
     NotificationManager provideNotificationManager();
 
     GroupRealmRepository provideGroupRealmRepository();
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationModule.java
similarity index 87%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationModule.java
index 80b0839..580c530 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/ApplicationModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationModule.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.di;
+package de.beyondsoft.ownchat.di;
 
 import com.bumptech.glide.Glide;
-import com.p3.bewoplaner.BewoplanerApplication;
-import com.p3.bewoplaner.di.scopes.ApplicationScope;
-import com.p3.bewoplaner.utils.SystemUtils;
+import de.beyondsoft.ownchat.BewoplanerApplication;
+import de.beyondsoft.ownchat.di.scopes.ApplicationScope;
+import de.beyondsoft.ownchat.utils.SystemUtils;
 
 import android.app.NotificationManager;
 import android.content.Context;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/InjectionHelper.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/InjectionHelper.java
similarity index 68%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/InjectionHelper.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/InjectionHelper.java
index 3af5f8a..6a03067 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/InjectionHelper.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/InjectionHelper.java
@@ -1,20 +1,22 @@
-package com.p3.bewoplaner.di;
+package de.beyondsoft.ownchat.di;
 
-import com.p3.bewoplaner.BewoplanerApplication;
-import com.p3.bewoplaner.data.firebase.DaggerMessagingComponent;
-import com.p3.bewoplaner.data.firebase.MessagingComponent;
-import com.p3.bewoplaner.page.chat.ChatComponent;
-import com.p3.bewoplaner.page.chat.DaggerChatComponent;
-import com.p3.bewoplaner.page.contacts.ContactsComponent;
-import com.p3.bewoplaner.page.contacts.DaggerContactsComponent;
-import com.p3.bewoplaner.page.login.DaggerLoginComponent;
-import com.p3.bewoplaner.page.login.LoginComponent;
-import com.p3.bewoplaner.page.main.DaggerMainComponent;
-import com.p3.bewoplaner.page.main.MainComponent;
-import com.p3.bewoplaner.page.profile.DaggerProfileComponent;
-import com.p3.bewoplaner.page.profile.ProfileComponent;
-import com.p3.bewoplaner.page.splash.DaggerSplashComponent;
-import com.p3.bewoplaner.page.splash.SplashComponent;
+import de.beyondsoft.ownchat.BewoplanerApplication;
+import de.beyondsoft.ownchat.data.firebase.DaggerMessagingComponent;
+import de.beyondsoft.ownchat.data.firebase.MessagingComponent;
+import de.beyondsoft.ownchat.page.chat.ChatComponent;
+import de.beyondsoft.ownchat.page.chat.DaggerChatComponent;
+import de.beyondsoft.ownchat.page.contacts.ContactsComponent;
+import de.beyondsoft.ownchat.page.contacts.DaggerContactsComponent;
+import de.beyondsoft.ownchat.page.fileconfirmation.DaggerFileConfirmationComponent;
+import de.beyondsoft.ownchat.page.fileconfirmation.FileConfirmationComponent;
+import de.beyondsoft.ownchat.page.login.DaggerLoginComponent;
+import de.beyondsoft.ownchat.page.login.LoginComponent;
+import de.beyondsoft.ownchat.page.main.DaggerMainComponent;
+import de.beyondsoft.ownchat.page.main.MainComponent;
+import de.beyondsoft.ownchat.page.profile.DaggerProfileComponent;
+import de.beyondsoft.ownchat.page.profile.ProfileComponent;
+import de.beyondsoft.ownchat.page.splash.DaggerSplashComponent;
+import de.beyondsoft.ownchat.page.splash.SplashComponent;
 
 import android.content.Context;
 
@@ -30,6 +32,7 @@ public class InjectionHelper {
     private static MessagingComponent sMessagingComponent;
     private static ChatComponent sChatComponent;
     private static ProfileComponent sProfileComponent;
+    private static FileConfirmationComponent sFileConfirmationComponent;
 
     public static ApplicationComponent getApplicationComponent(Context context) {
         return ((BewoplanerApplication) context.getApplicationContext()).getApplicationComponent();
@@ -41,6 +44,7 @@ public class InjectionHelper {
                     .applicationComponent(getApplicationComponent(context))
                     .build();
         }
+
         return sSplashComponent;
     }
 
@@ -50,6 +54,7 @@ public class InjectionHelper {
                     .applicationComponent(getApplicationComponent(context))
                     .build();
         }
+
         return sLoginComponent;
     }
 
@@ -59,6 +64,7 @@ public class InjectionHelper {
                     .applicationComponent(getApplicationComponent(context))
                     .build();
         }
+
         return sMainComponent;
     }
 
@@ -68,6 +74,7 @@ public class InjectionHelper {
                     .applicationComponent(getApplicationComponent(context))
                     .build();
         }
+
         return sContactsComponent;
     }
 
@@ -77,6 +84,7 @@ public class InjectionHelper {
                     .applicationComponent(getApplicationComponent(context))
                     .build();
         }
+
         return sMessagingComponent;
     }
 
@@ -86,6 +94,7 @@ public class InjectionHelper {
                     .applicationComponent(getApplicationComponent(context))
                     .build();
         }
+
         return sProfileComponent;
     }
 
@@ -95,9 +104,20 @@ public class InjectionHelper {
                     .applicationComponent(getApplicationComponent(context))
                     .build();
         }
+
         return sChatComponent;
     }
 
+    public static FileConfirmationComponent getFileConfirmationComponent(Context context) {
+        if(sFileConfirmationComponent == null) {
+            sFileConfirmationComponent = DaggerFileConfirmationComponent.builder()
+                    .applicationComponent(getApplicationComponent(context))
+                    .build();
+        }
+
+        return sFileConfirmationComponent;
+    }
+
     public static void destroySplashComponent() {
         sSplashComponent = null;
     }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/P3DSEndpoint.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/P3DSEndpoint.java
similarity index 88%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/P3DSEndpoint.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/P3DSEndpoint.java
index 9b4b3b2..954090b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/P3DSEndpoint.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/P3DSEndpoint.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.di;
+package de.beyondsoft.ownchat.di;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ActivityScope.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/scopes/ActivityScope.java
similarity index 87%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ActivityScope.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/scopes/ActivityScope.java
index 3717bdb..1750b39 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ActivityScope.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/scopes/ActivityScope.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.di.scopes;
+package de.beyondsoft.ownchat.di.scopes;
 
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ApplicationScope.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/scopes/ApplicationScope.java
similarity index 87%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ApplicationScope.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/scopes/ApplicationScope.java
index dd57a56..b44cc62 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/di/scopes/ApplicationScope.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/scopes/ApplicationScope.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.di.scopes;
+package de.beyondsoft.ownchat.di.scopes;
 
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Group.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Group.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Group.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Group.java
index 4c40178..e0ae89e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Group.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Group.java
@@ -1,10 +1,10 @@
-package com.p3.bewoplaner.model;
+package de.beyondsoft.ownchat.model;
 
 import com.google.gson.annotations.SerializedName;
 
-import com.p3.bewoplaner.data.repository.models.GroupRealm;
-import com.p3.bewoplaner.data.repository.models.MessageRealm;
-import com.p3.bewoplaner.data.repository.models.UserRealm;
+import de.beyondsoft.ownchat.data.repository.models.GroupRealm;
+import de.beyondsoft.ownchat.data.repository.models.MessageRealm;
+import de.beyondsoft.ownchat.data.repository.models.UserRealm;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Message.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Message.java
similarity index 98%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Message.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Message.java
index 3ff5e2b..ef1bd37 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/Message.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Message.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.model;
+package de.beyondsoft.ownchat.model;
 
 import com.google.gson.annotations.SerializedName;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.repository.models.MessageRealm;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.repository.models.MessageRealm;
 
 import java.util.ArrayList;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/User.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/User.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/User.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/User.java
index 4536a3d..9b52208 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/User.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/User.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.model;
+package de.beyondsoft.ownchat.model;
 
 import com.google.gson.annotations.SerializedName;
 
-import com.p3.bewoplaner.data.repository.models.UserRealm;
+import de.beyondsoft.ownchat.data.repository.models.UserRealm;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -84,6 +84,7 @@ public class User implements Parcelable {
         if (userRealm == null) {
             return null;
         }
+
         return new User(userRealm.getId(), userRealm.getFirstName(), userRealm.getLastName(),
                 userRealm.getAvatar(), userRealm.getMobile(), userRealm.isEmployee());
     }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/common/BaseResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/common/BaseResponse.java
similarity index 72%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/common/BaseResponse.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/common/BaseResponse.java
index badc282..95b03f3 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/model/common/BaseResponse.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/common/BaseResponse.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.model.common;
+package de.beyondsoft.ownchat.model.common;
 
 import com.google.gson.annotations.SerializedName;
 
@@ -35,5 +35,13 @@ public class BaseResponse {
         @SerializedName("token")
         public String token;
 
+        @SerializedName("chatcode_inactive")
+        public List<String> chatCodeInactive;
+
+        @SerializedName("chatcode_failed")
+        public List<String> chatCodeFailed;
+
+        @SerializedName("chatcode")
+        public List<String> chatCodeTooShort;
     }
 }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java
similarity index 91%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java
index 2329b00..17ef1df 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java
@@ -1,21 +1,21 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.events.InvalidTokenEvent;
-import com.p3.bewoplaner.data.events.LogoutDirectlyEvent;
-import com.p3.bewoplaner.data.prefs.BooleanPreference;
-import com.p3.bewoplaner.data.prefs.LongPreference;
-import com.p3.bewoplaner.di.InjectionHelper;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.common.RuntimePermissionActivity;
-import com.p3.bewoplaner.page.login.LoginPresenter;
-import com.p3.bewoplaner.page.main.LogoutNavigation;
-import com.p3.bewoplaner.utils.EndlessScrollListener;
-import com.p3.bewoplaner.utils.FileUtils;
-import com.p3.bewoplaner.utils.SystemUtils;
-import com.p3.bewoplaner.utils.ui.EmptyLayout;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.events.InvalidTokenEvent;
+import de.beyondsoft.ownchat.data.events.LogoutDirectlyEvent;
+import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
+import de.beyondsoft.ownchat.data.prefs.LongPreference;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.common.RuntimePermissionActivity;
+import de.beyondsoft.ownchat.page.login.LoginPresenter;
+import de.beyondsoft.ownchat.page.main.LogoutNavigation;
+import de.beyondsoft.ownchat.utils.EndlessScrollListener;
+import de.beyondsoft.ownchat.utils.FileUtils;
+import de.beyondsoft.ownchat.utils.SystemUtils;
+import de.beyondsoft.ownchat.utils.ui.EmptyLayout;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -62,8 +62,6 @@ import hani.momanii.supernova_emoji_library.Actions.EmojIconActions;
 import hani.momanii.supernova_emoji_library.Helper.EmojiconEditText;
 import okhttp3.MediaType;
 
-import static com.p3.bewoplaner.data.AppPrefsConstants.USER_ID;
-
 /**
  * Created by Rares Teodorescu on 21/02/2017.
  */
@@ -109,7 +107,7 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
     CoordinatorLayout mCoordinatorLayout;
 
     @Inject
-    @Named(USER_ID)
+    @Named(AppPrefsConstants.USER_ID)
     LongPreference mUserIdPreference;
 
     @Inject
@@ -253,7 +251,7 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
 
     @OnClick(R.id.chat_send_message)
     void messageSent() {
-        mLoginPresenter.checkIfVoucherStillAvailable(this);
+//        mLoginPresenter.checkIfVoucherStillAvailable(this);
         mCallback.sendMessage(mChatMessageEmojiEditText.getText().toString());
         mChatMessageEmojiEditText.setText("");
     }
@@ -265,22 +263,24 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
 
     private void selectFile(int requestCode) {
         Intent intent;
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
             intent.addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION);
         } else {
             intent = new Intent(Intent.ACTION_GET_CONTENT);
         }
+
         intent.setType("*/*");
         intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
         startActivityForResult(Intent.createChooser(intent, getResources().getString(R.string.chat_select_file)), SELECT_FILE);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        mLoginPresenter.checkIfVoucherStillAvailable(this);
     }
 
     @Override
@@ -316,14 +316,22 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
                 mChatPresenter.attachView(this);
             }
 
-            // Show preview for images/gifs and maybe videos
+            // TODO: Show preview for images/gifs and maybe videos
+
+            /*Bundle bundle = new Bundle();
+            bundle.putString(Constants.FILENAME, uri.toString());
+
+            Intent intent = new Intent(this, FileConfirmationActivity.class);
+            intent.putExtras(bundle);
+
+            startActivityForResult(intent, 666);*/
 
             mCallback.sendFile(uri);
         }
     }
 
     @Override
-    public void logoutDirectly() {
+    public void logoutDirectly(boolean clearAllPrefs) {
         EventBus.getDefault().post(new LogoutDirectlyEvent());
         finish();
     }
@@ -359,10 +367,10 @@ abstract class BaseChatActivity extends RuntimePermissionActivity implements Cha
 
     @Override
     public void resendMessage(Message message) {
-        mLoginPresenter.checkIfVoucherStillAvailable(this);
         if (!mChatPresenter.isAttached()) {
             mChatPresenter.attachView(this);
         }
+
         mCallback.resendMessage(message);
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
similarity index 98%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
index 1ca0b55..a8174da 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/BaseChatAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
@@ -1,12 +1,12 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.github.lzyzsd.circleprogress.DonutProgress;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.utils.DateUtils;
-import com.p3.bewoplaner.utils.ui.ViewUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.utils.DateUtils;
+import de.beyondsoft.ownchat.utils.ui.ViewUtils;
 
 import android.net.Uri;
 import android.support.annotation.Nullable;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatComponent.java
similarity index 59%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatComponent.java
index 732077f..a96bff8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatComponent.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import com.p3.bewoplaner.di.ApplicationComponent;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
-import com.p3.bewoplaner.page.login.LoginModule;
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.page.login.LoginModule;
 
 import dagger.Component;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatModule.java
similarity index 61%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatModule.java
index 4155e08..f88e94a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatModule.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import com.p3.bewoplaner.data.api.services.ChatService;
-import com.p3.bewoplaner.di.P3DSEndpoint;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.data.api.services.ChatService;
+import de.beyondsoft.ownchat.di.P3DSEndpoint;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
 
 import dagger.Module;
 import dagger.Provides;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java
index 8003d96..6d71d55 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java
@@ -1,27 +1,27 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import com.p3.bewoplaner.data.api.responses.MessageResponse;
-import com.p3.bewoplaner.data.api.responses.MessagesResponse;
-import com.p3.bewoplaner.data.api.services.ChatService;
-import com.p3.bewoplaner.data.events.GroupUpdatedEvent;
-import com.p3.bewoplaner.data.prefs.LongPreference;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.data.repository.GroupRealmRepository;
-import com.p3.bewoplaner.data.repository.MessageRealmRepository;
-import com.p3.bewoplaner.data.repository.RealmProvider;
-import com.p3.bewoplaner.data.repository.models.MessageRealm;
-import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import com.p3.bewoplaner.data.repository.specifications.MessageByGroupIdSpecification;
-import com.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import com.p3.bewoplaner.utils.SystemUtils;
-import com.p3.bewoplaner.utils.rx.RxUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.api.common.ErrorHandlingResponseConverter;
+import de.beyondsoft.ownchat.data.api.responses.MessageResponse;
+import de.beyondsoft.ownchat.data.api.responses.MessagesResponse;
+import de.beyondsoft.ownchat.data.api.services.ChatService;
+import de.beyondsoft.ownchat.data.events.GroupUpdatedEvent;
+import de.beyondsoft.ownchat.data.prefs.LongPreference;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.data.repository.GroupRealmRepository;
+import de.beyondsoft.ownchat.data.repository.MessageRealmRepository;
+import de.beyondsoft.ownchat.data.repository.RealmProvider;
+import de.beyondsoft.ownchat.data.repository.models.MessageRealm;
+import de.beyondsoft.ownchat.data.repository.specifications.GroupByIdSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.MessageByGroupIdSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.MessageByIdSpecification;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.mvp.MVPAbstractPresenter;
+import de.beyondsoft.ownchat.utils.SystemUtils;
+import de.beyondsoft.ownchat.utils.rx.RxUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -45,6 +45,7 @@ import java.util.Random;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import de.beyondsoft.ownchat.utils.FileUtils;
 import io.realm.Realm;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -56,15 +57,13 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
-import static com.p3.bewoplaner.data.AppPrefsConstants.USER_ID;
-import static com.p3.bewoplaner.utils.FileUtils.getFileTypeFromFilePath;
+import static de.beyondsoft.ownchat.data.AppPrefsConstants.USER_ID;
 
 /**
  * Created by Rares Teodorescu on 21/02/2017.
  */
 @ActivityScope
-public class ChatPresenter extends MVPAbstractPresenter<ChatView>
-        implements ChatView.Callback {
+public class ChatPresenter extends MVPAbstractPresenter<ChatView> implements ChatView.Callback {
 
     private static final int FIRST_PAGE = 1;
     private static final int GROUP_ID_NOT_SET = -999;
@@ -154,33 +153,43 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
                         if (messageResponse.response.messages == null || messageResponse.response.messages.isEmpty()) {
                             return Observable.just(null);
                         }
+
                         Message lastMessage = messageResponse.response.messages.get(messageResponse.response.messages.size() - 1);
                         lastMessage.status = Message.Status.DELIVERED;
                         lastMessage.isRead = true;
+
                         if (!mMessages.contains(lastMessage)) {
                             long groupId = mGroupId;
                             resetMessages();
                             loadMessagesFromServerByGroupId(groupId);
+
                             return Observable.just(null);
                         }
+
                         for (int i = 0; i < mMessageToUpdate.size(); i++) {
                             Pair<Message, String> messageToUpdate = mMessageToUpdate.get(i);
+
                             if (isAttached()) {
                                 getView().lastMessageUpdated(messageToUpdate.first, messageToUpdate.second);
                             }
                         }
+
                         mMessageToUpdate.clear();
                         ArrayList<Message> messages = new ArrayList<>();
+
                         for (int i = messageResponse.response.messages.size() - 1; i >= 0; i--) {
                             Message message = messageResponse.response.messages.get(i);
                             message.status = Message.Status.DELIVERED;
                             message.isRead = true;
                             message.userId = mUserIdPreference.get();
+
                             if (mMessages.contains(message)) {
                                 continue;
                             }
+
                             messages.add(message);
                         }
+
                         return mMessageRealmRepository.updateMessages(messages, new MessageByIdSpecification(mUserIdPreference.get()));
                     }
                 })
@@ -257,10 +266,12 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
         Log.e(ChatPresenter.class.getSimpleName(), throwable.getMessage(), throwable);
         getView().hideLoading();
         getView().hideMessagesLoading();
+
         if (mSystemUtils.isNetworkUnavailable()) {
             getView().showError(R.string.error_no_internet_connection);
             return;
         }
+
         getView().showError(R.string.error_something_went_wrong);
     }
 
@@ -371,10 +382,12 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
     @Override
     public void sendFile(Uri fileUri) {
         File file = getView().getFile(fileUri);
+
         if (file == null || !file.exists()) {
             getView().showToastMessage(R.string.error_file_not_found);
             return;
         }
+
         String[] split = file.getAbsolutePath().split("/");
 
         Message message = new Message(findUniqueRandomId(mRealmProvider, mUserIdPreference.get()),
@@ -393,8 +406,7 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
                 mUserIdPreference.get(),
                 false);
 
-        storeMessageLocally(message)
-                .subscribe(new Subscriber<Object>() {
+        storeMessageLocally(message).subscribe(new Subscriber<Object>() {
                     @Override
                     public void onCompleted() {
                         if (mSystemUtils.isNetworkUnavailable()) {
@@ -481,7 +493,7 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
     public void downloadFile(Message message, String filePath, int itemPosition) {
         if (message.fileDownloaded) {
             getView().stopItemProgress(itemPosition);
-            getView().fileDownloadedSuccessfully(filePath, getFileTypeFromFilePath(filePath));
+            getView().fileDownloadedSuccessfully(filePath, FileUtils.getFileTypeFromFilePath(filePath));
             return;
         }
         downloadFileFromUrl(message.filePath, filePath, itemPosition)
@@ -911,7 +923,7 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
                 int totalSize = urlConnection.getContentLength();
 
                 if (file.length() == totalSize || totalSize == -1) {
-                    subscriber.onNext(getFileTypeFromFilePath(filePath));
+                    subscriber.onNext(FileUtils.getFileTypeFromFilePath(filePath));
                     subscriber.onCompleted();
                     return;
                 }
@@ -946,7 +958,7 @@ public class ChatPresenter extends MVPAbstractPresenter<ChatView>
                 //close the output stream when done
                 fileOutput.close();
 
-                subscriber.onNext(getFileTypeFromFilePath(filePath));
+                subscriber.onNext(FileUtils.getFileTypeFromFilePath(filePath));
                 subscriber.onCompleted();
 
             } catch (IOException e) {
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatView.java
similarity index 90%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatView.java
index 3189457..f876d46 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/ChatView.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatView.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.mvp.MVPView;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.mvp.MVPView;
 
 import android.net.Uri;
 import android.support.annotation.StringRes;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java
index 129391a..22bfffb 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java
@@ -1,10 +1,10 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.chatmembers.ChatMembersActivity;
-import com.p3.bewoplaner.utils.Constants;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.chatmembers.ChatMembersActivity;
+import de.beyondsoft.ownchat.utils.Constants;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatAdapter.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatAdapter.java
index 296a42d..bbfda9e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/GroupChatAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatAdapter.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.utils.DateUtils;
-import com.p3.bewoplaner.utils.ui.ViewUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.utils.DateUtils;
+import de.beyondsoft.ownchat.utils.ui.ViewUtils;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatActivity.java
similarity index 86%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatActivity.java
index 4d726e4..0eb5ee9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatActivity.java
@@ -1,10 +1,10 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
 import com.bumptech.glide.Glide;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.utils.Constants;
+
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.utils.Constants;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -48,7 +48,7 @@ public class SingleChatActivity extends BaseChatActivity {
 
             if (mSystemUtils.isNetworkUnavailable()) {
                 mCallback.loadMessagesFromDBByGroupId(mGroup.id, true);
-                showError(R.string.error_no_internet_connection);
+                showError(de.beyondsoft.ownchat.R.string.error_no_internet_connection);
             } else {
                 mCallback.loadMessagesFromServerByGroupId(mGroup.id);
             }
@@ -66,7 +66,7 @@ public class SingleChatActivity extends BaseChatActivity {
 
             if (mSystemUtils.isNetworkUnavailable()) {
                 mCallback.loadMessagesFromDBByGroupId(mGroup.id, true);
-                showError(R.string.error_no_internet_connection);
+                showError(de.beyondsoft.ownchat.R.string.error_no_internet_connection);
             } else {
                 mCallback.fetchNewMessages(mGroup.id);
             }
@@ -89,12 +89,12 @@ public class SingleChatActivity extends BaseChatActivity {
     protected void loadMessages() {
         if (!TextUtils.isEmpty(mGroup.mobile)) {
             mExtraImageView.setVisibility(View.VISIBLE);
-            mExtraImageView.setImageResource(R.drawable.call);
+            mExtraImageView.setImageResource(de.beyondsoft.ownchat.R.drawable.call);
         }
 
         if (mSystemUtils.isNetworkUnavailable()) {
             mCallback.loadMessagesFromDBByGroupId(mGroup.id, true);
-            showError(R.string.error_no_internet_connection);
+            showError(de.beyondsoft.ownchat.R.string.error_no_internet_connection);
         } else {
             mCallback.loadMessagesFromServerByGroupId(mGroup.id);
         }
@@ -104,13 +104,13 @@ public class SingleChatActivity extends BaseChatActivity {
     protected void setToolbar() {
         mSingleChatTitleTextView.setVisibility(View.VISIBLE);
         mSingleChatTitleTextView.setText(mGroup.name);
-        mSingleChatTitleTextView.setTextColor(ContextCompat.getColor(this, mGroup.isEmployee(mGroup.users) ? R.color.colorHelpGroup : R.color.colorBlack));
+        mSingleChatTitleTextView.setTextColor(ContextCompat.getColor(this, mGroup.isEmployee(mGroup.users) ? de.beyondsoft.ownchat.R.color.colorHelpGroup : de.beyondsoft.ownchat.R.color.colorBlack));
 
         if (TextUtils.isEmpty(mGroup.avatar)) {
-            mChatImageView.setImageResource(R.drawable.avatar);
+            mChatImageView.setImageResource(de.beyondsoft.ownchat.R.drawable.avatar);
         } else {
             Glide.with(this).load(mGroup.avatar)
-                    .placeholder(R.drawable.avatar)
+                    .placeholder(de.beyondsoft.ownchat.R.drawable.avatar)
                     .dontAnimate()
                     .into(mChatImageView);
         }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatAdapter.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatAdapter.java
index 5960951..2fb94d9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chat/SingleChatAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatAdapter.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.utils.DateUtils;
-import com.p3.bewoplaner.utils.ui.ViewUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.utils.DateUtils;
+import de.beyondsoft.ownchat.utils.ui.ViewUtils;
 
 import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersActivity.java
similarity index 86%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersActivity.java
index 2982a55..51a3f31 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersActivity.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.page.chatmembers;
+package de.beyondsoft.ownchat.page.chatmembers;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.utils.ui.HorizontalDividerItemDecoration;
 
 import android.content.Context;
 import android.content.Intent;
@@ -57,8 +57,7 @@ public class ChatMembersActivity extends AppCompatActivity {
         Group group = getIntent().getParcelableExtra(GROUP_ARG);
         setToolbar(group);
 
-        mHorizontalDividerItemDecoration = new HorizontalDividerItemDecoration.Builder(this)
-                .colorResId(R.color.colorFill).build();
+        mHorizontalDividerItemDecoration = new HorizontalDividerItemDecoration.Builder(this).colorResId(R.color.colorFill).build();
         mChatMembersRecyclerView.addItemDecoration(mHorizontalDividerItemDecoration);
         mChatMembersRecyclerView.setLayoutManager(new LinearLayoutManager(this));
 
@@ -70,11 +69,9 @@ public class ChatMembersActivity extends AppCompatActivity {
         mGroupTitleTextView.setVisibility(View.VISIBLE);
         mGroupMembersTextView.setVisibility(View.GONE);
         mExtraImageView.setVisibility(View.GONE);
-        mChatImageView.setImageResource(group.isHelpGroup() ? R.drawable.avatar_help_group
-                : R.drawable.avatar_team_group);
+        mChatImageView.setImageResource(group.isHelpGroup() ? R.drawable.avatar_help_group : R.drawable.avatar_team_group);
         mGroupTitleTextView.setText(group.name);
-        mGroupTitleTextView.setTextColor(ContextCompat.getColor(this,
-                group.isHelpGroup() ? R.color.colorHelpGroup : R.color.colorTeamGroup));
+        mGroupTitleTextView.setTextColor(ContextCompat.getColor(this, group.isHelpGroup() ? R.color.colorHelpGroup : R.color.colorTeamGroup));
     }
 
     @OnClick(R.id.chat_toolbar_back_arrow)
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersAdapter.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersAdapter.java
index 0b88c5a..2dd0fdf 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersAdapter.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.page.chatmembers;
+package de.beyondsoft.ownchat.page.chatmembers;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.model.User;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.model.User;
 
 import android.content.Intent;
 import android.net.Uri;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/BaseFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/BaseFragment.java
similarity index 89%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/BaseFragment.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/BaseFragment.java
index 7bcd467..59ac93b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/BaseFragment.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/BaseFragment.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.page.common;
+package de.beyondsoft.ownchat.page.common;
 
 import android.support.v4.app.Fragment;
 
@@ -14,9 +14,11 @@ public class BaseFragment extends Fragment {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+
         if (mUnbinder == null) {
             return;
         }
+
         mUnbinder.unbind();
     }
 }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/PermissionGrantedListener.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/PermissionGrantedListener.java
similarity index 87%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/PermissionGrantedListener.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/PermissionGrantedListener.java
index 818cb0c..87f081b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/PermissionGrantedListener.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/PermissionGrantedListener.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.page.common;
+package de.beyondsoft.ownchat.page.common;
 
 /**
  * Callback for requesting permission.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/RuntimePermissionActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/RuntimePermissionActivity.java
similarity index 97%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/RuntimePermissionActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/RuntimePermissionActivity.java
index b0d731e..fecc19f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/common/RuntimePermissionActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/RuntimePermissionActivity.java
@@ -1,7 +1,7 @@
-package com.p3.bewoplaner.page.common;
+package de.beyondsoft.ownchat.page.common;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.utils.DialogHandler;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.utils.DialogHandler;
 
 import android.app.Dialog;
 import android.content.Intent;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java
index b6dfd73..09de973 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java
@@ -1,11 +1,11 @@
-package com.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.utils.DateUtils;
-import com.p3.bewoplaner.utils.ui.ViewUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.utils.DateUtils;
+import de.beyondsoft.ownchat.utils.ui.ViewUtils;
 
 import android.graphics.Typeface;
 import android.support.v4.content.ContextCompat;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsComponent.java
similarity index 56%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsComponent.java
index d58cc13..cf56308 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsComponent.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
-import com.p3.bewoplaner.di.ApplicationComponent;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
-import com.p3.bewoplaner.page.chat.ChatModule;
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.page.chat.ChatModule;
 
 import dagger.Component;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java
similarity index 91%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsFragment.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java
index 524b94c..4d1c904 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsFragment.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java
@@ -1,18 +1,18 @@
-package com.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.events.GroupUpdatedEvent;
-import com.p3.bewoplaner.data.prefs.LongPreference;
-import com.p3.bewoplaner.di.InjectionHelper;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.chat.GroupChatActivity;
-import com.p3.bewoplaner.page.chat.SingleChatActivity;
-import com.p3.bewoplaner.page.common.BaseFragment;
-import com.p3.bewoplaner.utils.Constants;
-import com.p3.bewoplaner.utils.ui.EmptyLayout;
-import com.p3.bewoplaner.utils.ui.HorizontalDividerItemDecoration;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.events.GroupUpdatedEvent;
+import de.beyondsoft.ownchat.data.prefs.LongPreference;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.chat.GroupChatActivity;
+import de.beyondsoft.ownchat.page.chat.SingleChatActivity;
+import de.beyondsoft.ownchat.page.common.BaseFragment;
+import de.beyondsoft.ownchat.utils.Constants;
+import de.beyondsoft.ownchat.utils.ui.EmptyLayout;
+import de.beyondsoft.ownchat.utils.ui.HorizontalDividerItemDecoration;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java
similarity index 84%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java
index 81edf6f..3f28ba9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java
@@ -1,22 +1,22 @@
-package com.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import com.p3.bewoplaner.data.api.responses.GroupResponse;
-import com.p3.bewoplaner.data.api.services.ChatService;
-import com.p3.bewoplaner.data.prefs.LongPreference;
-import com.p3.bewoplaner.data.repository.GroupRealmRepository;
-import com.p3.bewoplaner.data.repository.UserRealmRepository;
-import com.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import com.p3.bewoplaner.data.repository.specifications.GroupByNameSpecification;
-import com.p3.bewoplaner.data.repository.specifications.GroupSpecification;
-import com.p3.bewoplaner.data.repository.specifications.UserByIdSpecification;
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import com.p3.bewoplaner.utils.SystemUtils;
-import com.p3.bewoplaner.utils.rx.RxUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.api.common.ErrorHandlingResponseConverter;
+import de.beyondsoft.ownchat.data.api.responses.GroupResponse;
+import de.beyondsoft.ownchat.data.api.services.ChatService;
+import de.beyondsoft.ownchat.data.prefs.LongPreference;
+import de.beyondsoft.ownchat.data.repository.GroupRealmRepository;
+import de.beyondsoft.ownchat.data.repository.UserRealmRepository;
+import de.beyondsoft.ownchat.data.repository.specifications.GroupByIdSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.GroupByNameSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.GroupSpecification;
+import de.beyondsoft.ownchat.data.repository.specifications.UserByIdSpecification;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.mvp.MVPAbstractPresenter;
+import de.beyondsoft.ownchat.utils.SystemUtils;
+import de.beyondsoft.ownchat.utils.rx.RxUtils;
 
 import android.support.annotation.NonNull;
 import android.util.Log;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsView.java
similarity index 75%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsView.java
index f044996..a02cbbb 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/contacts/ContactsView.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsView.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
-import com.p3.bewoplaner.model.Group;
-import com.p3.bewoplaner.model.Message;
-import com.p3.bewoplaner.page.mvp.MVPView;
+import de.beyondsoft.ownchat.model.Group;
+import de.beyondsoft.ownchat.model.Message;
+import de.beyondsoft.ownchat.page.mvp.MVPView;
 
 import android.support.annotation.StringRes;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java
new file mode 100644
index 0000000..7fd2010
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java
@@ -0,0 +1,124 @@
+package de.beyondsoft.ownchat.page.fileconfirmation;
+
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.MediaStore;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.webkit.WebView;
+import android.widget.ImageView;
+
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.utils.Constants;
+import de.beyondsoft.ownchat.utils.FileUtils;
+
+import java.io.File;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import hani.momanii.supernova_emoji_library.Helper.EmojiconEditText;
+
+public class FileConfirmationActivity extends AppCompatActivity implements FileConfirmationView {
+
+    @BindView(R.id.file_message)
+    EmojiconEditText mMessageEmojiconEditText;
+
+    @BindView(R.id.file_emoji_button)
+    ImageView mEmojiButtonImageView;
+
+    @BindView(R.id.media_file_webview)
+    WebView mFileWebView;
+
+    @BindView(R.id.file_send_message)
+    ImageView mSendMessageButtonImageView;
+
+
+    @Inject
+    FileConfirmationPresenter mFileConfirmationPresenter;
+
+    private Callback mCallback;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_file_confirmation);
+
+        InjectionHelper.getFileConfirmationComponent(this).inject(this);
+        ButterKnife.bind(this);
+        mFileConfirmationPresenter.attachView(this);
+
+        String fileUri = getIntent().getStringExtra(Constants.FILENAME);
+
+        File file = getFile(Uri.parse(fileUri));
+        String absolutePath = file.getAbsolutePath();
+
+        String html = "<html><head></head><body><img src=\""+ absolutePath + "\"></body></html>";
+        try {
+            mFileWebView.loadDataWithBaseURL("", html, "text/html", "utf-8", null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private String getPath(Uri uri) {
+        String[] projection = {MediaStore.Images.Media.DATA};
+        Cursor cursor = getContentResolver().query(uri, projection, null, null, null);
+
+        if(cursor == null) {
+            return null;
+        }
+
+        int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+        cursor.moveToFirst();
+        String path = cursor.getString(columnIndex);
+        cursor.close();
+
+        return path;
+    }
+
+    @Override
+    public void sendFileSuccessful() {
+
+    }
+
+    @Override
+    public void setCallback(Callback callback) {
+        mCallback = callback;
+    }
+
+    @Override
+    protected void onDestroy() {
+        InjectionHelper.destroyLoginComponent();
+        mFileConfirmationPresenter.detachView();
+        super.onDestroy();
+    }
+
+    @Override
+    public void showLoading() {
+
+    }
+
+    @Override
+    public void showContent() {
+
+    }
+
+    @Override
+    public void showError(@StringRes int messageRes) {
+
+    }
+
+    @Override
+    public void showError(String message) {
+
+    }
+
+    public File getFile(Uri fileUri) {
+        return FileUtils.getFile(this, fileUri);
+    }
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationComponent.java
new file mode 100644
index 0000000..e8e5b07
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationComponent.java
@@ -0,0 +1,16 @@
+package de.beyondsoft.ownchat.page.fileconfirmation;
+
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+
+import dagger.Component;
+
+/**
+ * Created by Lyndon on 13-Oct-2017.
+ */
+
+@ActivityScope
+@Component(dependencies = ApplicationComponent.class, modules = FileConfirmationModule.class)
+public interface FileConfirmationComponent {
+    void inject(FileConfirmationActivity fileConfirmationActivity);
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationModule.java
new file mode 100644
index 0000000..22baeb2
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationModule.java
@@ -0,0 +1,22 @@
+package de.beyondsoft.ownchat.page.fileconfirmation;
+
+import de.beyondsoft.ownchat.data.api.services.ChatService;
+import de.beyondsoft.ownchat.di.P3DSEndpoint;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+
+import dagger.Module;
+import dagger.Provides;
+import retrofit2.Retrofit;
+
+/**
+ * Created by Lyndon on 13-Oct-2017.
+ */
+
+@Module
+public class FileConfirmationModule {
+    @Provides
+    @ActivityScope
+    ChatService provideChatService(@P3DSEndpoint Retrofit retrofit) {
+        return retrofit.create(ChatService.class);
+    }
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationPresenter.java
new file mode 100644
index 0000000..e7ee936
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationPresenter.java
@@ -0,0 +1,43 @@
+package de.beyondsoft.ownchat.page.fileconfirmation;
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+
+import de.beyondsoft.ownchat.data.api.services.ChatService;
+import de.beyondsoft.ownchat.page.mvp.MVPAbstractPresenter;
+
+import javax.inject.Inject;
+
+/**
+ * Created by Lyndon on 13-Oct-2017.
+ */
+
+public class FileConfirmationPresenter extends MVPAbstractPresenter<FileConfirmationView> implements FileConfirmationView.Callback {
+
+    @Inject
+    ChatService mChatService;
+
+    @Inject
+    Context mContext;
+
+    @Inject
+    FileConfirmationPresenter() {}
+
+    @Override
+    protected void afterAttachView(@NonNull FileConfirmationView view) {
+        super.afterAttachView(view);
+        view.setCallback(this);
+    }
+
+    @Override
+    protected void beforeDetachView(@NonNull FileConfirmationView view) {
+        view.setCallback(null);
+        super.beforeDetachView(view);
+    }
+
+    @Override
+    public void sendFile(Uri fileUri) {
+
+    }
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationView.java
new file mode 100644
index 0000000..f66062c
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationView.java
@@ -0,0 +1,19 @@
+package de.beyondsoft.ownchat.page.fileconfirmation;
+
+import android.net.Uri;
+
+import de.beyondsoft.ownchat.page.mvp.MVPLceView;
+
+/**
+ * Created by Lyndon on 13-Oct-2017.
+ */
+
+public interface FileConfirmationView extends MVPLceView {
+    void sendFileSuccessful();
+
+    void setCallback(Callback callback);
+
+    interface Callback {
+        void sendFile(Uri fileUri);
+    }
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/impressum/ImpressumActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/impressum/ImpressumActivity.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/impressum/ImpressumActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/impressum/ImpressumActivity.java
index 06fed75..8ea682d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/impressum/ImpressumActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/impressum/ImpressumActivity.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.page.impressum;
+package de.beyondsoft.ownchat.page.impressum;
 
-import com.p3.bewoplaner.R;
+import de.beyondsoft.ownchat.R;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginActivity.java
similarity index 73%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginActivity.java
index 2af370c..5fc433a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginActivity.java
@@ -1,16 +1,17 @@
-package com.p3.bewoplaner.page.login;
+package de.beyondsoft.ownchat.page.login;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 
-import com.p3.bewoplaner.BewoplanerApplication;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.prefs.AppPrefs;
-import com.p3.bewoplaner.di.InjectionHelper;
-import com.p3.bewoplaner.page.main.MainActivity;
-import com.p3.bewoplaner.utils.AppStoppedService;
-import com.p3.bewoplaner.utils.DialogHandler;
-import com.p3.bewoplaner.utils.ui.ViewUtils;
+import de.beyondsoft.ownchat.BewoplanerApplication;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.prefs.AppPrefs;
+import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.page.main.MainActivity;
+import de.beyondsoft.ownchat.utils.AppStoppedService;
+import de.beyondsoft.ownchat.utils.DialogHandler;
+import de.beyondsoft.ownchat.utils.ui.ViewUtils;
 import com.securepreferences.SecurePreferences;
 
 import android.content.Intent;
@@ -31,6 +32,7 @@ import android.widget.ProgressBar;
 import java.util.Map;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -40,8 +42,7 @@ import butterknife.OnEditorAction;
 /**
  * Created by imarneanu on 2/10/17.
  */
-public class LoginActivity extends AppCompatActivity
-        implements LoginView {
+public class LoginActivity extends AppCompatActivity implements LoginView {
 
     @BindView(R.id.login_chat_code)
     EditText mChatCodeEditText;
@@ -58,6 +59,10 @@ public class LoginActivity extends AppCompatActivity
     @BindView(R.id.login_save_password_checkBox)
     CheckBox mSavePasswordCheckbox;
 
+    @Inject
+    @Named(AppPrefsConstants.SHOW_LOGIN_AGAIN)
+    BooleanPreference mShowLoginAgainPreference;
+
     @Inject
     LoginPresenter mLoginPresenter;
 
@@ -77,8 +82,13 @@ public class LoginActivity extends AppCompatActivity
         mLoginPresenter.attachView(this);
         decryptPreference();
         ViewUtils.setProgressBarColor(mProgressBar, R.color.colorDefault);
-        mCallback.logout(Settings.Secure.getString(this.getContentResolver(),
-                Settings.Secure.ANDROID_ID), true, null);
+
+        if(mShowLoginAgainPreference.get()) {
+            mShowLoginAgainPreference.set(false);
+            showError(R.string.login_again);
+        }
+
+        mCallback.logout(Settings.Secure.getString(this.getContentResolver(), Settings.Secure.ANDROID_ID), true, null);
     }
 
     @OnEditorAction(R.id.login_password)
@@ -86,47 +96,61 @@ public class LoginActivity extends AppCompatActivity
         if (actionId == EditorInfo.IME_ACTION_DONE) {
             ViewUtils.hideKeyboard(this);
         }
+
         return false;
     }
 
     @OnClick(R.id.login_button)
     void loginButtonClicked() {
-        mCallback.checkVoucher(mAccountEditText.getText().toString().trim(),
-                mChatCodeEditText.getText().toString().trim(),
-                mPasswordEditText.getText().toString(),
-                mSavePasswordCheckbox.isChecked());
+        mCallback.checkTypeAndCustomerId(mAccountEditText.getText().toString().trim(), mPasswordEditText.getText().toString().trim(), mSavePasswordCheckbox.isChecked());
     }
 
     @Override
-    public void voucherIsNotValid() {
+    public void customerIdIsValid() {
+        ((BewoplanerApplication) getApplication()).resetApplicationComponent();
+        verifyIfIsChecked();
+    }
+
+    @Override
+    public void customerIdIsNotValid(int status) {
+        int dialogMessage;
+
+        switch (status) {
+            case 1:
+                dialogMessage = R.string.login_customer_id_is_invalid;
+                break;
+            default:
+                dialogMessage = R.string.login_service_type_is_undefined;
+        }
+
         DialogHandler.createNoTitleDialog(this,
-                R.string.login_voucher_code_is_not_valid,
+                dialogMessage,
                 false,
                 android.R.string.ok,
                 (dialog, which) -> dialog.dismiss()).show();
     }
 
-    @Override
-    public void voucherIsValid() {
-        ((BewoplanerApplication) getApplication()).resetApplicationComponent();
-        verifyIfIsChecked();
-    }
-
     private void verifyIfIsChecked() {
         mLoginPresenter.detachView();
         InjectionHelper.destroyLoginComponent();
         InjectionHelper.getLoginComponent(this).inject(this);
         mLoginPresenter.attachView(this);
-        mCallback.tryToLogin(mUsernameEditText.getText().toString().trim(), mPasswordEditText.getText().toString());
+        mCallback.tryToLogin(mUsernameEditText.getText().toString().trim(), mPasswordEditText.getText().toString(), mChatCodeEditText.getText().toString().trim());
     }
 
     @Override
     public void loginSuccessful() {
-        mCallback.tryToRegisterDevice(Settings.Secure.getString(this.getContentResolver(),
-                Settings.Secure.ANDROID_ID), FirebaseInstanceId.getInstance().getToken());
+        mCallback.retrieveUploadMaxSize();
+    }
+
+    @Override
+    public void retrievedUploadMaxSize() {
+        mCallback.tryToRegisterDevice(Settings.Secure.getString(this.getContentResolver(), Settings.Secure.ANDROID_ID), FirebaseInstanceId.getInstance().getToken());
+
         if (!mSavePasswordCheckbox.isChecked()) {
             startService(new Intent(getBaseContext(), AppStoppedService.class));
         }
+
         Intent intent = new Intent(this, MainActivity.class);
         startActivity(intent);
         finish();
@@ -135,6 +159,7 @@ public class LoginActivity extends AppCompatActivity
     private void decryptPreference() {
         for (Map.Entry<String, ?> entry : mSecuredPrefs.getAll().entrySet()) {
             final String key = entry.getKey();
+
             if (key == null) {
                 continue;
             } else if (key.equals(SecurePreferences.hashPrefKey(AppPrefsConstants.CHAT_CODE))) {
@@ -180,10 +205,10 @@ public class LoginActivity extends AppCompatActivity
     @Override
     public void showError(String message) {
         if (mSnackbar == null) {
-            mSnackbar = Snackbar.make(findViewById(R.id.login_coordinator_layout), message, Snackbar.LENGTH_LONG)
-                    .setAction("Retry", view -> verifyIfIsChecked());
+            mSnackbar = Snackbar.make(findViewById(R.id.login_coordinator_layout), message, Snackbar.LENGTH_LONG).setAction("Retry", view -> verifyIfIsChecked());
             mSnackbar.setActionTextColor(ContextCompat.getColor(this, R.color.colorDefault));
         }
+
         mSnackbar.setText(message);
         mSnackbar.show();
     }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginComponent.java
similarity index 63%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginComponent.java
index d22652e..c5e217e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginComponent.java
@@ -1,7 +1,7 @@
-package com.p3.bewoplaner.page.login;
+package de.beyondsoft.ownchat.page.login;
 
-import com.p3.bewoplaner.di.ApplicationComponent;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
 
 import dagger.Component;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginModule.java
new file mode 100644
index 0000000..7e4118a
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginModule.java
@@ -0,0 +1,29 @@
+package de.beyondsoft.ownchat.page.login;
+
+import de.beyondsoft.ownchat.data.api.services.LoginService;
+import de.beyondsoft.ownchat.data.api.services.RegisterService;
+import de.beyondsoft.ownchat.di.P3DSEndpoint;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+
+import dagger.Module;
+import dagger.Provides;
+import retrofit2.Retrofit;
+
+/**
+ * Created by laszloffiferenc on 2/21/17.
+ */
+@Module
+public class LoginModule {
+
+    @Provides
+    @ActivityScope
+    LoginService provideLoginService(@P3DSEndpoint Retrofit retrofit) {
+        return retrofit.create(LoginService.class);
+    }
+
+    @Provides
+    @ActivityScope
+    RegisterService provideRegisterService(@P3DSEndpoint Retrofit retrofit) {
+        return retrofit.create(RegisterService.class);
+    }
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
similarity index 60%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
index 1c8cf7b..cb89da2 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/login/LoginPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
@@ -1,32 +1,31 @@
-package com.p3.bewoplaner.page.login;
+package de.beyondsoft.ownchat.page.login;
 
 import com.google.gson.JsonObject;
 
 import com.bumptech.glide.Glide;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import com.p3.bewoplaner.data.api.common.ErrorThrowable;
-import com.p3.bewoplaner.data.api.common.ErrorType;
-import com.p3.bewoplaner.data.api.common.ErrorUtils;
-import com.p3.bewoplaner.data.api.responses.RegisterResponse;
-import com.p3.bewoplaner.data.api.services.LoginService;
-import com.p3.bewoplaner.data.api.services.RegisterService;
-import com.p3.bewoplaner.data.api.services.VoucherService;
-import com.p3.bewoplaner.data.prefs.AppPrefs;
-import com.p3.bewoplaner.data.prefs.BooleanPreference;
-import com.p3.bewoplaner.data.prefs.LongPreference;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.data.repository.GroupRealmRepository;
-import com.p3.bewoplaner.data.repository.MessageRealmRepository;
-import com.p3.bewoplaner.data.repository.RealmProvider;
-import com.p3.bewoplaner.data.repository.UserRealmRepository;
-import com.p3.bewoplaner.model.User;
-import com.p3.bewoplaner.page.main.LogoutNavigation;
-import com.p3.bewoplaner.page.main.MainNavigation;
-import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import com.p3.bewoplaner.utils.SystemUtils;
-import com.p3.bewoplaner.utils.rx.RxUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.api.common.ErrorHandlingResponseConverter;
+import de.beyondsoft.ownchat.data.api.common.ErrorThrowable;
+import de.beyondsoft.ownchat.data.api.common.ErrorType;
+import de.beyondsoft.ownchat.data.api.common.ErrorUtils;
+import de.beyondsoft.ownchat.data.api.responses.RegisterResponse;
+import de.beyondsoft.ownchat.data.api.services.LoginService;
+import de.beyondsoft.ownchat.data.api.services.RegisterService;
+import de.beyondsoft.ownchat.data.prefs.AppPrefs;
+import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
+import de.beyondsoft.ownchat.data.prefs.LongPreference;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.data.repository.GroupRealmRepository;
+import de.beyondsoft.ownchat.data.repository.MessageRealmRepository;
+import de.beyondsoft.ownchat.data.repository.RealmProvider;
+import de.beyondsoft.ownchat.data.repository.UserRealmRepository;
+import de.beyondsoft.ownchat.model.User;
+import de.beyondsoft.ownchat.page.main.LogoutNavigation;
+import de.beyondsoft.ownchat.page.main.MainNavigation;
+import de.beyondsoft.ownchat.page.mvp.MVPAbstractPresenter;
+import de.beyondsoft.ownchat.utils.SystemUtils;
+import de.beyondsoft.ownchat.utils.rx.RxUtils;
 import com.securepreferences.SecurePreferences;
 
 import android.app.NotificationManager;
@@ -54,11 +53,11 @@ import rx.schedulers.Schedulers;
 /**
  * Created by laszloffiferenc on 2/21/17.
  */
-public class LoginPresenter extends MVPAbstractPresenter<LoginView>
-        implements LoginView.Callback {
+public class LoginPresenter extends MVPAbstractPresenter<LoginView> implements LoginView.Callback {
 
     private static final String TAG = "error";
 
+    //region Dependency injection
     @Inject
     LoginService mLoginService;
 
@@ -66,7 +65,8 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
     RegisterService mRegisterService;
 
     @Inject
-    VoucherService mVoucherService;
+    @Named(AppPrefsConstants.SHOW_LOGIN_AGAIN)
+    BooleanPreference mShowLoginAgainPreference;
 
     @Inject
     @Named(AppPrefsConstants.API_ENDPOINT)
@@ -104,6 +104,14 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
     @Named(AppPrefsConstants.PHONE_NUMBER)
     StringPreference mPhoneNumberPreference;
 
+    @Inject
+    @Named(AppPrefsConstants.UPLOAD_MAX_SIZE)
+    LongPreference mUploadMaxSizePreference;
+
+    @Inject
+    @Named(AppPrefsConstants.IS_EMPLOYEE)
+    BooleanPreference mIsEmployee;
+
     @Inject
     @AppPrefs
     SharedPreferences mSharedPreferences;
@@ -135,13 +143,14 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
 
     @Inject
     Context mContext;
+    //endregion
 
     private String mLastVoucher;
 
-    @Inject
-    LoginPresenter() {
+    private int mStatus;
 
-    }
+    @Inject
+    LoginPresenter() {}
 
     @Override
     protected void afterAttachView(@NonNull LoginView view) {
@@ -155,47 +164,73 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
         super.beforeDetachView(view);
     }
 
+    //region Login and device registration
     /**
      * Try to login with the given parameters
      * @param username login username as {@code String}
      * @param password login password as {@code String}
+     * @param chatCode login chat code as {@code String}
      */
-    private void loginCall(String username, String password) {
+    private void loginCall(String username, String password, String chatCode) {
         getView().showLoading();
-        Subscription subscription = mLoginService.login(username, password)
+
+        mLastVoucher = chatCode;
+
+        Subscription subscription = mLoginService.loginWithChatCode(username, password, chatCode)
                 .compose(RxUtils.provideDefaultTransformer())
                 .flatMap(new ErrorHandlingResponseConverter<>())
                 .map(loginResponse -> loginResponse.response.user)
                 .subscribe(this::loginSuccess, this::loginError);
+
         addSubscription(subscription);
     }
 
     /**
      * Error to show in view if something went wrong during the login.
      */
-
     private void loginError(Throwable throwable) {
         getView().showContent();
+
         if (mSystemUtils.isNetworkUnavailable()) {
             getView().showError(R.string.error_no_internet_connection);
             return;
         }
-        if (ErrorUtils.getErrorType(throwable) == ErrorType.DATA_INPUT) {
-            ErrorThrowable errorThrowable = (ErrorThrowable) throwable;
-            if (errorThrowable.getError().loginFailed != null && errorThrowable.getError().loginFailed.size() > 0) {
-                getView().showError(errorThrowable.getError().loginFailed.get(0));
-                return;
-            }
+
+        ErrorThrowable errorThrowable = (ErrorThrowable) throwable;
+
+        switch(ErrorUtils.getErrorType(throwable)) {
+            case DATA_INPUT:
+                if (errorThrowable.getError().loginFailed != null && errorThrowable.getError().loginFailed.size() > 0) {
+                    getView().showError(errorThrowable.getError().loginFailed.get(0));
+                    return;
+                }
+            case WRONG_CHATCODE:
+                if (errorThrowable.getError().chatCodeFailed != null && errorThrowable.getError().chatCodeFailed.size() > 0) {
+                    getView().showError(R.string.error_wrong_chat_code);
+                    return;
+                }
+            case DEACTIVATED_CHATCODE:
+                if (errorThrowable.getError().chatCodeInactive != null && errorThrowable.getError().chatCodeInactive.size() > 0) {
+                    getView().showError(R.string.error_deactivated_chat_code);
+                    return;
+                }
+            case CHATCODE_TOO_SHORT:
+                if (errorThrowable.getError().chatCodeTooShort != null && errorThrowable.getError().chatCodeTooShort.size() > 0) {
+                    getView().showError(R.string.error_chat_code_too_short);
+                    return;
+                }
+            default:
+                getView().showError(R.string.error_something_went_wrong);
         }
-        getView().showError(R.string.error_something_went_wrong);
     }
 
     /**
      * Set user data in preferences if login is successful.
      * @param user {@code User} the current logged in user.
      */
-
     private void loginSuccess(User user) {
+        mIsEmployee.set(user.isEmployee);
+        mChatCodePreference.set(mLastVoucher);
         mLoginTokenPreference.set(user.token);
         mUserIdReference.set(user.id);
         mAvatarPreference.set(user.avatar);
@@ -208,22 +243,22 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
      *Checks the {@code String} username and {@code String} password
      * if are corresponding to criteria.
      */
-
     @Override
-    public void tryToLogin(String username, String password) {
+    public void tryToLogin(String username, String password, String chatCode) {
         if (!checkPassword(password)) {
             return;
         }
+
         if (!checkUsername(username)) {
             return;
         }
-        loginCall(username, password);
+
+        loginCall(username, password, chatCode);
     }
 
     /**
      * Register the current device. Used if the login is successful.
      */
-
     @Override
     public void tryToRegisterDevice(String deviceId, String fcmToken) {
         Subscription subscription = mRegisterService.registerDevice(deviceId, fcmToken)
@@ -231,89 +266,165 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
                 .flatMap(new ErrorHandlingResponseConverter<>())
                 .map(registerResponse -> registerResponse.response)
                 .subscribe(this::registerSuccessful, this::registerError);
+
         addSubscription(subscription);
     }
 
+    private void registerError(Throwable throwable) {
+        if (ErrorUtils.getErrorType(throwable) == ErrorType.DATA_INPUT) {
+            ErrorThrowable errorThrowable = (ErrorThrowable) throwable;
+
+            if (errorThrowable.getError().fcmToken != null && errorThrowable.getError().fcmToken.size() > 0) {
+                Log.d(TAG, "fcmToken error: " + errorThrowable.getError().fcmToken.get(0));
+                return;
+            }
+
+            if (errorThrowable.getError().deviceId != null && errorThrowable.getError().deviceId.size() > 0) {
+                Log.d(TAG, "fcmToken error: " + errorThrowable.getError().deviceId.get(0));
+            }
+        }
+    }
+
+    private void registerSuccessful(String s) {
+    }
+    //endregion
+
+    //region CheckTypeAndCustomerId
     /**
      * Checks if the voucher necessary for login is correct.
      */
-
     @Override
-    public void checkVoucher(String customerId, String voucher, String password, boolean isChecked) {
-        mLastVoucher = voucher;
+    public void checkTypeAndCustomerId(String customerId, String password, boolean isChecked) {
         mAccountNumberPreference.set(customerId);
         mSavePasswordPreference.set(isChecked);
+
         if (!checkPassword(password)) {
             return;
         }
-        if (TextUtils.isEmpty(voucher)) {
-            getView().showError(R.string.error_voucher_code_must_not_be_null);
-            return;
-        }
+
         if (TextUtils.isEmpty(customerId)) {
             getView().showError(R.string.error_customer_id_must_not_be_null);
             return;
         }
+
         getView().showLoading();
-        Subscription subscription = mVoucherService.checkVoucher(customerId, voucher)
+
+        Subscription subscription = mLoginService.getServiceType("1", customerId)
                 .flatMap(new Func1<JsonObject, Observable<Boolean>>() {
                     @Override
                     public Observable<Boolean> call(JsonObject response) {
-                        if (response.has(voucher) && response.get(voucher) != null) {
-                            JsonObject voucherObject = response.getAsJsonObject(voucher);
-                            if (voucherObject.has("CustomerID")
-                                    && !TextUtils.isEmpty(voucherObject.get("CustomerID").getAsString())
-                                    && voucherObject.has("ServerName")
-                                    && !TextUtils.isEmpty(voucherObject.get("ServerName").getAsString())) {
-                                String serverName = voucherObject.get("ServerName").getAsString();
-                                if (!serverName.startsWith("https")) {
-                                    serverName = "https://" + serverName + "/";
-                                }
-                                mApiEndpointPreference.set(serverName);
-                                return Observable.just(true);
+                        JsonObject serviceObject = response.getAsJsonObject();
+
+                        if (serviceObject.has("Status")
+                                && !TextUtils.isEmpty(serviceObject.get("Status").getAsString())
+                                && serviceObject.has("URL")
+                                && !TextUtils.isEmpty(serviceObject.get("URL").getAsString())) {
+
+
+                            String serverName = serviceObject.get("URL").getAsString();
+
+                            if (!serverName.startsWith("https")) {
+                                serverName = "https://" + serverName + "/";
                             }
+
+                            mApiEndpointPreference.set(serverName);
+
+                            return Observable.just(true);
+                        } else if(serviceObject.has("Status") && !TextUtils.isEmpty(serviceObject.get("Status").getAsString())) {
+                            mStatus = serviceObject.get("Status").getAsInt();
                         }
+
                         return Observable.just(false);
                     }
                 })
                 .compose(RxUtils.provideDefaultTransformer())
-                .subscribe(this::checkVoucherSuccessful, this::checkVoucherError);
+                .subscribe(this::checkTypeAndCustomerIdSuccessful, this::checkTypeAndCustomerIdError);
+
         addSubscription(subscription);
     }
 
-    private void checkVoucherError(Throwable throwable) {
+    private void checkTypeAndCustomerIdError(Throwable throwable) {
         getView().showContent();
+
         if (mSystemUtils.isNetworkUnavailable()) {
             getView().showError(R.string.error_no_internet_connection);
             return;
         }
+
         getView().showError(R.string.error_something_went_wrong);
     }
 
-    private void checkVoucherSuccessful(Boolean vouchIsValid) {
+    private void checkTypeAndCustomerIdSuccessful(Boolean customerIdIsValid) {
         getView().showContent();
-        if (vouchIsValid) {
-            mChatCodePreference.set(mLastVoucher);
-            getView().voucherIsValid();
+
+        if(customerIdIsValid) {
+            getView().customerIdIsValid();
             return;
         }
+
         deleteData(true);
-        getView().voucherIsNotValid();
+        getView().customerIdIsNotValid(mStatus);
+    }
+    //endregion
+
+    //region UploadMaxSize
+    @Override
+    public void retrieveUploadMaxSize() {
+        getView().showLoading();
+
+        Subscription subscription = mLoginService.getUploadMaxSize()
+                .flatMap(new Func1<JsonObject, Observable<Integer>>() {
+                    @Override
+                    public Observable<Integer> call(JsonObject response) {
+                        JsonObject maxSizeObject = response.getAsJsonObject();
+
+                        if(maxSizeObject.has("file_upload_max_size")) {
+                            mUploadMaxSizePreference.set(maxSizeObject.get("file_upload_max_size").getAsLong());
+                        }
+
+                        return Observable.just(0);
+                    }
+                })
+                .compose(RxUtils.provideDefaultTransformer())
+                .subscribe(this::retrieveUploadMaxSizeSuccessful, this::retrieveUploadMaxSizeError);
+
+        addSubscription(subscription);
     }
 
+    private void retrieveUploadMaxSizeError(Throwable throwable) {
+        getView().showContent();
+
+        if (mSystemUtils.isNetworkUnavailable()) {
+            getView().showError(R.string.error_no_internet_connection);
+            return;
+        }
+
+        getView().showError(R.string.login_service_type_is_undefined);
+    }
+
+    private void retrieveUploadMaxSizeSuccessful(long retrievedMaxSize) {
+        getView().showContent();
+
+        getView().retrievedUploadMaxSize();
+    }
+    //endregion
+
+    //region Logout
     /**
      * Logout from application deletes all login preferences and redirects to login screen.
      */
-
     @Override
     public void logout(String deviceId, boolean clearAllPrefs, MainNavigation mainNavigation) {
         mNotificationManager.cancelAll();
+
         if (!mLoginTokenPreference.isSet()) {
             if (mainNavigation != null) {
                 mainNavigation.goToLoginActivity();
             }
+
             return;
         }
+
         mRegisterService.unregisterDevice(deviceId)
                 .compose(RxUtils.provideDefaultTransformer())
                 .flatMap(new ErrorHandlingResponseConverter<>())
@@ -323,6 +434,7 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
                         //after device unregister we remove also the token
                         mLoginTokenPreference.delete();
                         deleteData(clearAllPrefs);
+
                         if (mainNavigation != null) {
                             mainNavigation.goToLoginActivity();
                         }
@@ -334,6 +446,7 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
                         //after device unregister we remove also the token
                         mLoginTokenPreference.delete();
                         deleteData(clearAllPrefs);
+
                         if (mainNavigation != null) {
                             mainNavigation.goToLoginActivity();
                         }
@@ -346,72 +459,71 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
                 });
     }
 
-    private void registerError(Throwable throwable) {
-        if (ErrorUtils.getErrorType(throwable) == ErrorType.DATA_INPUT) {
-            ErrorThrowable errorThrowable = (ErrorThrowable) throwable;
-            if (errorThrowable.getError().fcmToken != null && errorThrowable.getError().fcmToken.size() > 0) {
-                Log.d(TAG, "fcmToken error: " + errorThrowable.getError().fcmToken.get(0));
-                return;
-            }
-            if (errorThrowable.getError().deviceId != null && errorThrowable.getError().deviceId.size() > 0) {
-                Log.d(TAG, "fcmToken error: " + errorThrowable.getError().deviceId.get(0));
-            }
-        }
-    }
-
     @Override
     public void tryToLogout(String deviceId, MainNavigation mainNavigation) {
         if (mSavePasswordPreference.get()) {
             return;
         }
+
         logout(deviceId, false, mainNavigation);
     }
+    //endregion
 
     @Override
-    public void checkIfVoucherStillAvailable(LogoutNavigation logoutNavigation) {
+    public void verifyChatCode(LogoutNavigation logoutNavigation) {
         if (mAccountNumberPreference.get() == null) {
             return;
         }
-        String voucher = mChatCodePreference.get();
+
+        String chatCode = mChatCodePreference.get();
         String customerId = mAccountNumberPreference.get();
-        Subscription subscription = mVoucherService.checkVoucher(customerId, voucher)
+        String userId = (mIsEmployee.get() ? "E" : "C") + mUserIdReference.get().toString();
+
+        Subscription subscription = mLoginService.verifyChatCode(customerId, userId, chatCode)
                 .compose(RxUtils.provideDefaultTransformer())
                 .subscribe(new Subscriber<JsonObject>() {
                     @Override
-                    public void onCompleted() {
-
-                    }
+                    public void onCompleted() {}
 
                     @Override
                     public void onError(Throwable e) {
                         if (mSystemUtils.isNetworkUnavailable() || e instanceof SocketTimeoutException) {
                             return;
                         }
-                        Toast.makeText(mContext, "Please make sure you have internet connection", Toast.LENGTH_SHORT).show();
+
+                        Toast.makeText(mContext, mContext.getString(R.string.error_token_validation_failed), Toast.LENGTH_SHORT).show();
                     }
 
                     @Override
                     public void onNext(JsonObject response) {
-                        if (!response.has(voucher) || response.get(voucher) == null) {
-                            logoutNavigation.logoutDirectly();
+                        if (!response.has("result") || response.get("result") == null) {
+                            logoutNavigation.logoutDirectly(false);
                             return;
                         }
-                        JsonObject voucherObject = response.getAsJsonObject(voucher);
-                        if (!voucherObject.has("CustomerID")
-                                || TextUtils.isEmpty(voucherObject.get("CustomerID").getAsString())
-                                || !voucherObject.has("ServerName")
-                                || TextUtils.isEmpty(voucherObject.get("ServerName").getAsString())) {
-                            logoutNavigation.logoutDirectly();
+
+                        int result = response.get("result").getAsInt();
+
+                        boolean shouldClearAllPrefs = false;
+
+                        if(result == 0) {
+                            deleteData(true);
+                            shouldClearAllPrefs = true;
                         }
+
+                        if(result == 1) {
+                            mShowLoginAgainPreference.set(true);
+                        }
+
+                        logoutNavigation.logoutDirectly(shouldClearAllPrefs);
                     }
                 });
+
         addSubscription(subscription);
     }
 
     /**
      * Clears all login preferences.
      */
-
     private void deleteData(boolean clearAllPrefs) {
         if (clearAllPrefs) {
             Observable.create(subscriber -> mGlide.clearDiskCache())
@@ -422,10 +534,13 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
             mAccountNumberPreference.deleteFromSecurePreference();
             mChatCodePreference.deleteFromSecurePreference();
             mSavePasswordPreference.deleteFromSecurePreference();
+
             File dir = mContext.getExternalFilesDir(null);
+
             if (dir != null) {
                 if (dir.isDirectory()) {
                     String[] children = dir.list();
+
                     for (String aChildren : children) {
                         //noinspection ResultOfMethodCallIgnored
                         new File(dir, aChildren).delete();
@@ -435,8 +550,10 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
                 }
             } else {
                 dir = new File(Environment.getExternalStorageDirectory(), "BeWoPlaner");
+
                 if (dir.isDirectory()) {
                     String[] children = dir.list();
+
                     for (String aChildren : children) {
                         //noinspection ResultOfMethodCallIgnored
                         new File(dir, aChildren).delete();
@@ -445,6 +562,7 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
                     Log.e("deleteData", dir.getAbsolutePath() + " is not a directory!");
                 }
             }
+
             Realm realm = mRealmProvider.provide();
             realm.executeTransaction(realm1 -> realm1.deleteAll());
         } else {
@@ -452,21 +570,20 @@ public class LoginPresenter extends MVPAbstractPresenter<LoginView>
         }
     }
 
-    private void registerSuccessful(String s) {
-    }
-
     private boolean checkPassword(String password) {
-        if (password.length() >= 8) {
+        if (password.length() >= 1) {
             return true;
         }
+
         getView().showError(R.string.error_password_too_short);
         return false;
     }
 
     private boolean checkUsername(String username) {
-        if (username.length() >= 4) {
+        if (username.length() >= 1) {
             return true;
         }
+
         getView().showError(R.string.error_username_too_short);
         return false;
     }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginView.java
new file mode 100644
index 0000000..1b7b0e5
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginView.java
@@ -0,0 +1,36 @@
+package de.beyondsoft.ownchat.page.login;
+
+import de.beyondsoft.ownchat.page.main.LogoutNavigation;
+import de.beyondsoft.ownchat.page.main.MainNavigation;
+import de.beyondsoft.ownchat.page.mvp.MVPLceView;
+
+/**
+ * Created by laszloffiferenc on 2/21/17.
+ */
+interface LoginView extends MVPLceView {
+    void loginSuccessful();
+
+    void setCallback(Callback callback);
+
+    void customerIdIsValid();
+
+    void customerIdIsNotValid(int status);
+
+    void retrievedUploadMaxSize();
+
+    interface Callback {
+        void verifyChatCode(LogoutNavigation logoutNavigation);
+
+        void retrieveUploadMaxSize();
+
+        void checkTypeAndCustomerId(String customerId, String password, boolean isChecked);
+
+        void tryToLogin(String email, String password, String chatCode);
+
+        void tryToRegisterDevice(String deviceId, String fcmToken);
+
+        void logout(String deviceId, boolean clearAllPrefs, MainNavigation mainNavigation);
+
+        void tryToLogout(String deviceId, MainNavigation mainNavigation);
+    }
+}
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/LogoutNavigation.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/LogoutNavigation.java
new file mode 100644
index 0000000..56b7fe2
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/LogoutNavigation.java
@@ -0,0 +1,7 @@
+package de.beyondsoft.ownchat.page.main;
+
+public interface LogoutNavigation {
+
+    void logoutDirectly(boolean clearAllPrefs);
+
+}
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java
similarity index 79%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java
index 25dc5aa..dcfe431 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java
@@ -1,24 +1,24 @@
-package com.p3.bewoplaner.page.main;
+package de.beyondsoft.ownchat.page.main;
 
 import com.bumptech.glide.Glide;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.events.InvalidTokenEvent;
-import com.p3.bewoplaner.data.events.LogoutDirectlyEvent;
-import com.p3.bewoplaner.data.prefs.BooleanPreference;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.di.InjectionHelper;
-import com.p3.bewoplaner.page.chat.GroupChatActivity;
-import com.p3.bewoplaner.page.chat.SingleChatActivity;
-import com.p3.bewoplaner.page.contacts.ContactsFragment;
-import com.p3.bewoplaner.page.impressum.ImpressumActivity;
-import com.p3.bewoplaner.page.login.LoginActivity;
-import com.p3.bewoplaner.page.login.LoginPresenter;
-import com.p3.bewoplaner.page.profile.ProfileFragment;
-import com.p3.bewoplaner.utils.Constants;
-import com.p3.bewoplaner.utils.DialogHandler;
-import com.p3.bewoplaner.utils.SystemUtils;
-import com.p3.bewoplaner.utils.Utils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.events.InvalidTokenEvent;
+import de.beyondsoft.ownchat.data.events.LogoutDirectlyEvent;
+import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.page.chat.GroupChatActivity;
+import de.beyondsoft.ownchat.page.chat.SingleChatActivity;
+import de.beyondsoft.ownchat.page.contacts.ContactsFragment;
+import de.beyondsoft.ownchat.page.impressum.ImpressumActivity;
+import de.beyondsoft.ownchat.page.login.LoginActivity;
+import de.beyondsoft.ownchat.page.login.LoginPresenter;
+import de.beyondsoft.ownchat.page.profile.ProfileFragment;
+import de.beyondsoft.ownchat.utils.Constants;
+import de.beyondsoft.ownchat.utils.DialogHandler;
+import de.beyondsoft.ownchat.utils.SystemUtils;
+import de.beyondsoft.ownchat.utils.Utils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -38,10 +38,10 @@ import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
-import android.widget.Toast;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -53,8 +53,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
 /**
  * Created by imarneanu on 2/9/17.
  */
-public class MainActivity extends AppCompatActivity
-        implements MainNavigation, LogoutNavigation {
+public class MainActivity extends AppCompatActivity implements MainNavigation, LogoutNavigation {
 
     private static final String REDIRECT_TO_CHAT = "redirect_to_chat";
     private static final String BUNDLE = "bundle";
@@ -115,39 +114,44 @@ public class MainActivity extends AppCompatActivity
                 Utils.hideKeyboard(MainActivity.this);
             }
         };
+
         mDrawer.closeDrawer(GravityCompat.START);
         mDrawer.addDrawerListener(toggle);
         View headerLayout = mNavigationView.getHeaderView(0);
         CircleImageView avatar = (CircleImageView) headerLayout.findViewById(R.id.menu_profile_imageView);
         Glide.with(this).load(mAvatarPreference.get()).into(avatar);
+
         mDrawer.setOnTouchListener((view, motionEvent) -> {
             Glide.with(view.getContext()).load(mAvatarPreference.get()).into(avatar);
             return false;
         });
+
         toggle.syncState();
-        ArrayAdapter<String> adapter = new NavigationMenuAdapter(this,
-                getResources().getStringArray(R.array.nav_menu), this);
+        ArrayAdapter<String> adapter = new NavigationMenuAdapter(this, getResources().getStringArray(R.array.nav_menu), this);
         mNavigationListView.setAdapter(adapter);
         switchFragment(new ContactsFragment());
         onNewIntent(getIntent());
     }
 
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
-    }
+    protected void onSaveInstanceState(Bundle outState) {}
 
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
+
         if (intent.hasExtra(REDIRECT_TO_CHAT) && !mChatOpenedPref.get()) {
             Bundle message = intent.getBundleExtra(BUNDLE);
             Intent startIntent;
+
             if (intent.getIntExtra(Constants.GROUP_NR_USERS, 2) > 2) {
                 startIntent = GroupChatActivity.createIntent(this, message);
             } else {
                 startIntent = SingleChatActivity.createIntent(this, message);
             }
+
             mChatOpenedPref.set(true);
+
             startIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP);
             startActivity(startIntent);
             intent.removeExtra(REDIRECT_TO_CHAT);
@@ -158,7 +162,6 @@ public class MainActivity extends AppCompatActivity
     @Override
     protected void onResume() {
         super.onResume();
-        mLoginPresenter.checkIfVoucherStillAvailable(this);
     }
 
     private void switchFragment(@NonNull Fragment fragment) {
@@ -167,12 +170,15 @@ public class MainActivity extends AppCompatActivity
 
     private void switchFragment(@NonNull Fragment fragment, boolean clearBackStack) {
         Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.content_main);
+
         if (fragment.getClass().isInstance(currentFragment)) {
             return;
         }
+
         if (clearBackStack) {
             Utils.clearFullBackStack(this);
         }
+
         addFragmentToBackStack(fragment);
     }
 
@@ -189,23 +195,22 @@ public class MainActivity extends AppCompatActivity
         if (mDrawer.isDrawerOpen(GravityCompat.START)) {
             mDrawer.closeDrawer(GravityCompat.START);
         }
+
         if (getSupportFragmentManager().getBackStackEntryCount() <= 1) {
             finish();
         }
-        mLoginPresenter.checkIfVoucherStillAvailable(this);
+
         super.onBackPressed();
     }
 
     @Override
     public void goToContacts() {
-        mLoginPresenter.checkIfVoucherStillAvailable(this);
         mDrawer.closeDrawer(GravityCompat.START);
         switchFragment(new ContactsFragment());
     }
 
     @Override
     public void goToProfile() {
-        mLoginPresenter.checkIfVoucherStillAvailable(this);
         mDrawer.closeDrawer(GravityCompat.START);
         switchFragment(new ProfileFragment(), false);
     }
@@ -220,10 +225,10 @@ public class MainActivity extends AppCompatActivity
                 (dialog, which) -> {
                     mLogoutClicked = true;
                     mDrawer.closeDrawer(GravityCompat.START);
-                    mLoginPresenter.logout(Settings.Secure.getString(MainActivity.this.getContentResolver(),
-                            Settings.Secure.ANDROID_ID), false, this);
+                    mLoginPresenter.logout(Settings.Secure.getString(MainActivity.this.getContentResolver(), Settings.Secure.ANDROID_ID), false, this);
                 },
                 (dialog, which) -> dialog.dismiss());
+
         if (!isFinishing()) {
             alertDialog.show();
         }
@@ -237,9 +242,8 @@ public class MainActivity extends AppCompatActivity
     }
 
     @Override
-    public void logoutDirectly() {
-        mLoginPresenter.logout(Settings.Secure.getString(MainActivity.this.getContentResolver(),
-                Settings.Secure.ANDROID_ID), true, this);
+    public void logoutDirectly(boolean clearAllPrefs) {
+        mLoginPresenter.logout(Settings.Secure.getString(MainActivity.this.getContentResolver(), Settings.Secure.ANDROID_ID), clearAllPrefs, this);
     }
 
     @Override
@@ -247,31 +251,35 @@ public class MainActivity extends AppCompatActivity
         if (isFinishing()) {
             return;
         }
-        startActivity(new Intent(MainActivity.this, LoginActivity.class).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP));
+
+        Intent intent = new Intent(MainActivity.this, LoginActivity.class).setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+
+        startActivity(intent);
         finish();
     }
 
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onInvalidToken(InvalidTokenEvent invalidTokenEvent) {
-        Toast.makeText(this, R.string.login_again, Toast.LENGTH_LONG).show();
-        logoutDirectly();
+        Log.d("INVALID TOKEN", "                                                                                                                                                invalid token event fired");
+        mLoginPresenter.verifyChatCode(this);
     }
 
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onLogoutDirectlyEvent(LogoutDirectlyEvent logoutDirectlyEvent) {
-        logoutDirectly();
+        logoutDirectly(true);
     }
 
     @Override
     protected void onDestroy() {
         EventBus.getDefault().unregister(this);
         mChatOpenedPref.set(false);
+
         if (!mLogoutClicked && getIntent().getBooleanExtra(LOGOUT, true)) {
-            mLoginPresenter.tryToLogout(Settings.Secure.getString(this.getContentResolver(),
-                    Settings.Secure.ANDROID_ID), this);
+            mLoginPresenter.tryToLogout(Settings.Secure.getString(this.getContentResolver(), Settings.Secure.ANDROID_ID), this);
         }
+
         getIntent().removeExtra(LOGOUT);
         InjectionHelper.destroyMainComponents();
         super.onDestroy();
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainComponent.java
similarity index 51%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainComponent.java
index ac894c9..34577cf 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainComponent.java
@@ -1,10 +1,10 @@
-package com.p3.bewoplaner.page.main;
+package de.beyondsoft.ownchat.page.main;
 
-import com.p3.bewoplaner.di.ApplicationComponent;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
-import com.p3.bewoplaner.page.chat.ChatModule;
-import com.p3.bewoplaner.page.login.LoginModule;
-import com.p3.bewoplaner.utils.AppStoppedService;
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.page.chat.ChatModule;
+import de.beyondsoft.ownchat.page.login.LoginModule;
+import de.beyondsoft.ownchat.utils.AppStoppedService;
 
 import dagger.Component;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainNavigation.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainNavigation.java
similarity index 83%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainNavigation.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainNavigation.java
index 7562a95..39308a6 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/MainNavigation.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainNavigation.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.page.main;
+package de.beyondsoft.ownchat.page.main;
 
 /**
  * Created by imarneanu on 2/10/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/NavigationMenuAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/NavigationMenuAdapter.java
similarity index 93%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/NavigationMenuAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/NavigationMenuAdapter.java
index 9bce47a..1c831f0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/main/NavigationMenuAdapter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/NavigationMenuAdapter.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.page.main;
+package de.beyondsoft.ownchat.page.main;
 
-import com.p3.bewoplaner.R;
+import de.beyondsoft.ownchat.R;
 
 import android.app.Activity;
 import android.content.Context;
@@ -35,6 +35,7 @@ class NavigationMenuAdapter extends ArrayAdapter<String> {
     @Override
     public View getView(int position, View view, ViewGroup parent) {
         ViewHolder holder;
+
         if (view != null) {
             holder = (ViewHolder) view.getTag();
         } else {
@@ -43,11 +44,12 @@ class NavigationMenuAdapter extends ArrayAdapter<String> {
             holder = new ViewHolder(view);
             view.setTag(holder);
         }
+
         holder.action.setText(mData[position]);
         holder.action.setTextSize(position < IMPRESSUM ?  21.0f : 12.0f);
-        holder.action.setTextColor(ContextCompat.getColor(mContext, (position < IMPRESSUM ?
-                R.color.colorWhite : R.color.colorImpressum)));
+        holder.action.setTextColor(ContextCompat.getColor(mContext, (position < IMPRESSUM ? R.color.colorWhite : R.color.colorImpressum)));
         holder.position = position;
+
         return view;
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPAbstractPresenter.java
similarity index 74%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPAbstractPresenter.java
index c724015..27c9245 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPAbstractPresenter.java
@@ -1,14 +1,14 @@
-package com.p3.bewoplaner.page.mvp;
+package de.beyondsoft.ownchat.page.mvp;
 
 import android.support.annotation.CallSuper;
 import android.support.annotation.NonNull;
 
+import de.beyondsoft.ownchat.utils.Preconditions;
 import rx.Subscription;
 import rx.subscriptions.CompositeSubscription;
 
-import static com.p3.bewoplaner.utils.Preconditions.checkNotNull;
-import static com.p3.bewoplaner.utils.Preconditions.checkNull;
-import static com.p3.bewoplaner.utils.Preconditions.checkState;
+import static de.beyondsoft.ownchat.utils.Preconditions.checkNotNull;
+import static de.beyondsoft.ownchat.utils.Preconditions.checkState;
 
 /**
  * Created by imarneanu on 2/9/17.
@@ -29,20 +29,20 @@ public abstract class MVPAbstractPresenter<V extends MVPView>
 
     @Override
     public final void attachView(@NonNull V view) {
-        checkNull(mView, "view is already attached");
+        Preconditions.checkNull(mView, "view is already attached");
         mView = view;
         afterAttachView(view);
-        checkState((mCalledThroughSuper & METHOD_AFTER_ATTACH) == METHOD_AFTER_ATTACH,
+        Preconditions.checkState((mCalledThroughSuper & METHOD_AFTER_ATTACH) == METHOD_AFTER_ATTACH,
                 "super.afterAttachView() not called");
     }
 
     @Override
     public final void detachView() {
-        checkNotNull(mCompositeSubscription, "subscriptionList is NULL");
+        Preconditions.checkNotNull(mCompositeSubscription, "subscriptionList is NULL");
         mCompositeSubscription.clear();
-        checkNotNull(mView, "view is not attached");
+        Preconditions.checkNotNull(mView, "view is not attached");
         beforeDetachView(mView);
-        checkState((mCalledThroughSuper & METHOD_BEFORE_DETACH) == METHOD_BEFORE_DETACH,
+        Preconditions.checkState((mCalledThroughSuper & METHOD_BEFORE_DETACH) == METHOD_BEFORE_DETACH,
                 "super.beforeDetachView() not called");
         mView = null;
         mCalledThroughSuper = 0;
@@ -60,7 +60,7 @@ public abstract class MVPAbstractPresenter<V extends MVPView>
      */
     @NonNull
     protected V getView() {
-        checkNotNull(mView, "view is not attached");
+        Preconditions.checkNotNull(mView, "view is not attached");
         return mView;
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPLceView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPLceView.java
similarity index 93%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPLceView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPLceView.java
index c4fc056..e285611 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPLceView.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPLceView.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.page.mvp;
+package de.beyondsoft.ownchat.page.mvp;
 
 import android.support.annotation.StringRes;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPPresenter.java
similarity index 91%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPPresenter.java
index 465bd4c..9b7a704 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPPresenter.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.page.mvp;
+package de.beyondsoft.ownchat.page.mvp;
 
 import android.support.annotation.NonNull;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPView.java
similarity index 64%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPView.java
index 503b1f6..22755e5 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/mvp/MVPView.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPView.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.page.mvp;
+package de.beyondsoft.ownchat.page.mvp;
 
 /**
  * Created by imarneanu on 2/9/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileComponent.java
similarity index 63%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileComponent.java
index 1d69a9a..9080b1b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileComponent.java
@@ -1,11 +1,11 @@
-package com.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
 /**
  * Created by imarneanu on 2/22/17.
  */
 
-import com.p3.bewoplaner.di.ApplicationComponent;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
 
 import dagger.Component;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileFragment.java
similarity index 92%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileFragment.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileFragment.java
index 5ac866a..d4d3fb0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileFragment.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileFragment.java
@@ -1,14 +1,14 @@
-package com.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
 import com.bumptech.glide.Glide;
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.di.InjectionHelper;
-import com.p3.bewoplaner.model.User;
-import com.p3.bewoplaner.utils.DialogHandler;
-import com.p3.bewoplaner.utils.FileUtils;
-import com.p3.bewoplaner.utils.RuntimePermissionBaseFragment;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.model.User;
+import de.beyondsoft.ownchat.utils.DialogHandler;
+import de.beyondsoft.ownchat.utils.FileUtils;
+import de.beyondsoft.ownchat.utils.RuntimePermissionBaseFragment;
 
 import android.Manifest;
 import android.app.Activity;
@@ -102,9 +102,11 @@ public class ProfileFragment extends RuntimePermissionBaseFragment implements Pr
         if (!TextUtils.isEmpty(mPhoneNumberPreference.get())) {
             mPhoneNumberEditText.setText(mPhoneNumberPreference.get());
         }
+
         if (!TextUtils.isEmpty(mProfileNamePreference.get())) {
             mNameTextView.setText(mProfileNamePreference.get());
         }
+
         mProfilePresenter.attachView(this);
         mCallback.getProfile();
     }
@@ -112,21 +114,24 @@ public class ProfileFragment extends RuntimePermissionBaseFragment implements Pr
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+
         if (resultCode != Activity.RESULT_OK) {
             return;
         }
+
         if (null == data) {
             return;
         }
+
         if (requestCode == SELECT_FILE) {
             if (null == data.getData()) {
                 return;
             }
+
             final Uri uri = data.getData();
+
             if (Build.VERSION.SDK_INT >= 19) {
-                final int takeFlags = data.getFlags()
-                        & (Intent.FLAG_GRANT_READ_URI_PERMISSION |
-                        Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
+                final int takeFlags = data.getFlags() & (Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
                 // Check for the freshest data.
                 try {
                     getActivity().getContentResolver().takePersistableUriPermission(uri, takeFlags);
@@ -134,9 +139,11 @@ public class ProfileFragment extends RuntimePermissionBaseFragment implements Pr
                     e.printStackTrace();
                 }
             }
+
             if (!mProfilePresenter.isAttached()) {
                 mProfilePresenter.attachView(this);
             }
+
             mCallback.uploadImage(uri);
         }
     }
@@ -156,6 +163,7 @@ public class ProfileFragment extends RuntimePermissionBaseFragment implements Pr
         if (!TextUtils.isEmpty(user.avatar)) {
             Glide.with(getActivity()).load(user.avatar).into(mAvatarImageview);
         }
+
         mProfileChangeButton.setEnabled(true);
         mNameTextView.setText(user.firstName.concat(" ").concat(user.lastName));
         mPhoneNumberEditText.setText(user.mobile);
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileModule.java
similarity index 60%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileModule.java
index 8b77487..05bdfb9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileModule.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
-import com.p3.bewoplaner.data.api.services.ProfileService;
-import com.p3.bewoplaner.di.P3DSEndpoint;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.data.api.services.ProfileService;
+import de.beyondsoft.ownchat.di.P3DSEndpoint;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
 
 import dagger.Module;
 import dagger.Provides;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfilePresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfilePresenter.java
similarity index 85%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfilePresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfilePresenter.java
index 771dd5e..d9aa0e2 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfilePresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfilePresenter.java
@@ -1,15 +1,15 @@
-package com.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
-import com.p3.bewoplaner.R;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import com.p3.bewoplaner.data.api.services.ProfileService;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
-import com.p3.bewoplaner.model.User;
-import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import com.p3.bewoplaner.utils.SystemUtils;
-import com.p3.bewoplaner.utils.rx.RxUtils;
+import de.beyondsoft.ownchat.R;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.api.common.ErrorHandlingResponseConverter;
+import de.beyondsoft.ownchat.data.api.services.ProfileService;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.model.User;
+import de.beyondsoft.ownchat.page.mvp.MVPAbstractPresenter;
+import de.beyondsoft.ownchat.utils.SystemUtils;
+import de.beyondsoft.ownchat.utils.rx.RxUtils;
 
 import android.net.Uri;
 import android.support.annotation.NonNull;
@@ -111,6 +111,7 @@ class ProfilePresenter extends MVPAbstractPresenter<ProfileView> implements Prof
             getView().showError(R.string.error_no_internet_connection);
             return;
         }
+
         getView().showError(R.string.error_something_went_wrong);
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileView.java
similarity index 79%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileView.java
index bff011c..dc6ef46 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/profile/ProfileView.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileView.java
@@ -1,7 +1,7 @@
-package com.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
-import com.p3.bewoplaner.model.User;
-import com.p3.bewoplaner.page.mvp.MVPView;
+import de.beyondsoft.ownchat.model.User;
+import de.beyondsoft.ownchat.page.mvp.MVPView;
 
 import android.net.Uri;
 import android.support.annotation.StringRes;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashActivity.java
similarity index 90%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashActivity.java
index 0bea94d..0b6c304 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashActivity.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.page.splash;
+package de.beyondsoft.ownchat.page.splash;
 
-import com.p3.bewoplaner.di.InjectionHelper;
-import com.p3.bewoplaner.page.login.LoginActivity;
-import com.p3.bewoplaner.page.main.MainActivity;
+import de.beyondsoft.ownchat.di.InjectionHelper;
+import de.beyondsoft.ownchat.page.login.LoginActivity;
+import de.beyondsoft.ownchat.page.main.MainActivity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -25,6 +25,7 @@ public class SplashActivity extends AppCompatActivity implements SplashView {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
             // Activity was brought to front and not created,
             // Thus finishing this will get us to the last viewed activity
@@ -32,6 +33,7 @@ public class SplashActivity extends AppCompatActivity implements SplashView {
             Log.e("Splash", "FINISH");
             return;
         }
+
         InjectionHelper.getSplashComponent(this).inject(this);
         mSplashPresenter.attachView(this);
         mCallbacks.startTimer();
@@ -42,6 +44,7 @@ public class SplashActivity extends AppCompatActivity implements SplashView {
         if (mSplashPresenter != null && mSplashPresenter.isAttached()) {
             mSplashPresenter.detachView();
         }
+
         InjectionHelper.destroySplashComponent();
         super.onDestroy();
     }
@@ -64,6 +67,7 @@ public class SplashActivity extends AppCompatActivity implements SplashView {
             goToMainActivity();
             return;
         }
+
         goToLoginActivity();
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashComponent.java
similarity index 59%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashComponent.java
index a4b5fa9..9660d38 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashComponent.java
@@ -1,7 +1,7 @@
-package com.p3.bewoplaner.page.splash;
+package de.beyondsoft.ownchat.page.splash;
 
-import com.p3.bewoplaner.di.ApplicationComponent;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.di.ApplicationComponent;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
 
 import dagger.Component;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashPresenter.java
similarity index 75%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashPresenter.java
index 6d99256..5aa3591 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashPresenter.java
@@ -1,11 +1,11 @@
-package com.p3.bewoplaner.page.splash;
+package de.beyondsoft.ownchat.page.splash;
 
-import com.p3.bewoplaner.BuildConfig;
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.prefs.BooleanPreference;
-import com.p3.bewoplaner.data.prefs.StringPreference;
-import com.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import com.p3.bewoplaner.utils.rx.RxUtils;
+import de.beyondsoft.ownchat.BuildConfig;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
+import de.beyondsoft.ownchat.data.prefs.StringPreference;
+import de.beyondsoft.ownchat.page.mvp.MVPAbstractPresenter;
+import de.beyondsoft.ownchat.utils.rx.RxUtils;
 
 import android.support.annotation.NonNull;
 
@@ -19,8 +19,7 @@ import rx.Subscription;
 /**
  * Created by imarneanu on 2/9/17.
  */
-class SplashPresenter extends MVPAbstractPresenter<SplashView>
-        implements SplashView.Callbacks {
+class SplashPresenter extends MVPAbstractPresenter<SplashView> implements SplashView.Callbacks {
 
     private static final int SPLASH_DELAY_MILLIS = BuildConfig.DEBUG ? 0 : 1500;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashView.java
similarity index 72%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashView.java
index 7c0e604..4e39e72 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/page/splash/SplashView.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashView.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.page.splash;
+package de.beyondsoft.ownchat.page.splash;
 
-import com.p3.bewoplaner.page.mvp.MVPView;
+import de.beyondsoft.ownchat.page.mvp.MVPView;
 
 /**
  * Created by imarneanu on 2/9/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/AppStoppedService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/AppStoppedService.java
similarity index 78%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/AppStoppedService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/AppStoppedService.java
index 3eaae86..2bb43d2 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/AppStoppedService.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/AppStoppedService.java
@@ -1,8 +1,8 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.prefs.BooleanPreference;
-import com.p3.bewoplaner.di.InjectionHelper;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
+import de.beyondsoft.ownchat.di.InjectionHelper;
 
 import android.app.NotificationManager;
 import android.app.Service;
@@ -13,9 +13,11 @@ import android.support.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Named;
 
+import de.beyondsoft.ownchat.page.login.LoginActivity;
+
 /**
  * Service should be started only when "Password Save"
- * is not checked in {@link com.p3.bewoplaner.page.login.LoginActivity};
+ * is not checked in {@link LoginActivity};
  */
 public class AppStoppedService extends Service {
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Constants.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java
similarity index 89%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Constants.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java
index 4d94864..305ccd4 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Constants.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java
@@ -1,11 +1,10 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 /**
  * Created by laszloffiferenc on 2/21/17.
  */
 public interface Constants {
     String BEWOPLANER_ENDPOINT = "https://www.p3ds.net/bewoplaner/public/";
-    String VOUCHER_ENDPOINT = "https://bewoplaner.beyondsoft.de/";
     int DISK_CACHE_SIZE = 10 * 1024;
     String GROUP_NR_USERS = "group_nb_users";
     String GROUP_ID = "groupid";
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DateUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DateUtils.java
similarity index 98%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DateUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DateUtils.java
index 69e85a1..10d7b16 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DateUtils.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DateUtils.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DialogHandler.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DialogHandler.java
similarity index 97%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DialogHandler.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DialogHandler.java
index 4dee81f..b8b4fcf 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/DialogHandler.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DialogHandler.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
-import com.p3.bewoplaner.R;
+import de.beyondsoft.ownchat.R;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -75,9 +75,11 @@ public final class DialogHandler {
             DialogInterface.OnClickListener callback) {
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(context, R.style.StyledDialog);
+
         if (title != 0) {
             builder.setTitle(title);
         }
+
         return builder
                 .setMessage(message)
                 .setPositiveButton(positiveButton, callback)
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/EndlessScrollListener.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/EndlessScrollListener.java
similarity index 90%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/EndlessScrollListener.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/EndlessScrollListener.java
index 5abd6ff..5ca11ec 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/EndlessScrollListener.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/EndlessScrollListener.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -32,12 +32,13 @@ public abstract class EndlessScrollListener extends RecyclerView.OnScrollListene
                 mPreviousTotal = totalItemCount;
             }
         }
+
         if (recyclerView == null) {
             return;
         }
+
         recyclerView.post(() -> {
-            if (!mLoading
-                    && (totalItemCount - visibleItemCount) <= (mVisibleItem + mVisibleThreshold)) {
+            if (!mLoading && (totalItemCount - visibleItemCount) <= (mVisibleItem + mVisibleThreshold)) {
                 mLoading = onLoad();
             }
         });
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/FileUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/FileUtils.java
similarity index 99%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/FileUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/FileUtils.java
index 4e45588..913eac5 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/FileUtils.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/FileUtils.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils;/*
+package de.beyondsoft.ownchat.utils;/*
  * Copyright (C) 2007-2008 OpenIntents.org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -67,6 +67,7 @@ public class FileUtils {
         }
 
         int dot = uri.lastIndexOf(".");
+
         if (dot >= 0) {
             return uri.substring(dot);
         } else {
@@ -217,18 +218,19 @@ public class FileUtils {
         Cursor cursor = null;
         final String column = "_data";
         final String[] projection = {
-                column
+            column
         };
 
         try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
-                    null);
+            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
+
             if (cursor != null && cursor.moveToFirst()) {
                 if (DEBUG) {
                     DatabaseUtils.dumpCursor(cursor);
                 }
 
                 final int column_index = cursor.getColumnIndexOrThrow(column);
+
                 return cursor.getString(column_index);
             }
         } finally {
@@ -558,7 +560,7 @@ public class FileUtils {
         } else {
             extension = "*/*";
         }
+
         return extension;
     }
-
 }
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/LoggedOutUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/LoggedOutUtils.java
similarity index 74%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/LoggedOutUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/LoggedOutUtils.java
index 12709d9..66c2ec8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/LoggedOutUtils.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/LoggedOutUtils.java
@@ -1,9 +1,9 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
-import com.p3.bewoplaner.data.AppPrefsConstants;
-import com.p3.bewoplaner.data.prefs.BooleanPreference;
-import com.p3.bewoplaner.di.scopes.ActivityScope;
-import com.p3.bewoplaner.page.login.LoginPresenter;
+import de.beyondsoft.ownchat.data.AppPrefsConstants;
+import de.beyondsoft.ownchat.data.prefs.BooleanPreference;
+import de.beyondsoft.ownchat.di.scopes.ActivityScope;
+import de.beyondsoft.ownchat.page.login.LoginPresenter;
 
 import android.app.NotificationManager;
 import android.content.Context;
@@ -42,10 +42,11 @@ public class LoggedOutUtils {
     public boolean checkLoggedOutPrefs() {
         if (!mSavePasswordPreference.get() && mAppKilledPreference.get()) {
             mNotificationManager.cancelAll();
-            mLoginPresenter.logout(Settings.Secure.getString(mContext.getContentResolver(),
-                    Settings.Secure.ANDROID_ID), true, null);
+            mLoginPresenter.logout(Settings.Secure.getString(mContext.getContentResolver(), Settings.Secure.ANDROID_ID), true, null);
+
             return true;
         }
+
         return false;
     }
 }
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Preconditions.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Preconditions.java
similarity index 98%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Preconditions.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Preconditions.java
index 0085bbe..50ed2ec 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Preconditions.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Preconditions.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import android.support.annotation.NonNull;
 
@@ -48,6 +48,7 @@ public final class Preconditions {
         if (thing == null) {
             throw new NullPointerException(formatMessage(message, args));
         }
+
         return thing;
     }
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/RuntimePermissionBaseFragment.java
similarity index 97%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/RuntimePermissionBaseFragment.java
index c97e336..4e3fc14 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/RuntimePermissionBaseFragment.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 
 import android.content.pm.PackageManager;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/SystemUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/SystemUtils.java
similarity index 93%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/SystemUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/SystemUtils.java
index 21e7f57..147b4b1 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/SystemUtils.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/SystemUtils.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -17,6 +17,7 @@ public class SystemUtils {
 
     public boolean isNetworkUnavailable() {
         NetworkInfo activeNetwork = mConnectivityManager.getActiveNetworkInfo();
+
         return activeNetwork == null || !activeNetwork.isConnectedOrConnecting();
     }
 }
\ No newline at end of file
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Utils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Utils.java
similarity index 92%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Utils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Utils.java
index 1a62f4b..e7c0a26 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/Utils.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Utils.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import android.app.Activity;
 import android.support.v4.app.FragmentManager;
@@ -11,12 +11,13 @@ import android.view.inputmethod.InputMethodManager;
  */
 public class Utils {
     /**
-     * Clears activity's backstack
+     * Clears activity's back stack
      *
-     * @param appCompatActivity The activity which will have no fragments in backstack
+     * @param appCompatActivity The activity which will have no fragments in back stack
      */
     public static void clearFullBackStack(AppCompatActivity appCompatActivity) {
         FragmentManager fragmentManager = appCompatActivity.getSupportFragmentManager();
+
         if (fragmentManager.getBackStackEntryCount() > 0) {
             // clear the fragment back stack
             FragmentManager.BackStackEntry first = fragmentManager.getBackStackEntryAt(0);
@@ -27,10 +28,11 @@ public class Utils {
     public static void hideKeyboard(Activity activity) {
         InputMethodManager imm = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
         View view = activity.getCurrentFocus();
+
         if (view == null) {
             view = new View(activity);
         }
+
         imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
     }
-
 }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/rx/RxUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/rx/RxUtils.java
similarity index 93%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/rx/RxUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/rx/RxUtils.java
index 5c063ac..dd50a10 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/rx/RxUtils.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/rx/RxUtils.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils.rx;
+package de.beyondsoft.ownchat.utils.rx;
 
 import rx.Observable;
 import rx.android.schedulers.AndroidSchedulers;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/EmptyLayout.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/EmptyLayout.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/EmptyLayout.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/EmptyLayout.java
index ef2a2cb..33cb98c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/EmptyLayout.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/EmptyLayout.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.utils.ui;
+package de.beyondsoft.ownchat.utils.ui;
 
-import com.p3.bewoplaner.R;
+import de.beyondsoft.ownchat.R;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -14,8 +14,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-import static com.p3.bewoplaner.utils.ui.ViewUtils.*;
-
 /**
  * Custom layout to show loading, try again and error messages.
  * <p>
@@ -58,7 +56,7 @@ public class EmptyLayout extends FrameLayout {
         inflate(getContext(), R.layout.empty_layout, this);
         ButterKnife.bind(this);
 
-        setProgressBarColorToOrange(mProgressBar);
+        ViewUtils.setProgressBarColorToOrange(mProgressBar);
 
         TypedArray a = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.EmptyLayout, 0, 0);
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/FlexibleDividerDecoration.java
similarity index 99%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/FlexibleDividerDecoration.java
index 00def26..450daba 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/FlexibleDividerDecoration.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils.ui;
+package de.beyondsoft.ownchat.utils.ui;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/HorizontalDividerItemDecoration.java
similarity index 99%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/HorizontalDividerItemDecoration.java
index b7e28c1..9d2c54f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/HorizontalDividerItemDecoration.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils.ui;
+package de.beyondsoft.ownchat.utils.ui;
 
 import android.content.Context;
 import android.graphics.Rect;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LayoutBehavior.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/LayoutBehavior.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LayoutBehavior.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/LayoutBehavior.java
index 229237a..9c72067 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LayoutBehavior.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/LayoutBehavior.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils.ui;
+package de.beyondsoft.ownchat.utils.ui;
 
 import android.content.Context;
 import android.support.design.widget.CoordinatorLayout;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/LinearLayoutBehavior.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/LinearLayoutBehavior.java
index 31ff42b..728d89c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/LinearLayoutBehavior.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner.utils.ui;
+package de.beyondsoft.ownchat.utils.ui;
 
 import android.content.Context;
 import android.support.design.widget.CoordinatorLayout;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/ViewUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/ViewUtils.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/ViewUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/ViewUtils.java
index 0b8bc25..f283cc5 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/com/p3/bewoplaner/utils/ui/ViewUtils.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/ViewUtils.java
@@ -1,6 +1,6 @@
-package com.p3.bewoplaner.utils.ui;
+package de.beyondsoft.ownchat.utils.ui;
 
-import com.p3.bewoplaner.R;
+import de.beyondsoft.ownchat.R;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/one_size_fits_all_2.png b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/one_size_fits_all_2.png
new file mode 100644
index 0000000..e6f561e
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/drawable/one_size_fits_all_2.png differ
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml
index 2e70971..c8a72fc 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_chat.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:emojicon="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -21,7 +22,7 @@
         android:layout_marginTop="?attr/actionBarSize"
         tools:listitem="@layout/item_single_chat_left" />
 
-    <com.p3.bewoplaner.utils.ui.EmptyLayout
+    <de.beyondsoft.ownchat.utils.ui.EmptyLayout
         android:id="@+id/chat_empty_layout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -33,7 +34,7 @@
         android:layout_gravity="bottom"
         android:background="@color/colorWhite"
         android:gravity="center"
-        app:layout_behavior="com.p3.bewoplaner.utils.ui.LinearLayoutBehavior">
+        app:layout_behavior="de.beyondsoft.ownchat.utils.ui.LinearLayoutBehavior">
 
         <ImageView
             android:id="@+id/emoji_button"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_file_confirmation.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_file_confirmation.xml
new file mode 100644
index 0000000..f82d6c8
--- /dev/null
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_file_confirmation.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:emojicon="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="de.beyondsoft.ownchat.page.fileconfirmation.FileConfirmationActivity">
+
+    <WebView
+        android:id="@+id/media_file_webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    </WebView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:background="@color/colorPrimary"
+        app:layout_behavior="de.beyondsoft.ownchat.utils.ui.LinearLayoutBehavior">
+
+        <ImageView
+            android:id="@+id/file_emoji_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="5dp"
+            android:contentDescription="@null"
+            android:paddingBottom="10dp"
+            android:paddingLeft="16dp"
+            android:paddingStart="16dp"
+            android:paddingTop="10dp"
+            android:src="@drawable/smiley"
+            tools:ignore="RtlSymmetry" />
+
+        <hani.momanii.supernova_emoji_library.Helper.EmojiconEditText
+            android:id="@+id/file_message"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:background="@android:color/transparent"
+            android:hint="@string/chat_type_your_message"
+            android:maxHeight="100dp"
+            android:paddingBottom="10dp"
+            android:paddingEnd="5dp"
+            android:paddingRight="5dp"
+            android:paddingTop="10dp"
+            android:scrollHorizontally="false"
+            android:scrollbars="vertical"
+            android:textColor="@color/colorBlack"
+            android:textColorHint="@color/colorManatee"
+            emojicon:emojiconSize="28sp"
+            tools:ignore="RtlSymmetry" />
+
+        <ImageView
+            android:id="@+id/file_send_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:contentDescription="@null"
+            android:paddingEnd="16dp"
+            android:paddingRight="16dp"
+            android:src="@drawable/send"
+            tools:ignore="RtlSymmetry" />
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml
index 37a1b91..5794330 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/activity_login.xml
@@ -5,7 +5,7 @@
     android:id="@+id/login_coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".page.login.LoginActivity">
+    tools:context="de.beyondsoft.ownchat.page.login.LoginActivity">
 
     <LinearLayout
         android:id="@+id/login_linear_layout"
@@ -16,7 +16,7 @@
         android:layout_marginLeft="@dimen/activity_horizontal_margin"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:orientation="vertical"
-        app:layout_behavior="com.p3.bewoplaner.utils.ui.LayoutBehavior">
+        app:layout_behavior="de.beyondsoft.ownchat.utils.ui.LayoutBehavior">
 
         <EditText
             android:id="@+id/login_chat_code"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_contacts.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_contacts.xml
index c87ac78..2970a2e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_contacts.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_contacts.xml
@@ -20,7 +20,7 @@
                 android:layout_height="wrap_content"
                 android:background="@color/colorWhite" />
 
-            <com.p3.bewoplaner.utils.ui.EmptyLayout
+            <de.beyondsoft.ownchat.utils.ui.EmptyLayout
                 android:id="@+id/contacts_empty_layout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml
index d18608f..4457dc1 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/fragment_profile.xml
@@ -37,13 +37,14 @@
         android:layout_height="0dp"
         android:layout_marginTop="24dp"
         android:layout_weight="1"
-        tools:text="Howard Hines" />
+        tools:text="Sasha Grey" />
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/profile_phone_number"
-        android:textSize="@dimen/profile_phone_number_subtext" />
+        android:textSize="@dimen/profile_phone_number_subtext"
+        android:visibility="invisible"/>
 
     <EditText
         android:id="@+id/profile_phone_number"
@@ -54,7 +55,8 @@
         android:textSize="@dimen/profile_phone_number_text"
         android:inputType="phone"
         android:digits="0123456789+"
-        tools:text="775-206-8983" />
+        tools:text="775-206-8983"
+        android:visibility="invisible"/>
 
     <Button
         android:id="@+id/profile_update_button"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_contact.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_contact.xml
index 179eff0..0f33293 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_contact.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_contact.xml
@@ -30,7 +30,7 @@
             style="@style/AppTheme.ListTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            tools:text="John Doe" />
+            tools:text="Sasha Grey" />
 
         <hani.momanii.supernova_emoji_library.Helper.EmojiconTextView
             android:id="@+id/contact_message_last"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
index d274737..56b7367 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/layout/item_single_chat_right.xml
@@ -20,10 +20,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
-
-
-
-
         <TextView
             android:id="@+id/chat_item_sending_failed"
             android:layout_width="wrap_content"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml
index fa37102..159a5c8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#FFFFFF</color>
+    <color name="colorPrimary">#ffffff</color>
     <color name="colorPrimaryDark">#E0E0E0</color>
     <color name="colorAccent">#FFFFFF</color>
     <color name="colorBackground">#F3F3F3</color>
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml
index 189ef06..bb28a9b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/strings.xml
@@ -15,6 +15,8 @@
     <string name="login_save_password">Passwort speichern</string>
     <string name="login_button_text">Anmelden</string>
     <string name="login_voucher_code_is_not_valid">Chat-Code oder Kundennummer stimmen nicht überein.</string>
+    <string name="login_customer_id_is_invalid">Die Kundennummer ist ungültig.</string>
+    <string name="login_service_type_is_undefined">Fehler. Bitte wenden Sie sich an den Support.</string>
 
     <!-- Navigation Drawer -->
     <string-array name="nav_menu">
@@ -23,6 +25,7 @@
         <item>Abmelden</item>
         <item>Impressum</item>
     </string-array>
+
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
 
@@ -45,18 +48,22 @@
     <!-- Error messages -->
     <string name="error_no_internet_connection">Keine Internetverbindung</string>
     <string name="error_password_too_short">Passwort ist zu kurz</string>
-    <string name="error_username_too_short">Username is too short</string>
+    <string name="error_username_too_short">Benutzername ist zu kurz</string>
     <string name="error_something_went_wrong">Ungültige Eingabe</string>
     <string name="error_customer_id_must_not_be_null">Kundennummer darf nicht leer sein</string>
     <string name="error_voucher_code_must_not_be_null">Chat-code darf nicht leer sein</string>
     <string name="error_retry">Wiederholen</string>
     <string name="error">Fehler</string>
-    <string name="change_avatar_permisssion">Avatar Berechtigung ändern</string>
+    <string name="change_avatar_permisssion">Avatar-Berechtigung ändern</string>
     <string name="error_retry_failed">Erneut fehlgeschlagen</string>
     <string name="error_message_not_sent">Nachricht konnte nicht gesendet werden</string>
     <string name="error_could_not_open_file">Datei konnte nicht geöffnet werden</string>
-    <string name="error_file_does_not_exist_anymore">File does not exist anymore.</string>
-    <string name="error_file_not_found">File not found, please try again.</string>
+    <string name="error_file_does_not_exist_anymore">Die Datei existiert nicht mehr.</string>
+    <string name="error_file_not_found">Die Datei konnte nicht gefunden werden, bitte versuchen Sie es erneut.</string>
+    <string name="error_wrong_chat_code">Bitte den Chat-Code prüfen</string>
+    <string name="error_deactivated_chat_code">Chat-Code ist deaktiviert</string>
+    <string name="error_chat_code_too_short">Chat-Code hat eine falsche Länge</string>
+    <string name="error_token_validation_failed">Bitte stellen Sie sicher, dass Sie mit dem Internet verbunden sind.</string>
 
     <!-- Permissions -->
     <string name="permission_grant">Erlauben</string>
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml
index 217c60a..cc3a6f7 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/res/values/styles.xml
@@ -23,7 +23,7 @@
 
     <style name="AppTheme.FullBackground" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowTranslucentStatus" tools:targetApi="kitkat">true</item>
-        <item name="android:windowBackground">@drawable/splash_one_size_fits_all</item>
+        <item name="android:windowBackground">@drawable/one_size_fits_all_2</item>
     </style>
 
     <!-- Login style -->
@@ -97,7 +97,7 @@
     <style name="BaseChatItemText">
         <item name="android:textSize">14sp</item>
         <item name="android:autoLink">all</item>
-        <item name="android:textColorLink">#424242</item>
+        <item name="android:textColorLink">#666666</item>
     </style>
 
     <style name="RightChatItemRelativeLayout">
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/com/p3/bewoplaner/ExampleUnitTest.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/de/beyondsoft/ownchat/ExampleUnitTest.java
similarity index 92%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/com/p3/bewoplaner/ExampleUnitTest.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/de/beyondsoft/ownchat/ExampleUnitTest.java
index aefb6ba..88e9c87 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/com/p3/bewoplaner/ExampleUnitTest.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/de/beyondsoft/ownchat/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.p3.bewoplaner;
+package de.beyondsoft.ownchat;
 
 import org.junit.Test;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/ownChat.jks b/BeWoPlanerChat/bewoplaner-chat-android/ownChat.jks
new file mode 100644
index 0000000..afbb92d
Binary files /dev/null and b/BeWoPlanerChat/bewoplaner-chat-android/ownChat.jks differ