From 42f73b9418e14bdf22e0dee59a43d85460b5381e Mon Sep 17 00:00:00 2001
From: Gregor Santner <gdev@live.de>
Date: Tue, 29 Mar 2016 19:38:50 +0200
Subject: [PATCH] Final package id

---
 app/build.gradle                                 |  2 +-
 app/src/main/AndroidManifest.xml                 | 16 ++++++++--------
 .../github}/dfa/diaspora_android/App.java        |  6 +++---
 .../diaspora_android/activity/MainActivity.java  | 16 ++++++++--------
 .../diaspora_android/activity/PodsActivity.java  | 12 ++++++------
 .../diaspora_android/activity/ShareActivity.java | 10 +++++-----
 .../activity/ShareActivity2.java                 | 10 +++++-----
 .../activity/SplashActivity.java                 |  8 ++++----
 .../dfa/diaspora_android/data/AppSettings.java   |  2 +-
 .../diaspora_android/data/WebUserProfile.java    |  8 ++++----
 .../listener/SoftKeyboardStateWatcher.java       |  2 +-
 .../listener/WebUserProfileChangedListener.java  |  2 +-
 .../diaspora_android/task/GetPodsService.java    |  4 ++--
 .../diaspora_android/task/ImageDownloadTask.java |  6 +++---
 .../ui/FloatingActionsMenuBehavior.java          |  2 +-
 .../diaspora_android/util/AvatarImageLoader.java |  6 +++---
 .../dfa/diaspora_android/util/Helpers.java       |  2 +-
 app/src/main/res/layout/activity_pods.xml        |  2 +-
 app/src/main/res/layout/activity_splash.xml      |  2 +-
 app/src/main/res/layout/app_bar_main.xml         |  4 ++--
 app/src/main/res/layout/content_main.xml         |  2 +-
 app/src/main/res/menu/menu_compose.xml           |  2 +-
 app/src/main/res/menu/menu_main.xml              |  2 +-
 app/src/main/res/menu/menu_pods.xml              |  2 +-
 24 files changed, 65 insertions(+), 65 deletions(-)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/App.java (80%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/activity/MainActivity.java (99%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/activity/PodsActivity.java (97%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/activity/ShareActivity.java (98%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/activity/ShareActivity2.java (98%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/activity/SplashActivity.java (94%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/data/AppSettings.java (98%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/data/WebUserProfile.java (96%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java (98%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/listener/WebUserProfileChangedListener.java (87%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/task/GetPodsService.java (97%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/task/ImageDownloadTask.java (95%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/ui/FloatingActionsMenuBehavior.java (95%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/util/AvatarImageLoader.java (91%)
 rename app/src/main/java/{de => com/github}/dfa/diaspora_android/util/Helpers.java (98%)

diff --git a/app/build.gradle b/app/build.gradle
index acda24e7..707cdd36 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        applicationId "de.dfa.diaspora_android"
+        applicationId "com.github.dfa.diaspora_android"
         minSdkVersion 15
         targetSdkVersion 23
         versionCode 1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b17cf461..0edf9dc7 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.dfa.diaspora_android">
+    package="com.github.dfa.diaspora_android">
 
     <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="de.dfa.diaspora_android.App"
+        android:name="com.github.dfa.diaspora_android.App"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".activity.SplashActivity"
+            android:name="com.github.dfa.diaspora_android.activity.SplashActivity"
             android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
@@ -26,7 +26,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.PodsActivity"
+            android:name="com.github.dfa.diaspora_android.activity.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=".activity.MainActivity"
+            android:name="com.github.dfa.diaspora_android.activity.MainActivity"
             android:launchMode="singleInstance"
             android:windowSoftInputMode="adjustResize"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -43,7 +43,7 @@
         </activity>
 
         <activity
-            android:name=".activity.ShareActivity"
+            android:name="com.github.dfa.diaspora_android.activity.ShareActivity"
             android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/new_post"
@@ -58,7 +58,7 @@
         </activity>
 
         <activity
-            android:name=".activity.ShareActivity2"
+            android:name="com.github.dfa.diaspora_android.activity.ShareActivity2"
             android:launchMode="singleInstance"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/new_post"
@@ -74,7 +74,7 @@
         </activity>
 
         <service
-            android:name=".task.GetPodsService"
+            android:name="com.github.dfa.diaspora_android.task.GetPodsService"
             android:enabled="true"
             android:exported="false" >
         </service>
diff --git a/app/src/main/java/de/dfa/diaspora_android/App.java b/app/src/main/java/com/github/dfa/diaspora_android/App.java
similarity index 80%
rename from app/src/main/java/de/dfa/diaspora_android/App.java
rename to app/src/main/java/com/github/dfa/diaspora_android/App.java
index 52066191..a79c3293 100644
--- a/app/src/main/java/de/dfa/diaspora_android/App.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/App.java
@@ -1,9 +1,9 @@
-package de.dfa.diaspora_android;
+package com.github.dfa.diaspora_android;
 
 import android.app.Application;
 
-import de.dfa.diaspora_android.data.AppSettings;
-import de.dfa.diaspora_android.util.AvatarImageLoader;
+import com.github.dfa.diaspora_android.data.AppSettings;
+import com.github.dfa.diaspora_android.util.AvatarImageLoader;
 
 /**
  * Created by gregor on 24.03.16.
diff --git a/app/src/main/java/de/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
similarity index 99%
rename from app/src/main/java/de/dfa/diaspora_android/activity/MainActivity.java
rename to app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
index 82bcc535..3c9a501b 100644
--- a/app/src/main/java/de/dfa/diaspora_android/activity/MainActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.dfa.diaspora_android.activity;
+package com.github.dfa.diaspora_android.activity;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -69,6 +69,13 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.getbase.floatingactionbutton.FloatingActionsMenu;
+import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.R;
+import com.github.dfa.diaspora_android.data.AppSettings;
+import com.github.dfa.diaspora_android.data.WebUserProfile;
+import com.github.dfa.diaspora_android.listener.SoftKeyboardStateWatcher;
+import com.github.dfa.diaspora_android.listener.WebUserProfileChangedListener;
+import com.github.dfa.diaspora_android.util.Helpers;
 
 import org.json.JSONException;
 
@@ -80,13 +87,6 @@ import java.util.Date;
 
 import butterknife.Bind;
 import butterknife.ButterKnife;
-import de.dfa.diaspora_android.App;
-import de.dfa.diaspora_android.R;
-import de.dfa.diaspora_android.data.AppSettings;
-import de.dfa.diaspora_android.data.WebUserProfile;
-import de.dfa.diaspora_android.listener.SoftKeyboardStateWatcher;
-import de.dfa.diaspora_android.listener.WebUserProfileChangedListener;
-import de.dfa.diaspora_android.util.Helpers;
 
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener, WebUserProfileChangedListener {
diff --git a/app/src/main/java/de/dfa/diaspora_android/activity/PodsActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodsActivity.java
similarity index 97%
rename from app/src/main/java/de/dfa/diaspora_android/activity/PodsActivity.java
rename to app/src/main/java/com/github/dfa/diaspora_android/activity/PodsActivity.java
index f1362414..a9b10951 100644
--- a/app/src/main/java/de/dfa/diaspora_android/activity/PodsActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/PodsActivity.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.dfa.diaspora_android.activity;
+package com.github.dfa.diaspora_android.activity;
 
 import android.annotation.TargetApi;
 import android.app.AlertDialog;
@@ -44,14 +44,14 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.R;
+import com.github.dfa.diaspora_android.task.GetPodsService;
+import com.github.dfa.diaspora_android.util.Helpers;
+
 import java.util.ArrayList;
 import java.util.Collections;
 
-import de.dfa.diaspora_android.App;
-import de.dfa.diaspora_android.R;
-import de.dfa.diaspora_android.task.GetPodsService;
-import de.dfa.diaspora_android.util.Helpers;
-
 
 public class PodsActivity extends AppCompatActivity {
 
diff --git a/app/src/main/java/de/dfa/diaspora_android/activity/ShareActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java
similarity index 98%
rename from app/src/main/java/de/dfa/diaspora_android/activity/ShareActivity.java
rename to app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java
index 4cf45f0c..1a72ab5a 100644
--- a/app/src/main/java/de/dfa/diaspora_android/activity/ShareActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.dfa.diaspora_android.activity;
+package com.github.dfa.diaspora_android.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -40,15 +40,15 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 
+import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.R;
+import com.github.dfa.diaspora_android.util.Helpers;
+
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import de.dfa.diaspora_android.App;
-import de.dfa.diaspora_android.R;
-import de.dfa.diaspora_android.util.Helpers;
-
 public class ShareActivity extends MainActivity {
 
     private WebView webView;
diff --git a/app/src/main/java/de/dfa/diaspora_android/activity/ShareActivity2.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity2.java
similarity index 98%
rename from app/src/main/java/de/dfa/diaspora_android/activity/ShareActivity2.java
rename to app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity2.java
index 88397d2e..e466e9de 100644
--- a/app/src/main/java/de/dfa/diaspora_android/activity/ShareActivity2.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/ShareActivity2.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.dfa.diaspora_android.activity;
+package com.github.dfa.diaspora_android.activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -40,15 +40,15 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
 
+import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.R;
+import com.github.dfa.diaspora_android.util.Helpers;
+
 import java.io.File;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import de.dfa.diaspora_android.App;
-import de.dfa.diaspora_android.R;
-import de.dfa.diaspora_android.util.Helpers;
-
 public class ShareActivity2 extends MainActivity {
 
     private WebView webView;
diff --git a/app/src/main/java/de/dfa/diaspora_android/activity/SplashActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java
similarity index 94%
rename from app/src/main/java/de/dfa/diaspora_android/activity/SplashActivity.java
rename to app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java
index 1e291bca..176e4ec4 100644
--- a/app/src/main/java/de/dfa/diaspora_android/activity/SplashActivity.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/SplashActivity.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.dfa.diaspora_android.activity;
+package com.github.dfa.diaspora_android.activity;
 
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -26,12 +26,12 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.WindowManager;
 import android.widget.ImageView;
 
+import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.R;
+
 import java.util.Timer;
 import java.util.TimerTask;
 
-import de.dfa.diaspora_android.App;
-import de.dfa.diaspora_android.R;
-
 
 public class SplashActivity extends AppCompatActivity {
     private App app;
diff --git a/app/src/main/java/de/dfa/diaspora_android/data/AppSettings.java b/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
similarity index 98%
rename from app/src/main/java/de/dfa/diaspora_android/data/AppSettings.java
rename to app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
index 841909bd..fb694711 100644
--- a/app/src/main/java/de/dfa/diaspora_android/data/AppSettings.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/AppSettings.java
@@ -1,4 +1,4 @@
-package de.dfa.diaspora_android.data;
+package com.github.dfa.diaspora_android.data;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/de/dfa/diaspora_android/data/WebUserProfile.java b/app/src/main/java/com/github/dfa/diaspora_android/data/WebUserProfile.java
similarity index 96%
rename from app/src/main/java/de/dfa/diaspora_android/data/WebUserProfile.java
rename to app/src/main/java/com/github/dfa/diaspora_android/data/WebUserProfile.java
index 3cfb36f1..7b3a7af8 100644
--- a/app/src/main/java/de/dfa/diaspora_android/data/WebUserProfile.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/data/WebUserProfile.java
@@ -1,14 +1,14 @@
-package de.dfa.diaspora_android.data;
+package com.github.dfa.diaspora_android.data;
 
 import android.os.Handler;
 import android.util.Log;
 
+import com.github.dfa.diaspora_android.App;
+import com.github.dfa.diaspora_android.listener.WebUserProfileChangedListener;
+
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import de.dfa.diaspora_android.App;
-import de.dfa.diaspora_android.listener.WebUserProfileChangedListener;
-
 /**
  * Created by de-live-gdev on 24.03.16.  Part of Diaspora WebApp.
  */
diff --git a/app/src/main/java/de/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java b/app/src/main/java/com/github/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java
similarity index 98%
rename from app/src/main/java/de/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java
rename to app/src/main/java/com/github/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java
index c225ba1e..2fa16e3c 100644
--- a/app/src/main/java/de/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/SoftKeyboardStateWatcher.java
@@ -1,4 +1,4 @@
-package de.dfa.diaspora_android.listener;
+package com.github.dfa.diaspora_android.listener;
 
 /**
  * Created by juergen on 25.03.16. Part of Diaspora WebApp.
diff --git a/app/src/main/java/de/dfa/diaspora_android/listener/WebUserProfileChangedListener.java b/app/src/main/java/com/github/dfa/diaspora_android/listener/WebUserProfileChangedListener.java
similarity index 87%
rename from app/src/main/java/de/dfa/diaspora_android/listener/WebUserProfileChangedListener.java
rename to app/src/main/java/com/github/dfa/diaspora_android/listener/WebUserProfileChangedListener.java
index 519a4850..8a4cc312 100644
--- a/app/src/main/java/de/dfa/diaspora_android/listener/WebUserProfileChangedListener.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/listener/WebUserProfileChangedListener.java
@@ -1,4 +1,4 @@
-package de.dfa.diaspora_android.listener;
+package com.github.dfa.diaspora_android.listener;
 
 /**
  * Created by Gregor Santner (de-live-gdev) on 26.03.16.
diff --git a/app/src/main/java/de/dfa/diaspora_android/task/GetPodsService.java b/app/src/main/java/com/github/dfa/diaspora_android/task/GetPodsService.java
similarity index 97%
rename from app/src/main/java/de/dfa/diaspora_android/task/GetPodsService.java
rename to app/src/main/java/com/github/dfa/diaspora_android/task/GetPodsService.java
index cae2bfb0..c07c5a5d 100644
--- a/app/src/main/java/de/dfa/diaspora_android/task/GetPodsService.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/task/GetPodsService.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.dfa.diaspora_android.task;
+package com.github.dfa.diaspora_android.task;
 
 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.dfa.diaspora.podsreceived";
+    public static final String MESSAGE = "com.github.dfa.diaspora.podsreceived";
 
     private static final String TAG = "Diaspora Pod Service";
 
diff --git a/app/src/main/java/de/dfa/diaspora_android/task/ImageDownloadTask.java b/app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java
similarity index 95%
rename from app/src/main/java/de/dfa/diaspora_android/task/ImageDownloadTask.java
rename to app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java
index cc7fa580..eecfb6a4 100644
--- a/app/src/main/java/de/dfa/diaspora_android/task/ImageDownloadTask.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/task/ImageDownloadTask.java
@@ -1,4 +1,4 @@
-package de.dfa.diaspora_android.task;
+package com.github.dfa.diaspora_android.task;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -7,12 +7,12 @@ import android.support.annotation.Nullable;
 import android.util.Log;
 import android.widget.ImageView;
 
+import com.github.dfa.diaspora_android.App;
+
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import de.dfa.diaspora_android.App;
-
 /**
  * Created by Gregor Santner (de-live-gdev) on 24.03.16.
  */
diff --git a/app/src/main/java/de/dfa/diaspora_android/ui/FloatingActionsMenuBehavior.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/FloatingActionsMenuBehavior.java
similarity index 95%
rename from app/src/main/java/de/dfa/diaspora_android/ui/FloatingActionsMenuBehavior.java
rename to app/src/main/java/com/github/dfa/diaspora_android/ui/FloatingActionsMenuBehavior.java
index 03a8abc9..0100ee51 100644
--- a/app/src/main/java/de/dfa/diaspora_android/ui/FloatingActionsMenuBehavior.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/FloatingActionsMenuBehavior.java
@@ -1,4 +1,4 @@
-package de.dfa.diaspora_android.ui;
+package com.github.dfa.diaspora_android.ui;
 
 /**
  * Created by juergen on 29.02.16. Part of Diaspora WebApp.
diff --git a/app/src/main/java/de/dfa/diaspora_android/util/AvatarImageLoader.java b/app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java
similarity index 91%
rename from app/src/main/java/de/dfa/diaspora_android/util/AvatarImageLoader.java
rename to app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java
index 9bc6cf07..088b21f5 100644
--- a/app/src/main/java/de/dfa/diaspora_android/util/AvatarImageLoader.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/AvatarImageLoader.java
@@ -1,13 +1,13 @@
-package de.dfa.diaspora_android.util;
+package com.github.dfa.diaspora_android.util;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.widget.ImageView;
 
-import java.io.File;
+import com.github.dfa.diaspora_android.task.ImageDownloadTask;
 
-import de.dfa.diaspora_android.task.ImageDownloadTask;
+import java.io.File;
 
 /**
  * Created by Gregor Santner (de-live-gdev) on 24.03.16.
diff --git a/app/src/main/java/de/dfa/diaspora_android/util/Helpers.java b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
similarity index 98%
rename from app/src/main/java/de/dfa/diaspora_android/util/Helpers.java
rename to app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
index 48792235..1ad1da44 100644
--- a/app/src/main/java/de/dfa/diaspora_android/util/Helpers.java
+++ b/app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
@@ -17,7 +17,7 @@
     If not, see <http://www.gnu.org/licenses/>.
  */
 
-package de.dfa.diaspora_android.util;
+package com.github.dfa.diaspora_android.util;
 
 
 import android.content.Context;
diff --git a/app/src/main/res/layout/activity_pods.xml b/app/src/main/res/layout/activity_pods.xml
index 41c9050e..d2329f30 100644
--- a/app/src/main/res/layout/activity_pods.xml
+++ b/app/src/main/res/layout/activity_pods.xml
@@ -7,7 +7,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".activity.PodsActivity">
+    tools:context="com.github.dfa.diaspora_android.activity.PodsActivity">
 
     <ListView
         android:id="@+id/lstPods"
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index c2752e03..a5c9f697 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -2,7 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.SplashActivity">
+    tools:context="com.github.dfa.diaspora_android.activity.SplashActivity">
 
     <ImageView
         android:id="@+id/imgSplash"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index a20e8dd6..a4037bf1 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.dfa.myapplication.MainActivity">
+    tools:context=".activity.MainActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -33,7 +33,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"
         android:visibility="gone"
-        app:layout_behavior="de.dfa.diaspora_android.ui.FloatingActionsMenuBehavior"
+        app:layout_behavior=".ui.FloatingActionsMenuBehavior"
         fab:fab_addButtonColorNormal="@color/fab_big"
         fab:fab_addButtonColorPressed="@color/fab_big_pressed"
         fab:fab_addButtonPlusIconColor="@color/white"
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 2489ecc4..074bfa1c 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.dfa.myapplication.MainActivity"
+    tools:context="com.github.dfa.myapplication.MainActivity"
     tools:showIn="@layout/app_bar_main">
 
     <android.support.v4.widget.SwipeRefreshLayout
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index ef9f4af2..3640fe90 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context="com.github.dfa.diaspora_android.activity.MainActivity">
 
     <item
         android:id="@+id/action_exit"
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 8c6ab81e..ec8ad3ca 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context="com.github.dfa.diaspora_android.activity.MainActivity">
 
     <item
         android:id="@+id/action_notifications"
diff --git a/app/src/main/res/menu/menu_pods.xml b/app/src/main/res/menu/menu_pods.xml
index 733e9432..51f7c17c 100644
--- a/app/src/main/res/menu/menu_pods.xml
+++ b/app/src/main/res/menu/menu_pods.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.PodsActivity">
+    tools:context="com.github.dfa.diaspora_android.activity.PodsActivity">
 
     <item
         android:id="@+id/action_reload"