diff --git a/app/build.gradle b/app/build.gradle
index 73730b47..cda8402e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        applicationId "de.baumann.diaspora"
+        applicationId "de.dfa.diaspora"
         minSdkVersion 15
         targetSdkVersion 23
         versionCode 17
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c8c756a..55f314e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.baumann.diaspora">
+    package="de.dfa.diaspora">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -10,11 +10,11 @@
         android:allowBackup="true"
         android:fullBackupContent="true"
         android:icon="@drawable/ic_launcher"
-        android:name=".App"
+        android:name="de.dfa.diaspora.App"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".SplashActivity"
+            android:name="de.dfa.diaspora.SplashActivity"
             android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
@@ -26,7 +26,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".PodsActivity"
+            android:name="de.dfa.diaspora.PodsActivity"
             android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/title_activity_pods"
@@ -34,7 +34,7 @@
             android:windowSoftInputMode="stateHidden" >
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name="de.dfa.diaspora.MainActivity"
             android:launchMode="singleInstance"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -43,7 +43,7 @@
         </activity>
 
         <activity
-            android:name=".ShareActivity"
+            android:name="de.dfa.diaspora.ShareActivity"
             android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/new_post"
@@ -58,7 +58,7 @@
         </activity>
 
         <activity
-            android:name=".ShareActivity2"
+            android:name="de.dfa.diaspora.ShareActivity2"
             android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/new_post"
@@ -74,7 +74,7 @@
         </activity>
 
         <service
-            android:name=".services.GetPodsService"
+            android:name="de.dfa.diaspora.services.GetPodsService"
             android:enabled="true"
             android:exported="false" >
         </service>
diff --git a/app/src/main/java/de/baumann/diaspora/App.java b/app/src/main/java/de/dfa/diaspora/App.java
similarity index 86%
rename from app/src/main/java/de/baumann/diaspora/App.java
rename to app/src/main/java/de/dfa/diaspora/App.java
index 93e387ff..9339c94b 100644
--- a/app/src/main/java/de/baumann/diaspora/App.java
+++ b/app/src/main/java/de/dfa/diaspora/App.java
@@ -1,10 +1,8 @@
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.app.Application;
 
