diff --git a/ServerProxy/AndroidManifest.xml b/ServerProxy/AndroidManifest.xml
index 0a01ed9f0..7e45fe788 100644
--- a/ServerProxy/AndroidManifest.xml
+++ b/ServerProxy/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="github.daneren2005.serverproxy">
+    package="github.paroj.serverproxy">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 </manifest>
diff --git a/ServerProxy/src/github/daneren2005/serverproxy/BufferFile.java b/ServerProxy/src/github/paroj/serverproxy/BufferFile.java
similarity index 95%
rename from ServerProxy/src/github/daneren2005/serverproxy/BufferFile.java
rename to ServerProxy/src/github/paroj/serverproxy/BufferFile.java
index 59b306a2c..ba580467c 100644
--- a/ServerProxy/src/github/daneren2005/serverproxy/BufferFile.java
+++ b/ServerProxy/src/github/paroj/serverproxy/BufferFile.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.serverproxy;
+package github.paroj.serverproxy;
 
 import java.io.File;
 
diff --git a/ServerProxy/src/github/daneren2005/serverproxy/BufferProxy.java b/ServerProxy/src/github/paroj/serverproxy/BufferProxy.java
similarity index 97%
rename from ServerProxy/src/github/daneren2005/serverproxy/BufferProxy.java
rename to ServerProxy/src/github/paroj/serverproxy/BufferProxy.java
index 969536551..f3eda7915 100644
--- a/ServerProxy/src/github/daneren2005/serverproxy/BufferProxy.java
+++ b/ServerProxy/src/github/paroj/serverproxy/BufferProxy.java
@@ -13,7 +13,7 @@
 Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.serverproxy;
+package github.paroj.serverproxy;
 
 import java.io.File;
 import java.net.Socket;
diff --git a/ServerProxy/src/github/daneren2005/serverproxy/FileProxy.java b/ServerProxy/src/github/paroj/serverproxy/FileProxy.java
similarity index 99%
rename from ServerProxy/src/github/daneren2005/serverproxy/FileProxy.java
rename to ServerProxy/src/github/paroj/serverproxy/FileProxy.java
index 0465723d4..88daeef7b 100644
--- a/ServerProxy/src/github/daneren2005/serverproxy/FileProxy.java
+++ b/ServerProxy/src/github/paroj/serverproxy/FileProxy.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.serverproxy;
+package github.paroj.serverproxy;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/ServerProxy/src/github/daneren2005/serverproxy/ServerProxy.java b/ServerProxy/src/github/paroj/serverproxy/ServerProxy.java
similarity index 98%
rename from ServerProxy/src/github/daneren2005/serverproxy/ServerProxy.java
rename to ServerProxy/src/github/paroj/serverproxy/ServerProxy.java
index 5564e1074..a49c2bcc1 100644
--- a/ServerProxy/src/github/daneren2005/serverproxy/ServerProxy.java
+++ b/ServerProxy/src/github/paroj/serverproxy/ServerProxy.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.serverproxy;
+package github.paroj.serverproxy;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -21,12 +21,10 @@
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
-import java.net.HttpURLConnection;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
-import java.net.URL;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.net.UnknownHostException;
diff --git a/ServerProxy/src/github/daneren2005/serverproxy/WebProxy.java b/ServerProxy/src/github/paroj/serverproxy/WebProxy.java
similarity index 99%
rename from ServerProxy/src/github/daneren2005/serverproxy/WebProxy.java
rename to ServerProxy/src/github/paroj/serverproxy/WebProxy.java
index a8f7d395a..4eeefac5f 100644
--- a/ServerProxy/src/github/daneren2005/serverproxy/WebProxy.java
+++ b/ServerProxy/src/github/paroj/serverproxy/WebProxy.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.serverproxy;
+package github.paroj.serverproxy;
 
 import android.content.Context;
 import android.util.Log;
