diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
index f97d915..7135ea4 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/build.gradle
@@ -39,10 +39,10 @@ android {
     }
     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 {
@@ -117,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/src/androidTest/java/de/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/de/p3/bewoplaner/ExampleInstrumentedTest.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/beyondsoft/ownchat/ExampleInstrumentedTest.java
index 58d0656..97e9f10 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/p3/bewoplaner/ExampleInstrumentedTest.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/androidTest/java/de/beyondsoft/ownchat/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package de.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 b02b378..0d7b0ee 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.p3.bewoplaner">
+    package="de.beyondsoft.ownchat">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -10,14 +10,14 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
-        android:name="de.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="de.p3.bewoplaner.page.splash.SplashActivity"
+            android:name="de.beyondsoft.ownchat.page.splash.SplashActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.FullBackground">
             <intent-filter>
@@ -27,32 +27,32 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="de.p3.bewoplaner.page.login.LoginActivity"
+            android:name="de.beyondsoft.ownchat.page.login.LoginActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.FullBackground" />
         <activity
-            android:name="de.p3.bewoplaner.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="de.p3.bewoplaner.page.impressum.ImpressumActivity"
+            android:name="de.beyondsoft.ownchat.page.impressum.ImpressumActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name="de.p3.bewoplaner.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="de.p3.bewoplaner.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="de.p3.bewoplaner.page.chatmembers.ChatMembersActivity"
+            android:name="de.beyondsoft.ownchat.page.chatmembers.ChatMembersActivity"
             android:label=""
             android:screenOrientation="portrait"
             android:theme="@style/ChatStyle" />
@@ -61,15 +61,15 @@
             android:name="io.fabric.ApiKey"
             android:value="1dcc8d0ead50f1b328778876834fea3392c6fc22" />
 
-        <service android:name="de.p3.bewoplaner.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="de.p3.bewoplaner.utils.AppStoppedService"
+            android:name="de.beyondsoft.ownchat.utils.AppStoppedService"
             android:stopWithTask="false" />
-        <service android:name="de.p3.bewoplaner.data.firebase.HandleMessagesService">
+        <service android:name="de.beyondsoft.ownchat.data.firebase.HandleMessagesService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
@@ -86,7 +86,7 @@
         </provider>
 
         <receiver
-            android:name="de.p3.bewoplaner.data.firebase.ReplyNotificationReceiver"
+            android:name="de.beyondsoft.ownchat.data.firebase.ReplyNotificationReceiver"
             android:enabled="true"
             android:exported="false" />
 
@@ -97,7 +97,7 @@
             android:name="com.google.firebase.messaging.default_notification_color"
             android:resource="@color/colorDefault" />
 
-        <activity android:name="de.p3.bewoplaner.page.fileconfirmation.FileConfirmationActivity"></activity>
+        <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/de/p3/bewoplaner/BewoplanerApplication.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/BewoplanerApplication.java
similarity index 79%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/BewoplanerApplication.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/BewoplanerApplication.java
index 1bd1fc0..09685e8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/BewoplanerApplication.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/BewoplanerApplication.java
@@ -1,11 +1,11 @@
-package de.p3.bewoplaner;
+package de.beyondsoft.ownchat;
 
 import com.crashlytics.android.Crashlytics;
-import de.p3.bewoplaner.data.firebase.MessagingInstanceIdService;
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.p3.bewoplaner.di.ApplicationModule;
-import de.p3.bewoplaner.di.DaggerApplicationComponent;
-import de.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;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/AppPrefsConstants.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/AppPrefsConstants.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/AppPrefsConstants.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/AppPrefsConstants.java
index bef0ae0..b4710e4 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data;
+package de.beyondsoft.ownchat.data;
 
 /**
  * Created by imarneanu on 2/10/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/ApiModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java
similarity index 90%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/ApiModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java
index 85f08d1..bef5273 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/ApiModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/ApiModule.java
@@ -1,15 +1,15 @@
-package de.p3.bewoplaner.data.api;
+package de.beyondsoft.ownchat.data.api;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
-import de.p3.bewoplaner.BewoplanerApplication;
-import de.p3.bewoplaner.BuildConfig;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.di.P3DSEndpoint;
-import de.p3.bewoplaner.di.scopes.ApplicationScope;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorHandlingResponseConverter.java
similarity index 87%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorHandlingResponseConverter.java
index ebbb866..cb725c1 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorHandlingResponseConverter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorHandlingResponseConverter.java
@@ -1,7 +1,7 @@
-package de.p3.bewoplaner.data.api.common;
+package de.beyondsoft.ownchat.data.api.common;
 
-import de.p3.bewoplaner.data.events.InvalidTokenEvent;
-import de.p3.bewoplaner.model.common.BaseResponse;
+import de.beyondsoft.ownchat.data.events.InvalidTokenEvent;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/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 5faba9b..8bd446e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.api.common;
+package de.beyondsoft.ownchat.data.api.common;
 
-import de.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/p3/bewoplaner/data/api/common/ErrorType.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorType.java
similarity index 90%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorType.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorType.java
index 7b8f74d..2005d5d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/common/ErrorType.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/common/ErrorType.java
@@ -1,4 +1,4 @@
-package de.p3.bewoplaner.data.api.common;
+package de.beyondsoft.ownchat.data.api.common;
 
 /**
  * Created by laszloffiferenc on 2/21/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/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 1fc4189..c76f0c8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/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 7cb2b83..d5dea5b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import de.p3.bewoplaner.model.Group;
-import de.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/de/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 69%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 9cc1564..eff0b48 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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,9 +1,9 @@
-package de.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import de.p3.bewoplaner.model.Message;
-import de.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.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 74%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 f21194e..91edd29 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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,12 +1,12 @@
-package de.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import de.p3.bewoplaner.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
 
 import java.util.ArrayList;
 
-import de.p3.bewoplaner.model.Message;
+import de.beyondsoft.ownchat.model.Message;
 
 /**
  * Created by imarneanu on 3/1/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/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 92bc6a8..b17bb0f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import de.p3.bewoplaner.model.common.BaseResponse;
-import de.p3.bewoplaner.model.User;
+import de.beyondsoft.ownchat.model.common.BaseResponse;
+import de.beyondsoft.ownchat.model.User;
 
 /**
  * Created by imarneanu on 2/23/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/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 75e5e40..464491c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
 
-import de.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/de/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/de/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 07ab00d..28bfa0d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.api.responses;
+package de.beyondsoft.ownchat.data.api.responses;
 
 import com.google.gson.annotations.SerializedName;
-import de.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/de/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/de/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 a9e488c..4504540 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.api.services;
+package de.beyondsoft.ownchat.data.api.services;
 
-import de.p3.bewoplaner.data.api.responses.GroupResponse;
-import de.p3.bewoplaner.data.api.responses.MessageResponse;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/LoginService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/LoginService.java
similarity index 91%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/LoginService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/LoginService.java
index dc457f0..0046a6d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/api/services/LoginService.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/api/services/LoginService.java
@@ -1,7 +1,7 @@
-package de.p3.bewoplaner.data.api.services;
+package de.beyondsoft.ownchat.data.api.services;
 
 import com.google.gson.JsonObject;
-import de.p3.bewoplaner.data.api.responses.ProfileResponse;
+import de.beyondsoft.ownchat.data.api.responses.ProfileResponse;
 
 import retrofit2.http.Field;
 import retrofit2.http.FormUrlEncoded;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/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 cd04233..9489017 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.api.services;
+package de.beyondsoft.ownchat.data.api.services;
 
-import de.p3.bewoplaner.data.api.responses.ProfileResponse;
-import de.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/de/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/de/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 94b7c79..8292a08 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.api.services;
+package de.beyondsoft.ownchat.data.api.services;
 
-import de.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/de/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/de/p3/bewoplaner/data/events/GroupUpdatedEvent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/GroupUpdatedEvent.java
index 556b7b7..79c1dee 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/data/events/InvalidTokenEvent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/events/InvalidTokenEvent.java
index 10d1b6d..2ff8b89 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/data/firebase/HandleMessagesService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/HandleMessagesService.java
index feef552..26c5b6a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.firebase;
+package de.beyondsoft.ownchat.data.firebase;
 
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.prefs.LongPreference;
-import de.p3.bewoplaner.data.repository.GroupRealmRepository;
-import de.p3.bewoplaner.data.repository.MessageRealmRepository;
-import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.page.main.MainActivity;
-import de.p3.bewoplaner.utils.Constants;
-import de.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 de.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.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/data/firebase/MessagingComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/MessagingComponent.java
index 4baa5ce..a4b3a09 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.firebase;
+package de.beyondsoft.ownchat.data.firebase;
 
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.p3.bewoplaner.di.scopes.ActivityScope;
-import de.p3.bewoplaner.page.chat.ChatModule;
-import de.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/de/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/de/p3/bewoplaner/data/firebase/MessagingInstanceIdService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/MessagingInstanceIdService.java
index 7ffc9ad..01e99e9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.firebase;
+package de.beyondsoft.ownchat.data.firebase;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
 
-import de.p3.bewoplaner.BewoplanerApplication;
-import de.p3.bewoplaner.data.api.responses.RegisterResponse;
-import de.p3.bewoplaner.data.api.services.RegisterService;
-import de.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/de/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/de/p3/bewoplaner/data/firebase/ReplyNotificationReceiver.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/firebase/ReplyNotificationReceiver.java
index 0e7466b..9550fce 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.firebase;
+package de.beyondsoft.ownchat.data.firebase;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import de.p3.bewoplaner.data.api.responses.MessageResponse;
-import de.p3.bewoplaner.data.api.services.ChatService;
-import de.p3.bewoplaner.data.prefs.LongPreference;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.data.repository.GroupRealmRepository;
-import de.p3.bewoplaner.data.repository.MessageRealmRepository;
-import de.p3.bewoplaner.data.repository.RealmProvider;
-import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.page.chat.ChatPresenter;
-import de.p3.bewoplaner.utils.Constants;
-import de.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 de.p3.bewoplaner.utils.Constants.GROUP_ID;
+import static de.beyondsoft.ownchat.utils.Constants.GROUP_ID;
 
 /**
  * Created by laszloffiferenc on 3/20/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/data/prefs/AppPrefs.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefs.java
index e5f97ae..25d5275 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/p3/bewoplaner/data/prefs/AppPrefsModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefsModule.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/prefs/AppPrefsModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/AppPrefsModule.java
index 0415922..0c459fd 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.prefs;
+package de.beyondsoft.ownchat.data.prefs;
 
-import de.p3.bewoplaner.BewoplanerApplication;
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/data/prefs/BasePreference.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/BasePreference.java
index 0f25ec9..72a906a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/data/prefs/BooleanPreference.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/BooleanPreference.java
index a13011d..0da323d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/data/prefs/LongPreference.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/LongPreference.java
index 5f07a7f..78925b1 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/data/prefs/StringPreference.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/prefs/StringPreference.java
index 412609a..a473e1f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/p3/bewoplaner/data/repository/GroupRealmRepository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/GroupRealmRepository.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/GroupRealmRepository.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/GroupRealmRepository.java
index a128206..cc82922 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import de.p3.bewoplaner.data.repository.mapper.Mapper;
-import de.p3.bewoplaner.data.repository.models.GroupRealm;
-import de.p3.bewoplaner.data.repository.models.UserRealm;
-import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import de.p3.bewoplaner.data.repository.specifications.RealmSpecification;
-import de.p3.bewoplaner.data.repository.specifications.Specification;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.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/de/p3/bewoplaner/data/repository/MessageRealmRepository.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/MessageRealmRepository.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/repository/MessageRealmRepository.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/MessageRealmRepository.java
index 7e031f2..359153c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import de.p3.bewoplaner.data.repository.mapper.Mapper;
-import de.p3.bewoplaner.data.repository.models.MessageRealm;
-import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
-import de.p3.bewoplaner.data.repository.specifications.RealmSpecification;
-import de.p3.bewoplaner.data.repository.specifications.Specification;
-import de.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/de/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/de/p3/bewoplaner/data/repository/RealmProvider.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RealmProvider.java
index ee85942..502e1c6 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/data/repository/RealmWrapper.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RealmWrapper.java
index be69090..a5c0c6f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/data/repository/Repository.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/Repository.java
index 5e1a872..4b0be1c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import de.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/de/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/de/p3/bewoplaner/data/repository/RepositoryModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/RepositoryModule.java
index afc1f91..72102ba 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import de.p3.bewoplaner.data.repository.mapper.Mapper;
-import de.p3.bewoplaner.data.repository.models.GroupRealm;
-import de.p3.bewoplaner.data.repository.models.MessageRealm;
-import de.p3.bewoplaner.data.repository.models.UserRealm;
-import de.p3.bewoplaner.di.scopes.ApplicationScope;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.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/de/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/de/p3/bewoplaner/data/repository/UserRealmRepository.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/data/repository/UserRealmRepository.java
index cfaca55..4453b5b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository;
+package de.beyondsoft.ownchat.data.repository;
 
-import de.p3.bewoplaner.data.repository.mapper.Mapper;
-import de.p3.bewoplaner.data.repository.models.UserRealm;
-import de.p3.bewoplaner.data.repository.specifications.RealmSpecification;
-import de.p3.bewoplaner.data.repository.specifications.Specification;
-import de.p3.bewoplaner.data.repository.specifications.UserByIdSpecification;
-import de.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/de/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/de/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 3519543..30d4819 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/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 40c0a5c..66b2bc0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.models;
+package de.beyondsoft.ownchat.data.repository.models;
 
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.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/de/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/de/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 59942e3..6574a6f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.models;
+package de.beyondsoft.ownchat.data.repository.models;
 
-import de.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/de/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/de/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 707b972..21a1f4c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.models;
+package de.beyondsoft.ownchat.data.repository.models;
 
-import de.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/de/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/de/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 472bde0..224422a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import de.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/de/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/de/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 c6f4c8a..8bbc027 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import de.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/de/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/de/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 799f747..5db11ab 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import de.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/de/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/de/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 353c080..e440369 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import de.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/de/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/de/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 f412c12..9f2fe5a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import de.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/de/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/de/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 59b6640..04689d0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/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 c552fdd..7d8f344 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/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 7a7701a..cff44ad 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.data.repository.specifications;
+package de.beyondsoft.ownchat.data.repository.specifications;
 
-import de.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/de/p3/bewoplaner/di/ApplicationComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationComponent.java
similarity index 71%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/ApplicationComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationComponent.java
index fa512dc..54341c9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.di;
+package de.beyondsoft.ownchat.di;
 
 import com.bumptech.glide.Glide;
-import de.p3.bewoplaner.BewoplanerApplication;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.api.ApiModule;
-import de.p3.bewoplaner.data.prefs.AppPrefs;
-import de.p3.bewoplaner.data.prefs.AppPrefsModule;
-import de.p3.bewoplaner.data.prefs.BooleanPreference;
-import de.p3.bewoplaner.data.prefs.LongPreference;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.data.repository.GroupRealmRepository;
-import de.p3.bewoplaner.data.repository.MessageRealmRepository;
-import de.p3.bewoplaner.data.repository.RealmProvider;
-import de.p3.bewoplaner.data.repository.RepositoryModule;
-import de.p3.bewoplaner.data.repository.UserRealmRepository;
-import de.p3.bewoplaner.di.scopes.ApplicationScope;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/di/ApplicationModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/ApplicationModule.java
index c6af234..580c530 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.di;
+package de.beyondsoft.ownchat.di;
 
 import com.bumptech.glide.Glide;
-import de.p3.bewoplaner.BewoplanerApplication;
-import de.p3.bewoplaner.di.scopes.ApplicationScope;
-import de.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/de/p3/bewoplaner/di/InjectionHelper.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/InjectionHelper.java
similarity index 78%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/InjectionHelper.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/InjectionHelper.java
index 67beabb..6a03067 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/di/InjectionHelper.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/InjectionHelper.java
@@ -1,22 +1,22 @@
-package de.p3.bewoplaner.di;
+package de.beyondsoft.ownchat.di;
 
-import de.p3.bewoplaner.BewoplanerApplication;
-import de.p3.bewoplaner.data.firebase.DaggerMessagingComponent;
-import de.p3.bewoplaner.data.firebase.MessagingComponent;
-import de.p3.bewoplaner.page.chat.ChatComponent;
-import de.p3.bewoplaner.page.chat.DaggerChatComponent;
-import de.p3.bewoplaner.page.contacts.ContactsComponent;
-import de.p3.bewoplaner.page.contacts.DaggerContactsComponent;
-import de.p3.bewoplaner.page.fileconfirmation.DaggerFileConfirmationComponent;
-import de.p3.bewoplaner.page.fileconfirmation.FileConfirmationComponent;
-import de.p3.bewoplaner.page.login.DaggerLoginComponent;
-import de.p3.bewoplaner.page.login.LoginComponent;
-import de.p3.bewoplaner.page.main.DaggerMainComponent;
-import de.p3.bewoplaner.page.main.MainComponent;
-import de.p3.bewoplaner.page.profile.DaggerProfileComponent;
-import de.p3.bewoplaner.page.profile.ProfileComponent;
-import de.p3.bewoplaner.page.splash.DaggerSplashComponent;
-import de.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;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/di/P3DSEndpoint.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/P3DSEndpoint.java
index 5d5d740..954090b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/di/scopes/ActivityScope.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/scopes/ActivityScope.java
index 8c85aaa..1750b39 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/di/scopes/ApplicationScope.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/di/scopes/ApplicationScope.java
index e02c3bb..b44cc62 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/model/Group.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Group.java
index f912cf5..e0ae89e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.model;
+package de.beyondsoft.ownchat.model;
 
 import com.google.gson.annotations.SerializedName;
 
-import de.p3.bewoplaner.data.repository.models.GroupRealm;
-import de.p3.bewoplaner.data.repository.models.MessageRealm;
-import de.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/de/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/de/p3/bewoplaner/model/Message.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/Message.java
index 95db5bc..ef1bd37 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.model;
+package de.beyondsoft.ownchat.model;
 
 import com.google.gson.annotations.SerializedName;
 
-import de.p3.bewoplaner.R;
-import de.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/de/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/de/p3/bewoplaner/model/User.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/User.java
index 1d04a68..9b52208 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.model;
+package de.beyondsoft.ownchat.model;
 
 import com.google.gson.annotations.SerializedName;
 
-import de.p3.bewoplaner.data.repository.models.UserRealm;
+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/de/p3/bewoplaner/model/common/BaseResponse.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/common/BaseResponse.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/model/common/BaseResponse.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/model/common/BaseResponse.java
index 9b015a7..95b03f3 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.model.common;
+package de.beyondsoft.ownchat.model.common;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/BaseChatActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/BaseChatActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatActivity.java
index a2b5027..17ef1df 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.events.InvalidTokenEvent;
-import de.p3.bewoplaner.data.events.LogoutDirectlyEvent;
-import de.p3.bewoplaner.data.prefs.BooleanPreference;
-import de.p3.bewoplaner.data.prefs.LongPreference;
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.page.common.RuntimePermissionActivity;
-import de.p3.bewoplaner.page.login.LoginPresenter;
-import de.p3.bewoplaner.page.main.LogoutNavigation;
-import de.p3.bewoplaner.utils.EndlessScrollListener;
-import de.p3.bewoplaner.utils.FileUtils;
-import de.p3.bewoplaner.utils.SystemUtils;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/chat/BaseChatAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/BaseChatAdapter.java
index 3affb77..a8174da 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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 de.p3.bewoplaner.R;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.utils.DateUtils;
-import de.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/de/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/de/p3/bewoplaner/page/chat/ChatComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatComponent.java
index 32e5956..a96bff8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.p3.bewoplaner.di.scopes.ActivityScope;
-import de.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/de/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/de/p3/bewoplaner/page/chat/ChatModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatModule.java
index 1087a75..f88e94a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import de.p3.bewoplaner.data.api.services.ChatService;
-import de.p3.bewoplaner.di.P3DSEndpoint;
-import de.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/de/p3/bewoplaner/page/chat/ChatPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chat/ChatPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatPresenter.java
index 77847e1..6d71d55 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import de.p3.bewoplaner.data.api.responses.MessageResponse;
-import de.p3.bewoplaner.data.api.responses.MessagesResponse;
-import de.p3.bewoplaner.data.api.services.ChatService;
-import de.p3.bewoplaner.data.events.GroupUpdatedEvent;
-import de.p3.bewoplaner.data.prefs.LongPreference;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.data.repository.GroupRealmRepository;
-import de.p3.bewoplaner.data.repository.MessageRealmRepository;
-import de.p3.bewoplaner.data.repository.RealmProvider;
-import de.p3.bewoplaner.data.repository.models.MessageRealm;
-import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import de.p3.bewoplaner.data.repository.specifications.MessageByGroupIdSpecification;
-import de.p3.bewoplaner.data.repository.specifications.MessageByIdSpecification;
-import de.p3.bewoplaner.di.scopes.ActivityScope;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import de.p3.bewoplaner.utils.SystemUtils;
-import de.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,7 +45,7 @@ import java.util.Random;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import de.p3.bewoplaner.utils.FileUtils;
+import de.beyondsoft.ownchat.utils.FileUtils;
 import io.realm.Realm;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
@@ -57,7 +57,7 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 
-import static de.p3.bewoplaner.data.AppPrefsConstants.USER_ID;
+import static de.beyondsoft.ownchat.data.AppPrefsConstants.USER_ID;
 
 /**
  * Created by Rares Teodorescu on 21/02/2017.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/chat/ChatView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/ChatView.java
index f589159..f876d46 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.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/de/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/de/p3/bewoplaner/page/chat/GroupChatActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatActivity.java
index 04a259f..22bfffb 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.page.chatmembers.ChatMembersActivity;
-import de.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/de/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/de/p3/bewoplaner/page/chat/GroupChatAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/GroupChatAdapter.java
index 7737621..bbfda9e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.utils.DateUtils;
-import de.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/de/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/de/p3/bewoplaner/page/chat/SingleChatActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatActivity.java
index 1a91e2d..0eb5ee9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
 import com.bumptech.glide.Glide;
 
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.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(de.p3.bewoplaner.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(de.p3.bewoplaner.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(de.p3.bewoplaner.R.drawable.call);
+            mExtraImageView.setImageResource(de.beyondsoft.ownchat.R.drawable.call);
         }
 
         if (mSystemUtils.isNetworkUnavailable()) {
             mCallback.loadMessagesFromDBByGroupId(mGroup.id, true);
-            showError(de.p3.bewoplaner.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) ? de.p3.bewoplaner.R.color.colorHelpGroup : de.p3.bewoplaner.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(de.p3.bewoplaner.R.drawable.avatar);
+            mChatImageView.setImageResource(de.beyondsoft.ownchat.R.drawable.avatar);
         } else {
             Glide.with(this).load(mGroup.avatar)
-                    .placeholder(de.p3.bewoplaner.R.drawable.avatar)
+                    .placeholder(de.beyondsoft.ownchat.R.drawable.avatar)
                     .dontAnimate()
                     .into(mChatImageView);
         }
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/chat/SingleChatAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chat/SingleChatAdapter.java
index ac7c115..2fb94d9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chat;
+package de.beyondsoft.ownchat.page.chat;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.utils.DateUtils;
-import de.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/de/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersActivity.java
similarity index 93%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/chatmembers/ChatMembersActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersActivity.java
index cbe9785..51a3f31 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chatmembers;
+package de.beyondsoft.ownchat.page.chatmembers;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.model.Group;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/chatmembers/ChatMembersAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/chatmembers/ChatMembersAdapter.java
index 6712e92..2dd0fdf 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.chatmembers;
+package de.beyondsoft.ownchat.page.chatmembers;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import de.p3.bewoplaner.R;
-import de.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/de/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/de/p3/bewoplaner/page/common/BaseFragment.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/BaseFragment.java
index 3630825..59ac93b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.common;
+package de.beyondsoft.ownchat.page.common;
 
 import android.support.v4.app.Fragment;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/common/PermissionGrantedListener.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/PermissionGrantedListener.java
index 47244e5..87f081b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/page/common/RuntimePermissionActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/common/RuntimePermissionActivity.java
index ab7e40f..fecc19f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.common;
+package de.beyondsoft.ownchat.page.common;
 
-import de.p3.bewoplaner.R;
-import de.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/de/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/de/p3/bewoplaner/page/contacts/ContactsAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsAdapter.java
index b6d5233..09de973 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.utils.DateUtils;
-import de.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/de/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/de/p3/bewoplaner/page/contacts/ContactsComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsComponent.java
index f476118..cf56308 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.p3.bewoplaner.di.scopes.ActivityScope;
-import de.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/de/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/de/p3/bewoplaner/page/contacts/ContactsFragment.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsFragment.java
index 7ac5105..4d1c904 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.events.GroupUpdatedEvent;
-import de.p3.bewoplaner.data.prefs.LongPreference;
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.page.chat.GroupChatActivity;
-import de.p3.bewoplaner.page.chat.SingleChatActivity;
-import de.p3.bewoplaner.page.common.BaseFragment;
-import de.p3.bewoplaner.utils.Constants;
-import de.p3.bewoplaner.utils.ui.EmptyLayout;
-import de.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/de/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/de/p3/bewoplaner/page/contacts/ContactsPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsPresenter.java
index 9870ae0..3f28ba9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import de.p3.bewoplaner.data.api.responses.GroupResponse;
-import de.p3.bewoplaner.data.api.services.ChatService;
-import de.p3.bewoplaner.data.prefs.LongPreference;
-import de.p3.bewoplaner.data.repository.GroupRealmRepository;
-import de.p3.bewoplaner.data.repository.UserRealmRepository;
-import de.p3.bewoplaner.data.repository.specifications.GroupByIdSpecification;
-import de.p3.bewoplaner.data.repository.specifications.GroupByNameSpecification;
-import de.p3.bewoplaner.data.repository.specifications.GroupSpecification;
-import de.p3.bewoplaner.data.repository.specifications.UserByIdSpecification;
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import de.p3.bewoplaner.utils.SystemUtils;
-import de.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/de/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/de/p3/bewoplaner/page/contacts/ContactsView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/contacts/ContactsView.java
index 504ff89..a02cbbb 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.contacts;
+package de.beyondsoft.ownchat.page.contacts;
 
-import de.p3.bewoplaner.model.Group;
-import de.p3.bewoplaner.model.Message;
-import de.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/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java
similarity index 92%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java
index a3df528..7fd2010 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationActivity.java
@@ -1,4 +1,4 @@
-package de.p3.bewoplaner.page.fileconfirmation;
+package de.beyondsoft.ownchat.page.fileconfirmation;
 
 import android.database.Cursor;
 import android.net.Uri;
@@ -10,10 +10,10 @@ import android.os.Bundle;
 import android.webkit.WebView;
 import android.widget.ImageView;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.utils.Constants;
-import de.p3.bewoplaner.utils.FileUtils;
+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;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationComponent.java
similarity index 64%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationComponent.java
index 5966d8a..e8e5b07 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationComponent.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationComponent.java
@@ -1,7 +1,7 @@
-package de.p3.bewoplaner.page.fileconfirmation;
+package de.beyondsoft.ownchat.page.fileconfirmation;
 
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.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/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationModule.java
similarity index 60%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationModule.java
index d4b4b88..22baeb2 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationModule.java
@@ -1,8 +1,8 @@
-package de.p3.bewoplaner.page.fileconfirmation;
+package de.beyondsoft.ownchat.page.fileconfirmation;
 
-import de.p3.bewoplaner.data.api.services.ChatService;
-import de.p3.bewoplaner.di.P3DSEndpoint;
-import de.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/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationPresenter.java
similarity index 82%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationPresenter.java
index ffc83b8..e7ee936 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationPresenter.java
@@ -1,11 +1,11 @@
-package de.p3.bewoplaner.page.fileconfirmation;
+package de.beyondsoft.ownchat.page.fileconfirmation;
 
 import android.content.Context;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 
-import de.p3.bewoplaner.data.api.services.ChatService;
-import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
+import de.beyondsoft.ownchat.data.api.services.ChatService;
+import de.beyondsoft.ownchat.page.mvp.MVPAbstractPresenter;
 
 import javax.inject.Inject;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationView.java
similarity index 72%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationView.java
index cc77dec..f66062c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/fileconfirmation/FileConfirmationView.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/fileconfirmation/FileConfirmationView.java
@@ -1,8 +1,8 @@
-package de.p3.bewoplaner.page.fileconfirmation;
+package de.beyondsoft.ownchat.page.fileconfirmation;
 
 import android.net.Uri;
 
-import de.p3.bewoplaner.page.mvp.MVPLceView;
+import de.beyondsoft.ownchat.page.mvp.MVPLceView;
 
 /**
  * Created by Lyndon on 13-Oct-2017.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/impressum/ImpressumActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/impressum/ImpressumActivity.java
index ad1aa5a..8ea682d 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.impressum;
+package de.beyondsoft.ownchat.page.impressum;
 
-import de.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/de/p3/bewoplaner/page/login/LoginActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginActivity.java
similarity index 92%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginActivity.java
index 9234ddc..5fc433a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginActivity.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginActivity.java
@@ -1,17 +1,17 @@
-package de.p3.bewoplaner.page.login;
+package de.beyondsoft.ownchat.page.login;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 
-import de.p3.bewoplaner.BewoplanerApplication;
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.prefs.AppPrefs;
-import de.p3.bewoplaner.data.prefs.BooleanPreference;
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.page.main.MainActivity;
-import de.p3.bewoplaner.utils.AppStoppedService;
-import de.p3.bewoplaner.utils.DialogHandler;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/login/LoginComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginComponent.java
index c094635..c5e217e 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.login;
+package de.beyondsoft.ownchat.page.login;
 
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.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/p3/bewoplaner/page/login/LoginModule.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginModule.java
similarity index 65%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginModule.java
index 8c56512..7e4118a 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginModule.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginModule.java
@@ -1,9 +1,9 @@
-package de.p3.bewoplaner.page.login;
+package de.beyondsoft.ownchat.page.login;
 
-import de.p3.bewoplaner.data.api.services.LoginService;
-import de.p3.bewoplaner.data.api.services.RegisterService;
-import de.p3.bewoplaner.di.P3DSEndpoint;
-import de.p3.bewoplaner.di.scopes.ActivityScope;
+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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
similarity index 93%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
index cbab5f4..cb89da2 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginPresenter.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginPresenter.java
@@ -1,31 +1,31 @@
-package de.p3.bewoplaner.page.login;
+package de.beyondsoft.ownchat.page.login;
 
 import com.google.gson.JsonObject;
 
 import com.bumptech.glide.Glide;
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import de.p3.bewoplaner.data.api.common.ErrorThrowable;
-import de.p3.bewoplaner.data.api.common.ErrorType;
-import de.p3.bewoplaner.data.api.common.ErrorUtils;
-import de.p3.bewoplaner.data.api.responses.RegisterResponse;
-import de.p3.bewoplaner.data.api.services.LoginService;
-import de.p3.bewoplaner.data.api.services.RegisterService;
-import de.p3.bewoplaner.data.prefs.AppPrefs;
-import de.p3.bewoplaner.data.prefs.BooleanPreference;
-import de.p3.bewoplaner.data.prefs.LongPreference;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.data.repository.GroupRealmRepository;
-import de.p3.bewoplaner.data.repository.MessageRealmRepository;
-import de.p3.bewoplaner.data.repository.RealmProvider;
-import de.p3.bewoplaner.data.repository.UserRealmRepository;
-import de.p3.bewoplaner.model.User;
-import de.p3.bewoplaner.page.main.LogoutNavigation;
-import de.p3.bewoplaner.page.main.MainNavigation;
-import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import de.p3.bewoplaner.utils.SystemUtils;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginView.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginView.java
similarity index 79%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginView.java
index 7d4e8fd..1b7b0e5 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/login/LoginView.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/login/LoginView.java
@@ -1,8 +1,8 @@
-package de.p3.bewoplaner.page.login;
+package de.beyondsoft.ownchat.page.login;
 
-import de.p3.bewoplaner.page.main.LogoutNavigation;
-import de.p3.bewoplaner.page.main.MainNavigation;
-import de.p3.bewoplaner.page.mvp.MVPLceView;
+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.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/LogoutNavigation.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/LogoutNavigation.java
similarity index 68%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/LogoutNavigation.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/LogoutNavigation.java
index a87ff46..56b7fe2 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/LogoutNavigation.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/LogoutNavigation.java
@@ -1,4 +1,4 @@
-package de.p3.bewoplaner.page.main;
+package de.beyondsoft.ownchat.page.main;
 
 public interface LogoutNavigation {
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainActivity.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java
similarity index 89%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/MainActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainActivity.java
index 454ce9e..dcfe431 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.main;
+package de.beyondsoft.ownchat.page.main;
 
 import com.bumptech.glide.Glide;
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.events.InvalidTokenEvent;
-import de.p3.bewoplaner.data.events.LogoutDirectlyEvent;
-import de.p3.bewoplaner.data.prefs.BooleanPreference;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.page.chat.GroupChatActivity;
-import de.p3.bewoplaner.page.chat.SingleChatActivity;
-import de.p3.bewoplaner.page.contacts.ContactsFragment;
-import de.p3.bewoplaner.page.impressum.ImpressumActivity;
-import de.p3.bewoplaner.page.login.LoginActivity;
-import de.p3.bewoplaner.page.login.LoginPresenter;
-import de.p3.bewoplaner.page.profile.ProfileFragment;
-import de.p3.bewoplaner.utils.Constants;
-import de.p3.bewoplaner.utils.DialogHandler;
-import de.p3.bewoplaner.utils.SystemUtils;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/main/MainComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainComponent.java
index 0087854..34577cf 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.main;
+package de.beyondsoft.ownchat.page.main;
 
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.p3.bewoplaner.di.scopes.ActivityScope;
-import de.p3.bewoplaner.page.chat.ChatModule;
-import de.p3.bewoplaner.page.login.LoginModule;
-import de.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/de/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/de/p3/bewoplaner/page/main/MainNavigation.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/MainNavigation.java
index 5eb8062..39308a6 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/p3/bewoplaner/page/main/NavigationMenuAdapter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/NavigationMenuAdapter.java
similarity index 96%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/main/NavigationMenuAdapter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/main/NavigationMenuAdapter.java
index b291036..1c831f0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.main;
+package de.beyondsoft.ownchat.page.main;
 
-import de.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/java/de/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPAbstractPresenter.java
similarity index 92%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/mvp/MVPAbstractPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPAbstractPresenter.java
index 03f3008..27c9245 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.mvp;
+package de.beyondsoft.ownchat.page.mvp;
 
 import android.support.annotation.CallSuper;
 import android.support.annotation.NonNull;
 
-import de.p3.bewoplaner.utils.Preconditions;
+import de.beyondsoft.ownchat.utils.Preconditions;
 import rx.Subscription;
 import rx.subscriptions.CompositeSubscription;
 
-import static de.p3.bewoplaner.utils.Preconditions.checkNotNull;
-import static de.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.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/mvp/MVPLceView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPLceView.java
index ee9f82b..e285611 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/page/mvp/MVPPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPPresenter.java
index 17a136d..9b7a704 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/page/mvp/MVPView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/mvp/MVPView.java
index 547a58d..22755e5 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/page/profile/ProfileComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileComponent.java
index a3bb7db..9080b1b 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
 /**
  * Created by imarneanu on 2/22/17.
  */
 
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.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/p3/bewoplaner/page/profile/ProfileFragment.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileFragment.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/profile/ProfileFragment.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileFragment.java
index 13806f1..d4d3fb0 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
 import com.bumptech.glide.Glide;
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.model.User;
-import de.p3.bewoplaner.utils.DialogHandler;
-import de.p3.bewoplaner.utils.FileUtils;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/profile/ProfileModule.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileModule.java
index 43558b5..05bdfb9 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
-import de.p3.bewoplaner.data.api.services.ProfileService;
-import de.p3.bewoplaner.di.P3DSEndpoint;
-import de.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/de/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/de/p3/bewoplaner/page/profile/ProfilePresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfilePresenter.java
index f12c832..d9aa0e2 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
-import de.p3.bewoplaner.R;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.api.common.ErrorHandlingResponseConverter;
-import de.p3.bewoplaner.data.api.services.ProfileService;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.di.scopes.ActivityScope;
-import de.p3.bewoplaner.model.User;
-import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import de.p3.bewoplaner.utils.SystemUtils;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/profile/ProfileView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/profile/ProfileView.java
index 9e775dd..dc6ef46 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.profile;
+package de.beyondsoft.ownchat.page.profile;
 
-import de.p3.bewoplaner.model.User;
-import de.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/de/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/de/p3/bewoplaner/page/splash/SplashActivity.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashActivity.java
index a6b1e04..0b6c304 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.splash;
+package de.beyondsoft.ownchat.page.splash;
 
-import de.p3.bewoplaner.di.InjectionHelper;
-import de.p3.bewoplaner.page.login.LoginActivity;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/splash/SplashComponent.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashComponent.java
index 6d77ec4..9660d38 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.splash;
+package de.beyondsoft.ownchat.page.splash;
 
-import de.p3.bewoplaner.di.ApplicationComponent;
-import de.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/p3/bewoplaner/page/splash/SplashPresenter.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashPresenter.java
similarity index 80%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/page/splash/SplashPresenter.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashPresenter.java
index 999d619..5aa3591 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.splash;
+package de.beyondsoft.ownchat.page.splash;
 
-import de.p3.bewoplaner.BuildConfig;
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.prefs.BooleanPreference;
-import de.p3.bewoplaner.data.prefs.StringPreference;
-import de.p3.bewoplaner.page.mvp.MVPAbstractPresenter;
-import de.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;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/page/splash/SplashView.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/page/splash/SplashView.java
index e7012c0..4e39e72 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.page.splash;
+package de.beyondsoft.ownchat.page.splash;
 
-import de.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/de/p3/bewoplaner/utils/AppStoppedService.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/AppStoppedService.java
similarity index 81%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/AppStoppedService.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/AppStoppedService.java
index cb5d94a..2bb43d2 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.prefs.BooleanPreference;
-import de.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,7 +13,7 @@ import android.support.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import de.p3.bewoplaner.page.login.LoginActivity;
+import de.beyondsoft.ownchat.page.login.LoginActivity;
 
 /**
  * Service should be started only when "Password Save"
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Constants.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java
similarity index 95%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Constants.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java
index 750c56d..305ccd4 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Constants.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Constants.java
@@ -1,4 +1,4 @@
-package de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 /**
  * Created by laszloffiferenc on 2/21/17.
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/utils/DateUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DateUtils.java
index 9c2f147..10d7b16 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/p3/bewoplaner/utils/DialogHandler.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DialogHandler.java
similarity index 98%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/DialogHandler.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/DialogHandler.java
index 97cd67f..b8b4fcf 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
-import de.p3.bewoplaner.R;
+import de.beyondsoft.ownchat.R;
 
 import android.app.Dialog;
 import android.content.Context;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/EndlessScrollListener.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/EndlessScrollListener.java
similarity index 97%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/EndlessScrollListener.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/EndlessScrollListener.java
index 42858e4..5ca11ec 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/utils/FileUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/FileUtils.java
index edcbddf..913eac5 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;/*
+package de.beyondsoft.ownchat.utils;/*
  * Copyright (C) 2007-2008 OpenIntents.org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/LoggedOutUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/LoggedOutUtils.java
similarity index 79%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/LoggedOutUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/LoggedOutUtils.java
index 381f0b6..66c2ec8 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
-import de.p3.bewoplaner.data.AppPrefsConstants;
-import de.p3.bewoplaner.data.prefs.BooleanPreference;
-import de.p3.bewoplaner.di.scopes.ActivityScope;
-import de.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;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/utils/Preconditions.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Preconditions.java
index 6eb26d2..50ed2ec 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import android.support.annotation.NonNull;
 
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/utils/RuntimePermissionBaseFragment.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/RuntimePermissionBaseFragment.java
index dbf00fe..4e3fc14 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 
 import android.content.pm.PackageManager;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/SystemUtils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/SystemUtils.java
similarity index 94%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/SystemUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/SystemUtils.java
index 0ae5d2d..147b4b1 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Utils.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Utils.java
similarity index 97%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/Utils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/Utils.java
index 482f3e6..e7c0a26 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils;
+package de.beyondsoft.ownchat.utils;
 
 import android.app.Activity;
 import android.support.v4.app.FragmentManager;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/utils/rx/RxUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/rx/RxUtils.java
index 06bba4f..dd50a10 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/p3/bewoplaner/utils/ui/EmptyLayout.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/EmptyLayout.java
similarity index 97%
rename from BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/utils/ui/EmptyLayout.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/EmptyLayout.java
index 137110d..33cb98c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils.ui;
+package de.beyondsoft.ownchat.utils.ui;
 
-import de.p3.bewoplaner.R;
+import de.beyondsoft.ownchat.R;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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/de/p3/bewoplaner/utils/ui/FlexibleDividerDecoration.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/FlexibleDividerDecoration.java
index 7ffd088..450daba 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/utils/ui/HorizontalDividerItemDecoration.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/HorizontalDividerItemDecoration.java
index 73e019d..9d2c54f 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/utils/ui/LayoutBehavior.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/LayoutBehavior.java
index 926981d..9c72067 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/utils/ui/LinearLayoutBehavior.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/LinearLayoutBehavior.java
index d93d52b..728d89c 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.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/de/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/de/p3/bewoplaner/utils/ui/ViewUtils.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/beyondsoft/ownchat/utils/ui/ViewUtils.java
index e76d0d6..f283cc5 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/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 de.p3.bewoplaner.utils.ui;
+package de.beyondsoft.ownchat.utils.ui;
 
-import de.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/java/de/p3/bewoplaner/data/events/LogoutDirectlyEvent.java b/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/LogoutDirectlyEvent.java
deleted file mode 100644
index ffb4897..0000000
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/main/java/de/p3/bewoplaner/data/events/LogoutDirectlyEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package de.p3.bewoplaner.data.events;
-
-public class LogoutDirectlyEvent {
-}
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 7947992..3a0f0bb 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
@@ -22,7 +22,7 @@
         android:layout_marginTop="?attr/actionBarSize"
         tools:listitem="@layout/item_single_chat_left" />
 
-    <de.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"
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 c5e1d9d..d8c6216 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="de.p3.bewoplaner.page.login.LoginActivity">
+    tools:context="de.beyondsoft.ownchat.page.login.LoginActivity">
 
     <LinearLayout
         android:id="@+id/login_linear_layout"
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 0c4e04f..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" />
 
-            <de.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/test/java/de/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/de/p3/bewoplaner/ExampleUnitTest.java
rename to BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/de/beyondsoft/ownchat/ExampleUnitTest.java
index c1e28f5..88e9c87 100644
--- a/BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/de/p3/bewoplaner/ExampleUnitTest.java
+++ b/BeWoPlanerChat/bewoplaner-chat-android/app/src/test/java/de/beyondsoft/ownchat/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package de.p3.bewoplaner;
+package de.beyondsoft.ownchat;
 
 import org.junit.Test;