-import java.io.File;
-
-import de.baumann.diaspora.utils.AvatarImageLoader;
+import de.dfa.diaspora.utils.AvatarImageLoader;
 
 /**
  * Created by gregor on 24.03.16.
diff --git a/app/src/main/java/de/baumann/diaspora/AppSettings.java b/app/src/main/java/de/dfa/diaspora/AppSettings.java
similarity index 98%
rename from app/src/main/java/de/baumann/diaspora/AppSettings.java
rename to app/src/main/java/de/dfa/diaspora/AppSettings.java
index 39063b31..b88a3bbe 100644
--- a/app/src/main/java/de/baumann/diaspora/AppSettings.java
+++ b/app/src/main/java/de/dfa/diaspora/AppSettings.java
@@ -1,4 +1,4 @@
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/de/baumann/diaspora/FloatingActionsMenuBehavior.java b/app/src/main/java/de/dfa/diaspora/FloatingActionsMenuBehavior.java
similarity index 97%
rename from app/src/main/java/de/baumann/diaspora/FloatingActionsMenuBehavior.java
rename to app/src/main/java/de/dfa/diaspora/FloatingActionsMenuBehavior.java
index 87c80cbd..f4cf37e8 100644
--- a/app/src/main/java/de/baumann/diaspora/FloatingActionsMenuBehavior.java
+++ b/app/src/main/java/de/dfa/diaspora/FloatingActionsMenuBehavior.java
@@ -1,4 +1,4 @@
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 /**
  * Created by juergen on 29.02.16. Part of Diaspora WebApp.
diff --git a/app/src/main/java/de/baumann/diaspora/ImageDownloadTask.java b/app/src/main/java/de/dfa/diaspora/ImageDownloadTask.java
similarity index 98%
rename from app/src/main/java/de/baumann/diaspora/ImageDownloadTask.java
rename to app/src/main/java/de/dfa/diaspora/ImageDownloadTask.java
index 289e3282..f3f4e81a 100644
--- a/app/src/main/java/de/baumann/diaspora/ImageDownloadTask.java
+++ b/app/src/main/java/de/dfa/diaspora/ImageDownloadTask.java
@@ -1,4 +1,4 @@
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
diff --git a/app/src/main/java/de/baumann/diaspora/MainActivity.java b/app/src/main/java/de/dfa/diaspora/MainActivity.java
similarity index 99%
rename from app/src/main/java/de/baumann/diaspora/MainActivity.java
rename to app/src/main/java/de/dfa/diaspora/MainActivity.java
index 25df04cc..86a7fba6 100644
--- a/app/src/main/java/de/baumann/diaspora/MainActivity.java
+++ b/app/src/main/java/de/dfa/diaspora/MainActivity.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -80,8 +80,8 @@ import java.util.Date;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
-import de.baumann.diaspora.utils.Helpers;
-import de.baumann.diaspora.utils.SoftKeyboardStateWatcher;
+import de.dfa.diaspora.utils.Helpers;
+import de.dfa.diaspora.utils.SoftKeyboardStateWatcher;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener, WebUserProfileChangedListener {
diff --git a/app/src/main/java/de/baumann/diaspora/PodsActivity.java b/app/src/main/java/de/dfa/diaspora/PodsActivity.java
similarity index 98%
rename from app/src/main/java/de/baumann/diaspora/PodsActivity.java
rename to app/src/main/java/de/dfa/diaspora/PodsActivity.java
index da2d3600..bb8c27ee 100644
--- a/app/src/main/java/de/baumann/diaspora/PodsActivity.java
+++ b/app/src/main/java/de/dfa/diaspora/PodsActivity.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -27,7 +27,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.Snackbar;
@@ -48,8 +47,8 @@ import android.widget.TextView;
 import java.util.ArrayList;
 import java.util.Collections;
 
-import de.baumann.diaspora.services.GetPodsService;
-import de.baumann.diaspora.utils.Helpers;
+import de.dfa.diaspora.services.GetPodsService;
+import de.dfa.diaspora.utils.Helpers;
 
 
 public class PodsActivity extends AppCompatActivity {
diff --git a/app/src/main/java/de/baumann/diaspora/ShareActivity.java b/app/src/main/java/de/dfa/diaspora/ShareActivity.java
similarity index 99%
rename from app/src/main/java/de/baumann/diaspora/ShareActivity.java
rename to app/src/main/java/de/dfa/diaspora/ShareActivity.java
index bfa54ed8..22607688 100644
--- a/app/src/main/java/de/baumann/diaspora/ShareActivity.java
+++ b/app/src/main/java/de/dfa/diaspora/ShareActivity.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -46,7 +46,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import de.baumann.diaspora.utils.Helpers;
+import de.dfa.diaspora.utils.Helpers;
 
 public class ShareActivity extends MainActivity {
 
diff --git a/app/src/main/java/de/baumann/diaspora/ShareActivity2.java b/app/src/main/java/de/dfa/diaspora/ShareActivity2.java
similarity index 99%
rename from app/src/main/java/de/baumann/diaspora/ShareActivity2.java
rename to app/src/main/java/de/dfa/diaspora/ShareActivity2.java
index 5eeafb23..8d615a90 100644
--- a/app/src/main/java/de/baumann/diaspora/ShareActivity2.java
+++ b/app/src/main/java/de/dfa/diaspora/ShareActivity2.java
@@ -17,12 +17,11 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -47,7 +46,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import de.baumann.diaspora.utils.Helpers;
+import de.dfa.diaspora.utils.Helpers;
 
 public class ShareActivity2 extends MainActivity {
 
diff --git a/app/src/main/java/de/baumann/diaspora/SplashActivity.java b/app/src/main/java/de/dfa/diaspora/SplashActivity.java
similarity index 97%
rename from app/src/main/java/de/baumann/diaspora/SplashActivity.java
rename to app/src/main/java/de/dfa/diaspora/SplashActivity.java
index b1a4648f..0554a78a 100644
--- a/app/src/main/java/de/baumann/diaspora/SplashActivity.java
+++ b/app/src/main/java/de/dfa/diaspora/SplashActivity.java
@@ -17,10 +17,9 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
diff --git a/app/src/main/java/de/baumann/diaspora/WebUserProfile.java b/app/src/main/java/de/dfa/diaspora/WebUserProfile.java
similarity index 98%
rename from app/src/main/java/de/baumann/diaspora/WebUserProfile.java
rename to app/src/main/java/de/dfa/diaspora/WebUserProfile.java
index 5ba29674..49be54fa 100644
--- a/app/src/main/java/de/baumann/diaspora/WebUserProfile.java
+++ b/app/src/main/java/de/dfa/diaspora/WebUserProfile.java
@@ -1,4 +1,4 @@
-package de.baumann.diaspora;
+package de.dfa.diaspora;
 
 import android.os.Handler;
 import android.util.Log;
@@ -6,8 +6,6 @@ import android.util.Log;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.File;
-
 /**
  * Created by de-live-gdev on 24.03.16.  Part of Diaspora WebApp.
  */