diff --git a/app/build.gradle b/app/build.gradle
index 7253bb077..30fb9eb35 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ android {
 	compileSdkVersion 30
 
 	defaultConfig {
-		applicationId "github.daneren2005.dsub"
+		applicationId "github.paroj.dsub2000"
 		minSdkVersion 24
 		targetSdkVersion 30
 		versionCode 208
@@ -54,7 +54,7 @@ android {
 		}
 	}
 
-	namespace 'github.daneren2005.dsub'
+	namespace 'github.paroj.dsub2000'
 	lint {
 		checkReleaseBuilds false
 	}
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/ApplicationTest.java b/app/src/androidTest/java/github/paroj/dsub2000/ApplicationTest.java
similarity index 71%
rename from app/src/androidTest/java/github/daneren2005/dsub/ApplicationTest.java
rename to app/src/androidTest/java/github/paroj/dsub2000/ApplicationTest.java
index a9ec53620..37a89f869 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/ApplicationTest.java
+++ b/app/src/androidTest/java/github/paroj/dsub2000/ApplicationTest.java
@@ -1,6 +1,4 @@
-package github.daneren2005.dsub;
-
-import android.app.Application;
+package github.paroj.dsub2000;
 
 /**
  * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/activity/SubsonicFragmentActivityTest.java b/app/src/androidTest/java/github/paroj/dsub2000/activity/SubsonicFragmentActivityTest.java
similarity index 90%
rename from app/src/androidTest/java/github/daneren2005/dsub/activity/SubsonicFragmentActivityTest.java
rename to app/src/androidTest/java/github/paroj/dsub2000/activity/SubsonicFragmentActivityTest.java
index 5e11c2c79..90892fc68 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/activity/SubsonicFragmentActivityTest.java
+++ b/app/src/androidTest/java/github/paroj/dsub2000/activity/SubsonicFragmentActivityTest.java
@@ -1,6 +1,6 @@
-package github.daneren2005.dsub.activity;
+package github.paroj.dsub2000.activity;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Before;
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/adapter/EntryGridAdapterTest.java b/app/src/androidTest/java/github/paroj/dsub2000/adapter/EntryGridAdapterTest.java
similarity index 82%
rename from app/src/androidTest/java/github/daneren2005/dsub/adapter/EntryGridAdapterTest.java
rename to app/src/androidTest/java/github/paroj/dsub2000/adapter/EntryGridAdapterTest.java
index 813341d24..5c937fa51 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/adapter/EntryGridAdapterTest.java
+++ b/app/src/androidTest/java/github/paroj/dsub2000/adapter/EntryGridAdapterTest.java
@@ -1,6 +1,4 @@
-package github.daneren2005.dsub.adapter;
-
-import org.junit.Test;
+package github.paroj.dsub2000.adapter;
 
 import static org.junit.Assert.assertEquals;
 
@@ -8,7 +6,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
 
 
 public class EntryGridAdapterTest {
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/domain/BookmarkTest.java b/app/src/androidTest/java/github/paroj/dsub2000/domain/BookmarkTest.java
similarity index 96%
rename from app/src/androidTest/java/github/daneren2005/dsub/domain/BookmarkTest.java
rename to app/src/androidTest/java/github/paroj/dsub2000/domain/BookmarkTest.java
index 30663543c..5ade2ca5d 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/domain/BookmarkTest.java
+++ b/app/src/androidTest/java/github/paroj/dsub2000/domain/BookmarkTest.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/domain/GenreComparatorTest.java b/app/src/androidTest/java/github/paroj/dsub2000/domain/GenreComparatorTest.java
similarity index 97%
rename from app/src/androidTest/java/github/daneren2005/dsub/domain/GenreComparatorTest.java
rename to app/src/androidTest/java/github/paroj/dsub2000/domain/GenreComparatorTest.java
index 16d189faf..b66e5bab8 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/domain/GenreComparatorTest.java
+++ b/app/src/androidTest/java/github/paroj/dsub2000/domain/GenreComparatorTest.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/domain/JUPNPTest.java b/app/src/androidTest/java/github/paroj/dsub2000/domain/JUPNPTest.java
similarity index 97%
rename from app/src/androidTest/java/github/daneren2005/dsub/domain/JUPNPTest.java
rename to app/src/androidTest/java/github/paroj/dsub2000/domain/JUPNPTest.java
index f161fc91d..a506b9b2d 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/domain/JUPNPTest.java
+++ b/app/src/androidTest/java/github/paroj/dsub2000/domain/JUPNPTest.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.text.ParseException;
 
diff --git a/app/src/androidTest/java/github/daneren2005/dsub/service/DownloadServiceTest.java b/app/src/androidTest/java/github/paroj/dsub2000/service/DownloadServiceTest.java
similarity index 94%
rename from app/src/androidTest/java/github/daneren2005/dsub/service/DownloadServiceTest.java
rename to app/src/androidTest/java/github/paroj/dsub2000/service/DownloadServiceTest.java
index ba5d231ee..c90226678 100644
--- a/app/src/androidTest/java/github/daneren2005/dsub/service/DownloadServiceTest.java
+++ b/app/src/androidTest/java/github/paroj/dsub2000/service/DownloadServiceTest.java
@@ -1,19 +1,18 @@
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
-import static github.daneren2005.dsub.domain.PlayerState.COMPLETED;
-import static github.daneren2005.dsub.domain.PlayerState.IDLE;
-import static github.daneren2005.dsub.domain.PlayerState.PAUSED;
-import static github.daneren2005.dsub.domain.PlayerState.STARTED;
-import static github.daneren2005.dsub.domain.PlayerState.STOPPED;
+import static github.paroj.dsub2000.domain.PlayerState.COMPLETED;
+import static github.paroj.dsub2000.domain.PlayerState.IDLE;
+import static github.paroj.dsub2000.domain.PlayerState.PAUSED;
+import static github.paroj.dsub2000.domain.PlayerState.STARTED;
+import static github.paroj.dsub2000.domain.PlayerState.STOPPED;
 import java.util.List;
 
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerState;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerState;
 
 import java.util.LinkedList;
 
-import android.app.Instrumentation;
 import android.content.Context;
 import android.util.Log;
 
diff --git a/app/src/floss/java/github/daneren2005/dsub/util/compat/GoogleCompat.java b/app/src/floss/java/github/paroj/dsub2000/util/compat/GoogleCompat.java
similarity index 80%
rename from app/src/floss/java/github/daneren2005/dsub/util/compat/GoogleCompat.java
rename to app/src/floss/java/github/paroj/dsub2000/util/compat/GoogleCompat.java
index f557bd31b..2d58a7ece 100644
--- a/app/src/floss/java/github/daneren2005/dsub/util/compat/GoogleCompat.java
+++ b/app/src/floss/java/github/paroj/dsub2000/util/compat/GoogleCompat.java
@@ -1,10 +1,10 @@
-package github.daneren2005.dsub.util.compat;
+package github.paroj.dsub2000.util.compat;
 
 import android.content.Context;
 import androidx.mediarouter.media.MediaRouter;
 
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.RemoteController;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.RemoteController;
 
 
 // Provides stubs for Google-related functionality
diff --git a/app/src/google/AndroidManifest.xml b/app/src/google/AndroidManifest.xml
index 2be4ac77e..28294118e 100644
--- a/app/src/google/AndroidManifest.xml
+++ b/app/src/google/AndroidManifest.xml
@@ -2,9 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:label="@string/common.appname"
-         android:backupAgent="github.daneren2005.dsub.util.SettingsBackupAgent"
+         android:backupAgent="github.paroj.dsub2000.util.SettingsBackupAgent"
          android:icon="@drawable/launch"
-         android:theme="@style/Theme.DSub.Light"
+         android:theme="@style/Theme.DSub2000.Light"
          android:largeHeap="true">
 
         <meta-data
diff --git a/app/src/google/java/github/daneren2005/dsub/service/ChromeCastController.java b/app/src/google/java/github/daneren2005/dsub/service/ChromeCastController.java
index 2bd4cb593..03b5dac39 100644
--- a/app/src/google/java/github/daneren2005/dsub/service/ChromeCastController.java
+++ b/app/src/google/java/github/daneren2005/dsub/service/ChromeCastController.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -37,19 +37,19 @@
 import java.io.File;
 import java.io.IOException;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.domain.RemoteControlState;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.EnvironmentVariables;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.serverproxy.FileProxy;
-import github.daneren2005.serverproxy.ServerProxy;
-import github.daneren2005.serverproxy.WebProxy;
-
-import static github.daneren2005.dsub.util.compat.GoogleCompat.castApplicationId;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.domain.RemoteControlState;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.EnvironmentVariables;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.serverproxy.FileProxy;
+import github.paroj.serverproxy.ServerProxy;
+import github.paroj.serverproxy.WebProxy;
+
+import static github.paroj.dsub2000.util.compat.GoogleCompat.castApplicationId;
 
 /**
  * Created by owner on 2/9/14.
diff --git a/app/src/google/java/github/daneren2005/dsub/util/compat/GoogleCompat.java b/app/src/google/java/github/daneren2005/dsub/util/compat/GoogleCompat.java
index 6f1cf310d..d0700a283 100644
--- a/app/src/google/java/github/daneren2005/dsub/util/compat/GoogleCompat.java
+++ b/app/src/google/java/github/daneren2005/dsub/util/compat/GoogleCompat.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.util.compat;
+package github.paroj.dsub2000.util.compat;
 
 import android.content.Context;
 import androidx.mediarouter.media.MediaRouter;
@@ -11,10 +11,10 @@
 import com.google.android.gms.security.ProviderInstaller;
 import static com.google.android.gms.cast.CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID;
 
-import github.daneren2005.dsub.service.ChromeCastController;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.RemoteController;
-import github.daneren2005.dsub.util.EnvironmentVariables;
+import github.paroj.dsub2000.service.ChromeCastController;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.RemoteController;
+import github.paroj.dsub2000.util.EnvironmentVariables;
 
 public final class GoogleCompat {
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d1eb61f2..9e72179bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 	android:installLocation="internalOnly">
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-		android:targetPackage="github.daneren2005.dsub"
+		android:targetPackage="github.paroj.dsub2000"
 		android:label="Tests" />
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -35,15 +35,15 @@
     <supports-screens android:anyDensity="true" android:xlargeScreens="true" android:largeScreens="true" android:normalScreens="true" android:smallScreens="true"/>
 
     <application android:label="@string/common.appname"
-    	android:backupAgent="github.daneren2005.dsub.util.SettingsBackupAgent"
+    	android:backupAgent="github.paroj.dsub2000.util.SettingsBackupAgent"
     	android:icon="@drawable/launch"
-    	android:theme="@style/Theme.DSub.Light"
+    	android:theme="@style/Theme.DSub2000.Light"
 		android:largeHeap="true"
 		android:usesCleartextTraffic="true">
     	
         <uses-library android:name="android.test.runner" />
 
-		<activity android:name="github.daneren2005.dsub.activity.SubsonicFragmentActivity"
+		<activity android:name="github.paroj.dsub2000.activity.SubsonicFragmentActivity"
 				  android:configChanges="keyboardHidden"
 				  android:launchMode="singleTask">
 			<intent-filter>
@@ -53,11 +53,11 @@
 			</intent-filter>
 		</activity>
 
-        <activity android:name="github.daneren2005.dsub.activity.SettingsActivity"
+        <activity android:name="github.paroj.dsub2000.activity.SettingsActivity"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="github.daneren2005.dsub.activity.VoiceQueryReceiverActivity"
+        <activity android:name="github.paroj.dsub2000.activity.VoiceQueryReceiverActivity"
                   android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
@@ -71,7 +71,7 @@
 			</intent-filter>
         </activity>
 
-        <activity android:name="github.daneren2005.dsub.activity.QueryReceiverActivity"
+        <activity android:name="github.paroj.dsub2000.activity.QueryReceiverActivity"
                   android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH"/>
@@ -80,7 +80,7 @@
         </activity>
 
 		<activity
-			android:name="github.daneren2005.dsub.activity.EditPlayActionActivity"
+			android:name="github.paroj.dsub2000.activity.EditPlayActionActivity"
 			android:label="@string/tasker.start_playing"
 			android:icon="@drawable/launch">
 
@@ -89,11 +89,11 @@
 			</intent-filter>
 		</activity>
 
-        <service android:name="github.daneren2005.dsub.service.DownloadService"
+        <service android:name="github.paroj.dsub2000.service.DownloadService"
                  android:label="DSub Playback Service"
                  android:foregroundServiceType="location"/>
 
-		<service android:name="github.daneren2005.dsub.service.AutoMediaBrowserService"
+		<service android:name="github.paroj.dsub2000.service.AutoMediaBrowserService"
 				 android:exported="true">
 
 			<intent-filter>
@@ -102,7 +102,7 @@
 		</service>
 
 		<service android:name="org.jupnp.android.AndroidUpnpServiceImpl"/>
-		<service android:name="github.daneren2005.dsub.service.sync.AuthenticatorService">
+		<service android:name="github.paroj.dsub2000.service.sync.AuthenticatorService">
 			<intent-filter>
 				<action android:name="android.accounts.AccountAuthenticator"/>
 			</intent-filter>
@@ -110,7 +110,7 @@
 			<meta-data android:name="android.accounts.AccountAuthenticator"
 				android:resource="@xml/authenticator" />
 		</service>
-		<service android:name="github.daneren2005.dsub.service.sync.PlaylistSyncService"
+		<service android:name="github.paroj.dsub2000.service.sync.PlaylistSyncService"
 			android:exported="true"
 			android:process=":sync">
 
@@ -120,7 +120,7 @@
 			<meta-data android:name="android.content.SyncAdapter"
 				android:resource="@xml/playlists_syncadapter" />
 		</service>
-		<service android:name="github.daneren2005.dsub.service.sync.PodcastSyncService"
+		<service android:name="github.paroj.dsub2000.service.sync.PodcastSyncService"
 				 android:exported="true"
 				 android:process=":sync">
 
@@ -130,7 +130,7 @@
 			<meta-data android:name="android.content.SyncAdapter"
 					   android:resource="@xml/podcasts_syncadapter" />
 		</service>
-		<service android:name="github.daneren2005.dsub.service.sync.StarredSyncService"
+		<service android:name="github.paroj.dsub2000.service.sync.StarredSyncService"
 				 android:exported="true"
 				 android:process=":sync">
 
@@ -140,7 +140,7 @@
 			<meta-data android:name="android.content.SyncAdapter"
 					   android:resource="@xml/starred_syncadapter" />
 		</service>
-		<service android:name="github.daneren2005.dsub.service.sync.MostRecentSyncService"
+		<service android:name="github.paroj.dsub2000.service.sync.MostRecentSyncService"
 				 android:exported="true"
 				 android:process=":sync">
 
@@ -151,30 +151,30 @@
 					   android:resource="@xml/mostrecent_syncadapter" />
 		</service>
 
-		<service android:name="github.daneren2005.dsub.service.HeadphoneListenerService"
+		<service android:name="github.paroj.dsub2000.service.HeadphoneListenerService"
 			android:label="DSub Headphone Listener"/>
 		<receiver
-			android:name="github.daneren2005.dsub.receiver.BootReceiver">
+			android:name="github.paroj.dsub2000.receiver.BootReceiver">
 			<intent-filter>
 				<action
 					android:name="android.intent.action.BOOT_COMPLETED" />
 			</intent-filter>
 		</receiver>
 
-        <receiver android:name="github.daneren2005.dsub.receiver.MediaButtonIntentReceiver">
+        <receiver android:name="github.paroj.dsub2000.receiver.MediaButtonIntentReceiver">
         	<intent-filter>
 				<action android:name="android.intent.action.MEDIA_BUTTON" />
 			</intent-filter>
         </receiver>
 
-		<receiver android:name="github.daneren2005.dsub.receiver.A2dpIntentReceiver">
+		<receiver android:name="github.paroj.dsub2000.receiver.A2dpIntentReceiver">
 			<intent-filter>
 				<action android:name="android.music.playstatusrequest"/>
 			</intent-filter>
 		</receiver>
 
         <receiver
-			android:name="github.daneren2005.dsub.provider.DSubWidget4x1"
+			android:name="github.paroj.dsub2000.provider.DSubWidget4x1"
 			android:label="@string/widget.4x1">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -182,7 +182,7 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget4x1"/>
         </receiver>
 		<receiver
-			android:name="github.daneren2005.dsub.provider.DSubWidget4x2"
+			android:name="github.paroj.dsub2000.provider.DSubWidget4x2"
 			android:label="@string/widget.4x2">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -190,7 +190,7 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget4x2"/>
         </receiver>
 		<receiver
-			android:name="github.daneren2005.dsub.provider.DSubWidget4x3"
+			android:name="github.paroj.dsub2000.provider.DSubWidget4x3"
 			android:label="@string/widget.4x3">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -198,7 +198,7 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget4x3"/>
         </receiver>
 		<receiver
-			android:name="github.daneren2005.dsub.provider.DSubWidget4x4"
+			android:name="github.paroj.dsub2000.provider.DSubWidget4x4"
 			android:label="@string/widget.4x4">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -207,38 +207,38 @@
         </receiver>
 
 		<receiver
-			android:name="github.daneren2005.dsub.receiver.PlayActionReceiver">
+			android:name="github.paroj.dsub2000.receiver.PlayActionReceiver">
 
 			<intent-filter>
 				<action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
 			</intent-filter>
 		</receiver>
 
-        <provider android:name="github.daneren2005.dsub.provider.DSubSearchProvider"
+        <provider android:name="github.paroj.dsub2000.provider.DSubSearchProvider"
                   android:authorities="@string/provider.search"/>
-		<provider android:name="github.daneren2005.dsub.provider.PlaylistStubProvider"
+		<provider android:name="github.paroj.dsub2000.provider.PlaylistStubProvider"
 			android:authorities="@string/provider.playlist"
 			android:label="@string/button_bar.playlists"
 			android:exported="false"
 			android:syncable="true"/>
-		<provider android:name="github.daneren2005.dsub.provider.PodcastStubProvider"
+		<provider android:name="github.paroj.dsub2000.provider.PodcastStubProvider"
 			android:authorities="@string/provider.podcast"
 			android:label="@string/button_bar.podcasts"
 			android:exported="false"
 			android:syncable="true"/>
-		<provider android:name="github.daneren2005.dsub.provider.StarredStubProvider"
+		<provider android:name="github.paroj.dsub2000.provider.StarredStubProvider"
 				  android:authorities="@string/provider.starred"
 				  android:label="@string/main.albums_starred"
 				  android:exported="false"
 				  android:syncable="true"/>
-		<provider android:name="github.daneren2005.dsub.provider.MostRecentStubProvider"
+		<provider android:name="github.paroj.dsub2000.provider.MostRecentStubProvider"
 				  android:authorities="@string/provider.recently_added"
 				  android:label="@string/main.albums_newest"
 				  android:exported="false"
 				  android:syncable="true"/>
 
         <meta-data android:name="android.app.default_searchable"
-                   android:value="github.daneren2005.dsub.activity.QueryReceiverActivity"/>
+                   android:value="github.paroj.dsub2000.activity.QueryReceiverActivity"/>
 
 	</application>
 
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/EditPlayActionActivity.java b/app/src/main/java/github/paroj/dsub2000/activity/EditPlayActionActivity.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/activity/EditPlayActionActivity.java
rename to app/src/main/java/github/paroj/dsub2000/activity/EditPlayActionActivity.java
index bc56eeb79..be21ecbc2 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/EditPlayActionActivity.java
+++ b/app/src/main/java/github/paroj/dsub2000/activity/EditPlayActionActivity.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.activity;
+package github.paroj.dsub2000.activity;
 
 import android.app.Activity;
 import androidx.appcompat.app.AlertDialog;
@@ -36,15 +36,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.LoadingTask;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.LoadingTask;
+import github.paroj.dsub2000.util.Util;
 
 public class EditPlayActionActivity extends SubsonicActivity {
 	private CheckBox shuffleCheckbox;
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/QueryReceiverActivity.java b/app/src/main/java/github/paroj/dsub2000/activity/QueryReceiverActivity.java
similarity index 89%
rename from app/src/main/java/github/daneren2005/dsub/activity/QueryReceiverActivity.java
rename to app/src/main/java/github/paroj/dsub2000/activity/QueryReceiverActivity.java
index 68f46599d..d2adeac73 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/QueryReceiverActivity.java
+++ b/app/src/main/java/github/paroj/dsub2000/activity/QueryReceiverActivity.java
@@ -17,19 +17,15 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.activity;
+package github.paroj.dsub2000.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
-import android.provider.SearchRecentSuggestions;
-import android.util.Log;
 
-import github.daneren2005.dsub.fragments.SubsonicFragment;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.provider.DSubSearchProvider;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Receives search queries and forwards to the SearchFragment.
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SettingsActivity.java b/app/src/main/java/github/paroj/dsub2000/activity/SettingsActivity.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/activity/SettingsActivity.java
rename to app/src/main/java/github/paroj/dsub2000/activity/SettingsActivity.java
index fb5a01694..7cf8c041a 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/app/src/main/java/github/paroj/dsub2000/activity/SettingsActivity.java
@@ -16,17 +16,17 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.activity;
+package github.paroj.dsub2000.activity;
 
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
 import androidx.appcompat.widget.Toolbar;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.fragments.PreferenceCompatFragment;
-import github.daneren2005.dsub.fragments.SettingsFragment;
-import github.daneren2005.dsub.util.Constants;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.fragments.PreferenceCompatFragment;
+import github.paroj.dsub2000.fragments.SettingsFragment;
+import github.paroj.dsub2000.util.Constants;
 
 public class SettingsActivity extends SubsonicActivity {
 	private static final String TAG = SettingsActivity.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/paroj/dsub2000/activity/SubsonicActivity.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
rename to app/src/main/java/github/paroj/dsub2000/activity/SubsonicActivity.java
index 6e69af6b3..8c1aa92ae 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/app/src/main/java/github/paroj/dsub2000/activity/SubsonicActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.activity;
+package github.paroj.dsub2000.activity;
 
 import android.Manifest;
 import android.app.UiModeManager;
@@ -68,23 +68,23 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.fragments.AdminFragment;
-import github.daneren2005.dsub.fragments.SubsonicFragment;
-import github.daneren2005.dsub.fragments.UserFragment;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.HeadphoneListenerService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.DrawableTint;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.ThemeUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.UpdateView;
-import github.daneren2005.dsub.util.UserUtil;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.fragments.AdminFragment;
+import github.paroj.dsub2000.fragments.SubsonicFragment;
+import github.paroj.dsub2000.fragments.UserFragment;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.HeadphoneListenerService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.DrawableTint;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.ThemeUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.UpdateView;
+import github.paroj.dsub2000.util.UserUtil;
 
 import static android.Manifest.*;
 
@@ -245,7 +245,7 @@ protected void onPostCreate(Bundle savedInstanceState) {
 
 	protected void createCustomActionBarView() {
 		actionBarSpinner = (Spinner) getLayoutInflater().inflate(R.layout.actionbar_spinner, null);
-		if((this instanceof SubsonicFragmentActivity || this instanceof SettingsActivity) && (Util.getPreferences(this).getBoolean(Constants.PREFERENCES_KEY_COLOR_ACTION_BAR, true) || ThemeUtil.getThemeRes(this) != R.style.Theme_DSub_Light_No_Color)) {
+		if((this instanceof SubsonicFragmentActivity || this instanceof SettingsActivity) && (Util.getPreferences(this).getBoolean(Constants.PREFERENCES_KEY_COLOR_ACTION_BAR, true) || ThemeUtil.getThemeRes(this) != R.style.Theme_DSub2000_Light_No_Color)) {
 			actionBarSpinner.setBackgroundDrawable(DrawableTint.getTintedDrawableFromColor(this, R.drawable.abc_spinner_mtrl_am_alpha, android.R.color.white));
 		}
 		spinnerAdapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item);
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/app/src/main/java/github/paroj/dsub2000/activity/SubsonicFragmentActivity.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
rename to app/src/main/java/github/paroj/dsub2000/activity/SubsonicFragmentActivity.java
index 365a2661f..41db5aa38 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/github/paroj/dsub2000/activity/SubsonicFragmentActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.activity;
+package github.paroj.dsub2000.activity;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -48,38 +48,38 @@
 import java.util.Date;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerQueue;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.fragments.AdminFragment;
-import github.daneren2005.dsub.fragments.ChatFragment;
-import github.daneren2005.dsub.fragments.DownloadFragment;
-import github.daneren2005.dsub.fragments.MainFragment;
-import github.daneren2005.dsub.fragments.NowPlayingFragment;
-import github.daneren2005.dsub.fragments.SearchFragment;
-import github.daneren2005.dsub.fragments.SelectArtistFragment;
-import github.daneren2005.dsub.fragments.SelectBookmarkFragment;
-import github.daneren2005.dsub.fragments.SelectDirectoryFragment;
-import github.daneren2005.dsub.fragments.SelectInternetRadioStationFragment;
-import github.daneren2005.dsub.fragments.SelectPlaylistFragment;
-import github.daneren2005.dsub.fragments.SelectPodcastsFragment;
-import github.daneren2005.dsub.fragments.SelectShareFragment;
-import github.daneren2005.dsub.fragments.SubsonicFragment;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.updates.Updater;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.DrawableTint;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.KeyStoreUtil;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.ChangeLog;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerQueue;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.fragments.AdminFragment;
+import github.paroj.dsub2000.fragments.ChatFragment;
+import github.paroj.dsub2000.fragments.DownloadFragment;
+import github.paroj.dsub2000.fragments.MainFragment;
+import github.paroj.dsub2000.fragments.NowPlayingFragment;
+import github.paroj.dsub2000.fragments.SearchFragment;
+import github.paroj.dsub2000.fragments.SelectArtistFragment;
+import github.paroj.dsub2000.fragments.SelectBookmarkFragment;
+import github.paroj.dsub2000.fragments.SelectDirectoryFragment;
+import github.paroj.dsub2000.fragments.SelectInternetRadioStationFragment;
+import github.paroj.dsub2000.fragments.SelectPlaylistFragment;
+import github.paroj.dsub2000.fragments.SelectPodcastsFragment;
+import github.paroj.dsub2000.fragments.SelectShareFragment;
+import github.paroj.dsub2000.fragments.SubsonicFragment;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.updates.Updater;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.DrawableTint;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.KeyStoreUtil;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.ChangeLog;
 
 /**
  * Created by Scott on 10/14/13.
diff --git a/app/src/main/java/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java b/app/src/main/java/github/paroj/dsub2000/activity/VoiceQueryReceiverActivity.java
similarity index 89%
rename from app/src/main/java/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java
rename to app/src/main/java/github/paroj/dsub2000/activity/VoiceQueryReceiverActivity.java
index 641b118f4..fa165854f 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java
+++ b/app/src/main/java/github/paroj/dsub2000/activity/VoiceQueryReceiverActivity.java
@@ -17,20 +17,16 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.activity;
+package github.paroj.dsub2000.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.provider.SearchRecentSuggestions;
-import android.util.Log;
 
-import github.daneren2005.dsub.fragments.SubsonicFragment;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.provider.DSubSearchProvider;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Receives voice search queries and forwards to the SearchFragment.
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/AlphabeticalAlbumAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/AlphabeticalAlbumAdapter.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/adapter/AlphabeticalAlbumAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/AlphabeticalAlbumAdapter.java
index ccb3df4e3..79733a8b5 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/AlphabeticalAlbumAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/AlphabeticalAlbumAdapter.java
@@ -13,15 +13,15 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 
 import java.util.List;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.view.FastScroller;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.view.FastScroller;
 
 public class AlphabeticalAlbumAdapter extends EntryInfiniteGridAdapter implements FastScroller.BubbleTextGetter {
 	public AlphabeticalAlbumAdapter(Context context, List<MusicDirectory.Entry> entries, ImageLoader imageLoader, boolean largeCell) {
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/ArtistAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/ArtistAdapter.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/adapter/ArtistAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/ArtistAdapter.java
index 0a8b9a547..cea7408ce 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/ArtistAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/ArtistAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import androidx.appcompat.widget.PopupMenu;
@@ -26,15 +26,15 @@
 import java.io.Serializable;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.ArtistView;
-import github.daneren2005.dsub.view.FastScroller;
-import github.daneren2005.dsub.view.SongView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.ArtistView;
+import github.paroj.dsub2000.view.FastScroller;
+import github.paroj.dsub2000.view.SongView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class ArtistAdapter extends SectionAdapter<Serializable> implements FastScroller.BubbleTextGetter {
 	public static int VIEW_TYPE_SONG = 3;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/BasicListAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/BasicListAdapter.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/adapter/BasicListAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/BasicListAdapter.java
index dfea91bff..aeaf0f8f3 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/BasicListAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/BasicListAdapter.java
@@ -13,15 +13,15 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.ViewGroup;
 
 import java.util.List;
 
-import github.daneren2005.dsub.view.BasicListView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.view.BasicListView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class BasicListAdapter extends SectionAdapter<String> {
 	public static int VIEW_TYPE_LINE = 1;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/BookmarkAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/BookmarkAdapter.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/adapter/BookmarkAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/BookmarkAdapter.java
index 8e960de40..5ffd5cb1a 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/BookmarkAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/BookmarkAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 
@@ -24,12 +24,12 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.SongView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.SongView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class BookmarkAdapter extends SectionAdapter<MusicDirectory.Entry> {
 	private final static String TAG = BookmarkAdapter.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/ChatAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/ChatAdapter.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/adapter/ChatAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/ChatAdapter.java
index 0c116d39e..fccb85f16 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/ChatAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/ChatAdapter.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;
@@ -8,12 +8,11 @@
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicActivity;
-import github.daneren2005.dsub.domain.ChatMessage;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicActivity;
+import github.paroj.dsub2000.domain.ChatMessage;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.UserUtil;
 
 import java.text.DateFormat;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/DetailsAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/DetailsAdapter.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/adapter/DetailsAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/DetailsAdapter.java
index 927b63aef..9032270a1 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/DetailsAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/DetailsAdapter.java
@@ -13,11 +13,9 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
-import android.text.SpannableString;
-import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,7 +25,7 @@
 
 import java.util.List;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class DetailsAdapter extends ArrayAdapter<String> {
 	private List<String> headers;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/DownloadFileAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/DownloadFileAdapter.java
similarity index 86%
rename from app/src/main/java/github/daneren2005/dsub/adapter/DownloadFileAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/DownloadFileAdapter.java
index 5b3dc289c..cce3cb283 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/DownloadFileAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/DownloadFileAdapter.java
@@ -13,24 +13,22 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.FastScroller;
-import github.daneren2005.dsub.view.SongView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.FastScroller;
+import github.paroj.dsub2000.view.SongView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class DownloadFileAdapter extends SectionAdapter<DownloadFile> implements FastScroller.BubbleTextGetter {
 	public static int VIEW_TYPE_DOWNLOAD_FILE = 1;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/EntryGridAdapter.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/EntryGridAdapter.java
index be20f4469..de6c18dcb 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/EntryGridAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/EntryGridAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.Menu;
@@ -25,15 +25,15 @@
 import java.util.Iterator;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.AlbumView;
-import github.daneren2005.dsub.view.SongView;
-import github.daneren2005.dsub.view.UpdateView;
-import github.daneren2005.dsub.view.UpdateView.UpdateViewHolder;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.AlbumView;
+import github.paroj.dsub2000.view.SongView;
+import github.paroj.dsub2000.view.UpdateView;
+import github.paroj.dsub2000.view.UpdateView.UpdateViewHolder;
 
 public class EntryGridAdapter extends SectionAdapter<Entry> {
 	private static String TAG = EntryGridAdapter.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/EntryInfiniteGridAdapter.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/EntryInfiniteGridAdapter.java
index 33fda2d9f..ea3d554b4 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/EntryInfiniteGridAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/EntryInfiniteGridAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -22,16 +22,16 @@
 
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.fragments.MainFragment;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.fragments.MainFragment;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class EntryInfiniteGridAdapter extends EntryGridAdapter {
 	public static int VIEW_TYPE_LOADING = 4;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/ExpandableSectionAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/ExpandableSectionAdapter.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/adapter/ExpandableSectionAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/ExpandableSectionAdapter.java
index 6ebb34e35..121e088e3 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/ExpandableSectionAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/ExpandableSectionAdapter.java
@@ -13,10 +13,9 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -25,10 +24,10 @@
 import java.util.Arrays;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.util.DrawableTint;
-import github.daneren2005.dsub.view.BasicHeaderView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.util.DrawableTint;
+import github.paroj.dsub2000.view.BasicHeaderView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public abstract class ExpandableSectionAdapter<T> extends SectionAdapter<T> {
 	private static final String TAG = ExpandableSectionAdapter.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/GenreAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/GenreAdapter.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/adapter/GenreAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/GenreAdapter.java
index 70aa5fe31..ebd277615 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/GenreAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/GenreAdapter.java
@@ -13,14 +13,14 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.ViewGroup;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.view.FastScroller;
-import github.daneren2005.dsub.view.GenreView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.view.FastScroller;
+import github.paroj.dsub2000.view.GenreView;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.util.List;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/InternetRadioStationAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/InternetRadioStationAdapter.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/adapter/InternetRadioStationAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/InternetRadioStationAdapter.java
index 9d47d70ca..68bea1c64 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/InternetRadioStationAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/InternetRadioStationAdapter.java
@@ -12,17 +12,17 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2016 (C) Scott Jackson
 */
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.ViewGroup;
 
 import java.util.List;
 
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.view.FastScroller;
-import github.daneren2005.dsub.view.InternetRadioStationView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.view.FastScroller;
+import github.paroj.dsub2000.view.InternetRadioStationView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class InternetRadioStationAdapter extends SectionAdapter<InternetRadioStation> implements FastScroller.BubbleTextGetter {
 	public static int VIEW_TYPE_INTERNET_RADIO_STATION = 1;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/MainAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/MainAdapter.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/adapter/MainAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/MainAdapter.java
index dd70aa99c..504096ef0 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/MainAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/MainAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.View;
@@ -23,13 +23,13 @@
 
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.AlbumListCountView;
-import github.daneren2005.dsub.view.BasicHeaderView;
-import github.daneren2005.dsub.view.BasicListView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.AlbumListCountView;
+import github.paroj.dsub2000.view.BasicHeaderView;
+import github.paroj.dsub2000.view.BasicListView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class MainAdapter extends SectionAdapter<Integer> {
 	public static final int VIEW_TYPE_ALBUM_LIST = 1;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/PlaylistAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/PlaylistAdapter.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/adapter/PlaylistAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/PlaylistAdapter.java
index 6402eecbb..9c0c34149 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/PlaylistAdapter.java
@@ -12,18 +12,18 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2015 (C) Scott Jackson
 */
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 
 import java.util.List;
 
 import android.view.ViewGroup;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.view.FastScroller;
-import github.daneren2005.dsub.view.PlaylistView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.view.FastScroller;
+import github.paroj.dsub2000.view.PlaylistView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class PlaylistAdapter extends SectionAdapter<Playlist> implements FastScroller.BubbleTextGetter {
 	public static int VIEW_TYPE_PLAYLIST = 1;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/PodcastChannelAdapter.java
similarity index 85%
rename from app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/PodcastChannelAdapter.java
index f843a722f..cbaeb85da 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/PodcastChannelAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/PodcastChannelAdapter.java
@@ -12,26 +12,22 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2015 (C) Scott Jackson
 */
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.util.DrawableTint;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.BasicHeaderView;
-import github.daneren2005.dsub.view.FastScroller;
-import github.daneren2005.dsub.view.PodcastChannelView;
-import github.daneren2005.dsub.view.SongView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.FastScroller;
+import github.paroj.dsub2000.view.PodcastChannelView;
+import github.paroj.dsub2000.view.SongView;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.io.Serializable;
 import java.util.Arrays;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SearchAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/SearchAdapter.java
similarity index 80%
rename from app/src/main/java/github/daneren2005/dsub/adapter/SearchAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/SearchAdapter.java
index 69e5d56de..43f23ec76 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/SearchAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/SearchAdapter.java
@@ -13,36 +13,32 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.view.Menu;
 import android.view.MenuInflater;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.util.DrawableTint;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.AlbumView;
-import github.daneren2005.dsub.view.ArtistView;
-import github.daneren2005.dsub.view.BasicHeaderView;
-import github.daneren2005.dsub.view.SongView;
-import github.daneren2005.dsub.view.UpdateView;
-
-import static github.daneren2005.dsub.adapter.ArtistAdapter.VIEW_TYPE_ARTIST;
-import static github.daneren2005.dsub.adapter.EntryGridAdapter.VIEW_TYPE_ALBUM_CELL;
-import static github.daneren2005.dsub.adapter.EntryGridAdapter.VIEW_TYPE_ALBUM_LINE;
-import static github.daneren2005.dsub.adapter.EntryGridAdapter.VIEW_TYPE_SONG;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.AlbumView;
+import github.paroj.dsub2000.view.ArtistView;
+import github.paroj.dsub2000.view.SongView;
+import github.paroj.dsub2000.view.UpdateView;
+
+import static github.paroj.dsub2000.adapter.ArtistAdapter.VIEW_TYPE_ARTIST;
+import static github.paroj.dsub2000.adapter.EntryGridAdapter.VIEW_TYPE_ALBUM_CELL;
+import static github.paroj.dsub2000.adapter.EntryGridAdapter.VIEW_TYPE_ALBUM_LINE;
+import static github.paroj.dsub2000.adapter.EntryGridAdapter.VIEW_TYPE_SONG;
 
 public class SearchAdapter extends ExpandableSectionAdapter<Serializable> {
 	private ImageLoader imageLoader;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/SectionAdapter.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/SectionAdapter.java
index af3690c38..e2875d43f 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/SectionAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/SectionAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -36,14 +36,14 @@
 import java.util.Arrays;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.MenuUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.BasicHeaderView;
-import github.daneren2005.dsub.view.UpdateView;
-import github.daneren2005.dsub.view.UpdateView.UpdateViewHolder;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.MenuUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.BasicHeaderView;
+import github.paroj.dsub2000.view.UpdateView;
+import github.paroj.dsub2000.view.UpdateView.UpdateViewHolder;
 
 public abstract class SectionAdapter<T> extends RecyclerView.Adapter<UpdateViewHolder<T>> {
 	private static String TAG = SectionAdapter.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SettingsAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/SettingsAdapter.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/adapter/SettingsAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/SettingsAdapter.java
index 4e75a2f76..c62fd7715 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/SettingsAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/SettingsAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,17 +24,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.view.BasicHeaderView;
-import github.daneren2005.dsub.view.RecyclingImageView;
-import github.daneren2005.dsub.view.SettingView;
-import github.daneren2005.dsub.view.UpdateView;
-
-import static github.daneren2005.dsub.domain.User.Setting;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.view.BasicHeaderView;
+import github.paroj.dsub2000.view.RecyclingImageView;
+import github.paroj.dsub2000.view.SettingView;
+import github.paroj.dsub2000.view.UpdateView;
+
+import static github.paroj.dsub2000.domain.User.Setting;
 
 public class SettingsAdapter extends SectionAdapter<Setting> {
 	private static final String TAG = SettingsAdapter.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/ShareAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/ShareAdapter.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/adapter/ShareAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/ShareAdapter.java
index 6db3d9276..5e01a6ee2 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/ShareAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/ShareAdapter.java
@@ -13,16 +13,16 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.ViewGroup;
 
 import java.util.List;
 
-import github.daneren2005.dsub.domain.Share;
-import github.daneren2005.dsub.view.ShareView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.domain.Share;
+import github.paroj.dsub2000.view.ShareView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class ShareAdapter extends SectionAdapter<Share>{
 	public static int VIEW_TYPE_SHARE = 1;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/SimilarArtistAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/SimilarArtistAdapter.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/adapter/SimilarArtistAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/SimilarArtistAdapter.java
index 2234d4cd3..d5a060f14 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/SimilarArtistAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/SimilarArtistAdapter.java
@@ -13,16 +13,16 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 import android.view.ViewGroup;
 
 import java.util.List;
 
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.view.ArtistView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.view.ArtistView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class SimilarArtistAdapter extends SectionAdapter<Artist> {
 	public static int VIEW_TYPE_ARTIST = 4;
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/TopRatedAlbumAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/TopRatedAlbumAdapter.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/adapter/TopRatedAlbumAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/TopRatedAlbumAdapter.java
index 876e59071..07fedad56 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/TopRatedAlbumAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/TopRatedAlbumAdapter.java
@@ -13,15 +13,15 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
 
 import java.util.List;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.view.FastScroller;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.view.FastScroller;
 
 public class TopRatedAlbumAdapter extends EntryInfiniteGridAdapter implements FastScroller.BubbleTextGetter {
 	public TopRatedAlbumAdapter(Context context, List<MusicDirectory.Entry> entries, ImageLoader imageLoader, boolean largeCell) {
diff --git a/app/src/main/java/github/daneren2005/dsub/adapter/UserAdapter.java b/app/src/main/java/github/paroj/dsub2000/adapter/UserAdapter.java
similarity index 82%
rename from app/src/main/java/github/daneren2005/dsub/adapter/UserAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/adapter/UserAdapter.java
index 95809e483..84f543141 100644
--- a/app/src/main/java/github/daneren2005/dsub/adapter/UserAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/adapter/UserAdapter.java
@@ -13,20 +13,18 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.adapter;
+package github.paroj.dsub2000.adapter;
 
 import android.content.Context;
-import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.view.UpdateView;
-import github.daneren2005.dsub.view.UserView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.view.UpdateView;
+import github.paroj.dsub2000.view.UserView;
 
 public class UserAdapter extends SectionAdapter<User> {
 	public static int VIEW_TYPE_USER = 1;
diff --git a/app/src/main/java/github/daneren2005/dsub/audiofx/AudioEffectsController.java b/app/src/main/java/github/paroj/dsub2000/audiofx/AudioEffectsController.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/audiofx/AudioEffectsController.java
rename to app/src/main/java/github/paroj/dsub2000/audiofx/AudioEffectsController.java
index 1933bd646..c0df7c06e 100644
--- a/app/src/main/java/github/daneren2005/dsub/audiofx/AudioEffectsController.java
+++ b/app/src/main/java/github/paroj/dsub2000/audiofx/AudioEffectsController.java
@@ -16,14 +16,10 @@
 
  Copyright 2014 (C) Scott Jackson
 */
-package github.daneren2005.dsub.audiofx;
+package github.paroj.dsub2000.audiofx;
 
 import android.content.Context;
-import android.media.MediaPlayer;
-import android.media.audiofx.AudioEffect;
-import android.media.audiofx.LoudnessEnhancer;
 import android.os.Build;
-import android.util.Log;
 
 public class AudioEffectsController {
     private static final String TAG = AudioEffectsController.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java b/app/src/main/java/github/paroj/dsub2000/audiofx/EqualizerController.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java
rename to app/src/main/java/github/paroj/dsub2000/audiofx/EqualizerController.java
index f170af0b2..7818e28e1 100644
--- a/app/src/main/java/github/daneren2005/dsub/audiofx/EqualizerController.java
+++ b/app/src/main/java/github/paroj/dsub2000/audiofx/EqualizerController.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.audiofx;
+package github.paroj.dsub2000.audiofx;
 
 import java.io.Serializable;
 
@@ -25,7 +25,7 @@
 import android.media.audiofx.Equalizer;
 import android.os.Build;
 import android.util.Log;
-import github.daneren2005.dsub.util.FileUtil;
+import github.paroj.dsub2000.util.FileUtil;
 
 /**
  * Backward-compatible wrapper for {@link Equalizer}, which is API Level 9.
diff --git a/app/src/main/java/github/daneren2005/dsub/audiofx/LoudnessEnhancerController.java b/app/src/main/java/github/paroj/dsub2000/audiofx/LoudnessEnhancerController.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/audiofx/LoudnessEnhancerController.java
rename to app/src/main/java/github/paroj/dsub2000/audiofx/LoudnessEnhancerController.java
index df6fdb1c6..41d075a4c 100644
--- a/app/src/main/java/github/daneren2005/dsub/audiofx/LoudnessEnhancerController.java
+++ b/app/src/main/java/github/paroj/dsub2000/audiofx/LoudnessEnhancerController.java
@@ -16,7 +16,7 @@
 
 	Copyright 2014 (C) Scott Jackson
 */
-package github.daneren2005.dsub.audiofx;
+package github.paroj.dsub2000.audiofx;
 
 import android.content.Context;
 import android.media.audiofx.LoudnessEnhancer;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java b/app/src/main/java/github/paroj/dsub2000/domain/Artist.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/domain/Artist.java
rename to app/src/main/java/github/paroj/dsub2000/domain/Artist.java
index ff4d86ce3..a2f31f741 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Artist.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/Artist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/ArtistInfo.java b/app/src/main/java/github/paroj/dsub2000/domain/ArtistInfo.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/domain/ArtistInfo.java
rename to app/src/main/java/github/paroj/dsub2000/domain/ArtistInfo.java
index 2205d5614..7c65229d0 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/ArtistInfo.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/ArtistInfo.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Bookmark.java b/app/src/main/java/github/paroj/dsub2000/domain/Bookmark.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/domain/Bookmark.java
rename to app/src/main/java/github/paroj/dsub2000/domain/Bookmark.java
index 3c0c58350..0a7731729 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Bookmark.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/Bookmark.java
@@ -16,7 +16,7 @@
 
  Copyright 2013 (C) Scott Jackson
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 import java.text.ParseException;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/ChatMessage.java b/app/src/main/java/github/paroj/dsub2000/domain/ChatMessage.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/domain/ChatMessage.java
rename to app/src/main/java/github/paroj/dsub2000/domain/ChatMessage.java
index 04b9effce..53bfbb584 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/ChatMessage.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/ChatMessage.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/DLNADevice.java b/app/src/main/java/github/paroj/dsub2000/domain/DLNADevice.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/domain/DLNADevice.java
rename to app/src/main/java/github/paroj/dsub2000/domain/DLNADevice.java
index 0f969259b..015f0ecd1 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/DLNADevice.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/DLNADevice.java
@@ -17,7 +17,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Genre.java b/app/src/main/java/github/paroj/dsub2000/domain/Genre.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/domain/Genre.java
rename to app/src/main/java/github/paroj/dsub2000/domain/Genre.java
index dcf12a1df..b171d2373 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Genre.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/Genre.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 import java.util.Collections;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Indexes.java b/app/src/main/java/github/paroj/dsub2000/domain/Indexes.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/domain/Indexes.java
rename to app/src/main/java/github/paroj/dsub2000/domain/Indexes.java
index 05e686ca3..fc3315d80 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Indexes.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/Indexes.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,8 +25,8 @@
 import java.util.List;
 import java.io.Serializable;
 
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/InternetRadioStation.java b/app/src/main/java/github/paroj/dsub2000/domain/InternetRadioStation.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/domain/InternetRadioStation.java
rename to app/src/main/java/github/paroj/dsub2000/domain/InternetRadioStation.java
index 47d79b994..df995a218 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/InternetRadioStation.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/InternetRadioStation.java
@@ -17,7 +17,7 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 public class InternetRadioStation extends MusicDirectory.Entry {
 	private String streamUrl;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Lyrics.java b/app/src/main/java/github/paroj/dsub2000/domain/Lyrics.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/domain/Lyrics.java
rename to app/src/main/java/github/paroj/dsub2000/domain/Lyrics.java
index 5272920db..68c665cc7 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Lyrics.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/Lyrics.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java b/app/src/main/java/github/paroj/dsub2000/domain/MusicDirectory.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java
rename to app/src/main/java/github/paroj/dsub2000/domain/MusicDirectory.java
index a2b6d4eda..8acc6ffd2 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/MusicDirectory.java
@@ -16,11 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.media.MediaMetadataRetriever;
 import android.os.Build;
 import android.util.Log;
@@ -42,10 +41,10 @@
 import java.util.Comparator;
 import java.util.Locale;
 
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.UpdateHelper;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.UpdateHelper;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java b/app/src/main/java/github/paroj/dsub2000/domain/MusicFolder.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java
rename to app/src/main/java/github/paroj/dsub2000/domain/MusicFolder.java
index 37f76249a..be6877fb4 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/MusicFolder.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/MusicFolder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/PlayerQueue.java b/app/src/main/java/github/paroj/dsub2000/domain/PlayerQueue.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/domain/PlayerQueue.java
rename to app/src/main/java/github/paroj/dsub2000/domain/PlayerQueue.java
index 32f29725d..f0e6d9950 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/PlayerQueue.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/PlayerQueue.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/PlayerState.java b/app/src/main/java/github/paroj/dsub2000/domain/PlayerState.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/domain/PlayerState.java
rename to app/src/main/java/github/paroj/dsub2000/domain/PlayerState.java
index 21f1b1a4e..cb74202d6 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/PlayerState.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/PlayerState.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import android.media.RemoteControlClient;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Playlist.java b/app/src/main/java/github/paroj/dsub2000/domain/Playlist.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/domain/Playlist.java
rename to app/src/main/java/github/paroj/dsub2000/domain/Playlist.java
index d3453e50c..509ac5706 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Playlist.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/Playlist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 import java.text.ParseException;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/PodcastChannel.java b/app/src/main/java/github/paroj/dsub2000/domain/PodcastChannel.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/domain/PodcastChannel.java
rename to app/src/main/java/github/paroj/dsub2000/domain/PodcastChannel.java
index 41640636b..8b6811204 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/PodcastChannel.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/PodcastChannel.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -26,8 +26,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 /**
  *
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/PodcastEpisode.java b/app/src/main/java/github/paroj/dsub2000/domain/PodcastEpisode.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/domain/PodcastEpisode.java
rename to app/src/main/java/github/paroj/dsub2000/domain/PodcastEpisode.java
index 4181b3d36..cbf2543c0 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/PodcastEpisode.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/PodcastEpisode.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 /**
  *
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/RemoteControlState.java b/app/src/main/java/github/paroj/dsub2000/domain/RemoteControlState.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/domain/RemoteControlState.java
rename to app/src/main/java/github/paroj/dsub2000/domain/RemoteControlState.java
index 47895984f..640b77b03 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/RemoteControlState.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/RemoteControlState.java
@@ -17,7 +17,7 @@
 	Copyright 2009 (C) Sindre Mehus
 */
 
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 public enum RemoteControlState {
 	LOCAL(0),
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/RemoteStatus.java b/app/src/main/java/github/paroj/dsub2000/domain/RemoteStatus.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/domain/RemoteStatus.java
rename to app/src/main/java/github/paroj/dsub2000/domain/RemoteStatus.java
index e97491207..21224f509 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/RemoteStatus.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/RemoteStatus.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/RepeatMode.java b/app/src/main/java/github/paroj/dsub2000/domain/RepeatMode.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/domain/RepeatMode.java
rename to app/src/main/java/github/paroj/dsub2000/domain/RepeatMode.java
index 7139029cf..82a13dfba 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/RepeatMode.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/RepeatMode.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/SearchCritera.java b/app/src/main/java/github/paroj/dsub2000/domain/SearchCritera.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/domain/SearchCritera.java
rename to app/src/main/java/github/paroj/dsub2000/domain/SearchCritera.java
index ed2400efd..0f3c40270 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/SearchCritera.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/SearchCritera.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.util.regex.Pattern;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/SearchResult.java b/app/src/main/java/github/paroj/dsub2000/domain/SearchResult.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/domain/SearchResult.java
rename to app/src/main/java/github/paroj/dsub2000/domain/SearchResult.java
index 4d761b023..8b0588041 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/SearchResult.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/SearchResult.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java b/app/src/main/java/github/paroj/dsub2000/domain/ServerInfo.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java
rename to app/src/main/java/github/paroj/dsub2000/domain/ServerInfo.java
index 5852210ea..34f35d36f 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/ServerInfo.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/ServerInfo.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import android.content.Context;
 
@@ -24,9 +24,8 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Information about the Subsonic server.
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Share.java b/app/src/main/java/github/paroj/dsub2000/domain/Share.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/domain/Share.java
rename to app/src/main/java/github/paroj/dsub2000/domain/Share.java
index 380811a73..5a6395c04 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Share.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/Share.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
 import java.io.Serializable;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/User.java b/app/src/main/java/github/paroj/dsub2000/domain/User.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/domain/User.java
rename to app/src/main/java/github/paroj/dsub2000/domain/User.java
index 5307828a1..4d2bae7d3 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/User.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/User.java
@@ -13,9 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.domain;
-
-import android.util.Pair;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/daneren2005/dsub/domain/Version.java b/app/src/main/java/github/paroj/dsub2000/domain/Version.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/domain/Version.java
rename to app/src/main/java/github/paroj/dsub2000/domain/Version.java
index 9df0dbb4e..dcb2f17a7 100644
--- a/app/src/main/java/github/daneren2005/dsub/domain/Version.java
+++ b/app/src/main/java/github/paroj/dsub2000/domain/Version.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.domain;
+package github.paroj.dsub2000.domain;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/AdminFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/AdminFragment.java
similarity index 86%
rename from app/src/main/java/github/daneren2005/dsub/fragments/AdminFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/AdminFragment.java
index 552712f7c..f0b5ffb1c 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/AdminFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/AdminFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -24,17 +24,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.parser.SubsonicRESTException;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.adapter.UserAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.parser.SubsonicRESTException;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.adapter.UserAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class AdminFragment extends SelectRecyclerFragment<User> {
 	private static String TAG = AdminFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/ChatFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/ChatFragment.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/fragments/ChatFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/ChatFragment.java
index efdf0c7ff..348b11319 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/ChatFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/ChatFragment.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,15 +25,15 @@
 import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ChatMessage;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.BackgroundTask;
-import github.daneren2005.dsub.util.TabBackgroundTask;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.adapter.ChatAdapter;
-import github.daneren2005.dsub.util.Constants;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ChatMessage;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.BackgroundTask;
+import github.paroj.dsub2000.util.TabBackgroundTask;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.adapter.ChatAdapter;
+import github.paroj.dsub2000.util.Constants;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/DownloadFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/DownloadFragment.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/fragments/DownloadFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/DownloadFragment.java
index 4c37beec7..db90d16de 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/DownloadFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -32,18 +32,18 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.DownloadFileItemHelperCallback;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.adapter.DownloadFileAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.DownloadFileItemHelperCallback;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.adapter.DownloadFileAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class DownloadFragment extends SelectRecyclerFragment<DownloadFile> implements SectionAdapter.OnItemClickedListener<DownloadFile> {
 	private long currentRevision;
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/EqualizerFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/EqualizerFragment.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/fragments/EqualizerFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/EqualizerFragment.java
index 948c59cf7..7cf17706c 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/EqualizerFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/EqualizerFragment.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.content.SharedPreferences;
 import android.media.audiofx.BassBoost;
@@ -37,12 +37,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.audiofx.EqualizerController;
-import github.daneren2005.dsub.audiofx.LoudnessEnhancerController;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.audiofx.EqualizerController;
+import github.paroj.dsub2000.audiofx.LoudnessEnhancerController;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Created by Scott on 10/27/13.
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/LyricsFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/LyricsFragment.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/fragments/LyricsFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/LyricsFragment.java
index 402bd257a..ef78a0cb6 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/LyricsFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/LyricsFragment.java
@@ -17,20 +17,20 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Lyrics;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.BackgroundTask;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.TabBackgroundTask;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Lyrics;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.BackgroundTask;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.TabBackgroundTask;
 
 /**
  * Displays song lyrics.
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/MainFragment.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/MainFragment.java
index e29b70886..004175df7 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/MainFragment.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -14,21 +14,21 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.MainAdapter;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.EnvironmentVariables;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.LoadingTask;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.view.ChangeLog;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.MainAdapter;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.EnvironmentVariables;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.LoadingTask;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.view.ChangeLog;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/NowPlayingFragment.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/NowPlayingFragment.java
index 44ad79d9d..3735c1a3b 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/NowPlayingFragment.java
@@ -12,7 +12,7 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2014 (C) Scott Jackson
 */
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -57,34 +57,34 @@
 import com.shehabic.droppy.DroppyClickCallbackInterface;
 import com.shehabic.droppy.DroppyMenuPopup;
 import com.shehabic.droppy.animations.DroppyFadeInAnimation;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.audiofx.EqualizerController;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.domain.RepeatMode;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.DownloadService.OnSongChangedListener;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.adapter.DownloadFileAdapter;
-import github.daneren2005.dsub.view.compat.CustomMediaRouteDialogFactory;
-import github.daneren2005.dsub.view.FadeOutAnimation;
-import github.daneren2005.dsub.view.FastScroller;
-import github.daneren2005.dsub.view.UpdateView;
-import github.daneren2005.dsub.util.Util;
-
-import static github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import static github.daneren2005.dsub.domain.PlayerState.*;
-import github.daneren2005.dsub.util.*;
-import github.daneren2005.dsub.view.AutoRepeatButton;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.audiofx.EqualizerController;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.domain.RepeatMode;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.DownloadService.OnSongChangedListener;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.adapter.DownloadFileAdapter;
+import github.paroj.dsub2000.view.compat.CustomMediaRouteDialogFactory;
+import github.paroj.dsub2000.view.FadeOutAnimation;
+import github.paroj.dsub2000.view.FastScroller;
+import github.paroj.dsub2000.view.UpdateView;
+import github.paroj.dsub2000.util.Util;
+
+import static github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import static github.paroj.dsub2000.domain.PlayerState.*;
+import github.paroj.dsub2000.util.*;
+import github.paroj.dsub2000.view.AutoRepeatButton;
 import java.util.ArrayList;
 import java.util.concurrent.ScheduledFuture;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/PreferenceCompatFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/PreferenceCompatFragment.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/fragments/PreferenceCompatFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/PreferenceCompatFragment.java
index d3b5ea3f7..327665dbd 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/PreferenceCompatFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/PreferenceCompatFragment.java
@@ -17,7 +17,7 @@
 	 Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.app.Activity;
 import android.content.Context;
@@ -29,7 +29,6 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -38,8 +37,8 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.util.Constants;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.util.Constants;
 
 public abstract class PreferenceCompatFragment extends SubsonicFragment {
 	private static final String TAG = PreferenceCompatFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SearchFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SearchFragment.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SearchFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SearchFragment.java
index d4478032f..dc15e15a9 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SearchFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SearchFragment.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -21,23 +21,23 @@
 import android.view.MenuItem;
 import android.net.Uri;
 import android.view.ViewGroup;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.ArtistAdapter;
-import github.daneren2005.dsub.adapter.EntryGridAdapter;
-import github.daneren2005.dsub.adapter.SearchAdapter;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.domain.SearchCritera;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.BackgroundTask;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.TabBackgroundTask;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.ArtistAdapter;
+import github.paroj.dsub2000.adapter.EntryGridAdapter;
+import github.paroj.dsub2000.adapter.SearchAdapter;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.SearchCritera;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.BackgroundTask;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.TabBackgroundTask;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class SearchFragment extends SubsonicFragment implements SectionAdapter.OnItemClickedListener<Serializable> {
 	private static final String TAG = SearchFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectArtistFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectArtistFragment.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectArtistFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectArtistFragment.java
index e971bfb6c..da4384815 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectArtistFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectArtistFragment.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -11,20 +11,20 @@
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.ArtistAdapter;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.ArtistAdapter;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.Indexes;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectBookmarkFragment.java
similarity index 85%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectBookmarkFragment.java
index c320f3c16..757198e3f 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectBookmarkFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectBookmarkFragment.java
@@ -16,26 +16,23 @@
 	
 	Copyright 2010 (C) Sindre Mehus
 */
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
-import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.MenuUtil;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.adapter.BookmarkAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.MenuUtil;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.adapter.BookmarkAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectDirectoryFragment.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectDirectoryFragment.java
index 59d333fdd..bad02c3b0 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectDirectoryFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectDirectoryFragment.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.annotation.TargetApi;
 import androidx.appcompat.app.AlertDialog;
@@ -29,48 +29,48 @@
 import android.widget.RatingBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.AlphabeticalAlbumAdapter;
-import github.daneren2005.dsub.adapter.EntryInfiniteGridAdapter;
-import github.daneren2005.dsub.adapter.EntryGridAdapter;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.adapter.TopRatedAlbumAdapter;
-import github.daneren2005.dsub.domain.ArtistInfo;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.domain.Share;
-import github.daneren2005.dsub.service.CachedMusicService;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.DrawableTint;
-import github.daneren2005.dsub.util.ImageLoader;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.AlphabeticalAlbumAdapter;
+import github.paroj.dsub2000.adapter.EntryInfiniteGridAdapter;
+import github.paroj.dsub2000.adapter.EntryGridAdapter;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.adapter.TopRatedAlbumAdapter;
+import github.paroj.dsub2000.domain.ArtistInfo;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.domain.Share;
+import github.paroj.dsub2000.service.CachedMusicService;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.DrawableTint;
+import github.paroj.dsub2000.util.ImageLoader;
 
 import java.io.Serializable;
 import java.util.List;
 
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.LoadingTask;
-import github.daneren2005.dsub.util.Pair;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.TabBackgroundTask;
-import github.daneren2005.dsub.util.UpdateHelper;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.FastScroller;
-import github.daneren2005.dsub.view.MyLeadingMarginSpan2;
-import github.daneren2005.dsub.view.RecyclingImageView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.LoadingTask;
+import github.paroj.dsub2000.util.Pair;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.TabBackgroundTask;
+import github.paroj.dsub2000.util.UpdateHelper;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.FastScroller;
+import github.paroj.dsub2000.view.MyLeadingMarginSpan2;
+import github.paroj.dsub2000.view.RecyclingImageView;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import static github.daneren2005.dsub.domain.MusicDirectory.Entry;
+import static github.paroj.dsub2000.domain.MusicDirectory.Entry;
 
 public class SelectDirectoryFragment extends SubsonicFragment implements SectionAdapter.OnItemClickedListener<Entry> {
 	private static final String TAG = SelectDirectoryFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectGenreFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectGenreFragment.java
similarity index 83%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectGenreFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectGenreFragment.java
index 8cbc273c8..4703522ff 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectGenreFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectGenreFragment.java
@@ -13,21 +13,21 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.adapter.GenreAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.adapter.GenreAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.util.List;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectInternetRadioStationFragment.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectInternetRadioStationFragment.java
index 74c4b269b..eca64ef26 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectInternetRadioStationFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectInternetRadioStationFragment.java
@@ -16,33 +16,30 @@
 
 	Copyright 2016 (C) Scott Jackson
 */
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.InternetRadioStationAdapter;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.TabBackgroundTask;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.InternetRadioStationAdapter;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.TabBackgroundTask;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class SelectInternetRadioStationFragment extends SelectRecyclerFragment<InternetRadioStation> {
 	private static final String TAG = SelectInternetRadioStationFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectPlaylistFragment.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectPlaylistFragment.java
index 206d030f0..53ca75afa 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectPlaylistFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectPlaylistFragment.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
@@ -15,25 +15,25 @@
 import android.widget.CheckBox;
 import android.widget.EditText;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.CacheCleaner;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.LoadingTask;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.adapter.PlaylistAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.CacheCleaner;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.LoadingTask;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.adapter.PlaylistAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectPodcastsFragment.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectPodcastsFragment.java
index 2a47c2bde..9fd9d9508 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectPodcastsFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectPodcastsFragment.java
@@ -12,7 +12,7 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2015 (C) Scott Jackson
 */
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.content.res.Resources;
 import androidx.appcompat.app.AlertDialog;
@@ -25,26 +25,26 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.LoadingTask;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.adapter.PodcastChannelAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.LoadingTask;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.adapter.PodcastChannelAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectRecyclerFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectRecyclerFragment.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectRecyclerFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectRecyclerFragment.java
index 5e575af2b..bab33fa81 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectRecyclerFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectRecyclerFragment.java
@@ -13,14 +13,14 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.os.Bundle;
-import androidx.core.view.MenuItemCompat;
+
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.SearchView;
+
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -33,14 +33,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.TabBackgroundTask;
-import github.daneren2005.dsub.view.FastScroller;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.TabBackgroundTask;
+import github.paroj.dsub2000.view.FastScroller;
 
 public abstract class SelectRecyclerFragment<T> extends SubsonicFragment implements SectionAdapter.OnItemClickedListener<T> {
 	private static final String TAG = SelectRecyclerFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectShareFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectShareFragment.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectShareFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectShareFragment.java
index 5ee06c2d9..c5754b600 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectShareFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectShareFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import androidx.appcompat.app.AlertDialog;
 import android.content.DialogInterface;
@@ -31,19 +31,19 @@
 import java.util.Date;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.Share;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.LoadingTask;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.adapter.ShareAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.Share;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.LoadingTask;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.adapter.ShareAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class SelectShareFragment extends SelectRecyclerFragment<Share> {
 	private static final String TAG = SelectShareFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectVideoFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectVideoFragment.java
similarity index 84%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectVideoFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectVideoFragment.java
index a09125ff0..e22de966b 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectVideoFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectVideoFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -21,13 +21,13 @@
 
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.EntryGridAdapter;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.EntryGridAdapter;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class SelectVideoFragment extends SelectRecyclerFragment<MusicDirectory.Entry> {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SelectYearFragment.java
similarity index 86%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SelectYearFragment.java
index ce1e55486..ee397284e 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SelectYearFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SelectYearFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -24,13 +24,13 @@
 import java.util.Calendar;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.BasicListAdapter;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.BasicListAdapter;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class SelectYearFragment extends SelectRecyclerFragment<String> {
 
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SettingsFragment.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SettingsFragment.java
index cb2f28256..cdefbdbf4 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SettingsFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SettingsFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.Manifest;
 import android.accounts.Account;
@@ -49,21 +49,21 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicActivity;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.HeadphoneListenerService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.LoadingTask;
-import github.daneren2005.dsub.util.MediaRouteManager;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.CacheLocationPreference;
-import github.daneren2005.dsub.view.ErrorDialog;
-import github.daneren2005.dsub.view.EditPasswordPreference;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicActivity;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.HeadphoneListenerService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.LoadingTask;
+import github.paroj.dsub2000.util.MediaRouteManager;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.CacheLocationPreference;
+import github.paroj.dsub2000.view.ErrorDialog;
+import github.paroj.dsub2000.view.EditPasswordPreference;
 
 public class SettingsFragment extends PreferenceCompatFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
 	private final static String TAG = SettingsFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SimilarArtistFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SimilarArtistFragment.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SimilarArtistFragment.java
index a41b9d6fa..38cc7c111 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SimilarArtistFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SimilarArtistFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.content.Intent;
 import android.net.Uri;
@@ -22,19 +22,19 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.adapter.SimilarArtistAdapter;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.ArtistInfo;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.adapter.SimilarArtistAdapter;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.ArtistInfo;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.net.URLEncoder;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/SubsonicFragment.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/SubsonicFragment.java
index 76db7576b..7da93ca44 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/SubsonicFragment.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.app.Activity;
 import android.app.SearchManager;
@@ -52,39 +52,39 @@
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicActivity;
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.domain.Share;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MediaStoreService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.MenuUtil;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.LoadingTask;
-import github.daneren2005.dsub.util.SongDBHandler;
-import github.daneren2005.dsub.util.UpdateHelper;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.view.GridSpacingDecoration;
-import github.daneren2005.dsub.view.PlaylistSongView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicActivity;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.domain.Share;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MediaStoreService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.MenuUtil;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.LoadingTask;
+import github.paroj.dsub2000.util.SongDBHandler;
+import github.paroj.dsub2000.util.UpdateHelper;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.view.GridSpacingDecoration;
+import github.paroj.dsub2000.view.PlaylistSongView;
+import github.paroj.dsub2000.view.UpdateView;
 
 import java.io.File;
 import java.text.DateFormat;
@@ -98,7 +98,7 @@
 import java.util.List;
 import java.util.Random;
 
-import static github.daneren2005.dsub.domain.MusicDirectory.Entry;
+import static github.paroj.dsub2000.domain.MusicDirectory.Entry;
 
 public class SubsonicFragment extends Fragment implements SwipeRefreshLayout.OnRefreshListener {
 	private static final String TAG = SubsonicFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/UserFragment.java b/app/src/main/java/github/paroj/dsub2000/fragments/UserFragment.java
similarity index 82%
rename from app/src/main/java/github/daneren2005/dsub/fragments/UserFragment.java
rename to app/src/main/java/github/paroj/dsub2000/fragments/UserFragment.java
index dde766240..961c0c391 100644
--- a/app/src/main/java/github/daneren2005/dsub/fragments/UserFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/fragments/UserFragment.java
@@ -13,27 +13,25 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.fragments;
+package github.paroj.dsub2000.fragments;
 
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.UserUtil;
-import github.daneren2005.dsub.adapter.SettingsAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.UserUtil;
+import github.paroj.dsub2000.adapter.SettingsAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class UserFragment extends SelectRecyclerFragment<User.Setting>{
 	private User user;
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DLNARouteProvider.java b/app/src/main/java/github/paroj/dsub2000/provider/DLNARouteProvider.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/provider/DLNARouteProvider.java
rename to app/src/main/java/github/paroj/dsub2000/provider/DLNARouteProvider.java
index 57162b6c5..d98c32bfc 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DLNARouteProvider.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/DLNARouteProvider.java
@@ -16,7 +16,7 @@
 
 	Copyright 2014 (C) Scott Jackson
 */
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -53,15 +53,15 @@
 import java.util.List;
 import java.util.Map;
 
-import github.daneren2005.dsub.domain.DLNADevice;
-import github.daneren2005.dsub.domain.RemoteControlState;
-import github.daneren2005.dsub.service.DLNAController;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.RemoteController;
+import github.paroj.dsub2000.domain.DLNADevice;
+import github.paroj.dsub2000.domain.RemoteControlState;
+import github.paroj.dsub2000.service.DLNAController;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.RemoteController;
 
 public class DLNARouteProvider extends MediaRouteProvider {
 	private static final String TAG = DLNARouteProvider.class.getSimpleName();
-	public static final String CATEGORY_DLNA = "github.daneren2005.dsub.DLNA";
+	public static final String CATEGORY_DLNA = "github.paroj.dsub2000.DLNA";
 
 	private DownloadService downloadService;
 	private RemoteController controller;
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubSearchProvider.java b/app/src/main/java/github/paroj/dsub2000/provider/DSubSearchProvider.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/provider/DSubSearchProvider.java
rename to app/src/main/java/github/paroj/dsub2000/provider/DSubSearchProvider.java
index b47cbd28c..6f58b17cf 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DSubSearchProvider.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/DSubSearchProvider.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
 import android.app.SearchManager;
 import android.content.ContentProvider;
@@ -24,21 +24,20 @@
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
-import android.util.Log;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.SearchCritera;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.SearchCritera;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Provides search suggestions based on recent searches.
@@ -48,7 +47,7 @@
 public class DSubSearchProvider extends ContentProvider {
 	private static final String TAG = DSubSearchProvider.class.getSimpleName();
 
-	private static final String RESOURCE_PREFIX = "android.resource://github.daneren2005.dsub/";
+	private static final String RESOURCE_PREFIX = "android.resource://github.paroj.dsub2000/";
 	private static final String[] COLUMNS = {"_id",
 			SearchManager.SUGGEST_COLUMN_TEXT_1,
 			SearchManager.SUGGEST_COLUMN_TEXT_2,
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x1.java b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x1.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x1.java
rename to app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x1.java
index c78257c49..233f14859 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x1.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x1.java
@@ -16,9 +16,9 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class DSubWidget4x1 extends DSubWidgetProvider {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x2.java b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x2.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x2.java
rename to app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x2.java
index 4c7d637c3..7d9987024 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x2.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x2.java
@@ -16,9 +16,9 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class DSubWidget4x2 extends DSubWidgetProvider {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x3.java b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x3.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x3.java
rename to app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x3.java
index b4f91a455..e7ff4a43d 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x3.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x3.java
@@ -16,9 +16,9 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class DSubWidget4x3 extends DSubWidgetProvider {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x4.java b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x4.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x4.java
rename to app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x4.java
index a591ff294..8e48f8613 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidget4x4.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidget4x4.java
@@ -16,9 +16,9 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class DSubWidget4x4 extends DSubWidgetProvider {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidgetProvider.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java
rename to app/src/main/java/github/paroj/dsub2000/provider/DSubWidgetProvider.java
index 27fc9ac60..db14be0d0 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/DSubWidgetProvider.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/DSubWidgetProvider.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
@@ -39,17 +39,17 @@
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicActivity;
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerQueue;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.DownloadServiceLifecycleSupport;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicActivity;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerQueue;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.DownloadServiceLifecycleSupport;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Simple widget to show currently playing album art along
@@ -274,7 +274,7 @@ private static Bitmap getRoundedCornerBitmap(Bitmap bitmap) {
     /**
      * Link up various button actions using {@link PendingIntent}.
      *
-     * @param playerActive @param playerActive True if player is active in background.  Launch {@link github.daneren2005.dsub.activity.SubsonicFragmentActivity}.
+     * @param playerActive @param playerActive True if player is active in background.  Launch {@link github.paroj.dsub2000.activity.SubsonicFragmentActivity}.
      */
     private void linkButtons(Context context, RemoteViews views, boolean playerActive) {
 		Intent intent = new Intent(context, SubsonicFragmentActivity.class);
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/JukeboxRouteProvider.java b/app/src/main/java/github/paroj/dsub2000/provider/JukeboxRouteProvider.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/provider/JukeboxRouteProvider.java
rename to app/src/main/java/github/paroj/dsub2000/provider/JukeboxRouteProvider.java
index 527a0d514..5002289ba 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/JukeboxRouteProvider.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/JukeboxRouteProvider.java
@@ -16,7 +16,7 @@
 
 	Copyright 2014 (C) Scott Jackson
 */
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
 import android.content.Context;
 import android.content.Intent;
@@ -28,15 +28,15 @@
 import androidx.mediarouter.media.MediaRouteProvider;
 import androidx.mediarouter.media.MediaRouteProviderDescriptor;
 
-import github.daneren2005.dsub.domain.RemoteControlState;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.RemoteController;
+import github.paroj.dsub2000.domain.RemoteControlState;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.RemoteController;
 
 /**
  * Created by Scott on 11/28/13.
  */
 public class JukeboxRouteProvider extends MediaRouteProvider {
-	public static final String CATEGORY_JUKEBOX_ROUTE = "github.daneren2005.dsub.SERVER_JUKEBOX";
+	public static final String CATEGORY_JUKEBOX_ROUTE = "github.paroj.dsub2000.SERVER_JUKEBOX";
 	private RemoteController controller;
 	private static final int MAX_VOLUME = 10;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/MostRecentStubProvider.java b/app/src/main/java/github/paroj/dsub2000/provider/MostRecentStubProvider.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/provider/MostRecentStubProvider.java
rename to app/src/main/java/github/paroj/dsub2000/provider/MostRecentStubProvider.java
index 80dd93cc6..36f144dbc 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/MostRecentStubProvider.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/MostRecentStubProvider.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/PlaylistStubProvider.java b/app/src/main/java/github/paroj/dsub2000/provider/PlaylistStubProvider.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/provider/PlaylistStubProvider.java
rename to app/src/main/java/github/paroj/dsub2000/provider/PlaylistStubProvider.java
index 1481557ff..70831d323 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/PlaylistStubProvider.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/PlaylistStubProvider.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/PodcastStubProvider.java b/app/src/main/java/github/paroj/dsub2000/provider/PodcastStubProvider.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/provider/PodcastStubProvider.java
rename to app/src/main/java/github/paroj/dsub2000/provider/PodcastStubProvider.java
index 7d9bfca14..d9d6e1588 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/PodcastStubProvider.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/PodcastStubProvider.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/github/daneren2005/dsub/provider/StarredStubProvider.java b/app/src/main/java/github/paroj/dsub2000/provider/StarredStubProvider.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/provider/StarredStubProvider.java
rename to app/src/main/java/github/paroj/dsub2000/provider/StarredStubProvider.java
index f638c348f..66026cc8a 100644
--- a/app/src/main/java/github/daneren2005/dsub/provider/StarredStubProvider.java
+++ b/app/src/main/java/github/paroj/dsub2000/provider/StarredStubProvider.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.provider;
+package github.paroj.dsub2000.provider;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/A2dpIntentReceiver.java b/app/src/main/java/github/paroj/dsub2000/receiver/A2dpIntentReceiver.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/receiver/A2dpIntentReceiver.java
rename to app/src/main/java/github/paroj/dsub2000/receiver/A2dpIntentReceiver.java
index 8f6ab810e..66b7f826d 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/A2dpIntentReceiver.java
+++ b/app/src/main/java/github/paroj/dsub2000/receiver/A2dpIntentReceiver.java
@@ -1,10 +1,10 @@
-package github.daneren2005.dsub.receiver;
+package github.paroj.dsub2000.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
-import github.daneren2005.dsub.service.DownloadService;
+import github.paroj.dsub2000.service.DownloadService;
 
 public class A2dpIntentReceiver extends BroadcastReceiver {
 	private static final String PLAYSTATUS_RESPONSE = "com.android.music.playstatusresponse";
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/AudioNoisyReceiver.java b/app/src/main/java/github/paroj/dsub2000/receiver/AudioNoisyReceiver.java
similarity index 86%
rename from app/src/main/java/github/daneren2005/dsub/receiver/AudioNoisyReceiver.java
rename to app/src/main/java/github/paroj/dsub2000/receiver/AudioNoisyReceiver.java
index cb2a433e8..5bf7a6fc6 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/AudioNoisyReceiver.java
+++ b/app/src/main/java/github/paroj/dsub2000/receiver/AudioNoisyReceiver.java
@@ -13,19 +13,18 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.receiver;
+package github.paroj.dsub2000.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.AudioManager;
-import android.util.Log;
 
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 public class AudioNoisyReceiver extends BroadcastReceiver {
 	private static final String TAG = AudioNoisyReceiver.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/BootReceiver.java b/app/src/main/java/github/paroj/dsub2000/receiver/BootReceiver.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/receiver/BootReceiver.java
rename to app/src/main/java/github/paroj/dsub2000/receiver/BootReceiver.java
index 634aeeee4..9ba87f5b2 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/BootReceiver.java
+++ b/app/src/main/java/github/paroj/dsub2000/receiver/BootReceiver.java
@@ -13,14 +13,14 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.receiver;
+package github.paroj.dsub2000.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import github.daneren2005.dsub.service.HeadphoneListenerService;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.service.HeadphoneListenerService;
+import github.paroj.dsub2000.util.Util;
 
 public class BootReceiver  extends BroadcastReceiver {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/HeadphonePlugReceiver.java b/app/src/main/java/github/paroj/dsub2000/receiver/HeadphonePlugReceiver.java
similarity index 89%
rename from app/src/main/java/github/daneren2005/dsub/receiver/HeadphonePlugReceiver.java
rename to app/src/main/java/github/paroj/dsub2000/receiver/HeadphonePlugReceiver.java
index ebf509362..5f4683478 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/HeadphonePlugReceiver.java
+++ b/app/src/main/java/github/paroj/dsub2000/receiver/HeadphonePlugReceiver.java
@@ -13,15 +13,14 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.receiver;
+package github.paroj.dsub2000.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.util.Log;
 
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.Util;
 
 public class HeadphonePlugReceiver extends BroadcastReceiver {
 	private static final String TAG = HeadphonePlugReceiver.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java b/app/src/main/java/github/paroj/dsub2000/receiver/MediaButtonIntentReceiver.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java
rename to app/src/main/java/github/paroj/dsub2000/receiver/MediaButtonIntentReceiver.java
index 0f0508019..01895f566 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java
+++ b/app/src/main/java/github/paroj/dsub2000/receiver/MediaButtonIntentReceiver.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.receiver;
+package github.paroj.dsub2000.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -24,7 +24,7 @@
 import android.util.Log;
 import android.view.KeyEvent;
 
-import github.daneren2005.dsub.service.DownloadService;
+import github.paroj.dsub2000.service.DownloadService;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/receiver/PlayActionReceiver.java b/app/src/main/java/github/paroj/dsub2000/receiver/PlayActionReceiver.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/receiver/PlayActionReceiver.java
rename to app/src/main/java/github/paroj/dsub2000/receiver/PlayActionReceiver.java
index aa3b9173b..b11af6390 100644
--- a/app/src/main/java/github/daneren2005/dsub/receiver/PlayActionReceiver.java
+++ b/app/src/main/java/github/paroj/dsub2000/receiver/PlayActionReceiver.java
@@ -13,16 +13,15 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.receiver;
+package github.paroj.dsub2000.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.Constants;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.Constants;
 
 public class PlayActionReceiver extends BroadcastReceiver {
 	private static final String TAG = PlayActionReceiver.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java b/app/src/main/java/github/paroj/dsub2000/service/AutoMediaBrowserService.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java
rename to app/src/main/java/github/paroj/dsub2000/service/AutoMediaBrowserService.java
index 4e64264d1..c9ca41605 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/AutoMediaBrowserService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/AutoMediaBrowserService.java
@@ -16,7 +16,7 @@
 
 	Copyright 2015 (C) Scott Jackson
 */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -32,19 +32,19 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.SilentServiceTask;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.util.compat.RemoteControlClientLP;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.Indexes;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.SilentServiceTask;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.util.compat.RemoteControlClientLP;
 
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class AutoMediaBrowserService extends MediaBrowserServiceCompat {
diff --git a/app/src/main/java/github/daneren2005/dsub/service/CachedMusicService.java b/app/src/main/java/github/paroj/dsub2000/service/CachedMusicService.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/service/CachedMusicService.java
rename to app/src/main/java/github/paroj/dsub2000/service/CachedMusicService.java
index bcb6daae3..f8a1c5a85 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/CachedMusicService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/CachedMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,34 +32,34 @@
 import android.graphics.Bitmap;
 import android.util.Log;
 
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.ArtistInfo;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.ChatMessage;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.domain.PlayerQueue;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.domain.RemoteStatus;
-import github.daneren2005.dsub.domain.Lyrics;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.domain.SearchCritera;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.domain.Share;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.SongDBHandler;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.TimeLimitedCache;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Util;
-
-import static github.daneren2005.dsub.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.ArtistInfo;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.ChatMessage;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.domain.Indexes;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.domain.PlayerQueue;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.domain.RemoteStatus;
+import github.paroj.dsub2000.domain.Lyrics;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.domain.SearchCritera;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.domain.Share;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.SongDBHandler;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.TimeLimitedCache;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Util;
+
+import static github.paroj.dsub2000.domain.MusicDirectory.Entry;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DLNAController.java b/app/src/main/java/github/paroj/dsub2000/service/DLNAController.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/service/DLNAController.java
rename to app/src/main/java/github/paroj/dsub2000/service/DLNAController.java
index e22c20c16..5471f4541 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DLNAController.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/DLNAController.java
@@ -13,9 +13,8 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
-import android.content.SharedPreferences;
 import android.os.Looper;
 import android.util.Log;
 
@@ -61,17 +60,14 @@
 import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicLong;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.DLNADevice;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Pair;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.serverproxy.FileProxy;
-import github.daneren2005.serverproxy.ServerProxy;
-import github.daneren2005.serverproxy.WebProxy;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.DLNADevice;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Pair;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.serverproxy.WebProxy;
 
 public class DLNAController extends RemoteController {
 	private static final String TAG = DLNAController.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadFile.java b/app/src/main/java/github/paroj/dsub2000/service/DownloadFile.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/service/DownloadFile.java
rename to app/src/main/java/github/paroj/dsub2000/service/DownloadFile.java
index 458a9659f..dc08e217e 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadFile.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/DownloadFile.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -31,15 +31,15 @@
 import android.os.PowerManager;
 import android.util.Log;
 
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.SongDBHandler;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.util.CacheCleaner;
-import github.daneren2005.serverproxy.BufferFile;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.SongDBHandler;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.util.CacheCleaner;
+import github.paroj.serverproxy.BufferFile;
 
 public class DownloadFile implements BufferFile {
     private static final String TAG = DownloadFile.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java b/app/src/main/java/github/paroj/dsub2000/service/DownloadService.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
rename to app/src/main/java/github/paroj/dsub2000/service/DownloadService.java
index d4698ceae..4f91d1e6e 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/DownloadService.java
@@ -16,48 +16,48 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import static androidx.mediarouter.media.MediaRouter.RouteInfo;
-import static github.daneren2005.dsub.domain.PlayerState.COMPLETED;
-import static github.daneren2005.dsub.domain.PlayerState.DOWNLOADING;
-import static github.daneren2005.dsub.domain.PlayerState.IDLE;
-import static github.daneren2005.dsub.domain.PlayerState.PAUSED;
-import static github.daneren2005.dsub.domain.PlayerState.PAUSED_TEMP;
-import static github.daneren2005.dsub.domain.PlayerState.PREPARED;
-import static github.daneren2005.dsub.domain.PlayerState.PREPARING;
-import static github.daneren2005.dsub.domain.PlayerState.STARTED;
-import static github.daneren2005.dsub.domain.PlayerState.STOPPED;
-import static github.daneren2005.dsub.domain.RemoteControlState.LOCAL;
-
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicActivity;
-import github.daneren2005.dsub.audiofx.AudioEffectsController;
-import github.daneren2005.dsub.audiofx.EqualizerController;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.domain.RemoteControlState;
-import github.daneren2005.dsub.domain.RepeatMode;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.receiver.AudioNoisyReceiver;
-import github.daneren2005.dsub.receiver.MediaButtonIntentReceiver;
-import github.daneren2005.dsub.util.ArtistRadioBuffer;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.Notifications;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.MediaRouteManager;
-import github.daneren2005.dsub.util.ShufflePlayBuffer;
-import github.daneren2005.dsub.util.SimpleServiceBinder;
-import github.daneren2005.dsub.util.UpdateHelper;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.util.compat.RemoteControlClientBase;
-import github.daneren2005.dsub.util.tags.BastpUtil;
-import github.daneren2005.dsub.view.UpdateView;
-import github.daneren2005.serverproxy.BufferProxy;
+import static github.paroj.dsub2000.domain.PlayerState.COMPLETED;
+import static github.paroj.dsub2000.domain.PlayerState.DOWNLOADING;
+import static github.paroj.dsub2000.domain.PlayerState.IDLE;
+import static github.paroj.dsub2000.domain.PlayerState.PAUSED;
+import static github.paroj.dsub2000.domain.PlayerState.PAUSED_TEMP;
+import static github.paroj.dsub2000.domain.PlayerState.PREPARED;
+import static github.paroj.dsub2000.domain.PlayerState.PREPARING;
+import static github.paroj.dsub2000.domain.PlayerState.STARTED;
+import static github.paroj.dsub2000.domain.PlayerState.STOPPED;
+import static github.paroj.dsub2000.domain.RemoteControlState.LOCAL;
+
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicActivity;
+import github.paroj.dsub2000.audiofx.AudioEffectsController;
+import github.paroj.dsub2000.audiofx.EqualizerController;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.domain.RemoteControlState;
+import github.paroj.dsub2000.domain.RepeatMode;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.receiver.AudioNoisyReceiver;
+import github.paroj.dsub2000.receiver.MediaButtonIntentReceiver;
+import github.paroj.dsub2000.util.ArtistRadioBuffer;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.Notifications;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.MediaRouteManager;
+import github.paroj.dsub2000.util.ShufflePlayBuffer;
+import github.paroj.dsub2000.util.SimpleServiceBinder;
+import github.paroj.dsub2000.util.UpdateHelper;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.util.compat.RemoteControlClientBase;
+import github.paroj.dsub2000.util.tags.BastpUtil;
+import github.paroj.dsub2000.view.UpdateView;
+import github.paroj.serverproxy.BufferProxy;
 
 import java.io.File;
 import java.io.IOException;
@@ -103,14 +103,14 @@
 public class DownloadService extends Service {
 	private static final String TAG = DownloadService.class.getSimpleName();
 
-	public static final String CMD_PLAY = "github.daneren2005.dsub.CMD_PLAY";
-	public static final String CMD_TOGGLEPAUSE = "github.daneren2005.dsub.CMD_TOGGLEPAUSE";
-	public static final String CMD_PAUSE = "github.daneren2005.dsub.CMD_PAUSE";
-	public static final String CMD_STOP = "github.daneren2005.dsub.CMD_STOP";
-	public static final String CMD_PREVIOUS = "github.daneren2005.dsub.CMD_PREVIOUS";
-	public static final String CMD_NEXT = "github.daneren2005.dsub.CMD_NEXT";
-	public static final String CANCEL_DOWNLOADS = "github.daneren2005.dsub.CANCEL_DOWNLOADS";
-	public static final String START_PLAY = "github.daneren2005.dsub.START_PLAYING";
+	public static final String CMD_PLAY = "github.paroj.dsub2000.CMD_PLAY";
+	public static final String CMD_TOGGLEPAUSE = "github.paroj.dsub2000.CMD_TOGGLEPAUSE";
+	public static final String CMD_PAUSE = "github.paroj.dsub2000.CMD_PAUSE";
+	public static final String CMD_STOP = "github.paroj.dsub2000.CMD_STOP";
+	public static final String CMD_PREVIOUS = "github.paroj.dsub2000.CMD_PREVIOUS";
+	public static final String CMD_NEXT = "github.paroj.dsub2000.CMD_NEXT";
+	public static final String CANCEL_DOWNLOADS = "github.paroj.dsub2000.CANCEL_DOWNLOADS";
+	public static final String START_PLAY = "github.paroj.dsub2000.START_PLAYING";
 	private static final long DEFAULT_DELAY_UPDATE_PROGRESS = 1000L;
 	private static final double DELETE_CUTOFF = 0.84;
 	private static final int REQUIRED_ALBUM_MATCHES = 4;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java b/app/src/main/java/github/paroj/dsub2000/service/DownloadServiceLifecycleSupport.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
rename to app/src/main/java/github/paroj/dsub2000/service/DownloadServiceLifecycleSupport.java
index 1c80b622a..2e8113b19 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/DownloadServiceLifecycleSupport.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -37,20 +37,20 @@
 import android.util.Log;
 import android.view.KeyEvent;
 
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerQueue;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.util.CacheCleaner;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Pair;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.SongDBHandler;
-import github.daneren2005.dsub.util.Util;
-
-import static github.daneren2005.dsub.domain.PlayerState.PREPARING;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerQueue;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.util.CacheCleaner;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Pair;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.SongDBHandler;
+import github.paroj.dsub2000.util.Util;
+
+import static github.paroj.dsub2000.domain.PlayerState.PREPARING;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/HeadphoneListenerService.java b/app/src/main/java/github/paroj/dsub2000/service/HeadphoneListenerService.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/HeadphoneListenerService.java
rename to app/src/main/java/github/paroj/dsub2000/service/HeadphoneListenerService.java
index f4375c507..03da4433f 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/HeadphoneListenerService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/HeadphoneListenerService.java
@@ -13,15 +13,15 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import android.app.Service;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.IBinder;
 
-import github.daneren2005.dsub.receiver.HeadphonePlugReceiver;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.receiver.HeadphonePlugReceiver;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Created by Scott on 4/6/2015.
diff --git a/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java b/app/src/main/java/github/paroj/dsub2000/service/JukeboxController.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java
rename to app/src/main/java/github/paroj/dsub2000/service/JukeboxController.java
index b9f40f320..44efba4e1 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/JukeboxController.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/JukeboxController.java
@@ -13,18 +13,18 @@
 	Copyright 2009 (C) Sindre Mehus
 */
 
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import android.os.Handler;
 import android.util.Log;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.RemoteStatus;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.domain.RemoteControlState;
-import github.daneren2005.dsub.domain.RepeatMode;
-import github.daneren2005.dsub.service.parser.SubsonicRESTException;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.RemoteStatus;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.domain.RemoteControlState;
+import github.paroj.dsub2000.domain.RepeatMode;
+import github.paroj.dsub2000.service.parser.SubsonicRESTException;
+import github.paroj.dsub2000.util.Util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/MediaStoreService.java b/app/src/main/java/github/paroj/dsub2000/service/MediaStoreService.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/service/MediaStoreService.java
rename to app/src/main/java/github/paroj/dsub2000/service/MediaStoreService.java
index 28bd488a4..96fcb9c8d 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/MediaStoreService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/MediaStoreService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import java.io.File;
 
@@ -27,9 +27,9 @@
 import android.net.Uri;
 import android.provider.MediaStore;
 import android.util.Log;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/MusicService.java b/app/src/main/java/github/paroj/dsub2000/service/MusicService.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/MusicService.java
rename to app/src/main/java/github/paroj/dsub2000/service/MusicService.java
index 6f2400017..91b306ab6 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/MusicService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/MusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import java.net.HttpURLConnection;
 import java.util.List;
@@ -25,25 +25,24 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 
-import github.daneren2005.dsub.domain.ArtistInfo;
-import github.daneren2005.dsub.domain.ChatMessage;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.domain.PlayerQueue;
-import github.daneren2005.dsub.domain.RemoteStatus;
-import github.daneren2005.dsub.domain.Lyrics;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.domain.SearchCritera;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.domain.Share;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.domain.Version;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.domain.ArtistInfo;
+import github.paroj.dsub2000.domain.ChatMessage;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.domain.Indexes;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.domain.PlayerQueue;
+import github.paroj.dsub2000.domain.RemoteStatus;
+import github.paroj.dsub2000.domain.Lyrics;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.domain.SearchCritera;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.domain.Share;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.ProgressListener;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/MusicServiceFactory.java b/app/src/main/java/github/paroj/dsub2000/service/MusicServiceFactory.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/service/MusicServiceFactory.java
rename to app/src/main/java/github/paroj/dsub2000/service/MusicServiceFactory.java
index e04522ff1..4dbad8164 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/MusicServiceFactory.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/MusicServiceFactory.java
@@ -16,10 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import android.content.Context;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/OfflineException.java b/app/src/main/java/github/paroj/dsub2000/service/OfflineException.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/OfflineException.java
rename to app/src/main/java/github/paroj/dsub2000/service/OfflineException.java
index e3a8d4607..220a8968a 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/OfflineException.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/OfflineException.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 /**
  * Thrown by service methods that are not available in offline mode.
diff --git a/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java b/app/src/main/java/github/paroj/dsub2000/service/OfflineMusicService.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java
rename to app/src/main/java/github/paroj/dsub2000/service/OfflineMusicService.java
index 350aa54e9..92bb8b8e9 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/OfflineMusicService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/OfflineMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import java.io.File;
 import java.io.Reader;
@@ -35,32 +35,32 @@
 import android.graphics.Bitmap;
 import android.util.Log;
 
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.ArtistInfo;
-import github.daneren2005.dsub.domain.ChatMessage;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.domain.PlayerQueue;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.domain.RemoteStatus;
-import github.daneren2005.dsub.domain.Lyrics;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.domain.SearchCritera;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.domain.Share;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Pair;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.SongDBHandler;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.ArtistInfo;
+import github.paroj.dsub2000.domain.ChatMessage;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.domain.Indexes;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.PlayerQueue;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.domain.RemoteStatus;
+import github.paroj.dsub2000.domain.Lyrics;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.domain.SearchCritera;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.domain.Share;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Pair;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.SongDBHandler;
+import github.paroj.dsub2000.util.Util;
 import java.io.*;
 import java.util.Comparator;
 import java.util.SortedSet;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java b/app/src/main/java/github/paroj/dsub2000/service/RESTMusicService.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java
rename to app/src/main/java/github/paroj/dsub2000/service/RESTMusicService.java
index ff2c2bf8d..1ff3920b3 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/RESTMusicService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/RESTMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -42,45 +42,45 @@
 import android.util.Base64;
 import android.util.Log;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.*;
-import github.daneren2005.dsub.fragments.MainFragment;
-import github.daneren2005.dsub.service.parser.EntryListParser;
-import github.daneren2005.dsub.service.parser.ArtistInfoParser;
-import github.daneren2005.dsub.service.parser.BookmarkParser;
-import github.daneren2005.dsub.service.parser.ChatMessageParser;
-import github.daneren2005.dsub.service.parser.ErrorParser;
-import github.daneren2005.dsub.service.parser.GenreParser;
-import github.daneren2005.dsub.service.parser.IndexesParser;
-import github.daneren2005.dsub.service.parser.InternetRadioStationParser;
-import github.daneren2005.dsub.service.parser.JukeboxStatusParser;
-import github.daneren2005.dsub.service.parser.LicenseParser;
-import github.daneren2005.dsub.service.parser.LyricsParser;
-import github.daneren2005.dsub.service.parser.MusicDirectoryParser;
-import github.daneren2005.dsub.service.parser.MusicFoldersParser;
-import github.daneren2005.dsub.service.parser.PlayQueueParser;
-import github.daneren2005.dsub.service.parser.PlaylistParser;
-import github.daneren2005.dsub.service.parser.PlaylistsParser;
-import github.daneren2005.dsub.service.parser.PodcastChannelParser;
-import github.daneren2005.dsub.service.parser.PodcastEntryParser;
-import github.daneren2005.dsub.service.parser.RandomSongsParser;
-import github.daneren2005.dsub.service.parser.ScanStatusParser;
-import github.daneren2005.dsub.service.parser.SearchResult2Parser;
-import github.daneren2005.dsub.service.parser.SearchResultParser;
-import github.daneren2005.dsub.service.parser.ShareParser;
-import github.daneren2005.dsub.service.parser.StarredListParser;
-import github.daneren2005.dsub.service.parser.TopSongsParser;
-import github.daneren2005.dsub.service.parser.UserParser;
-import github.daneren2005.dsub.service.parser.VideosParser;
-import github.daneren2005.dsub.util.KeyStoreUtil;
-import github.daneren2005.dsub.util.Pair;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.SongDBHandler;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.dsub.util.compat.GoogleCompat;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.*;
+import github.paroj.dsub2000.fragments.MainFragment;
+import github.paroj.dsub2000.service.parser.EntryListParser;
+import github.paroj.dsub2000.service.parser.ArtistInfoParser;
+import github.paroj.dsub2000.service.parser.BookmarkParser;
+import github.paroj.dsub2000.service.parser.ChatMessageParser;
+import github.paroj.dsub2000.service.parser.ErrorParser;
+import github.paroj.dsub2000.service.parser.GenreParser;
+import github.paroj.dsub2000.service.parser.IndexesParser;
+import github.paroj.dsub2000.service.parser.InternetRadioStationParser;
+import github.paroj.dsub2000.service.parser.JukeboxStatusParser;
+import github.paroj.dsub2000.service.parser.LicenseParser;
+import github.paroj.dsub2000.service.parser.LyricsParser;
+import github.paroj.dsub2000.service.parser.MusicDirectoryParser;
+import github.paroj.dsub2000.service.parser.MusicFoldersParser;
+import github.paroj.dsub2000.service.parser.PlayQueueParser;
+import github.paroj.dsub2000.service.parser.PlaylistParser;
+import github.paroj.dsub2000.service.parser.PlaylistsParser;
+import github.paroj.dsub2000.service.parser.PodcastChannelParser;
+import github.paroj.dsub2000.service.parser.PodcastEntryParser;
+import github.paroj.dsub2000.service.parser.RandomSongsParser;
+import github.paroj.dsub2000.service.parser.ScanStatusParser;
+import github.paroj.dsub2000.service.parser.SearchResult2Parser;
+import github.paroj.dsub2000.service.parser.SearchResultParser;
+import github.paroj.dsub2000.service.parser.ShareParser;
+import github.paroj.dsub2000.service.parser.StarredListParser;
+import github.paroj.dsub2000.service.parser.TopSongsParser;
+import github.paroj.dsub2000.service.parser.UserParser;
+import github.paroj.dsub2000.service.parser.VideosParser;
+import github.paroj.dsub2000.util.KeyStoreUtil;
+import github.paroj.dsub2000.util.Pair;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.SongDBHandler;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.dsub2000.util.compat.GoogleCompat;
 
 import java.io.*;
 import java.util.Map;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/RemoteController.java b/app/src/main/java/github/paroj/dsub2000/service/RemoteController.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/service/RemoteController.java
rename to app/src/main/java/github/paroj/dsub2000/service/RemoteController.java
index e12edb02e..cdcacda56 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/RemoteController.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/RemoteController.java
@@ -17,7 +17,7 @@
 	Copyright 2009 (C) Sindre Mehus
 */
 
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import android.content.SharedPreferences;
 import android.util.Log;
@@ -25,13 +25,13 @@
 import java.util.Iterator;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.RemoteStatus;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
-import github.daneren2005.serverproxy.FileProxy;
-import github.daneren2005.serverproxy.ServerProxy;
-import github.daneren2005.serverproxy.WebProxy;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.RemoteStatus;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
+import github.paroj.serverproxy.FileProxy;
+import github.paroj.serverproxy.ServerProxy;
+import github.paroj.serverproxy.WebProxy;
 
 public abstract class RemoteController {
 	private static final String TAG = RemoteController.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/Scrobbler.java b/app/src/main/java/github/paroj/dsub2000/service/Scrobbler.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/service/Scrobbler.java
rename to app/src/main/java/github/paroj/dsub2000/service/Scrobbler.java
index c7ad639ec..56ecc3b0a 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/Scrobbler.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/Scrobbler.java
@@ -1,14 +1,13 @@
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
 import android.content.Context;
 import android.util.Log;
 
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.SongDBHandler;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.SongDBHandler;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Scrobbles played songs to Last.fm.
diff --git a/app/src/main/java/github/daneren2005/dsub/service/ServerTooOldException.java b/app/src/main/java/github/paroj/dsub2000/service/ServerTooOldException.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/ServerTooOldException.java
rename to app/src/main/java/github/paroj/dsub2000/service/ServerTooOldException.java
index e4a951de0..a5a7094c6 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/ServerTooOldException.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/ServerTooOldException.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service;
+package github.paroj.dsub2000.service;
 
-import github.daneren2005.dsub.domain.Version;
+import github.paroj.dsub2000.domain.Version;
 
 /**
  * Thrown if the REST API version implemented by the server is too old.
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/AbstractParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/AbstractParser.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/AbstractParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/AbstractParser.java
index d4c090c1c..1f1fce89b 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/AbstractParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/AbstractParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -26,11 +26,11 @@
 import android.content.Context;
 import android.util.Log;
 import android.util.Xml;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.domain.Version;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.domain.Version;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/ArtistInfoParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/ArtistInfoParser.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/ArtistInfoParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/ArtistInfoParser.java
index 5c3d2412c..37d974349 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/ArtistInfoParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/ArtistInfoParser.java
@@ -13,10 +13,9 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import android.util.Log;
 
 import org.xmlpull.v1.XmlPullParser;
 
@@ -24,9 +23,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.ArtistInfo;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.ArtistInfo;
+import github.paroj.dsub2000.util.ProgressListener;
 
 public class ArtistInfoParser extends AbstractParser {
 	private static final String TAG = ArtistInfo.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/BookmarkParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/BookmarkParser.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/BookmarkParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/BookmarkParser.java
index 8e04749cc..a86d18a03 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/BookmarkParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/BookmarkParser.java
@@ -16,17 +16,16 @@
 	
 	Copyright 2013 (C) Scott Jackson
 */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 import java.io.Reader;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/ChatMessageParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/ChatMessageParser.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/ChatMessageParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/ChatMessageParser.java
index 36835fcee..f25636046 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/ChatMessageParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/ChatMessageParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ChatMessage;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ChatMessage;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/EntryListParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/EntryListParser.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/EntryListParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/EntryListParser.java
index f91aaae1c..780ca7b45 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/EntryListParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/EntryListParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/ErrorParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/ErrorParser.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/ErrorParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/ErrorParser.java
index 1b389f800..8c11a39a9 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/ErrorParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/ErrorParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/GenreParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/GenreParser.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/GenreParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/GenreParser.java
index ddb035445..8cac1d5ef 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/GenreParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/GenreParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 import android.text.Html;
 import android.util.Log;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.util.ProgressListener;
 
 import org.xmlpull.v1.XmlPullParser;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/IndexesParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/IndexesParser.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/IndexesParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/IndexesParser.java
index f0cce2178..3fb3e62c5 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/IndexesParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/IndexesParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import java.io.Reader;
 import java.util.HashMap;
@@ -28,14 +28,14 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.Indexes;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ProgressListener;
 import android.util.Log;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/InternetRadioStationParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/InternetRadioStationParser.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/InternetRadioStationParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/InternetRadioStationParser.java
index 77d7bc4ad..d3cff8308 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/InternetRadioStationParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/InternetRadioStationParser.java
@@ -16,11 +16,11 @@
 
 	Copyright 2016 (C) Scott Jackson
 */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/JukeboxStatusParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/JukeboxStatusParser.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/JukeboxStatusParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/JukeboxStatusParser.java
index 955296359..831a62b25 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/JukeboxStatusParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/JukeboxStatusParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import java.io.Reader;
 
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
-import github.daneren2005.dsub.domain.RemoteStatus;
+import github.paroj.dsub2000.domain.RemoteStatus;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/LicenseParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/LicenseParser.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/LicenseParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/LicenseParser.java
index 787900625..b0fd84445 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/LicenseParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/LicenseParser.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.domain.Version;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.domain.Version;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/LyricsParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/LyricsParser.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/LyricsParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/LyricsParser.java
index e7ce7a4bc..085f9b480 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/LyricsParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/LyricsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Lyrics;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Lyrics;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/MusicDirectoryEntryParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/MusicDirectoryEntryParser.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/MusicDirectoryEntryParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/MusicDirectoryEntryParser.java
index 9542324e1..4a01ee06f 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/MusicDirectoryEntryParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/MusicDirectoryEntryParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/MusicDirectoryParser.java
similarity index 89%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/MusicDirectoryParser.java
index bb1980b6e..f7ae904f9 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/MusicDirectoryParser.java
@@ -16,23 +16,22 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import android.util.Log;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.Util;
+
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.Util;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 import java.util.HashMap;
 import java.util.Map;
 
-import static github.daneren2005.dsub.domain.MusicDirectory.*;
+import static github.paroj.dsub2000.domain.MusicDirectory.*;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/MusicFoldersParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/MusicFoldersParser.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/MusicFoldersParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/MusicFoldersParser.java
index a525084e1..dbfb9a786 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/MusicFoldersParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/MusicFoldersParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import java.io.Reader;
 import java.util.ArrayList;
@@ -25,9 +25,9 @@
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.util.ProgressListener;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/PlayQueueParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/PlayQueueParser.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/PlayQueueParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/PlayQueueParser.java
index ec161d2b7..61d5d0a96 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/PlayQueueParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/PlayQueueParser.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 
@@ -25,9 +25,9 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerQueue;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerQueue;
+import github.paroj.dsub2000.util.ProgressListener;
 
 public class PlayQueueParser extends MusicDirectoryEntryParser {
 	private static final String TAG = PlayQueueParser.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/PlaylistParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/PlaylistParser.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/PlaylistParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/PlaylistParser.java
index 5bb07dfd7..0c321773b 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/PlaylistParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/PlaylistParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/PlaylistsParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/PlaylistsParser.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/PlaylistsParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/PlaylistsParser.java
index 7aa0e99ec..6a79f760b 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/PlaylistsParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/PlaylistsParser.java
@@ -16,14 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import android.util.Log;
 
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.Util;
 
 import org.xmlpull.v1.XmlPullParser;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/PodcastChannelParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/PodcastChannelParser.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/PodcastChannelParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/PodcastChannelParser.java
index 1786e034f..1b604e32c 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/PodcastChannelParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/PodcastChannelParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.util.ProgressListener;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/PodcastEntryParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/PodcastEntryParser.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/PodcastEntryParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/PodcastEntryParser.java
index 306464b06..064625803 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/PodcastEntryParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/PodcastEntryParser.java
@@ -16,17 +16,16 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import android.util.Log;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.ProgressListener;
 import java.io.Reader;
 import org.xmlpull.v1.XmlPullParser;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/RandomSongsParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/RandomSongsParser.java
similarity index 89%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/RandomSongsParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/RandomSongsParser.java
index 370577231..e3c258d11 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/RandomSongsParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/RandomSongsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/ScanStatusParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/ScanStatusParser.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/ScanStatusParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/ScanStatusParser.java
index acd006614..06df8a8b4 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/ScanStatusParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/ScanStatusParser.java
@@ -13,16 +13,16 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.util.ProgressListener;
 
 public class ScanStatusParser extends AbstractParser {
 
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/SearchResult2Parser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/SearchResult2Parser.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/SearchResult2Parser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/SearchResult2Parser.java
index 8cc0c50db..b2199121c 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/SearchResult2Parser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/SearchResult2Parser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/SearchResultParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/SearchResultParser.java
similarity index 86%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/SearchResultParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/SearchResultParser.java
index 252a7b209..c2ebdd73a 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/SearchResultParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/SearchResultParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/ShareParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/ShareParser.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/ShareParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/ShareParser.java
index ea7934f40..0cafbc277 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/ShareParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/ShareParser.java
@@ -16,22 +16,20 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.util.Log;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.domain.Share;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ProgressListener;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.domain.Share;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ProgressListener;
+import github.paroj.dsub2000.util.Util;
 
 import org.xmlpull.v1.XmlPullParser;
 import java.io.Reader;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/StarredListParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/StarredListParser.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/StarredListParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/StarredListParser.java
index 59652e29c..bc5014102 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/StarredListParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/StarredListParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/SubsonicRESTException.java b/app/src/main/java/github/paroj/dsub2000/service/parser/SubsonicRESTException.java
similarity index 86%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/SubsonicRESTException.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/SubsonicRESTException.java
index 096597a14..79d887e6d 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/SubsonicRESTException.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/SubsonicRESTException.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/TopSongsParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/TopSongsParser.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/TopSongsParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/TopSongsParser.java
index 2d1f43dc0..3a234b91c 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/TopSongsParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/TopSongsParser.java
@@ -12,7 +12,7 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2016 (C) Scott Jackson
 */
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 
@@ -20,8 +20,8 @@
 
 import java.io.Reader;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ProgressListener;
 
 public class TopSongsParser extends MusicDirectoryEntryParser {
 
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/UserParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/UserParser.java
similarity index 86%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/UserParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/UserParser.java
index fc2ddd7e8..0b07e4630 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/UserParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/UserParser.java
@@ -13,10 +13,9 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
-import android.util.Log;
 
 import org.xmlpull.v1.XmlPullParser;
 
@@ -24,13 +23,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.domain.User.MusicFolderSetting;
-import github.daneren2005.dsub.domain.User.Setting;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.domain.User.Setting;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.ProgressListener;
 
 public class UserParser extends AbstractParser {
 	private static final String TAG = UserParser.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/service/parser/VideosParser.java b/app/src/main/java/github/paroj/dsub2000/service/parser/VideosParser.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/service/parser/VideosParser.java
rename to app/src/main/java/github/paroj/dsub2000/service/parser/VideosParser.java
index f22c4a4a4..7be7522bd 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/parser/VideosParser.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/parser/VideosParser.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.service.parser;
+package github.paroj.dsub2000.service.parser;
 
 import android.content.Context;
 
@@ -21,8 +21,8 @@
 
 import java.io.Reader;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.ProgressListener;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.ProgressListener;
 
 public class VideosParser extends MusicDirectoryEntryParser {
 	public VideosParser(Context context, int instance) {
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/AuthenticatorService.java b/app/src/main/java/github/paroj/dsub2000/service/sync/AuthenticatorService.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/AuthenticatorService.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/AuthenticatorService.java
index 89fccb918..698f229ee 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/AuthenticatorService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/AuthenticatorService.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.accounts.AbstractAccountAuthenticator;
 import android.accounts.Account;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/MostRecentSyncAdapter.java b/app/src/main/java/github/paroj/dsub2000/service/sync/MostRecentSyncAdapter.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/MostRecentSyncAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/MostRecentSyncAdapter.java
index bcb7b92f0..f2d3924e6 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/MostRecentSyncAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/MostRecentSyncAdapter.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -26,12 +26,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Notifications;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Notifications;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Created by Scott on 8/28/13.
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/MostRecentSyncService.java b/app/src/main/java/github/paroj/dsub2000/service/sync/MostRecentSyncService.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/MostRecentSyncService.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/MostRecentSyncService.java
index 49ea4a0e2..12bbbad44 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/MostRecentSyncService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/MostRecentSyncService.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/PlaylistSyncAdapter.java b/app/src/main/java/github/paroj/dsub2000/service/sync/PlaylistSyncAdapter.java
similarity index 89%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/PlaylistSyncAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/PlaylistSyncAdapter.java
index cb3c38770..079b3b8a8 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/PlaylistSyncAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/PlaylistSyncAdapter.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
 */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -27,16 +27,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.parser.SubsonicRESTException;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Notifications;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.SyncUtil.SyncSet;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.parser.SubsonicRESTException;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Notifications;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.SyncUtil.SyncSet;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Created by Scott on 8/28/13.
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/PlaylistSyncService.java b/app/src/main/java/github/paroj/dsub2000/service/sync/PlaylistSyncService.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/PlaylistSyncService.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/PlaylistSyncService.java
index dd1f3859f..7313db076 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/PlaylistSyncService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/PlaylistSyncService.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/PodcastSyncAdapter.java b/app/src/main/java/github/paroj/dsub2000/service/sync/PodcastSyncAdapter.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/PodcastSyncAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/PodcastSyncAdapter.java
index 7afcad25b..a67e2e950 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/PodcastSyncAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/PodcastSyncAdapter.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -26,16 +26,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.parser.SubsonicRESTException;
-import github.daneren2005.dsub.util.Notifications;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.SyncUtil.SyncSet;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.parser.SubsonicRESTException;
+import github.paroj.dsub2000.util.Notifications;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.SyncUtil.SyncSet;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Created by Scott on 8/28/13.
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/PodcastSyncService.java b/app/src/main/java/github/paroj/dsub2000/service/sync/PodcastSyncService.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/PodcastSyncService.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/PodcastSyncService.java
index e49365819..0100c8bb2 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/PodcastSyncService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/PodcastSyncService.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/StarredSyncAdapter.java b/app/src/main/java/github/paroj/dsub2000/service/sync/StarredSyncAdapter.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/StarredSyncAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/StarredSyncAdapter.java
index 0af8886b6..c20d989ef 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/StarredSyncAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/StarredSyncAdapter.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -26,12 +26,12 @@
 import java.io.File;
 import java.util.ArrayList;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Notifications;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Notifications;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Created by Scott on 8/28/13.
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/StarredSyncService.java b/app/src/main/java/github/paroj/dsub2000/service/sync/StarredSyncService.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/StarredSyncService.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/StarredSyncService.java
index 9806d09ba..808c00822 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/StarredSyncService.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/StarredSyncService.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.app.Service;
 import android.content.Intent;
diff --git a/app/src/main/java/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java b/app/src/main/java/github/paroj/dsub2000/service/sync/SubsonicSyncAdapter.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java
rename to app/src/main/java/github/paroj/dsub2000/service/sync/SubsonicSyncAdapter.java
index 4879d0324..24b05622c 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/sync/SubsonicSyncAdapter.java
+++ b/app/src/main/java/github/paroj/dsub2000/service/sync/SubsonicSyncAdapter.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.service.sync;
+package github.paroj.dsub2000.service.sync;
 
 import android.accounts.Account;
 import android.annotation.TargetApi;
@@ -36,12 +36,12 @@
 
 import java.util.List;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.CachedMusicService;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.RESTMusicService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.CachedMusicService;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.RESTMusicService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * Created by Scott on 9/6/13.
diff --git a/app/src/main/java/github/daneren2005/dsub/updates/Updater.java b/app/src/main/java/github/paroj/dsub2000/updates/Updater.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/updates/Updater.java
rename to app/src/main/java/github/paroj/dsub2000/updates/Updater.java
index 2dabb6245..dafd7cc97 100644
--- a/app/src/main/java/github/daneren2005/dsub/updates/Updater.java
+++ b/app/src/main/java/github/paroj/dsub2000/updates/Updater.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.updates;
+package github.paroj.dsub2000.updates;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.Util;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/updates/UpdaterNoDLNA.java b/app/src/main/java/github/paroj/dsub2000/updates/UpdaterNoDLNA.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/updates/UpdaterNoDLNA.java
rename to app/src/main/java/github/paroj/dsub2000/updates/UpdaterNoDLNA.java
index a060c4fd8..8ab12a54e 100644
--- a/app/src/main/java/github/daneren2005/dsub/updates/UpdaterNoDLNA.java
+++ b/app/src/main/java/github/paroj/dsub2000/updates/UpdaterNoDLNA.java
@@ -13,14 +13,14 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.updates;
+package github.paroj.dsub2000.updates;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 public class UpdaterNoDLNA extends Updater {
 	public UpdaterNoDLNA() {
diff --git a/app/src/main/java/github/daneren2005/dsub/updates/UpdaterSongPress.java b/app/src/main/java/github/paroj/dsub2000/updates/UpdaterSongPress.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/updates/UpdaterSongPress.java
rename to app/src/main/java/github/paroj/dsub2000/updates/UpdaterSongPress.java
index 7efa18e43..d6078a954 100644
--- a/app/src/main/java/github/daneren2005/dsub/updates/UpdaterSongPress.java
+++ b/app/src/main/java/github/paroj/dsub2000/updates/UpdaterSongPress.java
@@ -13,13 +13,13 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.updates;
+package github.paroj.dsub2000.updates;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.Util;
 
 public class UpdaterSongPress extends Updater {
 	public UpdaterSongPress() {
diff --git a/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java b/app/src/main/java/github/paroj/dsub2000/util/ArtistRadioBuffer.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java
rename to app/src/main/java/github/paroj/dsub2000/util/ArtistRadioBuffer.java
index bdd961b4b..08880c55f 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/ArtistRadioBuffer.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/ArtistRadioBuffer.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.util.Log;
 
@@ -23,10 +23,10 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
 
 public class ArtistRadioBuffer {
 	private static final String TAG = ArtistRadioBuffer.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/util/BackgroundTask.java b/app/src/main/java/github/paroj/dsub2000/util/BackgroundTask.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/BackgroundTask.java
rename to app/src/main/java/github/paroj/dsub2000/util/BackgroundTask.java
index d03badb00..3854a397b 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/BackgroundTask.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/BackgroundTask.java
@@ -16,14 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -39,8 +38,8 @@
 
 import javax.net.ssl.SSLException;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.view.ErrorDialog;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.view.ErrorDialog;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/util/CacheCleaner.java b/app/src/main/java/github/paroj/dsub2000/util/CacheCleaner.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/util/CacheCleaner.java
rename to app/src/main/java/github/paroj/dsub2000/util/CacheCleaner.java
index f160e176b..8571278c5 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/CacheCleaner.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/CacheCleaner.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -11,10 +11,10 @@
 import android.content.Context;
 import android.util.Log;
 import android.os.StatFs;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MediaStoreService;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MediaStoreService;
 
 import java.util.*;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Constants.java b/app/src/main/java/github/paroj/dsub2000/util/Constants.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/util/Constants.java
rename to app/src/main/java/github/paroj/dsub2000/util/Constants.java
index 92be9f750..181a93981 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Constants.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/Constants.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
-import github.daneren2005.dsub.BuildConfig;
+import github.paroj.dsub2000.BuildConfig;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/util/DownloadFileItemHelperCallback.java b/app/src/main/java/github/paroj/dsub2000/util/DownloadFileItemHelperCallback.java
similarity index 89%
rename from app/src/main/java/github/daneren2005/dsub/util/DownloadFileItemHelperCallback.java
rename to app/src/main/java/github/paroj/dsub2000/util/DownloadFileItemHelperCallback.java
index dd7706bb9..0aba9f6f6 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/DownloadFileItemHelperCallback.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/DownloadFileItemHelperCallback.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.ItemTouchHelper;
@@ -7,12 +7,12 @@
 import java.util.Queue;
 import java.util.ArrayDeque;
 
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.fragments.SubsonicFragment;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.view.SongView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.fragments.SubsonicFragment;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.view.SongView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public class DownloadFileItemHelperCallback extends ItemTouchHelper.SimpleCallback {
 	private static final String TAG = DownloadFileItemHelperCallback.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/util/DrawableTint.java b/app/src/main/java/github/paroj/dsub2000/util/DrawableTint.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/DrawableTint.java
rename to app/src/main/java/github/paroj/dsub2000/util/DrawableTint.java
index 8f7e645cd..6effbdd9c 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/DrawableTint.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/DrawableTint.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -29,7 +29,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class DrawableTint {
 	private static final Map<Integer, Integer> attrMap = new HashMap<>();
diff --git a/app/src/main/java/github/daneren2005/dsub/util/DroppySpeedControl.java b/app/src/main/java/github/paroj/dsub2000/util/DroppySpeedControl.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/util/DroppySpeedControl.java
rename to app/src/main/java/github/paroj/dsub2000/util/DroppySpeedControl.java
index 8f58e60e0..b33417771 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/DroppySpeedControl.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/DroppySpeedControl.java
@@ -1,7 +1,6 @@
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/EnvironmentVariables.java b/app/src/main/java/github/paroj/dsub2000/util/EnvironmentVariables.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/util/EnvironmentVariables.java
rename to app/src/main/java/github/paroj/dsub2000/util/EnvironmentVariables.java
index 8af74f07c..68045fe21 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/EnvironmentVariables.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/EnvironmentVariables.java
@@ -13,7 +13,7 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 public final class EnvironmentVariables {
 	public static final String PASTEBIN_DEV_KEY = null;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java b/app/src/main/java/github/paroj/dsub2000/util/FileUtil.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/FileUtil.java
rename to app/src/main/java/github/paroj/dsub2000/util/FileUtil.java
index be25c351a..b54e71b28 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/FileUtil.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/FileUtil.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -45,15 +45,15 @@
 import android.os.Environment;
 import androidx.core.content.ContextCompat;
 import android.util.Log;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.Genre;
-import github.daneren2005.dsub.domain.Indexes;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicFolder;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.service.MediaStoreService;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.Genre;
+import github.paroj.dsub2000.domain.Indexes;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicFolder;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.service.MediaStoreService;
 
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/ImageLoader.java b/app/src/main/java/github/paroj/dsub2000/util/ImageLoader.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/util/ImageLoader.java
rename to app/src/main/java/github/paroj/dsub2000/util/ImageLoader.java
index b0a7d174a..48efd3daf 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/ImageLoader.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/ImageLoader.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -39,16 +39,16 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ArtistInfo;
-import github.daneren2005.dsub.domain.InternetRadioStation;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.compat.RemoteControlClientBase;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ArtistInfo;
+import github.paroj.dsub2000.domain.InternetRadioStation;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.compat.RemoteControlClientBase;
 
 /**
  * Asynchronous loading of images, with caching.
diff --git a/app/src/main/java/github/daneren2005/dsub/util/KeyStoreUtil.java b/app/src/main/java/github/paroj/dsub2000/util/KeyStoreUtil.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/util/KeyStoreUtil.java
rename to app/src/main/java/github/paroj/dsub2000/util/KeyStoreUtil.java
index b392bb57f..c5f5d5241 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/KeyStoreUtil.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/KeyStoreUtil.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.annotation.TargetApi;
 import android.security.keystore.KeyGenParameterSpec;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/LoadingTask.java b/app/src/main/java/github/paroj/dsub2000/util/LoadingTask.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/util/LoadingTask.java
rename to app/src/main/java/github/paroj/dsub2000/util/LoadingTask.java
index 116da8163..b5ffac144 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/LoadingTask.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/LoadingTask.java
@@ -1,10 +1,10 @@
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 
-import github.daneren2005.dsub.activity.SubsonicActivity;
+import github.paroj.dsub2000.activity.SubsonicActivity;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/util/MediaRouteManager.java b/app/src/main/java/github/paroj/dsub2000/util/MediaRouteManager.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/util/MediaRouteManager.java
rename to app/src/main/java/github/paroj/dsub2000/util/MediaRouteManager.java
index cf180eacf..12557ecec 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/MediaRouteManager.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/MediaRouteManager.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.os.Build;
 import androidx.mediarouter.media.MediaRouteProvider;
@@ -23,12 +23,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.domain.RemoteControlState;
-import github.daneren2005.dsub.provider.DLNARouteProvider;
-import github.daneren2005.dsub.provider.JukeboxRouteProvider;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.RemoteController;
-import github.daneren2005.dsub.util.compat.GoogleCompat;
+import github.paroj.dsub2000.domain.RemoteControlState;
+import github.paroj.dsub2000.provider.DLNARouteProvider;
+import github.paroj.dsub2000.provider.JukeboxRouteProvider;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.RemoteController;
+import github.paroj.dsub2000.util.compat.GoogleCompat;
 
 import static androidx.mediarouter.media.MediaRouter.RouteInfo;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/util/MenuUtil.java b/app/src/main/java/github/paroj/dsub2000/util/MenuUtil.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/util/MenuUtil.java
rename to app/src/main/java/github/paroj/dsub2000/util/MenuUtil.java
index 1b613b9d6..c1ea8c3dc 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/MenuUtil.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/MenuUtil.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,14 +22,14 @@
 
 import java.io.File;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.view.AlbumView;
-import github.daneren2005.dsub.view.ArtistEntryView;
-import github.daneren2005.dsub.view.ArtistView;
-import github.daneren2005.dsub.view.SongView;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.view.AlbumView;
+import github.paroj.dsub2000.view.ArtistEntryView;
+import github.paroj.dsub2000.view.ArtistView;
+import github.paroj.dsub2000.view.SongView;
+import github.paroj.dsub2000.view.UpdateView;
 
 public final class MenuUtil {
 	private final static String TAG = MenuUtil.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java b/app/src/main/java/github/paroj/dsub2000/util/Notifications.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/util/Notifications.java
rename to app/src/main/java/github/paroj/dsub2000/util/Notifications.java
index 821a1c979..803940692 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Notifications.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/Notifications.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
@@ -33,16 +33,16 @@
 import android.view.View;
 import android.widget.RemoteViews;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicActivity;
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.provider.DSubWidgetProvider;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.compat.RemoteControlClientLP;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicActivity;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.provider.DSubWidgetProvider;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.compat.RemoteControlClientLP;
+import github.paroj.dsub2000.view.UpdateView;
 
 public final class Notifications {
 	private static final String TAG = Notifications.class.getSimpleName();
@@ -51,7 +51,7 @@ public final class Notifications {
 	public static final int NOTIFICATION_ID_PLAYING = 100;
 	public static final int NOTIFICATION_ID_DOWNLOADING = 102;
 	public static final int NOTIFICATION_ID_SHUT_GOOGLE_UP = 103;
-	public static final String NOTIFICATION_SYNC_GROUP = "github.daneren2005.dsub.sync";
+	public static final String NOTIFICATION_SYNC_GROUP = "github.paroj.dsub2000.sync";
 
 	private static boolean playShowing = false;
 	private static boolean downloadShowing = false;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Pair.java b/app/src/main/java/github/paroj/dsub2000/util/Pair.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/util/Pair.java
rename to app/src/main/java/github/paroj/dsub2000/util/Pair.java
index 54386a626..b5888b9ad 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Pair.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/Pair.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/util/ProgressListener.java b/app/src/main/java/github/paroj/dsub2000/util/ProgressListener.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/util/ProgressListener.java
rename to app/src/main/java/github/paroj/dsub2000/util/ProgressListener.java
index 603b1ccbf..91f92f8fe 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/ProgressListener.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/ProgressListener.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/util/SettingsBackupAgent.java b/app/src/main/java/github/paroj/dsub2000/util/SettingsBackupAgent.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/util/SettingsBackupAgent.java
rename to app/src/main/java/github/paroj/dsub2000/util/SettingsBackupAgent.java
index e57658c4c..0a1c50e6e 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/SettingsBackupAgent.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/SettingsBackupAgent.java
@@ -16,7 +16,7 @@
 	
 	Copyright 2009 (C) Sindre Mehus
 */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.app.backup.BackupAgentHelper;
 import android.app.backup.BackupDataInput;
@@ -24,11 +24,8 @@
 import android.content.SharedPreferences;
 import android.os.ParcelFileDescriptor;
 
-import java.io.IOError;
 import java.io.IOException;
 
-import github.daneren2005.dsub.util.Constants;
-
 public class SettingsBackupAgent extends BackupAgentHelper {
 	@Override
 	public void onCreate() {
diff --git a/app/src/main/java/github/daneren2005/dsub/util/ShufflePlayBuffer.java b/app/src/main/java/github/paroj/dsub2000/util/ShufflePlayBuffer.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/util/ShufflePlayBuffer.java
rename to app/src/main/java/github/paroj/dsub2000/util/ShufflePlayBuffer.java
index 6996acaf5..a2f0155ad 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/ShufflePlayBuffer.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/ShufflePlayBuffer.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,14 +25,12 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.FileUtil;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/util/SilentBackgroundTask.java b/app/src/main/java/github/paroj/dsub2000/util/SilentBackgroundTask.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/util/SilentBackgroundTask.java
rename to app/src/main/java/github/paroj/dsub2000/util/SilentBackgroundTask.java
index b99b7e0ed..d4b638948 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/SilentBackgroundTask.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/SilentBackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/util/SilentServiceTask.java b/app/src/main/java/github/paroj/dsub2000/util/SilentServiceTask.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/util/SilentServiceTask.java
rename to app/src/main/java/github/paroj/dsub2000/util/SilentServiceTask.java
index 9fdfe66fb..c858691df 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/SilentServiceTask.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/SilentServiceTask.java
@@ -17,12 +17,12 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.content.Context;
 
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
 
 public abstract class SilentServiceTask<T> extends SilentBackgroundTask<T> {
 	protected MusicService musicService;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/SimpleServiceBinder.java b/app/src/main/java/github/paroj/dsub2000/util/SimpleServiceBinder.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/util/SimpleServiceBinder.java
rename to app/src/main/java/github/paroj/dsub2000/util/SimpleServiceBinder.java
index 9c0b36a92..88cbdb22e 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/SimpleServiceBinder.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/SimpleServiceBinder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.os.Binder;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/util/SongDBHandler.java b/app/src/main/java/github/paroj/dsub2000/util/SongDBHandler.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/SongDBHandler.java
rename to app/src/main/java/github/paroj/dsub2000/util/SongDBHandler.java
index 1309ee697..6044a1f34 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/SongDBHandler.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/SongDBHandler.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -25,8 +25,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.DownloadFile;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.DownloadFile;
 
 public class SongDBHandler extends SQLiteOpenHelper {
 	private static final String TAG = SongDBHandler.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/util/SyncUtil.java b/app/src/main/java/github/paroj/dsub2000/util/SyncUtil.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/SyncUtil.java
rename to app/src/main/java/github/paroj/dsub2000/util/SyncUtil.java
index 60ff603fc..4aebeea4e 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/SyncUtil.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/SyncUtil.java
@@ -1,9 +1,7 @@
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.content.Context;
 
-import androidx.core.app.NotificationCompat;
-
 import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/TabBackgroundTask.java b/app/src/main/java/github/paroj/dsub2000/util/TabBackgroundTask.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/util/TabBackgroundTask.java
rename to app/src/main/java/github/paroj/dsub2000/util/TabBackgroundTask.java
index 759e893ab..5db8d917f 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/TabBackgroundTask.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/TabBackgroundTask.java
@@ -1,6 +1,6 @@
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
-import github.daneren2005.dsub.fragments.SubsonicFragment;
+import github.paroj.dsub2000.fragments.SubsonicFragment;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/util/ThemeUtil.java b/app/src/main/java/github/paroj/dsub2000/util/ThemeUtil.java
similarity index 81%
rename from app/src/main/java/github/daneren2005/dsub/util/ThemeUtil.java
rename to app/src/main/java/github/paroj/dsub2000/util/ThemeUtil.java
index 7de4f928b..0c6775a03 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/ThemeUtil.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/ThemeUtil.java
@@ -13,7 +13,7 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -21,9 +21,9 @@
 
 import java.util.Locale;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SettingsActivity;
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SettingsActivity;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
 
 public final class ThemeUtil {
 	public static final String THEME_DARK = "dark";
@@ -62,34 +62,34 @@ public static int getThemeRes(Context context, String theme) {
 		if(context instanceof SubsonicFragmentActivity || context instanceof SettingsActivity) {
 			if(Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_COLOR_ACTION_BAR, true)) {
 				if (THEME_DARK.equals(theme)) {
-					return R.style.Theme_DSub_Dark_No_Actionbar;
+					return R.style.Theme_DSub2000_Dark_No_Actionbar;
 				} else if (THEME_BLACK.equals(theme)) {
-					return R.style.Theme_DSub_Black_No_Actionbar;
+					return R.style.Theme_DSub2000_Black_No_Actionbar;
 				} else if (THEME_HOLO.equals(theme)) {
-					return R.style.Theme_DSub_Holo_No_Actionbar;
+					return R.style.Theme_DSub2000_Holo_No_Actionbar;
 				} else {
-					return R.style.Theme_DSub_Light_No_Actionbar;
+					return R.style.Theme_DSub2000_Light_No_Actionbar;
 				}
 			} else {
 				if (THEME_DARK.equals(theme)) {
-					return R.style.Theme_DSub_Dark_No_Color;
+					return R.style.Theme_DSub2000_Dark_No_Color;
 				} else if (THEME_BLACK.equals(theme)) {
-					return R.style.Theme_DSub_Black_No_Color;
+					return R.style.Theme_DSub2000_Black_No_Color;
 				} else if (THEME_HOLO.equals(theme)) {
-					return R.style.Theme_DSub_Holo_No_Color;
+					return R.style.Theme_DSub2000_Holo_No_Color;
 				} else {
-					return R.style.Theme_DSub_Light_No_Color;
+					return R.style.Theme_DSub2000_Light_No_Color;
 				}
 			}
 		} else {
 			if (THEME_DARK.equals(theme)) {
-				return R.style.Theme_DSub_Dark;
+				return R.style.Theme_DSub2000_Dark;
 			} else if (THEME_BLACK.equals(theme)) {
-				return R.style.Theme_DSub_Black;
+				return R.style.Theme_DSub2000_Black;
 			} else if (THEME_HOLO.equals(theme)) {
-				return R.style.Theme_DSub_Holo;
+				return R.style.Theme_DSub2000_Holo;
 			} else {
-				return R.style.Theme_DSub_Light;
+				return R.style.Theme_DSub2000_Light;
 			}
 		}
 	}
diff --git a/app/src/main/java/github/daneren2005/dsub/util/TimeLimitedCache.java b/app/src/main/java/github/paroj/dsub2000/util/TimeLimitedCache.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/util/TimeLimitedCache.java
rename to app/src/main/java/github/paroj/dsub2000/util/TimeLimitedCache.java
index 8b7df783b..026d3cbdc 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/TimeLimitedCache.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/TimeLimitedCache.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import java.lang.ref.SoftReference;
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/UpdateHelper.java b/app/src/main/java/github/paroj/dsub2000/util/UpdateHelper.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/util/UpdateHelper.java
rename to app/src/main/java/github/paroj/dsub2000/util/UpdateHelper.java
index b335b54bf..94defdb39 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/UpdateHelper.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/UpdateHelper.java
@@ -17,7 +17,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.app.Activity;
 import android.content.Context;
@@ -31,16 +31,16 @@
 import java.util.Arrays;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.view.UpdateView;
 
 public final class UpdateHelper {
 	private static final String TAG = UpdateHelper.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java b/app/src/main/java/github/paroj/dsub2000/util/UserUtil.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/util/UserUtil.java
rename to app/src/main/java/github/paroj/dsub2000/util/UserUtil.java
index d5003f496..1ad8efabc 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/UserUtil.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/UserUtil.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.app.Activity;
 import androidx.appcompat.app.AlertDialog;
@@ -31,17 +31,17 @@
 import android.view.WindowManager;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.SectionAdapter;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.fragments.SubsonicFragment;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.service.OfflineException;
-import github.daneren2005.dsub.service.ServerTooOldException;
-import github.daneren2005.dsub.adapter.SettingsAdapter;
-import github.daneren2005.dsub.view.UpdateView;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.SectionAdapter;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.fragments.SubsonicFragment;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.service.OfflineException;
+import github.paroj.dsub2000.service.ServerTooOldException;
+import github.paroj.dsub2000.adapter.SettingsAdapter;
+import github.paroj.dsub2000.view.UpdateView;
 
 public final class UserUtil {
 	private static final String TAG = UserUtil.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/paroj/dsub2000/util/Util.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/Util.java
rename to app/src/main/java/github/paroj/dsub2000/util/Util.java
index eba3a5ef3..b9ecefc56 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/Util.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/Util.java
@@ -15,13 +15,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.util;
+package github.paroj.dsub2000.util;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.media.AudioAttributes;
 import android.media.AudioFocusRequest;
-import androidx.annotation.RequiresApi;
+
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import android.content.ClipboardManager;
@@ -55,14 +55,14 @@
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.adapter.DetailsAdapter;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PlayerState;
-import github.daneren2005.dsub.domain.RepeatMode;
-import github.daneren2005.dsub.domain.ServerInfo;
-import github.daneren2005.dsub.receiver.MediaButtonIntentReceiver;
-import github.daneren2005.dsub.service.DownloadService;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.adapter.DetailsAdapter;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PlayerState;
+import github.paroj.dsub2000.domain.RepeatMode;
+import github.paroj.dsub2000.domain.ServerInfo;
+import github.paroj.dsub2000.receiver.MediaButtonIntentReceiver;
+import github.paroj.dsub2000.service.DownloadService;
 
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -108,8 +108,8 @@ public final class Util {
 	private static SimpleDateFormat DATE_FORMAT_NO_TIME = new SimpleDateFormat("MMM d, yyyy");
 	private static int CURRENT_YEAR = new Date().getYear();
 
-    public static final String EVENT_META_CHANGED = "github.daneren2005.dsub.EVENT_META_CHANGED";
-    public static final String EVENT_PLAYSTATE_CHANGED = "github.daneren2005.dsub.EVENT_PLAYSTATE_CHANGED";
+    public static final String EVENT_META_CHANGED = "github.paroj.dsub2000.EVENT_META_CHANGED";
+    public static final String EVENT_PLAYSTATE_CHANGED = "github.paroj.dsub2000.EVENT_PLAYSTATE_CHANGED";
 	
 	public static final String AVRCP_PLAYSTATE_CHANGED = "com.android.music.playstatechanged";
 	public static final String AVRCP_METADATA_CHANGED = "com.android.music.metachanged";
@@ -1512,7 +1512,7 @@ private static void addTrackInfo(Context context, MusicDirectory.Entry song, Int
 			intent.putExtra("duration", (long) downloadService.getPlayerDuration());
 			intent.putExtra("position", (long) downloadService.getPlayerPosition());
 			intent.putExtra("coverart", albumArtFile.getAbsolutePath());
-			intent.putExtra("package","github.daneren2005.dsub");
+			intent.putExtra("package","github.paroj.dsub2000");
 		} else {
 			intent.putExtra("track", "");
 			intent.putExtra("artist", "");
@@ -1522,7 +1522,7 @@ private static void addTrackInfo(Context context, MusicDirectory.Entry song, Int
 			intent.putExtra("duration", (long) 0);
 			intent.putExtra("position", (long) 0);
 			intent.putExtra("coverart", "");
-			intent.putExtra("package","github.daneren2005.dsub");
+			intent.putExtra("package","github.paroj.dsub2000");
 		}
 	}
 	
diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientBase.java b/app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientBase.java
similarity index 89%
rename from app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientBase.java
rename to app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientBase.java
index 3e57e185f..14fc75915 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientBase.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientBase.java
@@ -1,7 +1,7 @@
-package github.daneren2005.dsub.util.compat;
+package github.paroj.dsub2000.util.compat;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.DownloadFile;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.DownloadFile;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientICS.java b/app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientICS.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientICS.java
rename to app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientICS.java
index 7585f9718..1e332ca70 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientICS.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientICS.java
@@ -1,9 +1,9 @@
-package github.daneren2005.dsub.util.compat;
+package github.paroj.dsub2000.util.compat;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.util.ImageLoader;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.util.ImageLoader;
 import android.annotation.TargetApi;
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -17,7 +17,7 @@
 
 import java.util.List;
 
-import github.daneren2005.dsub.activity.SubsonicActivity;
+import github.paroj.dsub2000.activity.SubsonicActivity;
 
 @TargetApi(14)
 public class RemoteControlClientICS extends RemoteControlClientBase {
diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientJB.java b/app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientJB.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientJB.java
rename to app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientJB.java
index d10c8594f..60d8a3e6d 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientJB.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientJB.java
@@ -1,11 +1,11 @@
-package github.daneren2005.dsub.util.compat;
+package github.paroj.dsub2000.util.compat;
 
 import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
 import android.media.RemoteControlClient;
 
-import github.daneren2005.dsub.util.SilentBackgroundTask;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
 
 @TargetApi(18)
 public class RemoteControlClientJB extends RemoteControlClientICS {
diff --git a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java b/app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientLP.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java
rename to app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientLP.java
index f0e1a80c5..d03445704 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/compat/RemoteControlClientLP.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/compat/RemoteControlClientLP.java
@@ -16,7 +16,7 @@
 
 	Copyright 2015 (C) Scott Jackson
 */
-package github.daneren2005.dsub.util.compat;
+package github.paroj.dsub2000.util.compat;
 
 import android.annotation.TargetApi;
 import android.app.PendingIntent;
@@ -42,29 +42,29 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicActivity;
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
-import github.daneren2005.dsub.domain.Bookmark;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.MusicDirectory.Entry;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.domain.SearchCritera;
-import github.daneren2005.dsub.domain.SearchResult;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.SilentServiceTask;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicActivity;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.domain.Bookmark;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.MusicDirectory.Entry;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.domain.SearchCritera;
+import github.paroj.dsub2000.domain.SearchResult;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.SilentServiceTask;
+import github.paroj.dsub2000.util.Util;
 
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class RemoteControlClientLP extends RemoteControlClientBase {
 	private static final String TAG = RemoteControlClientLP.class.getSimpleName();
-	private static final String CUSTOM_ACTION_THUMBS_UP = "github.daneren2005.dsub.THUMBS_UP";
-	private static final String CUSTOM_ACTION_THUMBS_DOWN = "github.daneren2005.dsub.THUMBS_DOWN";
-	private static final String CUSTOM_ACTION_STAR = "github.daneren2005.dsub.STAR";
+	private static final String CUSTOM_ACTION_THUMBS_UP = "github.paroj.dsub2000.THUMBS_UP";
+	private static final String CUSTOM_ACTION_THUMBS_DOWN = "github.paroj.dsub2000.THUMBS_DOWN";
+	private static final String CUSTOM_ACTION_STAR = "github.paroj.dsub2000.STAR";
 	// Copied from MediaControlConstants so I did not have to include the entire Wear SDK just for these constant
 	private static final String SHOW_ON_WEAR = "android.support.wearable.media.extra.CUSTOM_ACTION_SHOW_ON_WEAR";
 	private static final String WEAR_RESERVE_SKIP_TO_NEXT = "android.support.wearable.media.extra.RESERVE_SLOT_SKIP_TO_NEXT";
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/Bastp.java b/app/src/main/java/github/paroj/dsub2000/util/tags/Bastp.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/Bastp.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/Bastp.java
index dd456039a..732e29b96 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/Bastp.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/Bastp.java
@@ -17,7 +17,7 @@
  */
 
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import java.io.RandomAccessFile;
 import java.io.IOException;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/BastpUtil.java b/app/src/main/java/github/paroj/dsub2000/util/tags/BastpUtil.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/BastpUtil.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/BastpUtil.java
index 802aa5ad6..7e0e33013 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/BastpUtil.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/BastpUtil.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import android.util.LruCache;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/Common.java b/app/src/main/java/github/paroj/dsub2000/util/tags/Common.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/Common.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/Common.java
index c0d661f5d..badb9fd52 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/Common.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/Common.java
@@ -16,7 +16,7 @@
  */
 
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/FlacFile.java b/app/src/main/java/github/paroj/dsub2000/util/tags/FlacFile.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/FlacFile.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/FlacFile.java
index ce508d2e5..da9307890 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/FlacFile.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/FlacFile.java
@@ -15,12 +15,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.HashMap;
-import java.util.Enumeration;
 
 
 public class FlacFile extends Common implements PageInfo.PageParser {
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/ID3v2File.java b/app/src/main/java/github/paroj/dsub2000/util/tags/ID3v2File.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/ID3v2File.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/ID3v2File.java
index 4fb7418d4..dd30f5c34 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/ID3v2File.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/ID3v2File.java
@@ -16,14 +16,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Enumeration;
-
 
 
 public class ID3v2File extends Common {
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/LameHeader.java b/app/src/main/java/github/paroj/dsub2000/util/tags/LameHeader.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/LameHeader.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/LameHeader.java
index 691c7279c..f38378407 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/LameHeader.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/LameHeader.java
@@ -16,13 +16,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Enumeration;
 
 
 public class LameHeader extends Common {
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/Mp4File.java b/app/src/main/java/github/paroj/dsub2000/util/tags/Mp4File.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/Mp4File.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/Mp4File.java
index db00bf6ab..5205ef863 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/Mp4File.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/Mp4File.java
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/OggFile.java b/app/src/main/java/github/paroj/dsub2000/util/tags/OggFile.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/OggFile.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/OggFile.java
index 0383c68ab..de1f573d0 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/OggFile.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/OggFile.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 
 import java.io.IOException;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/OpusFile.java b/app/src/main/java/github/paroj/dsub2000/util/tags/OpusFile.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/OpusFile.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/OpusFile.java
index 38b402bb3..0a0260bbf 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/OpusFile.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/OpusFile.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 
 import java.io.IOException;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/PageInfo.java b/app/src/main/java/github/paroj/dsub2000/util/tags/PageInfo.java
similarity index 86%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/PageInfo.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/PageInfo.java
index 1081e355e..0a40c9e9a 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/PageInfo.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/PageInfo.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/github/daneren2005/dsub/util/tags/RawFile.java b/app/src/main/java/github/paroj/dsub2000/util/tags/RawFile.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/util/tags/RawFile.java
rename to app/src/main/java/github/paroj/dsub2000/util/tags/RawFile.java
index 2fa6cf307..cd25cd46d 100644
--- a/app/src/main/java/github/daneren2005/dsub/util/tags/RawFile.java
+++ b/app/src/main/java/github/paroj/dsub2000/util/tags/RawFile.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package github.daneren2005.dsub.util.tags;
+package github.paroj.dsub2000.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/AlbumListCountView.java b/app/src/main/java/github/paroj/dsub2000/view/AlbumListCountView.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/view/AlbumListCountView.java
rename to app/src/main/java/github/paroj/dsub2000/view/AlbumListCountView.java
index 1ae9ef8e4..1467cdbe2 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/AlbumListCountView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/AlbumListCountView.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -24,13 +24,13 @@
 
 import java.util.ArrayList;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.service.MusicService;
-import github.daneren2005.dsub.service.MusicServiceFactory;
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.service.MusicService;
+import github.paroj.dsub2000.service.MusicServiceFactory;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Util;
 
 public class AlbumListCountView extends UpdateView2<Integer, Void> {
 	private final String TAG = AlbumListCountView.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/AlbumView.java b/app/src/main/java/github/paroj/dsub2000/view/AlbumView.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/view/AlbumView.java
rename to app/src/main/java/github/paroj/dsub2000/view/AlbumView.java
index 3084e962d..eb9e3a8cb 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/AlbumView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/AlbumView.java
@@ -17,20 +17,19 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.RatingBar;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.Util;
 
 import java.io.File;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/view/ArtistEntryView.java b/app/src/main/java/github/paroj/dsub2000/view/ArtistEntryView.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/view/ArtistEntryView.java
rename to app/src/main/java/github/paroj/dsub2000/view/ArtistEntryView.java
index f6a6adb39..eb111e563 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/ArtistEntryView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/ArtistEntryView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,9 +24,9 @@
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.util.FileUtil;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.util.FileUtil;
 
 import java.io.File;
 /**
diff --git a/app/src/main/java/github/daneren2005/dsub/view/ArtistView.java b/app/src/main/java/github/paroj/dsub2000/view/ArtistView.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/view/ArtistView.java
rename to app/src/main/java/github/paroj/dsub2000/view/ArtistView.java
index d86c5d262..c26d66c43 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/ArtistView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/ArtistView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,9 +24,9 @@
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Artist;
-import github.daneren2005.dsub.util.FileUtil;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Artist;
+import github.paroj.dsub2000.util.FileUtil;
 
 import java.io.File;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java b/app/src/main/java/github/paroj/dsub2000/view/AutoRepeatButton.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java
rename to app/src/main/java/github/paroj/dsub2000/view/AutoRepeatButton.java
index 3c59dd37b..674331726 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/AutoRepeatButton.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/AutoRepeatButton.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/BasicHeaderView.java b/app/src/main/java/github/paroj/dsub2000/view/BasicHeaderView.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/view/BasicHeaderView.java
rename to app/src/main/java/github/paroj/dsub2000/view/BasicHeaderView.java
index 01aa42e1c..cb280eaf4 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/BasicHeaderView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/BasicHeaderView.java
@@ -13,13 +13,13 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class BasicHeaderView extends UpdateView<String> {
 	TextView nameView;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/BasicListView.java b/app/src/main/java/github/paroj/dsub2000/view/BasicListView.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/view/BasicListView.java
rename to app/src/main/java/github/paroj/dsub2000/view/BasicListView.java
index ca7e89933..39648044e 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/BasicListView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/BasicListView.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -22,7 +22,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class BasicListView extends UpdateView<String> {
 	private TextView titleView;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java b/app/src/main/java/github/paroj/dsub2000/view/CacheLocationPreference.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java
rename to app/src/main/java/github/paroj/dsub2000/view/CacheLocationPreference.java
index 069603689..79b7cf7db 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/CacheLocationPreference.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/CacheLocationPreference.java
@@ -12,7 +12,7 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2015 (C) Scott Jackson
 */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.os.Build;
@@ -30,7 +30,7 @@
 
 import java.io.File;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 public class CacheLocationPreference extends EditTextPreference {
 	private static final String TAG = CacheLocationPreference.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/CardView.java b/app/src/main/java/github/paroj/dsub2000/view/CardView.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/view/CardView.java
rename to app/src/main/java/github/paroj/dsub2000/view/CardView.java
index d6bca330a..3f8e5ed94 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/CardView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/CardView.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -11,8 +11,8 @@
 import android.view.View;
 import android.widget.FrameLayout;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.util.DrawableTint;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.util.DrawableTint;
 
 public class CardView extends FrameLayout{
 	private static final String TAG = CardView.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/ChangeLog.java b/app/src/main/java/github/paroj/dsub2000/view/ChangeLog.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/view/ChangeLog.java
rename to app/src/main/java/github/paroj/dsub2000/view/ChangeLog.java
index 840bb218a..05be5b2f1 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/ChangeLog.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/ChangeLog.java
@@ -30,7 +30,7 @@
  *
  * http://code.google.com/p/android-change-log/
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -52,7 +52,7 @@
 import android.util.Log;
 import android.util.SparseArray;
 import android.webkit.WebView;
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 
 /**
diff --git a/app/src/main/java/github/daneren2005/dsub/view/EditPasswordPreference.java b/app/src/main/java/github/paroj/dsub2000/view/EditPasswordPreference.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/view/EditPasswordPreference.java
rename to app/src/main/java/github/paroj/dsub2000/view/EditPasswordPreference.java
index 718fc22d9..c597dddd8 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/EditPasswordPreference.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/EditPasswordPreference.java
@@ -1,13 +1,13 @@
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.os.Build;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 
-import github.daneren2005.dsub.util.Constants;
-import github.daneren2005.dsub.util.KeyStoreUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.util.Constants;
+import github.paroj.dsub2000.util.KeyStoreUtil;
+import github.paroj.dsub2000.util.Util;
 
 public class EditPasswordPreference extends EditTextPreference {
     final private String TAG = EditPasswordPreference.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/ErrorDialog.java b/app/src/main/java/github/paroj/dsub2000/view/ErrorDialog.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/view/ErrorDialog.java
rename to app/src/main/java/github/paroj/dsub2000/view/ErrorDialog.java
index ccdbb2b3b..a3af4b5bf 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/ErrorDialog.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/ErrorDialog.java
@@ -16,16 +16,16 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.app.Activity;
 import androidx.appcompat.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.activity.SubsonicFragmentActivity;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.activity.SubsonicFragmentActivity;
+import github.paroj.dsub2000.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/daneren2005/dsub/view/FadeOutAnimation.java b/app/src/main/java/github/paroj/dsub2000/view/FadeOutAnimation.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/view/FadeOutAnimation.java
rename to app/src/main/java/github/paroj/dsub2000/view/FadeOutAnimation.java
index 817839ef2..3b75afb43 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/FadeOutAnimation.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/FadeOutAnimation.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.view.View;
 import android.view.animation.AlphaAnimation;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/FastScroller.java b/app/src/main/java/github/paroj/dsub2000/view/FastScroller.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/view/FastScroller.java
rename to app/src/main/java/github/paroj/dsub2000/view/FastScroller.java
index a8f2635a2..624ccd8d7 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/FastScroller.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/FastScroller.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -32,7 +32,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
+import github.paroj.dsub2000.R;
 
 import static androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/view/GenreView.java b/app/src/main/java/github/paroj/dsub2000/view/GenreView.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/view/GenreView.java
rename to app/src/main/java/github/paroj/dsub2000/view/GenreView.java
index b29aefbae..26cff8110 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/GenreView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/GenreView.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Genre;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Genre;
 
 public class GenreView extends UpdateView<Genre> {
 	private static final String TAG = GenreView.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java b/app/src/main/java/github/paroj/dsub2000/view/GridSpacingDecoration.java
similarity index 99%
rename from app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java
rename to app/src/main/java/github/paroj/dsub2000/view/GridSpacingDecoration.java
index de32a6441..11d22c242 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/GridSpacingDecoration.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/GridSpacingDecoration.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.graphics.Rect;
 import androidx.recyclerview.widget.GridLayoutManager;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/InternetRadioStationView.java b/app/src/main/java/github/paroj/dsub2000/view/InternetRadioStationView.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/view/InternetRadioStationView.java
rename to app/src/main/java/github/paroj/dsub2000/view/InternetRadioStationView.java
index 36aaa8af2..6615a90bf 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/InternetRadioStationView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/InternetRadioStationView.java
@@ -12,15 +12,15 @@
 	along with Subsonic. If not, see <http://www.gnu.org/licenses/>.
 	Copyright 2016 (C) Scott Jackson
 */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.InternetRadioStation;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.InternetRadioStation;
 
 public class InternetRadioStationView extends UpdateView<InternetRadioStation> {
 	private TextView titleView;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/MyLeadingMarginSpan2.java b/app/src/main/java/github/paroj/dsub2000/view/MyLeadingMarginSpan2.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/view/MyLeadingMarginSpan2.java
rename to app/src/main/java/github/paroj/dsub2000/view/MyLeadingMarginSpan2.java
index 20281a284..b79acff05 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/MyLeadingMarginSpan2.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/MyLeadingMarginSpan2.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/PlaylistSongView.java b/app/src/main/java/github/paroj/dsub2000/view/PlaylistSongView.java
similarity index 87%
rename from app/src/main/java/github/daneren2005/dsub/view/PlaylistSongView.java
rename to app/src/main/java/github/paroj/dsub2000/view/PlaylistSongView.java
index 581b92e4c..77ebbb516 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/PlaylistSongView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/PlaylistSongView.java
@@ -16,23 +16,20 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageButton;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import java.util.List;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.util.FileUtil;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.util.FileUtil;
+import github.paroj.dsub2000.util.Util;
 
 public class PlaylistSongView extends UpdateView2<Playlist, List<MusicDirectory.Entry>> {
 	private static final String TAG = PlaylistSongView.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/PlaylistView.java b/app/src/main/java/github/paroj/dsub2000/view/PlaylistView.java
similarity index 88%
rename from app/src/main/java/github/daneren2005/dsub/view/PlaylistView.java
rename to app/src/main/java/github/paroj/dsub2000/view/PlaylistView.java
index 7b5750a88..a3e5e6533 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/PlaylistView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/PlaylistView.java
@@ -16,17 +16,16 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Playlist;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.SyncUtil;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Playlist;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.SyncUtil;
 
 /**
  * Used to display albums in a {@code ListView}.
diff --git a/app/src/main/java/github/daneren2005/dsub/view/PodcastChannelView.java b/app/src/main/java/github/paroj/dsub2000/view/PodcastChannelView.java
similarity index 90%
rename from app/src/main/java/github/daneren2005/dsub/view/PodcastChannelView.java
rename to app/src/main/java/github/paroj/dsub2000/view/PodcastChannelView.java
index d3f50954f..90f6b28bb 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/PodcastChannelView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/PodcastChannelView.java
@@ -16,20 +16,19 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.PodcastChannel;
-import github.daneren2005.dsub.util.ImageLoader;
-import github.daneren2005.dsub.util.SyncUtil;
-import github.daneren2005.dsub.util.FileUtil;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.PodcastChannel;
+import github.paroj.dsub2000.util.ImageLoader;
+import github.paroj.dsub2000.util.SyncUtil;
+import github.paroj.dsub2000.util.FileUtil;
 import java.io.File;
 
 public class PodcastChannelView extends UpdateView<PodcastChannel> {
diff --git a/app/src/main/java/github/daneren2005/dsub/view/RecyclingImageView.java b/app/src/main/java/github/paroj/dsub2000/view/RecyclingImageView.java
similarity index 98%
rename from app/src/main/java/github/daneren2005/dsub/view/RecyclingImageView.java
rename to app/src/main/java/github/paroj/dsub2000/view/RecyclingImageView.java
index 501b363dc..16cd72627 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/RecyclingImageView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/RecyclingImageView.java
@@ -13,11 +13,10 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/SeekBarPreference.java b/app/src/main/java/github/paroj/dsub2000/view/SeekBarPreference.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/view/SeekBarPreference.java
rename to app/src/main/java/github/paroj/dsub2000/view/SeekBarPreference.java
index fa8e8b3ac..a4d062679 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/SeekBarPreference.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/SeekBarPreference.java
@@ -20,19 +20,17 @@
  * THE SOFTWARE.
  */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.util.Constants;
+import github.paroj.dsub2000.R;
 
 /**
  * SeekBar preference to set the shake force threshold.
diff --git a/app/src/main/java/github/daneren2005/dsub/view/SettingView.java b/app/src/main/java/github/paroj/dsub2000/view/SettingView.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/view/SettingView.java
rename to app/src/main/java/github/paroj/dsub2000/view/SettingView.java
index 6dc116f86..708ea848e 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/SettingView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/SettingView.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -21,11 +21,11 @@
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.domain.User.MusicFolderSetting;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.domain.User.MusicFolderSetting;
 
-import static github.daneren2005.dsub.domain.User.Setting;
+import static github.paroj.dsub2000.domain.User.Setting;
 
 public class SettingView extends UpdateView2<Setting, Boolean> {
 	private final TextView titleView;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/ShareView.java b/app/src/main/java/github/paroj/dsub2000/view/ShareView.java
similarity index 94%
rename from app/src/main/java/github/daneren2005/dsub/view/ShareView.java
rename to app/src/main/java/github/paroj/dsub2000/view/ShareView.java
index 12294369d..899db0603 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/ShareView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/ShareView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -28,8 +28,8 @@
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.Share;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.Share;
 
 public class ShareView extends UpdateView<Share> {
 	private static final String TAG = ShareView.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/SongView.java b/app/src/main/java/github/paroj/dsub2000/view/SongView.java
similarity index 95%
rename from app/src/main/java/github/daneren2005/dsub/view/SongView.java
rename to app/src/main/java/github/paroj/dsub2000/view/SongView.java
index fb9a25ee2..39aa48a35 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/SongView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/SongView.java
@@ -16,22 +16,22 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.*;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.domain.PodcastEpisode;
-import github.daneren2005.dsub.service.DownloadService;
-import github.daneren2005.dsub.service.DownloadFile;
-import github.daneren2005.dsub.util.DrawableTint;
-import github.daneren2005.dsub.util.SongDBHandler;
-import github.daneren2005.dsub.util.ThemeUtil;
-import github.daneren2005.dsub.util.Util;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.domain.PodcastEpisode;
+import github.paroj.dsub2000.service.DownloadService;
+import github.paroj.dsub2000.service.DownloadFile;
+import github.paroj.dsub2000.util.DrawableTint;
+import github.paroj.dsub2000.util.SongDBHandler;
+import github.paroj.dsub2000.util.ThemeUtil;
+import github.paroj.dsub2000.util.Util;
 
 import java.io.File;
 
diff --git a/app/src/main/java/github/daneren2005/dsub/view/SquareImageView.java b/app/src/main/java/github/paroj/dsub2000/view/SquareImageView.java
similarity index 93%
rename from app/src/main/java/github/daneren2005/dsub/view/SquareImageView.java
rename to app/src/main/java/github/paroj/dsub2000/view/SquareImageView.java
index 66ab7d8d3..dfbbd499d 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/SquareImageView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/SquareImageView.java
@@ -13,11 +13,10 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 public class SquareImageView extends RecyclingImageView {
 	public SquareImageView(final Context context, final AttributeSet attrs) {
diff --git a/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java b/app/src/main/java/github/paroj/dsub2000/view/UpdateView.java
similarity index 97%
rename from app/src/main/java/github/daneren2005/dsub/view/UpdateView.java
rename to app/src/main/java/github/paroj/dsub2000/view/UpdateView.java
index a47276430..df0d82c77 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/UpdateView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/UpdateView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -36,10 +36,10 @@
 import java.util.List;
 import java.util.WeakHashMap;
 
-import github.daneren2005.dsub.domain.MusicDirectory;
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.util.DrawableTint;
-import github.daneren2005.dsub.util.SilentBackgroundTask;
+import github.paroj.dsub2000.domain.MusicDirectory;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.util.DrawableTint;
+import github.paroj.dsub2000.util.SilentBackgroundTask;
 
 public abstract class UpdateView<T> extends LinearLayout {
 	private static final String TAG = UpdateView.class.getSimpleName();
diff --git a/app/src/main/java/github/daneren2005/dsub/view/UpdateView2.java b/app/src/main/java/github/paroj/dsub2000/view/UpdateView2.java
similarity index 96%
rename from app/src/main/java/github/daneren2005/dsub/view/UpdateView2.java
rename to app/src/main/java/github/paroj/dsub2000/view/UpdateView2.java
index 7dccba138..dc964777c 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/UpdateView2.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/UpdateView2.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.widget.ImageView;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/UserView.java b/app/src/main/java/github/paroj/dsub2000/view/UserView.java
similarity index 91%
rename from app/src/main/java/github/daneren2005/dsub/view/UserView.java
rename to app/src/main/java/github/paroj/dsub2000/view/UserView.java
index 38ad4f782..72b1eb885 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/UserView.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/UserView.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.daneren2005.dsub.view;
+package github.paroj.dsub2000.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -21,9 +21,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import github.daneren2005.dsub.R;
-import github.daneren2005.dsub.domain.User;
-import github.daneren2005.dsub.util.ImageLoader;
+import github.paroj.dsub2000.R;
+import github.paroj.dsub2000.domain.User;
+import github.paroj.dsub2000.util.ImageLoader;
 
 public class UserView extends UpdateView2<User, ImageLoader> {
 	private TextView usernameView;
diff --git a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteChooserDialogFragment.java b/app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteChooserDialogFragment.java
similarity index 83%
rename from app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteChooserDialogFragment.java
rename to app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteChooserDialogFragment.java
index 35c9b2924..d9e56badd 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteChooserDialogFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteChooserDialogFragment.java
@@ -1,11 +1,11 @@
-package github.daneren2005.dsub.view.compat;
+package github.paroj.dsub2000.view.compat;
 
 import android.content.Context;
 import android.os.Bundle;
 import androidx.mediarouter.app.MediaRouteChooserDialog;
 import androidx.mediarouter.app.MediaRouteChooserDialogFragment;
 
-import github.daneren2005.dsub.util.ThemeUtil;
+import github.paroj.dsub2000.util.ThemeUtil;
 
 public class CustomMediaRouteChooserDialogFragment extends MediaRouteChooserDialogFragment {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteControllerDialogFragment.java b/app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteControllerDialogFragment.java
similarity index 84%
rename from app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteControllerDialogFragment.java
rename to app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteControllerDialogFragment.java
index c85e7c62f..3d70c5dbb 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteControllerDialogFragment.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteControllerDialogFragment.java
@@ -1,11 +1,11 @@
-package github.daneren2005.dsub.view.compat;
+package github.paroj.dsub2000.view.compat;
 
 import android.content.Context;
 import android.os.Bundle;
 import androidx.mediarouter.app.MediaRouteControllerDialog;
 import androidx.mediarouter.app.MediaRouteControllerDialogFragment;
 
-import github.daneren2005.dsub.util.ThemeUtil;
+import github.paroj.dsub2000.util.ThemeUtil;
 
 public class CustomMediaRouteControllerDialogFragment extends MediaRouteControllerDialogFragment {
 	@Override
diff --git a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteDialogFactory.java b/app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteDialogFactory.java
similarity index 92%
rename from app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteDialogFactory.java
rename to app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteDialogFactory.java
index a39b1044c..a86177aa6 100644
--- a/app/src/main/java/github/daneren2005/dsub/view/compat/CustomMediaRouteDialogFactory.java
+++ b/app/src/main/java/github/paroj/dsub2000/view/compat/CustomMediaRouteDialogFactory.java
@@ -1,4 +1,4 @@
-package github.daneren2005.dsub.view.compat;
+package github.paroj.dsub2000.view.compat;
 
 import androidx.mediarouter.app.MediaRouteChooserDialogFragment;
 import androidx.mediarouter.app.MediaRouteControllerDialogFragment;
diff --git a/app/src/main/res/layout-land/download.xml b/app/src/main/res/layout-land/download.xml
index 6eabaf598..9d6dab308 100644
--- a/app/src/main/res/layout-land/download.xml
+++ b/app/src/main/res/layout-land/download.xml
@@ -11,7 +11,7 @@
 		android:layout_height="match_parent"
 		android:layout_weight="1">
 
-		<github.daneren2005.dsub.view.RecyclingImageView
+		<github.paroj.dsub2000.view.RecyclingImageView
 			android:id="@+id/download_album_art_image"
 			android:src="@drawable/unknown_album_large"
 			android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout-large-land/download.xml b/app/src/main/res/layout-large-land/download.xml
index bb9d7e5d2..35960180f 100644
--- a/app/src/main/res/layout-large-land/download.xml
+++ b/app/src/main/res/layout-large-land/download.xml
@@ -5,7 +5,7 @@
 	android:layout_width="match_parent"
 	android:layout_height="match_parent">
 
-	<github.daneren2005.dsub.view.RecyclingImageView
+	<github.paroj.dsub2000.view.RecyclingImageView
 		android:id="@+id/download_album_art_image"
 		android:src="@drawable/unknown_album_large"
 		android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-port/download.xml b/app/src/main/res/layout-port/download.xml
index 1e983793a..8524cf796 100644
--- a/app/src/main/res/layout-port/download.xml
+++ b/app/src/main/res/layout-port/download.xml
@@ -33,7 +33,7 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<github.daneren2005.dsub.view.RecyclingImageView
+						<github.paroj.dsub2000.view.RecyclingImageView
 							android:id="@+id/download_album_art_image"
 							android:layout_width="wrap_content"
 							android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml
index 1ce7d9e74..747d1f7a3 100644
--- a/app/src/main/res/layout/abstract_fragment_activity.xml
+++ b/app/src/main/res/layout/abstract_fragment_activity.xml
@@ -55,7 +55,7 @@
 				android:orientation="horizontal"
 				android:elevation="4dp">
 
-				<github.daneren2005.dsub.view.RecyclingImageView
+				<github.paroj.dsub2000.view.RecyclingImageView
 					android:id="@+id/album_art"
 					android:layout_width="?attr/actionBarSize"
 					android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/abstract_recycler_fragment.xml b/app/src/main/res/layout/abstract_recycler_fragment.xml
index eb9f5fb6b..773cab917 100644
--- a/app/src/main/res/layout/abstract_recycler_fragment.xml
+++ b/app/src/main/res/layout/abstract_recycler_fragment.xml
@@ -23,7 +23,7 @@
 				android:layout_marginRight="@dimen/FastScroller.NormalBarMargin"
 				android:scrollbarStyle="outsideOverlay"/>
 
-			<github.daneren2005.dsub.view.FastScroller
+			<github.paroj.dsub2000.view.FastScroller
 				android:id="@+id/fragment_fast_scroller"
 				android:layout_width="wrap_content"
 				android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/album_cell_item.xml b/app/src/main/res/layout/album_cell_item.xml
index 4ad32409e..ebaae97f9 100644
--- a/app/src/main/res/layout/album_cell_item.xml
+++ b/app/src/main/res/layout/album_cell_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<github.daneren2005.dsub.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<github.paroj.dsub2000.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:layout_margin="2dp">
@@ -15,7 +15,7 @@
 			android:layout_height="0dp"
 			android:layout_weight="1">
 
-			<github.daneren2005.dsub.view.SquareImageView
+			<github.paroj.dsub2000.view.SquareImageView
 				android:id="@+id/album_coverart"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
@@ -95,4 +95,4 @@
 		</LinearLayout>
 
 	</LinearLayout>
-</github.daneren2005.dsub.view.CardView>
\ No newline at end of file
+</github.paroj.dsub2000.view.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml
index ad7544767..a487fe610 100644
--- a/app/src/main/res/layout/album_list_item.xml
+++ b/app/src/main/res/layout/album_list_item.xml
@@ -10,7 +10,7 @@
 		android:layout_width="@dimen/AlbumArt.Small"
 		android:layout_height="@dimen/AlbumArt.Small">
 
-		<github.daneren2005.dsub.view.RecyclingImageView
+		<github.paroj.dsub2000.view.RecyclingImageView
 			android:id="@+id/album_coverart"
 			android:layout_width="@dimen/AlbumArt.Small"
 			android:layout_height="@dimen/AlbumArt.Small"
diff --git a/app/src/main/res/layout/basic_art_item.xml b/app/src/main/res/layout/basic_art_item.xml
index 339383bc1..ed933e621 100644
--- a/app/src/main/res/layout/basic_art_item.xml
+++ b/app/src/main/res/layout/basic_art_item.xml
@@ -5,7 +5,7 @@
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground">
 
-	<github.daneren2005.dsub.view.RecyclingImageView
+	<github.paroj.dsub2000.view.RecyclingImageView
 		android:id="@+id/item_art"
 		android:layout_width="@dimen/AlbumArt.Small"
 		android:layout_height="@dimen/AlbumArt.Small"
diff --git a/app/src/main/res/layout/basic_cell_item.xml b/app/src/main/res/layout/basic_cell_item.xml
index a10fc4be2..38da293be 100644
--- a/app/src/main/res/layout/basic_cell_item.xml
+++ b/app/src/main/res/layout/basic_cell_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<github.daneren2005.dsub.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<github.paroj.dsub2000.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:layout_margin="2dp">
@@ -10,7 +10,7 @@
 		android:layout_height="match_parent"
 		android:background="?attr/selectableItemBackground">
 
-		<github.daneren2005.dsub.view.SquareImageView
+		<github.paroj.dsub2000.view.SquareImageView
 			android:id="@+id/item_art"
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"/>
@@ -42,4 +42,4 @@
 				style="@style/MoreButton"/>
 		</LinearLayout>
 	</LinearLayout>
-</github.daneren2005.dsub.view.CardView>
\ No newline at end of file
+</github.paroj.dsub2000.view.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chat_item.xml b/app/src/main/res/layout/chat_item.xml
index bf5d81ca4..1e8a10c67 100644
--- a/app/src/main/res/layout/chat_item.xml
+++ b/app/src/main/res/layout/chat_item.xml
@@ -5,7 +5,7 @@
 	android:layout_height="wrap_content"
 	android:background="?attr/selectableItemBackground">
 
-	<github.daneren2005.dsub.view.RecyclingImageView
+	<github.paroj.dsub2000.view.RecyclingImageView
 		android:id="@+id/chat_avatar"
 		android:src="@drawable/ic_social_person"
 		android:layout_width="@dimen/AlbumArt.Small"
diff --git a/app/src/main/res/layout/chat_item_reverse.xml b/app/src/main/res/layout/chat_item_reverse.xml
index 31875208e..3c7b7f153 100644
--- a/app/src/main/res/layout/chat_item_reverse.xml
+++ b/app/src/main/res/layout/chat_item_reverse.xml
@@ -55,7 +55,7 @@
 			android:textColor="?android:textColorSecondary"/>
 	</LinearLayout>
 
-	<github.daneren2005.dsub.view.RecyclingImageView
+	<github.paroj.dsub2000.view.RecyclingImageView
 		android:id="@+id/chat_avatar"
 		android:src="@drawable/ic_social_person"
 		android:layout_width="@dimen/AlbumArt.Small"
diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml
index 0610c5f90..556452338 100644
--- a/app/src/main/res/layout/download_media_buttons.xml
+++ b/app/src/main/res/layout/download_media_buttons.xml
@@ -13,7 +13,7 @@
             android:layout_centerVertical="true"
             />
 
-    <github.daneren2005.dsub.view.AutoRepeatButton
+    <github.paroj.dsub2000.view.AutoRepeatButton
             style="@style/PlaybackControl.Small"
             android:id="@+id/download_previous"
             android:src="?attr/media_button_backward"
@@ -21,7 +21,7 @@
             android:layout_centerVertical="true"
             />
 
-	<github.daneren2005.dsub.view.AutoRepeatButton
+	<github.paroj.dsub2000.view.AutoRepeatButton
 		style="@style/PlaybackControl.Large"
 		android:id="@+id/download_rewind"
 		android:src="?attr/media_button_rewind"
@@ -52,7 +52,7 @@
             android:layout_centerInParent="true"
             />
 
-	<github.daneren2005.dsub.view.AutoRepeatButton
+	<github.paroj.dsub2000.view.AutoRepeatButton
 		style="@style/PlaybackControl.Large"
 		android:id="@+id/download_fastforward"
 		android:src="?attr/media_button_fastforward"
@@ -60,7 +60,7 @@
 		android:layout_centerVertical="true"
 		android:visibility="invisible"/>
 
-    <github.daneren2005.dsub.view.AutoRepeatButton
+    <github.paroj.dsub2000.view.AutoRepeatButton
             style="@style/PlaybackControl.Small"
             android:id="@+id/download_next"
             android:src="?attr/media_button_forward"
diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml
index 638e79c2d..9f6e858b3 100644
--- a/app/src/main/res/layout/download_playlist.xml
+++ b/app/src/main/res/layout/download_playlist.xml
@@ -27,7 +27,7 @@
             android:paddingRight="@dimen/FastScroller.LeftAlignedMargin"
             android:layout_marginRight="@dimen/FastScroller.NormalBarMargin"/>
 
-        <github.daneren2005.dsub.view.FastScroller
+        <github.paroj.dsub2000.view.FastScroller
             android:id="@+id/download_fast_scroller"
             android:layout_width="wrap_content"
             android:layout_height="fill_parent"
diff --git a/app/src/main/res/layout/select_album_header.xml b/app/src/main/res/layout/select_album_header.xml
index 24e85f62f..570a49b1a 100644
--- a/app/src/main/res/layout/select_album_header.xml
+++ b/app/src/main/res/layout/select_album_header.xml
@@ -111,7 +111,7 @@
 				android:layout_gravity="center_vertical"/>
 		</LinearLayout>
 
-		<github.daneren2005.dsub.view.RecyclingImageView
+		<github.paroj.dsub2000.view.RecyclingImageView
 			android:id="@+id/select_album_art"
 			android:layout_width="@dimen/AlbumArt.Header"
 			android:layout_height="@dimen/AlbumArt.Header"
diff --git a/app/src/main/res/layout/user_header.xml b/app/src/main/res/layout/user_header.xml
index c81863723..ba00cfb69 100644
--- a/app/src/main/res/layout/user_header.xml
+++ b/app/src/main/res/layout/user_header.xml
@@ -4,7 +4,7 @@
 	android:layout_width="fill_parent"
 	android:layout_height="wrap_content">
 		
-	<github.daneren2005.dsub.view.RecyclingImageView
+	<github.paroj.dsub2000.view.RecyclingImageView
 		android:id="@+id/user_avatar"
 		android:src="@drawable/ic_social_person"
 		android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/user_list_item.xml b/app/src/main/res/layout/user_list_item.xml
index c2e708c8d..0ce7b2a29 100644
--- a/app/src/main/res/layout/user_list_item.xml
+++ b/app/src/main/res/layout/user_list_item.xml
@@ -5,7 +5,7 @@
 			  android:layout_height="wrap_content"
 			  android:background="?attr/selectableItemBackground">
 
-	<github.daneren2005.dsub.view.RecyclingImageView
+	<github.paroj.dsub2000.view.RecyclingImageView
 		android:id="@+id/item_avatar"
 		android:src="@drawable/ic_social_person"
 		android:layout_width="@dimen/AlbumArt.Small"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 55a272dc8..df980da51 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Speichern</string>
     <string name="common.cancel">Abbrechen</string>
@@ -38,16 +38,16 @@
 	<string name="button_bar.downloading">Downloads</string>
 
     <string name="main.welcome_title">Willkommen!</string>
-    <string name="main.welcome_text">Willkommen zu DSub! Die App ist aktuell für den Subsonic-Demo-Server konfiguriert. Nachdem Sie Ihren eigenen Server
+    <string name="main.welcome_text">Willkommen zu DSub2000! Die App ist aktuell für den Subsonic-Demo-Server konfiguriert. Nachdem Sie Ihren eigenen Server
         aufgesetzt haben (verfügbar unter <b>subsonic.org</b>) könne Sie diesen unter <b>Einstellungen</b> konfigurieren.</string>
-	<string name="main.about_title">Über DSub</string>
+	<string name="main.about_title">Über DSub2000</string>
 	<string name="main.faq_title">FAQ</string>
         <string name="main.faq_text">
         <![CDATA[
                 <font color="red">Cache vs Permanenter Cache</font>:
-                <br/>Von DSub heruntergelade Titel im Cache können automatisch gelöscht werden, um Platz für neue Titel zu schaffen. Titel im permanenten Cache werden dagegen nie automatisch gelöscht.
+                <br/>Von DSub2000 heruntergelade Titel im Cache können automatisch gelöscht werden, um Platz für neue Titel zu schaffen. Titel im permanenten Cache werden dagegen nie automatisch gelöscht.
                 <p/><font color="red">ChromeCast funktioniert nicht</font>:
-		<br/>Versuchen Sie die Option Einstellungen -> Wiedergabe -> Nutze DSub als Proxy.  Dies ist eine provisorische Lösung, weil Chromecast keine selbstsignierten Zertifikate akzeptiert.
+		<br/>Versuchen Sie die Option Einstellungen -> Wiedergabe -> Nutze DSub2000 als Proxy.  Dies ist eine provisorische Lösung, weil Chromecast keine selbstsignierten Zertifikate akzeptiert.
 		<p/><font color="red">Erste Ebene in der Bibliothek sind Künstlergruppen</font>:
 		<br/>Im Optionsmenü deselektiere "Erste Ebene sind Künstler".  Dann wird die erste Verzeichnisebene wie Künstlergruppen anstelle von Künstler behandelt.
         ]]>
@@ -248,7 +248,7 @@
 
     <string name="error.label">Fehler</string>
 
-    <string name="settings.title">DSub Einstellungen</string>
+    <string name="settings.title">DSub2000 Einstellungen</string>
     <string name="settings.test_connection_title">Teste Verbindung</string>
 	<string name="settings.servers_add">Server hinzufügen</string>
 	<string name="settings.servers_remove">Server entfernen</string>
@@ -270,7 +270,7 @@
     <string name="settings.cache_size">Größe des Cache (MB)</string>
     <string name="settings.cache_location">Position des Cache</string>
     <string name="settings.cache_location_error">Ungültiger Pfad zum Cache. Nutze Standard.</string>
-    <string name="settings.cache_location_reset">Der gesetzte Cachepfad ist nicht (mehr) beschreibbar. Durch die Aktualisierung des Telefon-OS auf KitKat 4.4 wurde der Zugriff auf die SD-Karte durch Apps eingeschränkt auf spezielle Pfade. Der von DSub verwendete Pfad wurde entsprechend korrigiert. Um den alten Cache zu löschen, müssen Sie die SD-Karte an einem Computer anschliessend und den Ordner manuell löschen.</string>
+    <string name="settings.cache_location_reset">Der gesetzte Cachepfad ist nicht (mehr) beschreibbar. Durch die Aktualisierung des Telefon-OS auf KitKat 4.4 wurde der Zugriff auf die SD-Karte durch Apps eingeschränkt auf spezielle Pfade. Der von DSub2000 verwendete Pfad wurde entsprechend korrigiert. Um den alten Cache zu löschen, müssen Sie die SD-Karte an einem Computer anschliessend und den Ordner manuell löschen.</string>
 	<string name="settings.cache_clear">Lösche Cache</string>
 	<string name="settings.cache_clear_complete">Cache wurde geleert</string>
     <string name="settings.testing_connection">Teste Verbindung...</string>
@@ -394,10 +394,10 @@
 	<string name="settings.menu_options.rate_summary">Zeige \"Bewerten\" im Menü</string>
 	<string name="settings.browse_by_tags">Tags nutzen</string>
 	<string name="settings.browse_by_tags_summary">Tags statt Ordner verwenden.  Benötigt Subsonic 4.7+</string>
-	<string name="settings.disable_exit_prompt">DSub direkt verlassen</string>
-	<string name="settings.disable_exit_prompt_summary">DSub mit Zurück-Taste ohne zusätzliche Nachfrage sofort verlassen</string>
+	<string name="settings.disable_exit_prompt">DSub2000 direkt verlassen</string>
+	<string name="settings.disable_exit_prompt_summary">DSub2000 mit Zurück-Taste ohne zusätzliche Nachfrage sofort verlassen</string>
 	<string name="settings.override_system_language">In Englisch anzeigen</string>
-	<string name="settings.override_system_language_summary">Verwende Englisch anstatt Deutsch für DSub. Benötigt einen Neustart der App.</string>
+	<string name="settings.override_system_language_summary">Verwende Englisch anstatt Deutsch für DSub2000. Benötigt einen Neustart der App.</string>
 	<string name="settings.drawer_items_title">Seitenmenü</string>
 	<string name="settings.large_album_art">Große Cover anzeigen</string>
 	<string name="settings.large_album_art_summary">Verwende große Cover zur Anzeige der Alben anstatt einer Liste</string>
@@ -412,7 +412,7 @@
 	<string name="settings.replay_gain_bump">Wiedergabevorverstärkung</string>
 	<string name="settings.replay_gain_untagged">Lieder ohne Wiedergabeverstärkung</string>
 	<string name="settings.casting">Casting</string>
-	<string name="settings.casting_proxy">Nutze DSub als Proxy</string>
+	<string name="settings.casting_proxy">Nutze DSub2000 als Proxy</string>
 	<string name="settings.casting_proxy_summary">Sende alles über dieses Gerät als Proxy.  Dies umgeht Probleme mit selbstsignierten Zertifikaten.</string>
 	<string name="settings.rename_duplicates">Doppelte Medien umbenennen</string>
 	<string name="settings.rename_duplicates_summary">Für doppelte Medien den originalen Dateinamen verwenden, um diese auseinanderhalten zu können.</string>
@@ -483,7 +483,7 @@
 
     <string name="service.connecting">Kontaktiere Server, bitte warten.</string>
 
-    <string name="parser.upgrade_client">Inkompatible Versionen. Aktualisierung von DSub erforderlich.</string>
+    <string name="parser.upgrade_client">Inkompatible Versionen. Aktualisierung von DSub2000 erforderlich.</string>
     <string name="parser.upgrade_server">Inkompatible Versionen. Aktualisierung des Subsonic Server erforderlich.</string>
     <string name="parser.not_authenticated">Benutzername oder/und Passwort falsch.</string>
     <string name="parser.not_authorized">Nicht authorisiert. Bitte prüfen Sie die Einstellungen im Subsonic-Server.</string>
@@ -515,7 +515,7 @@
 
 	<string name="tasker.start_playing">Starte Wiedergabe</string>
 	<string name="tasker.start_playing_shuffled">Starte Zufallswiedergabe</string>
-	<string name="tasker.start_playing_title">Tasker -> Starte DSub</string>
+	<string name="tasker.start_playing_title">Tasker -> Starte DSub2000</string>
 	<string name="tasker.edit_shuffle_mode">Starte im Zufallsmodus: </string>
 	<string name="tasker.edit_shuffle_start_year">Startjahr:</string>
 	<string name="tasker.edit_shuffle_end_year">Endjahr:</string>
@@ -580,10 +580,10 @@
 	<string name="settings.max_video_bitrate_500">500 Kbps</string>
 	<string name="settings.max_video_bitrate_5000">5000 Kbps</string>
 	<string name="settings.max_video_bitrate_700">700 Kbps</string>
-	<string name="widget.4x1">DSub (4x1)</string>
-	<string name="widget.4x2">DSub (4x2)</string>
-	<string name="widget.4x3">DSub (4x3)</string>
-	<string name="widget.4x4">DSub (4x4)</string>
+	<string name="widget.4x1">DSub2000 (4x1)</string>
+	<string name="widget.4x2">DSub2000 (4x2)</string>
+	<string name="widget.4x3">DSub2000 (4x3)</string>
+	<string name="widget.4x4">DSub2000 (4x4)</string>
 	<string name="util.bytes_format.megabyte">0.00 MB</string>
 	<string name="util.bytes_format.kilobyte">0 KB</string>
 	<string name="util.bytes_format.gigabyte">0.00 GB</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9076cf783..0b92763f8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Guardar</string>
     <string name="common.cancel">Cancelar</string>
@@ -38,8 +38,8 @@
 	<string name="button_bar.admin">Admin</string>
 
     <string name="main.welcome_title">Bienvenido!</string>
-    <string name="main.welcome_text">Bienvenido a DSub! Ahora la aplicación está configurada para usar el servidor de demostración de Subsonic. Cuando configures tu servidor personal (disponible en <b>subsonic.org</b>), accede a <b>Preferencias</b> y cambia la configuración para conectarte.</string>
-	<string name="main.about_title">Acerca de DSub</string>
+    <string name="main.welcome_text">Bienvenido a DSub2000! Ahora la aplicación está configurada para usar el servidor de demostración de Subsonic. Cuando configures tu servidor personal (disponible en <b>subsonic.org</b>), accede a <b>Preferencias</b> y cambia la configuración para conectarte.</string>
+	<string name="main.about_title">Acerca de DSub2000</string>
 	<string name="main.shuffle">Reproducción aleatoria</string>
     <string name="main.offline">Modo Offline</string>
 	<string name="main.online">Modo Online</string>
@@ -57,7 +57,7 @@
 	<string name="main.faq_text">
 	<![CDATA[
 		<font color="red">Cache vs Cache permanente</font>:
-		<br/>Cuando DSub descarga las canciones, pueden ser eliminadas para dejar espacio a nuevas descargas.  La música en Caché Permanente, nunca será eliminada automáticamente.
+		<br/>Cuando DSub2000 descarga las canciones, pueden ser eliminadas para dejar espacio a nuevas descargas.  La música en Caché Permanente, nunca será eliminada automáticamente.
 		<p/><font color="red">ChromeCast falla</font>:
 		<br/>Asegúrate que no estás utilizando un certificado auto-firmado, porque Chromecast automáticamente lo rechazará.
 	]]>
@@ -224,7 +224,7 @@
 
     <string name="error.label">Error</string>
 
-    <string name="settings.title">Ajustes de DSub</string>
+    <string name="settings.title">Ajustes de DSub2000</string>
     <string name="settings.test_connection_title">Comprobar conexión</string>
 	<string name="settings.servers_add">Añadir servidor</string>
 	<string name="settings.servers_remove">Borrar servidor</string>
@@ -382,9 +382,9 @@
 	<string name="settings.browse_by_tags_summary">Explorar por tags en vez de por estructura de carpetas. Requiere Subsonic 4.7+</string>
 	<string name="settings.server_local_network_ssid" >SSID Red local</string>
 	<string name="settings.server_local_network_ssid_hint">SSID Actual: %s</string>
-	<string name="settings.cache_location_reset">No se puede escribir en la ubicación seleccionada para la caché. Si has actualizado recientemente el sistema operativo de tu dispositivo a KitKat 4.4, la manera en la que las apps escriben en la Tarjeta SD ha cambiado, por lo que sólo pueden escribir en una ubicación específica. La ubicación que utiliza DSub ha sido automáticamente cambiada por la ubicación correcta. Para eliminar todos los datos de la app anterior, tendrás que introducir la Tarjeta SD en el ordenador y eliminar la carpeta manualmente.</string>
+	<string name="settings.cache_location_reset">No se puede escribir en la ubicación seleccionada para la caché. Si has actualizado recientemente el sistema operativo de tu dispositivo a KitKat 4.4, la manera en la que las apps escriben en la Tarjeta SD ha cambiado, por lo que sólo pueden escribir en una ubicación específica. La ubicación que utiliza DSub2000 ha sido automáticamente cambiada por la ubicación correcta. Para eliminar todos los datos de la app anterior, tendrás que introducir la Tarjeta SD en el ordenador y eliminar la carpeta manualmente.</string>
 	<string name="settings.override_system_language">Sobreescribir idioma del sistema</string>
-	<string name="settings.override_system_language_summary">Mostrar la aplicación en inglés aún teniendo disponible DSub en el idioma del sistema. Probablemente necesite borrar la aplicación de la memoria para efectuar los cambios.</string>
+	<string name="settings.override_system_language_summary">Mostrar la aplicación en inglés aún teniendo disponible DSub2000 en el idioma del sistema. Probablemente necesite borrar la aplicación de la memoria para efectuar los cambios.</string>
 	<string name="settings.drawer_items_title">Pestañas</string>
 	<string name="settings.large_album_art">Carátulas grandes</string>
 	<string name="settings.large_album_art_summary">Mostrar los discos con carátulas grandes en vez de en lista</string>
@@ -475,7 +475,7 @@
 
     <string name="service.connecting">Conectando con el servidor, espere por favor.</string>
 
-    <string name="parser.upgrade_client">Versiones incompatibles. Por favor, actualice la aplicación DSub de Android.</string>
+    <string name="parser.upgrade_client">Versiones incompatibles. Por favor, actualice la aplicación DSub2000 de Android.</string>
     <string name="parser.upgrade_server">Versiones incompatibles. Por favor, actualice su servidor Subsonic.</string>
     <string name="parser.not_authenticated">Usuario o contraseña inconrrectos.</string>
     <string name="parser.not_authorized">Sin autorización. Compruebe los permisos en el servidor Subsonic.</string>
@@ -494,10 +494,10 @@
     <string name="equalizer.enabled">Activado</string>
     <string name="equalizer.preset">Seleccionar preset</string>
 
-	<string name="widget.4x1">DSub (4x1)</string>
-	<string name="widget.4x2">DSub (4x2)</string>
-	<string name="widget.4x3">DSub (4x3)</string>
-	<string name="widget.4x4">DSub (4x4)</string>
+	<string name="widget.4x1">DSub2000 (4x1)</string>
+	<string name="widget.4x2">DSub2000 (4x2)</string>
+	<string name="widget.4x3">DSub2000 (4x3)</string>
+	<string name="widget.4x4">DSub2000 (4x4)</string>
     <string name="widget.initial_text">Toca para seleccionar música</string>
     <string name="widget.sdcard_busy">Tarjeta SD no disponible</string>
     <string name="widget.sdcard_missing">No hay tarjeta SD</string>
@@ -515,7 +515,7 @@
 	<string name="chat.send_a_message">Enviar un mensaje</string>
 
 	<string name="tasker.start_playing">Comenzar reproduciendo</string>
-	<string name="tasker.start_playing_title">Tasker -> Encender DSub</string>
+	<string name="tasker.start_playing_title">Tasker -> Encender DSub2000</string>
 	<string name="tasker.edit_shuffle_mode">Comenzar en modo aleatorio: </string>
 	<string name="tasker.start_playing_shuffled">Comenzar en modo aleatorio</string>
 	<string name="tasker.edit_do_nothing">No hacer nada</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 50909e1e1..d35367019 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Sauver</string>
     <string name="common.cancel">Annuler</string>
@@ -38,13 +38,13 @@
 	<string name="button_bar.downloading">Téléchargement</string>
 
     <string name="main.welcome_title">Bienvenue !</string>
-    <string name="main.welcome_text">Bienvenue dans DSub ! L\'application est actuellement configurée pour se connecter au serveur de démo Subsonic (<b>demo.subsonic.org</b>). Vous pouvez configurer votre propre serveur dans les paramètres. Choisir <b>Paramètres</b> et mettre à jour la configuration pour vous y connecter.</string>
-    	<string name="main.about_title">À propos de DSub</string>
+    <string name="main.welcome_text">Bienvenue dans DSub2000 ! L\'application est actuellement configurée pour se connecter au serveur de démo Subsonic (<b>demo.subsonic.org</b>). Vous pouvez configurer votre propre serveur dans les paramètres. Choisir <b>Paramètres</b> et mettre à jour la configuration pour vous y connecter.</string>
+    	<string name="main.about_title">À propos de DSub2000</string>
 	<string name="main.faq_title">FAQ</string>
 	<string name="main.faq_text">
 	<![CDATA[
 		<font color="red">Cache vs Cache permanent</font> :
-		<br/>Lorsque des titres sont téléchargés par DSub, ils peuvent être supprimés pour libérer de l\'espace pour de nouveaux téléchargements. Le cache permanent premet, lui, de ne jamais supprimer automatiquement la musique téléchargée.
+		<br/>Lorsque des titres sont téléchargés par DSub2000, ils peuvent être supprimés pour libérer de l\'espace pour de nouveaux téléchargements. Le cache permanent premet, lui, de ne jamais supprimer automatiquement la musique téléchargée.
 		<p/><font color="red">ChromeCast a échoué</font> :
 		<br/>Assurez-vous de ne pas utiliser un certificat auto-signé, Chromecast les rejette systématiquement.
 	]]>
@@ -233,7 +233,7 @@
 
     <string name="error.label">Erreur</string>
 
-    <string name="settings.title">Paramètres DSub</string>
+    <string name="settings.title">Paramètres DSub2000</string>
     <string name="settings.test_connection_title">Test de connexion</string>
 	<string name="settings.servers_add">Ajouter un serveur</string>
 	<string name="settings.servers_remove">Supprimer le serveur</string>
@@ -253,7 +253,7 @@
     <string name="settings.cache_size">Taille de la mémoire tampon (MB)</string>
     <string name="settings.cache_location">Emplacement de la mémoire tampon</string>
     <string name="settings.cache_location_error">Emplacement invalide pour la mémoire tampon. Utilisation emplacement par défaut.</string>
-    <string name="settings.cache_location_reset">L\'emplacement choisi pour la mémoire tampon ne peut plus être utilisé. S\'il y a eu une mise à jour récente vers Android 4.4 KiktKat, la façon dont les application écrivent sur la carte SD à changée afin que ces dernières ne puissent écrire que dans un emplacement spécifique. L\'emplacement à utiliser pour DSub a déjà été mis à jour. Afin de supprimer toutes les données obsolètes, il faut vider l\'ancien emplacement en utilisant un ordinateur.</string>
+    <string name="settings.cache_location_reset">L\'emplacement choisi pour la mémoire tampon ne peut plus être utilisé. S\'il y a eu une mise à jour récente vers Android 4.4 KiktKat, la façon dont les application écrivent sur la carte SD à changée afin que ces dernières ne puissent écrire que dans un emplacement spécifique. L\'emplacement à utiliser pour DSub2000 a déjà été mis à jour. Afin de supprimer toutes les données obsolètes, il faut vider l\'ancien emplacement en utilisant un ordinateur.</string>
 	<string name="settings.cache_clear">Vider la mémoire tampon</string>
 	<string name="settings.cache_clear_complete">Mémoire tampon vidée</string>
     <string name="settings.testing_connection">Test de connexion...</string>
@@ -396,7 +396,7 @@
 	<string name="settings.browse_by_tags">Naviguer via les tags</string>
 	<string name="settings.browse_by_tags_summary">Naviguer via les tags plutôt que via l\'arborescence de fichier.  Nécessite Subsonic 4.7+</string>
 	<string name="settings.override_system_language">Ne pas utiliser la langue du système</string>
-	<string name="settings.override_system_language_summary">Afficher DSub en Anglais même si une traduction existe pour la langue système. Peut nécessiter un vidage du cache de l\'application.</string>
+	<string name="settings.override_system_language_summary">Afficher DSub2000 en Anglais même si une traduction existe pour la langue système. Peut nécessiter un vidage du cache de l\'application.</string>
 	<string name="settings.drawer_items_title">Entrées de menu</string>
 	<string name="settings.large_album_art">Pochettes larges</string>
 	<string name="settings.large_album_art_summary">Afficher les pochettes en grand plutôt qu\'en liste.</string>
@@ -467,7 +467,7 @@
 
     <string name="service.connecting">Interrogation du serveur, veuillez patienter.</string>
 
-    <string name="parser.upgrade_client">Version incompatible. Mettre à jour DSub.</string>
+    <string name="parser.upgrade_client">Version incompatible. Mettre à jour DSub2000.</string>
     <string name="parser.upgrade_server">Version incompatible. Mettre à jour le serveur Subsonic.</string>
     <string name="parser.not_authenticated">Mauvais nom d\'utilisateur ou mot de passe.</string>
     <string name="parser.not_authorized">Non autorisé. Vérifier les droit de l\'utilisateur sur le serveur Subsonic.</string>
@@ -486,10 +486,10 @@
 	<string name="equalizer.db_size">%d dB</string>
 	<string name="equalizer.bass_size">%d mille</string>
 
-	<string name="widget.4x1">DSub (4x1)</string>
-	<string name="widget.4x2">DSub (4x2)</string>
-	<string name="widget.4x3">DSub (4x3)</string>
-	<string name="widget.4x4">DSub (4x4)</string>
+	<string name="widget.4x1">DSub2000 (4x1)</string>
+	<string name="widget.4x2">DSub2000 (4x2)</string>
+	<string name="widget.4x3">DSub2000 (4x3)</string>
+	<string name="widget.4x4">DSub2000 (4x4)</string>
     <string name="widget.initial_text">Toucher pour choisir de la musique</string>
     <string name="widget.sdcard_busy">Carte SD indisponible</string>
     <string name="widget.sdcard_missing">Pas de carte SD</string>
@@ -507,7 +507,7 @@
 	<string name="chat.send_a_message">Envoyer un message</string>
 
 	<string name="tasker.start_playing">Commencer la lecture</string>
-	<string name="tasker.start_playing_title">Tasker -> Démarrer DSub</string>
+	<string name="tasker.start_playing_title">Tasker -> Démarrer DSub2000</string>
 	<string name="tasker.edit_shuffle_mode">Démarrer en mode lecture aléatoire : </string>
 	<string name="tasker.start_playing_shuffled">Démarrer la lecture en mode lecture aléatoire</string>
 
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6a2799ea7..9f6d08e93 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Mentés</string>
     <string name="common.cancel">Mégse</string>
@@ -44,9 +44,9 @@
 	<string name="button_bar.offline">Offline</string>
 
     <string name="main.welcome_title">Üdvözlet!</string>
-    <string name="main.welcome_text">Üdvözli a DSub! Az alkalmazás jelenleg egy Subsonic demo kiszolgálóhoz van beállítva. Miután konfigurálta saját kiszolgálóját 
+    <string name="main.welcome_text">Üdvözli a DSub2000! Az alkalmazás jelenleg egy Subsonic demo kiszolgálóhoz van beállítva. Miután konfigurálta saját kiszolgálóját 
 	(elérhető: <b>subsonic.org</b>), húzza balról jobbra az oldalsávot, lépjen be a <b>Beállítások</b> menüpontba és adja meg a kapcsolódási adatokat!</string>
-	<string name="main.about_title">DSub információk</string>
+	<string name="main.about_title">DSub2000 információk</string>
 	<string name="main.faq_title">GYIK</string>
 	<string name="main.faq_text">
 	<![CDATA[
@@ -565,7 +565,7 @@
 
     <string name="service.connecting">Kapcsolódás a kiszolgálóhoz, kérem várjon...</string>
 
-    <string name="parser.upgrade_client">Nem kompatibilis verzió. Kérjük, frissítse a DSub Android alkalmazást!</string>
+    <string name="parser.upgrade_client">Nem kompatibilis verzió. Kérjük, frissítse a DSub2000 Android alkalmazást!</string>
     <string name="parser.upgrade_server">Nem kompatibilis verzió. Kérjük, frissítse a Subsonic kiszolgálót!</string>
     <string name="parser.not_authenticated">Hibás felhasználónév vagy jelszó!</string>
     <string name="parser.not_authorized">Nincs engedélyezve! Ellenőrizze a felhasználó jogosultságait a Subsonic kiszolgálón!</string>
@@ -584,10 +584,10 @@
 	<string name="equalizer.db_size">%d dB</string>
 	<string name="equalizer.bass_size">%d ezer</string>
 
-	<string name="widget.4x1">DSub (4x1)</string>
-	<string name="widget.4x2">DSub (4x2)</string>
-	<string name="widget.4x3">DSub (4x3)</string>
-	<string name="widget.4x4">DSub (4x4)</string>
+	<string name="widget.4x1">DSub2000 (4x1)</string>
+	<string name="widget.4x2">DSub2000 (4x2)</string>
+	<string name="widget.4x3">DSub2000 (4x3)</string>
+	<string name="widget.4x4">DSub2000 (4x4)</string>
     <string name="widget.initial_text">Érintse meg a zene kiválasztásához!</string>
     <string name="widget.sdcard_busy">Az SD kártya nem elérhető!</string>
     <string name="widget.sdcard_missing">Nincs SD kártya!</string>
@@ -608,7 +608,7 @@
 
 	<string name="tasker.start_playing">Lejátszás indítása</string>
 	<string name="tasker.start_playing_shuffled">Lejátszás indítása kevert sorrendben</string>
-	<string name="tasker.start_playing_title">Tasker -> DSub indítása</string>
+	<string name="tasker.start_playing_title">Tasker -> DSub2000 indítása</string>
 	<string name="tasker.edit_shuffle_mode">Indítás kevert sorrendben: </string>
 	<string name="tasker.edit_shuffle_start_year">Kevert sorrend kezdő év:</string>
 	<string name="tasker.edit_shuffle_end_year">Kevert sorrend utolsó év:</string>
@@ -664,7 +664,7 @@
 	<string name="details.stream_url">Stream URL</string>
 	<string name="details.home_page">Honlap</string>
 
-	<string name="permission.external_storage.failed">A DSub nem tud működni tárhely-írási engedély nélkül!</string>
+	<string name="permission.external_storage.failed">A DSub2000 nem tud működni tárhely-írási engedély nélkül!</string>
 
     <plurals name="select_album_n_songs">
         <item quantity="zero">Nincsenek dalok</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 93ff1f1d4..384fefaad 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Opslaan</string>
     <string name="common.cancel">Annuleer</string>
@@ -42,13 +42,13 @@
 	<string name="button_bar.offline">Offline</string>
 
     <string name="main.welcome_title">Welkom!</string>
-    <string name="main.welcome_text">Welkom bij DSub! De app is momenteel alleen geconfigureerd om de demo server te gebruiken. Nadat je eigen server geïnstalleerd hebt  (beschikbaar bij <b>subsonic.org</b>), ga dan naar <b>Instellingen</b> en verander de configuratie zodat je ermee kunt verbinden.</string>
-	<string name="main.about_title">Over DSub</string>
+    <string name="main.welcome_text">Welkom bij DSub2000! De app is momenteel alleen geconfigureerd om de demo server te gebruiken. Nadat je eigen server geïnstalleerd hebt  (beschikbaar bij <b>subsonic.org</b>), ga dan naar <b>Instellingen</b> en verander de configuratie zodat je ermee kunt verbinden.</string>
+	<string name="main.about_title">Over DSub2000</string>
 	<string name="main.faq_title">FAQ</string>
 	<string name="main.faq_text">
 	<![CDATA[
 		<font color="red">Cache versus Permanente Cache</font>:
-		<br/>Wanneer nummers zijn gedownload door DSub (cache), kunnen ze verwijderd worden om ruimte te maken voor nieuwe downloads. Permanente cache, daarentegen, wordt nooit automatisch verwijderd. 
+		<br/>Wanneer nummers zijn gedownload door DSub2000 (cache), kunnen ze verwijderd worden om ruimte te maken voor nieuwe downloads. Permanente cache, daarentegen, wordt nooit automatisch verwijderd. 
 		<p/><font color="red">ChromeCast faalt</font>:
 		<br/>Probeer de optie Instellingen -> Afspelen -> Gebruik apparaat proxy. Hiermee wordt het probleem van niet geaccepteerde \'self signed\' certificaten omzeild.
 		<p/><font color="red">Het eerste niveau in de bibliotheek zijn eigenlijk groepen artiesten.</font>:
@@ -274,7 +274,7 @@
     <string name="settings.cache_size">Cache grootte</string>
     <string name="settings.cache_location">Cache locatie</string>
     <string name="settings.cache_location_error">Onjuiste cache locatie. Standaard wordt gebruikt.</string>
-    <string name="settings.cache_location_reset">De locatie van de cache die u hebt ingesteld is niet meer beschrijfbaar. Als onlangs uw Android telefoon geüpgraded is naar KitKat 4.4 en hoger, dan is de manier waarop apps naar de SD-kaart schrijven veranderd zodat er alleen naar een specifieke locatie geschreven kan worden. De locatie die DSub gebruikt is al automatisch veranderd naar de juiste locatie. Om de oude app-data te verwijderen, moet de SD-kaart gekoppeld worden aan een computer om de oude folder handmatig te verwijderen.</string>
+    <string name="settings.cache_location_reset">De locatie van de cache die u hebt ingesteld is niet meer beschrijfbaar. Als onlangs uw Android telefoon geüpgraded is naar KitKat 4.4 en hoger, dan is de manier waarop apps naar de SD-kaart schrijven veranderd zodat er alleen naar een specifieke locatie geschreven kan worden. De locatie die DSub2000 gebruikt is al automatisch veranderd naar de juiste locatie. Om de oude app-data te verwijderen, moet de SD-kaart gekoppeld worden aan een computer om de oude folder handmatig te verwijderen.</string>
 	<string name="settings.cache_clear">Cache legen</string>
 	<string name="settings.cache_clear_complete">Klaar met cache legen</string>
     <string name="settings.testing_connection">Verbinding testen...</string>
@@ -520,7 +520,7 @@
 
     <string name="service.connecting">Serververbinding wordt opgezet, moment geduld a.u.b.</string>
 
-    <string name="parser.upgrade_client">Onverenigbare versies. DSub upgraden a.u.b.</string>
+    <string name="parser.upgrade_client">Onverenigbare versies. DSub2000 upgraden a.u.b.</string>
     <string name="parser.upgrade_server">Onverenigbare versies. Subsonic server upgraden a.u.b.</string>
     <string name="parser.not_authenticated">Verkeerde gebruikersnaam of wachtwoord.</string>
     <string name="parser.not_authorized">Niet geautoriseerd. Controleer de gebruikerspermissies op Subsonic server.</string>
@@ -539,10 +539,10 @@
 	<string name="equalizer.db_size">%d dB</string>
 	<string name="equalizer.bass_size">%d mille</string>
 
-	<string name="widget.4x1">DSub (4x1)</string>
-	<string name="widget.4x2">DSub (4x2)</string>
-	<string name="widget.4x3">DSub (4x3)</string>
-	<string name="widget.4x4">DSub (4x4)</string>
+	<string name="widget.4x1">DSub2000 (4x1)</string>
+	<string name="widget.4x2">DSub2000 (4x2)</string>
+	<string name="widget.4x3">DSub2000 (4x3)</string>
+	<string name="widget.4x4">DSub2000 (4x4)</string>
     <string name="widget.initial_text">Aanraken om muziek te selecteren</string>
     <string name="widget.sdcard_busy">SD-kaart onbeschikbaar</string>
     <string name="widget.sdcard_missing">Geen SD-kaart</string>
@@ -563,7 +563,7 @@
 
 	<string name="tasker.start_playing">Begin met spelen</string>
 	<string name="tasker.start_playing_shuffled">Begin met spelen in shuffle-modus</string>
-	<string name="tasker.start_playing_title">Tasker -> Start DSub</string>
+	<string name="tasker.start_playing_title">Tasker -> Start DSub2000</string>
 	<string name="tasker.edit_shuffle_mode">Start in shuffle-modus: </string>
 	<string name="tasker.edit_shuffle_start_year">Shuffle start jaar:</string>
 	<string name="tasker.edit_shuffle_end_year">Shuffle einde jaar:</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index c8f59195e..f123331ab 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Guardar</string>
     <string name="common.cancel">Cancelar</string>
@@ -44,13 +44,13 @@
 	<string name="button_bar.offline">Offline</string>
 
     <string name="main.welcome_title">Bem-vindo!</string>
-    <string name="main.welcome_text">Bem-vindo ao DSub! Atualmente a aplicação está configurada para usar o servidor de demonstração do Subsonic. Depois de configurar o seu servidor pessoal (disponível em <b>subsonic.org</b>), consulte as <b>Definições</b> e altere as configurações para que possa conectar-se.</string>
-	<string name="main.about_title">Sobre o DSub</string>
+    <string name="main.welcome_text">Bem-vindo ao DSub2000! Atualmente a aplicação está configurada para usar o servidor de demonstração do Subsonic. Depois de configurar o seu servidor pessoal (disponível em <b>subsonic.org</b>), consulte as <b>Definições</b> e altere as configurações para que possa conectar-se.</string>
+	<string name="main.about_title">Sobre o DSub2000</string>
 	<string name="main.faq_title">FAQ</string>
 	<string name="main.faq_text">
 	<![CDATA[
 		<font color="red">Cache vs Cache permanente</font>:
-		<br/>Quando o DSub transfere as músicas, as mesmas poderão vir a ser eliminadas para dar espaço a novas transferências.  Por outro lado, as músicas que ficam permanentemente na cache nunca serão eliminadas automaticamente.
+		<br/>Quando o DSub2000 transfere as músicas, as mesmas poderão vir a ser eliminadas para dar espaço a novas transferências.  Por outro lado, as músicas que ficam permanentemente na cache nunca serão eliminadas automaticamente.
 		<p/><font color="red">Falhas com o Chromecast</font>:
 		<br/>Experimente a opção Definições -> Transmissão -> Usar dispositivo como proxy.  É uma solução alternativa devido ao Chromecast não aceitar certificados auto-assinados.
 		<p/><font color="red">Primeiro nível na biblioteca são grupos de artistas</font>:
@@ -289,7 +289,7 @@
     <string name="settings.cache_size">Tamanho da cache</string>
     <string name="settings.cache_location">Localização da cache</string>
     <string name="settings.cache_location_error">Localização da cache inválida. A usar predefinição.</string>
-    <string name="settings.cache_location_reset">Não foi possível escrever na localização da cache que definiu. Se atualizou recentemente o SO do seu dispositivo para o KitKat 4.4, então o modo como as aplicações escrevem no cartão SD mudou e só podem escrever numa localização específica. A localização que o DSub usa já foi alterada para a localização correta.  Para eliminar os antigos dados da aplicação, terá que montar o cartão SD no computador e eliminar a pasta manualmente</string>
+    <string name="settings.cache_location_reset">Não foi possível escrever na localização da cache que definiu. Se atualizou recentemente o SO do seu dispositivo para o KitKat 4.4, então o modo como as aplicações escrevem no cartão SD mudou e só podem escrever numa localização específica. A localização que o DSub2000 usa já foi alterada para a localização correta.  Para eliminar os antigos dados da aplicação, terá que montar o cartão SD no computador e eliminar a pasta manualmente</string>
 	<string name="settings.cache_location_internal">Interna</string>
 	<string name="settings.cache_location_external">Externa</string>
 	<string name="settings.cache_clear">Limpar cache</string>
@@ -451,7 +451,7 @@
 	<string name="settings.disable_exit_prompt">Desativar diálogo de saída</string>
 	<string name="settings.disable_exit_prompt_summary">Fechar a aplicação imediatamente após pressionar o botão de voltar no ecrã inicial</string>
 	<string name="settings.override_system_language">Sobrepor linguagem do sistema</string>
-	<string name="settings.override_system_language_summary">Mostrar a aplicação em inglês mesmo se o DSub tiver uma tradução disponível para a linguagem do sistema.  Poderá ser necessário limpar a aplicação da memória para as alterações terem efeito</string>
+	<string name="settings.override_system_language_summary">Mostrar a aplicação em inglês mesmo se o DSub2000 tiver uma tradução disponível para a linguagem do sistema.  Poderá ser necessário limpar a aplicação da memória para as alterações terem efeito</string>
 	<string name="settings.drawer_items_title">Separadores laterais</string>
 	<string name="settings.song_press_action">Ação ao pressionar uma música</string>
 	<string name="settings.song_press_play_single">Reproduzir apenas essa música</string>
@@ -476,7 +476,7 @@
 	<string name="settings.rename_duplicates">Renomear faixas duplicadas</string>
 	<string name="settings.rename_duplicates_summary">Renomear as faixas duplicadas para o nome do ficheiro original para que as possa distinguir</string>
 	<string name="settings.start_on_headphones">Iniciar com os auscultadores</string>
-	<string name="settings.start_on_headphones_summary">Iniciar quando os auscultadores são ligados.  Isto requer o uso de um serviço que inicia com o arranque, para verificar o evento de ligação dos auscultadores mesmo quando o DSub não está a ser executado</string>
+	<string name="settings.start_on_headphones_summary">Iniciar quando os auscultadores são ligados.  Isto requer o uso de um serviço que inicia com o arranque, para verificar o evento de ligação dos auscultadores mesmo quando o DSub2000 não está a ser executado</string>
 	<string name="settings.color_action_bar">Colorir barra de ações</string>
 	<string name="settings.color_action_bar.summary">Colorir ou não a barra de ações e a barra de estado</string>
 	<string name="settings.shuffle_by_album">Aleatorizar por álbum</string>
@@ -562,7 +562,7 @@
 
     <string name="service.connecting">A contactar o servidor, por favor aguarde.</string>
 
-    <string name="parser.upgrade_client">Versões incompatíveis. Por favor atualize o DSub.</string>
+    <string name="parser.upgrade_client">Versões incompatíveis. Por favor atualize o DSub2000.</string>
     <string name="parser.upgrade_server">Versões incompatíveis. Por favor atualize o servidor Subsonic.</string>
     <string name="parser.not_authenticated">Nome de utilizador ou palavra-passe errados.</string>
     <string name="parser.not_authorized">Não autorizado. Verifique as permissões no servidor Subsonic.</string>
@@ -581,10 +581,10 @@
 	<string name="equalizer.db_size">%d dB</string>
 	<string name="equalizer.bass_size">%d mille</string>
 
-	<string name="widget.4x1">DSub (4x1)</string>
-	<string name="widget.4x2">DSub (4x2)</string>
-	<string name="widget.4x3">DSub (4x3)</string>
-	<string name="widget.4x4">DSub (4x4)</string>
+	<string name="widget.4x1">DSub2000 (4x1)</string>
+	<string name="widget.4x2">DSub2000 (4x2)</string>
+	<string name="widget.4x3">DSub2000 (4x3)</string>
+	<string name="widget.4x4">DSub2000 (4x4)</string>
     <string name="widget.initial_text">Toque para selecionar a música</string>
     <string name="widget.sdcard_busy">Cartão SD não disponível</string>
     <string name="widget.sdcard_missing">Cartão SD em falta</string>
@@ -605,7 +605,7 @@
 
 	<string name="tasker.start_playing">Iniciar reprodução</string>
 	<string name="tasker.start_playing_shuffled">Iniciar reprodução em modo aleatório</string>
-	<string name="tasker.start_playing_title">Tasker -> Iniciar DSub</string>
+	<string name="tasker.start_playing_title">Tasker -> Iniciar DSub2000</string>
 	<string name="tasker.edit_shuffle_mode">Iniciar em modo aleatório: </string>
 	<string name="tasker.edit_shuffle_start_year">Reprodução aleatória desde o ano:</string>
 	<string name="tasker.edit_shuffle_end_year">Reprodução aleatória até ao ano:</string>
@@ -661,7 +661,7 @@
 	<string name="details.stream_url">URL da transmissão</string>
 	<string name="details.home_page">Página web</string>
 
-	<string name="permission.external_storage.failed">O DSub não funciona se não puder escrever no armazenamento</string>
+	<string name="permission.external_storage.failed">O DSub2000 não funciona se não puder escrever no armazenamento</string>
 
     <plurals name="select_album_n_songs">
         <item quantity="zero">Sem músicas</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 97ba18809..d5615bed6 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Сохранить</string>
     <string name="common.cancel">Отмена</string>
@@ -28,9 +28,9 @@
     <string name="button_bar.now_playing">Плеер</string>
 
     <string name="main.welcome_title">Здравствуйте!</string>
-    <string name="main.welcome_text">Добро пожаловать в DSub! Это приложение настроено на работу с демо сервером Subsonic. После настройки Вашего персонального сервера (доступен на <b>subsonic.org</b>), пожалуйста, перейдите в <b>Настройки</b> и измените параметры для подключения.</string>
+    <string name="main.welcome_text">Добро пожаловать в DSub2000! Это приложение настроено на работу с демо сервером Subsonic. После настройки Вашего персонального сервера (доступен на <b>subsonic.org</b>), пожалуйста, перейдите в <b>Настройки</b> и измените параметры для подключения.</string>
 	
-	<string name="main.about_title">О программе DSub</string>
+	<string name="main.about_title">О программе DSub2000</string>
     <string name="main.shuffle">Случайное воспроизведение</string>
     <string name="main.offline">Отключиться</string>
 	<string name="main.online">Подключиться</string>
@@ -126,7 +126,7 @@
 
     <string name="error.label">Ошибка</string>
 
-    <string name="settings.title">Настройки DSub</string>
+    <string name="settings.title">Настройки DSub2000</string>
     <string name="settings.test_connection_title">Проверить соединение</string>
     <string name="settings.servers_title">Серверы</string>
     <string name="settings.server_name">Название</string>
@@ -193,7 +193,7 @@
     <string name="settings.search_history_cleared">История поиска очищена</string>
     <string name="settings.other_title">Другие настройки</string>
     <string name="settings.scrobble_title">Скробблинг на Last.fm</string>
-    <string name="settings.scrobble_summary">Не забудьте установить логин и пароль от Last.fm на сервере DSub</string>
+    <string name="settings.scrobble_summary">Не забудьте установить логин и пароль от Last.fm на сервере DSub2000</string>
     <string name="settings.hide_media_title">Прятать от других</string>
     <string name="settings.hide_media_summary">Прятать музыкальные файлы от других приложений</string>
     <string name="settings.hide_media_toast">Изменения вступят в силу при следующем поиске музыки на Вашем устройстве.</string>
@@ -227,7 +227,7 @@
 
     <string name="service.connecting">Подключение к серверу. Пожалуйста, подождите.</string>
 
-    <string name="parser.upgrade_client">Несовместимые версии. Пожалуйста, обновите приложение DSub для Android.</string>
+    <string name="parser.upgrade_client">Несовместимые версии. Пожалуйста, обновите приложение DSub2000 для Android.</string>
     <string name="parser.upgrade_server">Несовместимые версии. Пожалуйста, обновите сервер Subsonic.</string>
     <string name="parser.not_authenticated">Неправильное имя пользователя или пароль.</string>
     <string name="parser.not_authorized">Не авторизирован. Проверьте права пользователя на сервере Subsonic.</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index ac2195309..a92ff5220 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Spara</string>
     <string name="common.cancel">Avbryt</string>
@@ -43,14 +43,14 @@
 	<string name="button_bar.offline">Offline</string>
 
     <string name="main.welcome_title">Välkommen!</string>
-    <string name="main.welcome_text">Välkommen till DSub! Appen är för tillfället konfigurerad till att använda Subsonics demo server.
+    <string name="main.welcome_text">Välkommen till DSub2000! Appen är för tillfället konfigurerad till att använda Subsonics demo server.
         När du har satt upp din egen server (hämtas på <b>subsonic.org</b>), kan du gå till inställningar och ändra konfigurationen till att ansluta till den.</string>
-	<string name="main.about_title">Om DSub</string>
+	<string name="main.about_title">Om DSub2000</string>
 	<string name="main.faq_title">FAQ</string>
 	<string name="main.faq_text">
 	<![CDATA[
 		<font color="red">Cache vs Permanent Cache</font>:
-		<br/>När filer laddas ner av DSub kan de senare raderas för att lämna rum åt nya filer.  Permanent cache kan aldrig raderas utan ett aktivt val av dig.
+		<br/>När filer laddas ner av DSub2000 kan de senare raderas för att lämna rum åt nya filer.  Permanent cache kan aldrig raderas utan ett aktivt val av dig.
 		<p/><font color="red">ChromeCast misslyckande</font>:
 		<br/>Prova att använda alternativet Inställningar -> Uppspelning -> Använd enhets proxy.  Det är ett "hack" för att Chromecast inte godtar självsignerade certifikat.
 		<p/><font color="red">Första steget i biblioteket är grupper med artister</font>:
@@ -273,7 +273,7 @@
     <string name="settings.cache_size">Cache storlek</string>
     <string name="settings.cache_location">Cache plats</string>
     <string name="settings.cache_location_error">Ogiltig cache placering. Använder standard.</string>
-    <string name="settings.cache_location_reset">Din cache placering är inte skrivbar. Om du nyligen uppdaterade Android till KitKat 4.4 så har sättet appar skriver till SD-kortet ändrats så de bara kan skriva till en specifik plats. Platsen som DSub använder har automatiskt ändrats till den korrekta platsen. För att radera gammal data måste du sätta in SD-kortet i din dator och radera mappen manuellt</string>
+    <string name="settings.cache_location_reset">Din cache placering är inte skrivbar. Om du nyligen uppdaterade Android till KitKat 4.4 så har sättet appar skriver till SD-kortet ändrats så de bara kan skriva till en specifik plats. Platsen som DSub2000 använder har automatiskt ändrats till den korrekta platsen. För att radera gammal data måste du sätta in SD-kortet i din dator och radera mappen manuellt</string>
 	<string name="settings.cache_clear">Rensa cachen</string>
 	<string name="settings.cache_clear_complete">Cachen har rensats</string>
     <string name="settings.testing_connection">Testar anslutning...</string>
@@ -519,7 +519,7 @@
 
     <string name="service.connecting">Ansluter till servern, vänta.</string>
 
-    <string name="parser.upgrade_client">Okompatibel version. Uppgradera DSub.</string>
+    <string name="parser.upgrade_client">Okompatibel version. Uppgradera DSub2000.</string>
     <string name="parser.upgrade_server">Okompatibel version. Uppgradera din Subsonic server.</string>
     <string name="parser.not_authenticated">Ogiltigt användarnamn eller lösenord.</string>
     <string name="parser.not_authorized">Inte auktoriserad. Kontrollera tillstånd på din Subsonic server.</string>
@@ -538,10 +538,10 @@
 	<string name="equalizer.db_size">%d dB</string>
 	<string name="equalizer.bass_size">%d mille</string>
 
-	<string name="widget.4x1">DSub (4x1)</string>
-	<string name="widget.4x2">DSub (4x2)</string>
-	<string name="widget.4x3">DSub (4x3)</string>
-	<string name="widget.4x4">DSub (4x4)</string>
+	<string name="widget.4x1">DSub2000 (4x1)</string>
+	<string name="widget.4x2">DSub2000 (4x2)</string>
+	<string name="widget.4x3">DSub2000 (4x3)</string>
+	<string name="widget.4x4">DSub2000 (4x4)</string>
     <string name="widget.initial_text">Tryck för att välja musik</string>
     <string name="widget.sdcard_busy">SD-kort kunde inte användas</string>
     <string name="widget.sdcard_missing">Inget SD-kort</string>
@@ -560,7 +560,7 @@
 
 	<string name="tasker.start_playing">Börja spela</string>
 	<string name="tasker.start_playing_shuffled">Börja spela i slumpat läge</string>
-	<string name="tasker.start_playing_title">Tasker -> Starta DSub</string>
+	<string name="tasker.start_playing_title">Tasker -> Starta DSub2000</string>
 	<string name="tasker.edit_shuffle_mode">Starta i slumpat läge: </string>
 	<string name="tasker.edit_shuffle_start_year">Slumpa start år:</string>
 	<string name="tasker.edit_shuffle_end_year">Slumpa slut år:</string>
diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml
index b6c6345ad..a8ffcf619 100644
--- a/app/src/main/res/values-v21/themes.xml
+++ b/app/src/main/res/values-v21/themes.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
+	<style name="Theme.DSub2000.Light" parent="Theme.DSub2000.Light.Base">
 		<item name="android:windowTranslucentStatus">true</item>
 	</style>
 
-	<style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base">
+	<style name="Theme.DSub2000.Dark" parent="Theme.DSub2000.Dark.Base">
 		<item name="android:windowTranslucentStatus">true</item>
 	</style>
-	<style name="Theme.DSub.Black" parent="Theme.DSub.Black.Base">
+	<style name="Theme.DSub2000.Black" parent="Theme.DSub2000.Black.Base">
 		<item name="android:windowTranslucentStatus">true</item>
 	</style>
-	<style name="Theme.DSub.Holo" parent="Theme.DSub.Holo.Base">
+	<style name="Theme.DSub2000.Holo" parent="Theme.DSub2000.Holo.Base">
 		<item name="android:windowTranslucentStatus">true</item>
 	</style>
 
-	<style name="Theme.DSub.Light.No_Color" parent="Theme.DSub.Light.No_Color.Base">
+	<style name="Theme.DSub2000.Light.No_Color" parent="Theme.DSub2000.Light.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
 		<item name="android:statusBarColor">@android:color/black</item>
 	</style>
-	<style name="Theme.DSub.Black.No_Color" parent="Theme.DSub.Black.No_Color.Base">
+	<style name="Theme.DSub2000.Black.No_Color" parent="Theme.DSub2000.Black.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
 		<item name="android:statusBarColor">@android:color/black</item>
 	</style>
-	<style name="Theme.DSub.Dark.No_Color" parent="Theme.DSub.Dark.No_Color.Base">
+	<style name="Theme.DSub2000.Dark.No_Color" parent="Theme.DSub2000.Dark.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
 		<item name="android:statusBarColor">@android:color/black</item>
 	</style>
-	<style name="Theme.DSub.Holo.No_Color" parent="Theme.DSub.Holo.No_Color.Base">
+	<style name="Theme.DSub2000.Holo.No_Color" parent="Theme.DSub2000.Holo.No_Color.Base">
 		<item name="android:windowTranslucentStatus">false</item>
 		<item name="android:statusBarColor">@android:color/black</item>
 	</style>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 7f64e1370..fb4a4b26f 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -71,7 +71,7 @@
     <string name="changelog_title">最新消息</string>
     <string name="changelog_version_format">版本%s</string>
     <string name="chat.send_a_message">发送消息</string>
-    <string name="common.appname" >DSub</string>
+    <string name="common.appname" >DSub2000</string>
     <string name="common.cancel">取消</string>
     <string name="common.close">关闭</string>
     <string name="common.comment">评论</string>
@@ -205,7 +205,7 @@
     <string name="equalizer.voice_booster">扩音器</string>
     <string name="error.label">错误</string>
     <string name="lyrics.nomatch">找不到歌词</string>
-    <string name="main.about_title">关于DSub</string>
+    <string name="main.about_title">关于DSub2000</string>
     <string name="main.albums_alphabetical">全部</string>
     <string name="main.albums_frequent">最多播放</string>
     <string name="main.albums_genres">流派</string>
@@ -222,7 +222,7 @@
     <string name="main.faq_text">
     <![CDATA[
         <font color="red">缓存与永久缓存</font>:
-        <br/>当DSub下载歌曲时，可以将其自动删除，为新的下载腾出空间。另一方面，永久缓存的音乐永远不会被自动删除。
+        <br/>当DSub2000下载歌曲时，可以将其自动删除，为新的下载腾出空间。另一方面，永久缓存的音乐永远不会被自动删除。
         <p/><font color="red">ChromeCast失败</font>:
         <br/>尝试设置选项设置->播放->使用设备代理。这是Chromecast不接受自签名证书的一个解决方案。
         <p/><font color="red">资源库中的第一级是艺术家组</font>:
@@ -238,7 +238,7 @@
     <string name="main.songs_top_played">最高播放</string>
     <string name="main.title">标题</string>
     <string name="main.videos">视频</string>
-    <string name="main.welcome_text">欢迎使用DSub！当前连接演示服务器。您可建立个人服务器 ( <b>subsonic.org</b> )，并在设置中配置连接。</string>
+    <string name="main.welcome_text">欢迎使用DSub2000！当前连接演示服务器。您可建立个人服务器 ( <b>subsonic.org</b> )，并在设置中配置连接。</string>
     <string name="main.welcome_title">欢迎使用！</string>
     <string name="menu.about">关于</string>
     <string name="menu.add_playlist">添加到播放列表</string>
@@ -286,9 +286,9 @@
     <string name="parser.not_authorized">未授权，检查Subsonic服务器中的用户权限。</string>
     <string name="parser.scan_count">已扫描%d个条目</string>
     <string name="parser.server_error">服务器错误：%s</string>
-    <string name="parser.upgrade_client">不兼容的版本。请升级DSub。</string>
+    <string name="parser.upgrade_client">不兼容的版本。请升级DSub2000。</string>
     <string name="parser.upgrade_server">不兼容的版本。请升级Subsonic服务器。</string>
-    <string name="permission.external_storage.failed">DSub不能在没有写入内部存储权限的情况下工作</string>
+    <string name="permission.external_storage.failed">DSub2000不能在没有写入内部存储权限的情况下工作</string>
     <string name="permission.location.failed">需要使用位置权限来获取WIFI名</string>
     <string name="playlist.add_to">添加到播放列表</string>
     <string name="playlist.create_new">新建</string>
@@ -359,7 +359,7 @@
     <string name="settings.cache_location_error">缓存位置无效，使用默认值。</string>
     <string name="settings.cache_location_external">外部</string>
     <string name="settings.cache_location_internal">内部</string>
-    <string name="settings.cache_location_reset">已设置的缓存位置不再可写。如果您最近将手机操作系统升级到kitkat4.4，那么应用程序写入SD卡的方式已经改变，因此它们只能写入特定位置。DSub使用的位置已自动更改为正确的位置。要删除所有旧应用程序数据，您需要在计算机上挂载SD卡并手动删除旧文件夹</string>
+    <string name="settings.cache_location_reset">已设置的缓存位置不再可写。如果您最近将手机操作系统升级到kitkat4.4，那么应用程序写入SD卡的方式已经改变，因此它们只能写入特定位置。DSub2000使用的位置已自动更改为正确的位置。要删除所有旧应用程序数据，您需要在计算机上挂载SD卡并手动删除旧文件夹</string>
     <string name="settings.cache_screen_title">缓存/网络</string>
     <string name="settings.cache_size">缓存大小</string>
     <string name="settings.cache_title">缓存</string>
@@ -586,17 +586,17 @@
     <string name="tasker.edit_shuffle_start_year">随机开始年代：</string>
     <string name="tasker.start_playing">开始播放</string>
     <string name="tasker.start_playing_shuffled">在随机模式开始播放</string>
-    <string name="tasker.start_playing_title">任务->启动DSub</string>
+    <string name="tasker.start_playing_title">任务->启动DSub2000</string>
     <string name="updated_playlist">已将%1$s首歌曲添加到“%2$s”</string>
     <string name="updated_playlist_error">更新“%s”失败，请稍后再试。</string>
     <string name="util.bytes_format.byte">0 B</string>
     <string name="util.bytes_format.gigabyte">0.00 GB</string>
     <string name="util.bytes_format.kilobyte">0 KB</string>
     <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="widget.4x1">DSub (4x1)</string>
-    <string name="widget.4x2">DSub (4x2)</string>
-    <string name="widget.4x3">DSub (4x3)</string>
-    <string name="widget.4x4">DSub (4x4)</string>
+    <string name="widget.4x1">DSub2000 (4x1)</string>
+    <string name="widget.4x2">DSub2000 (4x2)</string>
+    <string name="widget.4x3">DSub2000 (4x3)</string>
+    <string name="widget.4x4">DSub2000 (4x4)</string>
     <string name="widget.initial_text">触按可选择音乐</string>
     <string name="widget.sdcard_busy">SD卡不可用</string>
     <string name="widget.sdcard_missing">没有SD卡</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 738e4d348..8cbaffdb6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">DSub</string>
+    <string name="common.appname">DSub2000</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Save</string>
     <string name="common.cancel">Cancel</string>
@@ -44,14 +44,14 @@
 	<string name="button_bar.offline">Offline</string>
 
     <string name="main.welcome_title">Welcome!</string>
-    <string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve
+    <string name="main.welcome_text">Welcome to DSub2000! The app is currently configured to use the Subsonic demo server. After you\'ve
         set up your personal server (available from <b>subsonic.org</b>), please go to <b>Settings</b> and change the configuration to connect to it.</string>
-	<string name="main.about_title">About DSub</string>
+	<string name="main.about_title">About DSub2000</string>
 	<string name="main.faq_title">FAQ</string>
 	<string name="main.faq_text">
 	<![CDATA[
 		<font color="red">Cache vs Permanent Cache</font>:
-		<br/>When songs are downloaded by DSub, they can be deleted to make room for new downloads.  Permanently cached music on the other hand will never be automatically deleted.
+		<br/>When songs are downloaded by DSub2000, they can be deleted to make room for new downloads.  Permanently cached music on the other hand will never be automatically deleted.
 		<p/><font color="red">ChromeCast fails</font>:
 		<br/>Try setting the option Settings -> Playback -> Use device proxy.  It is a work around for Chromecast not accepting self-signed certificates.
 		<p/><font color="red">First level in Library are actually groups of artists</font>:
@@ -293,7 +293,7 @@
     <string name="settings.cache_size">Cache size</string>
     <string name="settings.cache_location">Cache location</string>
     <string name="settings.cache_location_error">Invalid cache location. Using default.</string>
-    <string name="settings.cache_location_reset">The cache location you have set is no longer writable. If you recently upgraded your phone OS to KitKat 4.4, then the way apps write to the SD Card has changed so that they can only write to a specific location.  The location that DSub uses has already been automatically changed to the correct location.  In order to delete all of the old app data, you will need to mount the SD Card on your computer and delete the old folder manually</string>
+    <string name="settings.cache_location_reset">The cache location you have set is no longer writable. If you recently upgraded your phone OS to KitKat 4.4, then the way apps write to the SD Card has changed so that they can only write to a specific location.  The location that DSub2000 uses has already been automatically changed to the correct location.  In order to delete all of the old app data, you will need to mount the SD Card on your computer and delete the old folder manually</string>
 	<string name="settings.cache_location_internal">Internal</string>
 	<string name="settings.cache_location_external">External</string>
 	<string name="settings.cache_clear">Clear Cache</string>
@@ -459,7 +459,7 @@
 	<string name="settings.disable_exit_prompt">Disable Exit Prompt</string>
 	<string name="settings.disable_exit_prompt_summary">Exit the app immediately upon pressing back from the home screen</string>
 	<string name="settings.override_system_language">Override System Language</string>
-	<string name="settings.override_system_language_summary">Display app in english even if the system language is something DSub has a translation for.  May need to clear the app from memory for changes to take affect.</string>
+	<string name="settings.override_system_language_summary">Display app in english even if the system language is something DSub2000 has a translation for.  May need to clear the app from memory for changes to take affect.</string>
 	<string name="settings.drawer_items_title">Drawer Tabs</string>
 	<string name="settings.song_press_action">Song Press Action</string>
 	<string name="settings.song_press_play_single">Play only that song</string>
@@ -484,7 +484,7 @@
 	<string name="settings.rename_duplicates">Rename duplicate tracks</string>
 	<string name="settings.rename_duplicates_summary">Rename duplicate tracks to the original filename so you can tell them apart.</string>
 	<string name="settings.start_on_headphones">Start on headphones</string>
-	<string name="settings.start_on_headphones_summary">Start when headphones are plugged in.  This requires the use of a service which starts on boot up to check for the headphone plug event even when DSub is not running.</string>
+	<string name="settings.start_on_headphones_summary">Start when headphones are plugged in.  This requires the use of a service which starts on boot up to check for the headphone plug event even when DSub2000 is not running.</string>
 	<string name="settings.color_action_bar">Color Action Bar</string>
 	<string name="settings.color_action_bar.summary">Color the action bar and status bar or leave them alone</string>
 	<string name="settings.shuffle_by_album">Shuffle By Album</string>
@@ -572,7 +572,7 @@
 
     <string name="service.connecting">Contacting server, please wait.</string>
 
-    <string name="parser.upgrade_client">Incompatible versions. Please upgrade DSub.</string>
+    <string name="parser.upgrade_client">Incompatible versions. Please upgrade DSub2000.</string>
     <string name="parser.upgrade_server">Incompatible versions. Please upgrade Subsonic server.</string>
     <string name="parser.not_authenticated">Wrong username or password.</string>
     <string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>
@@ -591,10 +591,10 @@
 	<string name="equalizer.db_size">%d dB</string>
 	<string name="equalizer.bass_size">%d mille</string>
 
-	<string name="widget.4x1">DSub (4x1)</string>
-	<string name="widget.4x2">DSub (4x2)</string>
-	<string name="widget.4x3">DSub (4x3)</string>
-	<string name="widget.4x4">DSub (4x4)</string>
+	<string name="widget.4x1">DSub2000 (4x1)</string>
+	<string name="widget.4x2">DSub2000 (4x2)</string>
+	<string name="widget.4x3">DSub2000 (4x3)</string>
+	<string name="widget.4x4">DSub2000 (4x4)</string>
     <string name="widget.initial_text">Touch to select music</string>
     <string name="widget.sdcard_busy">SD card unavailable</string>
     <string name="widget.sdcard_missing">No SD card</string>
@@ -615,7 +615,7 @@
 
 	<string name="tasker.start_playing">Start playing</string>
 	<string name="tasker.start_playing_shuffled">Start playing in Shuffle Mode</string>
-	<string name="tasker.start_playing_title">Tasker -> Start DSub</string>
+	<string name="tasker.start_playing_title">Tasker -> Start DSub2000</string>
 	<string name="tasker.edit_shuffle_mode">Start in shuffle mode: </string>
 	<string name="tasker.edit_shuffle_start_year">Shuffle start year:</string>
 	<string name="tasker.edit_shuffle_end_year">Shuffle end year:</string>
@@ -671,7 +671,7 @@
 	<string name="details.stream_url">Stream URL</string>
 	<string name="details.home_page">Home Page</string>
 
-	<string name="permission.external_storage.failed">DSub cannot function without the ability to write to storage</string>
+	<string name="permission.external_storage.failed">DSub2000 cannot function without the ability to write to storage</string>
 	<string name="permission.location.failed">This apps uses location data to get the WIFI SSID to match against your local network settings. To get rid of this message, change the local network SSID to blank.</string>
 
     <plurals name="select_album_n_songs">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 76c0df534..65013d8c9 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<style name="Theme.DSub.Light.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+	<style name="Theme.DSub2000.Light.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar">
 		<item name="element_color">@color/lightElement</item>
 		<item name="actionbar_element_color">@color/darkElement</item>
 		<item name="offline_icon">@drawable/main_offline</item>
@@ -57,7 +57,7 @@
 		<item name="drawerAdmin">@drawable/ic_menu_admin</item>
 		<item name="drawerDownloading">@drawable/ic_menu_download</item>
 		<item name="drawerSettings">@drawable/ic_menu_settings</item>
-		<item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
+		<item name="drawerArrowStyle">@style/DSub2000.DrawerArrow</item>
 		<item name="colorPrimary">@color/lightPrimary</item>
 		<item name="colorPrimaryDark">@color/lightPrimaryDark</item>
 		<item name="colorAccent">@color/lightAccent</item>
@@ -75,7 +75,7 @@
 		<item name="cardBackgroundDrawable">@drawable/card_rounded_corners</item>
 		<item name="drawerHeaderBackground">@drawable/drawer_header_light</item>
 	</style>
-	<style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat">
+	<style name="Theme.DSub2000.Dark.Base" parent="@style/Theme.AppCompat">
 		<item name="element_color">@color/darkElement</item>
 		<item name="actionbar_element_color">@color/darkElement</item>
 		<item name="offline_icon">@drawable/main_offline</item>
@@ -132,7 +132,7 @@
 		<item name="drawerAdmin">@drawable/ic_menu_admin</item>
 		<item name="drawerDownloading">@drawable/ic_menu_download</item>
 		<item name="drawerSettings">@drawable/ic_menu_settings</item>
-		<item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
+		<item name="drawerArrowStyle">@style/DSub2000.DrawerArrow</item>
 		<item name="colorPrimary">@color/lightPrimary</item>
 		<item name="colorPrimaryDark">@color/lightPrimaryDark</item>
 		<item name="colorAccent">@color/lightAccent</item>
@@ -149,18 +149,18 @@
 		<item name="cardBackgroundDrawable">@drawable/card_rounded_corners</item>
 		<item name="drawerHeaderBackground">@drawable/drawer_header_dark</item>
 	</style>
-	<style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base">
+	<style name="Theme.DSub2000.Light" parent="Theme.DSub2000.Light.Base">
 	</style>
-	<style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base">
+	<style name="Theme.DSub2000.Dark" parent="Theme.DSub2000.Dark.Base">
 	</style>
-	<style name="Theme.DSub.Black.Base" parent="Theme.DSub.Dark.Base">
+	<style name="Theme.DSub2000.Black.Base" parent="Theme.DSub2000.Dark.Base">
 		<item name="card_background">@color/background_material_dark</item>
 		<item name="cardBackgroundDrawable">@drawable/card_rounded_corners</item>
 		<item name="android:windowBackground">@android:color/black</item>
 	</style>
-	<style name="Theme.DSub.Black" parent="Theme.DSub.Black.Base">
+	<style name="Theme.DSub2000.Black" parent="Theme.DSub2000.Black.Base">
 	</style>
-	<style name="Theme.DSub.Holo.Base" parent="Theme.DSub.Dark.Base">
+	<style name="Theme.DSub2000.Holo.Base" parent="Theme.DSub2000.Dark.Base">
 		<item name="android:windowBackground">@drawable/background</item>
 		<item name="colorPrimary">@color/holoPrimary</item>
 		<item name="colorPrimaryDark">@color/holoPrimaryDark</item>
@@ -170,27 +170,27 @@
 		<item name="card_background">@color/background_material_dark</item>
 		<item name="cardBackgroundDrawable">@drawable/card_rounded_corners</item>
 	</style>
-	<style name="Theme.DSub.Holo" parent="Theme.DSub.Holo.Base">
+	<style name="Theme.DSub2000.Holo" parent="Theme.DSub2000.Holo.Base">
 	</style>
 
-	<style name="Theme.DSub.Light.No_Actionbar" parent="Theme.DSub.Light">
+	<style name="Theme.DSub2000.Light.No_Actionbar" parent="Theme.DSub2000.Light">
 		<item name="windowActionBar">false</item>
 		<item name="windowNoTitle">true</item>
 	</style>
-	<style name="Theme.DSub.Black.No_Actionbar" parent="Theme.DSub.Black">
+	<style name="Theme.DSub2000.Black.No_Actionbar" parent="Theme.DSub2000.Black">
 		<item name="windowActionBar">false</item>
 		<item name="windowNoTitle">true</item>
 	</style>
-	<style name="Theme.DSub.Dark.No_Actionbar" parent="Theme.DSub.Dark">
+	<style name="Theme.DSub2000.Dark.No_Actionbar" parent="Theme.DSub2000.Dark">
 		<item name="windowActionBar">false</item>
 		<item name="windowNoTitle">true</item>
 	</style>
-	<style name="Theme.DSub.Holo.No_Actionbar" parent="Theme.DSub.Holo">
+	<style name="Theme.DSub2000.Holo.No_Actionbar" parent="Theme.DSub2000.Holo">
 		<item name="windowActionBar">false</item>
 		<item name="windowNoTitle">true</item>
 	</style>
 
-	<style name="Theme.DSub.Light.No_Color.Base" parent="Theme.DSub.Light.No_Actionbar">
+	<style name="Theme.DSub2000.Light.No_Color.Base" parent="Theme.DSub2000.Light.No_Actionbar">
 		<item name="actionbar_element_color">@color/lightElement</item>
 		<item name="actionbarThemeStyle">@style/ThemeOverlay.AppCompat.ActionBar</item>
 		<item name="actionbarBackgroundColor">@android:color/transparent</item>
@@ -219,29 +219,29 @@
 		<item name="actionModeStyle">@style/LightActionMode</item>
 		<item name="actionModeCloseButtonStyle">@style/DarkCloseButton</item>
 	</style>
-	<style name="Theme.DSub.Black.No_Color.Base" parent="Theme.DSub.Black.No_Actionbar">
+	<style name="Theme.DSub2000.Black.No_Color.Base" parent="Theme.DSub2000.Black.No_Actionbar">
 		<item name="actionbarBackgroundColor">@android:color/transparent</item>
 		<item name="actionModeBackground">@android:color/black</item>
 	</style>
-	<style name="Theme.DSub.Dark.No_Color.Base" parent="Theme.DSub.Dark.No_Actionbar">
+	<style name="Theme.DSub2000.Dark.No_Color.Base" parent="Theme.DSub2000.Dark.No_Actionbar">
 		<item name="actionbarBackgroundColor">@android:color/transparent</item>
 		<item name="actionModeBackground">@color/background_material_dark</item>
 	</style>
-	<style name="Theme.DSub.Holo.No_Color.Base" parent="Theme.DSub.Holo.No_Actionbar">
+	<style name="Theme.DSub2000.Holo.No_Color.Base" parent="Theme.DSub2000.Holo.No_Actionbar">
 		<item name="actionbarBackgroundColor">@android:color/transparent</item>
 		<item name="actionModeBackground">@drawable/background</item>
 	</style>
 
-	<style name="Theme.DSub.Light.No_Color" parent="Theme.DSub.Light.No_Color.Base">
+	<style name="Theme.DSub2000.Light.No_Color" parent="Theme.DSub2000.Light.No_Color.Base">
 	</style>
-	<style name="Theme.DSub.Black.No_Color" parent="Theme.DSub.Black.No_Color.Base">
+	<style name="Theme.DSub2000.Black.No_Color" parent="Theme.DSub2000.Black.No_Color.Base">
 	</style>
-	<style name="Theme.DSub.Dark.No_Color" parent="Theme.DSub.Dark.No_Color.Base">
+	<style name="Theme.DSub2000.Dark.No_Color" parent="Theme.DSub2000.Dark.No_Color.Base">
 	</style>
-	<style name="Theme.DSub.Holo.No_Color" parent="Theme.DSub.Holo.No_Color.Base">
+	<style name="Theme.DSub2000.Holo.No_Color" parent="Theme.DSub2000.Holo.No_Color.Base">
 	</style>
 
-	<style name="DSub.DrawerArrow" parent="Widget.AppCompat.DrawerArrowToggle">
+	<style name="DSub2000.DrawerArrow" parent="Widget.AppCompat.DrawerArrowToggle">
 		<item name="spinBars">true</item>
 	</style>
 
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index 02f88497e..a1bd48824 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -304,7 +304,7 @@
 		<change>Bug fixes for Ampache users</change>
 	</release>
 	<release version="4.9.5" versioncode="149" releasedate="3/25/2015">
-		<change>Handoff: move to another DSub client and pickup where you left off (Subsonic 5.2+)</change>
+		<change>Handoff: move to another DSub2000 client and pickup where you left off (Subsonic 5.2+)</change>
 		<change>DLNA: gapless playback on supported renders</change>
 		<change>Option to warning on back press</change>
 		<change>Better handle date for Subsonic 5.1+</change>
@@ -503,6 +503,6 @@
 		<change>Fix for delay between headset disconnect and pause</change>
 		<change>Fix background bluetooth disconnects causing playback to stop</change>
 		<change>Fix app trying to upsample songs in mp3 -> mp3 transcode</change>
-		<change>Fix for DSub preempting bluetooth events</change>
+		<change>Fix for DSub2000 preempting bluetooth events</change>
 	</release>
 </changelog>
\ No newline at end of file
diff --git a/app/src/main/res/xml/settings_appearance.xml b/app/src/main/res/xml/settings_appearance.xml
index 8aad1c26b..3d219ac19 100644
--- a/app/src/main/res/xml/settings_appearance.xml
+++ b/app/src/main/res/xml/settings_appearance.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub"
+	xmlns:myns="http://schemas.android.com/apk/res/github.paroj.dsub2000"
 	android:title="@string/settings.appearance_title">
 
 	<PreferenceCategory
diff --git a/app/src/main/res/xml/settings_cache.xml b/app/src/main/res/xml/settings_cache.xml
index 769263799..6c3f9d771 100644
--- a/app/src/main/res/xml/settings_cache.xml
+++ b/app/src/main/res/xml/settings_cache.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub"
+	xmlns:myns="http://schemas.android.com/apk/res/github.paroj.dsub2000"
 	android:title="@string/settings.cache_screen_title">
 
 	<PreferenceCategory
@@ -63,7 +63,7 @@
 			android:defaultValue="2000"
 			android:digits="0123456789"/>
 
-		<github.daneren2005.dsub.view.CacheLocationPreference
+		<github.paroj.dsub2000.view.CacheLocationPreference
 			android:title="@string/settings.cache_location"
 			android:key="cacheLocation"/>
 
diff --git a/app/src/main/res/xml/settings_drawer.xml b/app/src/main/res/xml/settings_drawer.xml
index f89fb9905..1c512d1c5 100644
--- a/app/src/main/res/xml/settings_drawer.xml
+++ b/app/src/main/res/xml/settings_drawer.xml
@@ -54,7 +54,7 @@
 			android:entries="@array/defaultDrawerItems"
 			android:defaultValue="Home"/>
 
-		<github.daneren2005.dsub.view.SeekBarPreference
+		<github.paroj.dsub2000.view.SeekBarPreference
 			android:title="@string/settings.chat_refresh"
 			android:key="chatRefreshRate"
 			android:defaultValue="30"
diff --git a/app/src/main/res/xml/settings_playback.xml b/app/src/main/res/xml/settings_playback.xml
index 8b28a539d..f3a95e597 100644
--- a/app/src/main/res/xml/settings_playback.xml
+++ b/app/src/main/res/xml/settings_playback.xml
@@ -6,7 +6,7 @@
 	<PreferenceCategory
 		android:title="@string/settings.playback_title">
 
-		<github.daneren2005.dsub.view.SeekBarPreference
+		<github.paroj.dsub2000.view.SeekBarPreference
 			android:title="@string/settings.playlist_random_size_title"
 			android:key="randomSize"
 			android:defaultValue="20"
@@ -59,14 +59,14 @@
 			android:entryValues="@array/songPressActionValues"
 			android:entries="@array/songPressActionNames"/>
 
-        <github.daneren2005.dsub.view.SeekBarPreference
+        <github.paroj.dsub2000.view.SeekBarPreference
             android:title="@string/settings.rewind_interval"
             android:key="rewindInterval"
             android:defaultValue="10"
             android:dialogLayout="@layout/seekbar_preference"
             myns:max="60"/>
 
-        <github.daneren2005.dsub.view.SeekBarPreference
+        <github.paroj.dsub2000.view.SeekBarPreference
             android:title="@string/settings.fastforward_interval"
             android:key="fastforwardInterval"
             android:defaultValue="30"
@@ -114,7 +114,7 @@
 			android:entryValues="@array/replayGainTypeValues"
 			android:entries="@array/replayGainTypeNames"/>
 
-		<github.daneren2005.dsub.view.SeekBarPreference
+		<github.paroj.dsub2000.view.SeekBarPreference
 			android:key="replayGainBump2"
 			android:dialogLayout="@layout/seekbar_preference"
 			android:title="@string/settings.replay_gain_bump"
@@ -124,7 +124,7 @@
 			myns:stepSize="10"
 			myns:display="%+.1f dB"/>
 
-		<github.daneren2005.dsub.view.SeekBarPreference
+		<github.paroj.dsub2000.view.SeekBarPreference
 			android:key="replayGainUntagged2"
 			android:dialogLayout="@layout/seekbar_preference"
 			android:title="@string/settings.replay_gain_untagged"
diff --git a/app/src/main/res/xml/settings_sync.xml b/app/src/main/res/xml/settings_sync.xml
index 1fad10de5..ee44ad868 100644
--- a/app/src/main/res/xml/settings_sync.xml
+++ b/app/src/main/res/xml/settings_sync.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub"
+	xmlns:myns="http://schemas.android.com/apk/res/github.paroj.dsub2000"
 	android:title="@string/settings.sync_title">
 
 	<PreferenceCategory
diff --git a/privacy.txt b/privacy.txt
index 336f0bc0c..68d23471f 100644
--- a/privacy.txt
+++ b/privacy.txt
@@ -1,17 +1,17 @@
 Privacy Policy
 General
 
-DSub For Subsonic ("DSub") is developed & maintained by one developer. As the developer of DSub, I do care about and respect your privacy.
+DSub2000 For Subsonic ("DSub2000") is developed & maintained by one developer. As the developer of DSub2000, I do care about and respect your privacy.
 
 This Privacy Policy ("Policy") aims to describe how information obtained from users is collected, used and disclosed.
 
-By using DSub, you agree that your personal information will be handled as described in this Policy.
+By using DSub2000, you agree that your personal information will be handled as described in this Policy.
 Information being collected
 
-DSub does not collect any personally identifiable information.
+DSub2000 does not collect any personally identifiable information.
 
-DSub requests the permission 'READ_PHONE_STATE'. This permission is used by DSub solely to determine whether you're in a phone call/the phone is ringing, so that music playback can be paused. This permission also grants access to some personally identifiable information (your phone's IMEI number, your phone number and your network/carrier). This personally identifiable information is never accessed, used, stored or disclosed by DSub.
-DSub requests the permission 'RECORD_AUDIO'. This permission is used by DSub to provide Equalizer functionality and no audio is ever stored or transmitted by DSub.
+DSub2000 requests the permission 'READ_PHONE_STATE'. This permission is used by DSub2000 solely to determine whether you're in a phone call/the phone is ringing, so that music playback can be paused. This permission also grants access to some personally identifiable information (your phone's IMEI number, your phone number and your network/carrier). This personally identifiable information is never accessed, used, stored or disclosed by DSub2000.
+DSub2000 requests the permission 'RECORD_AUDIO'. This permission is used by DSub2000 to provide Equalizer functionality and no audio is ever stored or transmitted by DSub2000.
 
 Changes to the Policy