diff --git a/app/src/main/java/de/baumann/diaspora/services/GetPodsService.java b/app/src/main/java/de/dfa/diaspora/services/GetPodsService.java
similarity index 97%
rename from app/src/main/java/de/baumann/diaspora/services/GetPodsService.java
rename to app/src/main/java/de/dfa/diaspora/services/GetPodsService.java
index b8d060a8..fea448a1 100644
--- a/app/src/main/java/de/baumann/diaspora/services/GetPodsService.java
+++ b/app/src/main/java/de/dfa/diaspora/services/GetPodsService.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.baumann.diaspora.services;
+package de.dfa.diaspora.services;
 
 import android.app.Service;
 import android.content.Intent;
@@ -42,7 +42,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class GetPodsService extends Service {
-    public static final String MESSAGE = "de.baumann.diaspora.podsreceived";
+    public static final String MESSAGE = "de.dfa.diaspora.podsreceived";
 
     private static final String TAG = "Diaspora Pod Service";
 
diff --git a/app/src/main/java/de/baumann/diaspora/utils/AvatarImageLoader.java b/app/src/main/java/de/dfa/diaspora/utils/AvatarImageLoader.java
similarity index 93%
rename from app/src/main/java/de/baumann/diaspora/utils/AvatarImageLoader.java
rename to app/src/main/java/de/dfa/diaspora/utils/AvatarImageLoader.java
index 83ba0e76..cf244348 100644
--- a/app/src/main/java/de/baumann/diaspora/utils/AvatarImageLoader.java
+++ b/app/src/main/java/de/dfa/diaspora/utils/AvatarImageLoader.java
@@ -1,4 +1,4 @@
-package de.baumann.diaspora.utils;
+package de.dfa.diaspora.utils;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -7,7 +7,7 @@ import android.widget.ImageView;
 
 import java.io.File;
 
-import de.baumann.diaspora.ImageDownloadTask;
+import de.dfa.diaspora.ImageDownloadTask;
 
 /**
  * Created by Gregor Santner (de-live-gdev) on 24.03.16.
diff --git a/app/src/main/java/de/baumann/diaspora/utils/Helpers.java b/app/src/main/java/de/dfa/diaspora/utils/Helpers.java
similarity index 98%
rename from app/src/main/java/de/baumann/diaspora/utils/Helpers.java
rename to app/src/main/java/de/dfa/diaspora/utils/Helpers.java
index 7808f6f4..34912086 100644
--- a/app/src/main/java/de/baumann/diaspora/utils/Helpers.java
+++ b/app/src/main/java/de/dfa/diaspora/utils/Helpers.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.baumann.diaspora.utils;
+package de.dfa.diaspora.utils;
 
 
 import android.content.Context;
diff --git a/app/src/main/java/de/baumann/diaspora/utils/SoftKeyboardStateWatcher.java b/app/src/main/java/de/dfa/diaspora/utils/SoftKeyboardStateWatcher.java
similarity index 98%
rename from app/src/main/java/de/baumann/diaspora/utils/SoftKeyboardStateWatcher.java
rename to app/src/main/java/de/dfa/diaspora/utils/SoftKeyboardStateWatcher.java
index 624c5f81..2a9f836e 100644
--- a/app/src/main/java/de/baumann/diaspora/utils/SoftKeyboardStateWatcher.java
+++ b/app/src/main/java/de/dfa/diaspora/utils/SoftKeyboardStateWatcher.java
@@ -1,4 +1,4 @@
-package de.baumann.diaspora.utils;
+package de.dfa.diaspora.utils;
 
 /**
  * Created by juergen on 25.03.16. Part of Diaspora WebApp.
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index f09539b6..24c48cf7 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-    tools:context="de.baumann.myapplication.MainActivity">
+    tools:context="de.dfa.myapplication.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -37,7 +37,7 @@
         android:layout_marginRight="8dp"
         android:layout_marginBottom="4dp"
         android:layout_marginEnd="8dp"
-        app:layout_behavior="de.baumann.diaspora.FloatingActionsMenuBehavior">
+        app:layout_behavior="de.dfa.diaspora.FloatingActionsMenuBehavior">
 
         <com.getbase.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab_top"
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index e842ce1d..65a6b8fc 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="de.baumann.myapplication.MainActivity"
+    tools:context="de.dfa.myapplication.MainActivity"
     tools:showIn="@layout/app_bar_main">
 
     <android.support.v4.widget.SwipeRefreshLayout