diff --git a/app/build.gradle b/app/build.gradle
index dcd8a59..05e590b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
 	useLibrary 'org.apache.http.legacy'
 
 	defaultConfig {
-		applicationId "github.nvllsvm.audinaut"
+		applicationId "net.nullsum.audinaut"
 		minSdkVersion 19
 		targetSdkVersion 23
 		versionCode 186
diff --git a/app/src/androidTest/java/github/nvllsvm/audinaut/ApplicationTest.java b/app/src/androidTest/java/github/nvllsvm/audinaut/ApplicationTest.java
index e5d0567..3327e75 100644
--- a/app/src/androidTest/java/github/nvllsvm/audinaut/ApplicationTest.java
+++ b/app/src/androidTest/java/github/nvllsvm/audinaut/ApplicationTest.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut;
+package net.nullsum.audinaut;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;
diff --git a/app/src/androidTest/java/github/nvllsvm/audinaut/activity/SubsonicFragmentActivityTest.java b/app/src/androidTest/java/github/nvllsvm/audinaut/activity/SubsonicFragmentActivityTest.java
index 0458300..9190458 100644
--- a/app/src/androidTest/java/github/nvllsvm/audinaut/activity/SubsonicFragmentActivityTest.java
+++ b/app/src/androidTest/java/github/nvllsvm/audinaut/activity/SubsonicFragmentActivityTest.java
@@ -1,6 +1,6 @@
-package github.nvllsvm.audinaut.activity;
+package net.nullsum.audinaut.activity;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 import android.test.ActivityInstrumentationTestCase2;
 
 public class SubsonicFragmentActivityTest extends
diff --git a/app/src/androidTest/java/github/nvllsvm/audinaut/domain/GenreComparatorTest.java b/app/src/androidTest/java/github/nvllsvm/audinaut/domain/GenreComparatorTest.java
index df36d9e..69eda81 100644
--- a/app/src/androidTest/java/github/nvllsvm/audinaut/domain/GenreComparatorTest.java
+++ b/app/src/androidTest/java/github/nvllsvm/audinaut/domain/GenreComparatorTest.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/androidTest/java/github/nvllsvm/audinaut/service/DownloadServiceTest.java b/app/src/androidTest/java/github/nvllsvm/audinaut/service/DownloadServiceTest.java
index 9366f2b..0efd8f4 100644
--- a/app/src/androidTest/java/github/nvllsvm/audinaut/service/DownloadServiceTest.java
+++ b/app/src/androidTest/java/github/nvllsvm/audinaut/service/DownloadServiceTest.java
@@ -1,15 +1,15 @@
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
-import static github.nvllsvm.audinaut.domain.PlayerState.COMPLETED;
-import static github.nvllsvm.audinaut.domain.PlayerState.IDLE;
-import static github.nvllsvm.audinaut.domain.PlayerState.PAUSED;
-import static github.nvllsvm.audinaut.domain.PlayerState.STARTED;
-import static github.nvllsvm.audinaut.domain.PlayerState.STOPPED;
+import static net.nullsum.audinaut.domain.PlayerState.COMPLETED;
+import static net.nullsum.audinaut.domain.PlayerState.IDLE;
+import static net.nullsum.audinaut.domain.PlayerState.PAUSED;
+import static net.nullsum.audinaut.domain.PlayerState.STARTED;
+import static net.nullsum.audinaut.domain.PlayerState.STOPPED;
 import java.util.List;
 
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.PlayerState;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.PlayerState;
 
 import java.util.LinkedList;
 import android.test.ActivityInstrumentationTestCase2;
diff --git a/app/src/audinaut-stacktrace.txt b/app/src/audinaut-stacktrace.txt
index 57a6a54..bc9668b 100644
--- a/app/src/audinaut-stacktrace.txt
+++ b/app/src/audinaut-stacktrace.txt
@@ -8,9 +8,9 @@ android.content.res.Resources$NotFoundException: Resource ID #0xff33b5e5
 	at android.content.res.Resources.getColor(Resources.java:1028)
 	at android.content.res.Resources.getColor(Resources.java:1001)
 	at android.support.v4.widget.SwipeRefreshLayout.setColorSchemeResources(SwipeRefreshLayout.java:529)
-	at github.nvllsvm.audinaut.fragments.SubsonicFragment.setupScrollList(SubsonicFragment.java:691)
-	at github.nvllsvm.audinaut.fragments.SelectRecyclerFragment.onCreateView(SelectRecyclerFragment.java:89)
-	at github.nvllsvm.audinaut.fragments.SelectArtistFragment.onCreateView(SelectArtistFragment.java:77)
+	at net.nullsum.audinaut.fragments.SubsonicFragment.setupScrollList(SubsonicFragment.java:691)
+	at net.nullsum.audinaut.fragments.SelectRecyclerFragment.onCreateView(SelectRecyclerFragment.java:89)
+	at net.nullsum.audinaut.fragments.SelectArtistFragment.onCreateView(SelectArtistFragment.java:77)
 	at android.support.v4.app.Fragment.performCreateView(Fragment.java:1974)
 	at android.support.v4.app.FragmentManagerImpl.moveToState(FragmentManager.java:1067)
 	at android.support.v4.app.FragmentManagerImpl.moveToState(FragmentManager.java:1252)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3b66ddb..3c2f68b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="github.nvllsvm.audinaut"
+          package="net.nullsum.audinaut"
           android:installLocation="internalOnly">
 
     <instrumentation android:name="android.test.InstrumentationTestRunner"
-		android:targetPackage="github.nvllsvm.audinaut"
+		android:targetPackage="net.nullsum.audinaut"
 		android:label="Tests" />
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -33,13 +33,13 @@
     <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.nvllsvm.audinaut.util.SettingsBackupAgent"
+    	android:backupAgent="net.nullsum.audinaut.util.SettingsBackupAgent"
     	android:icon="@drawable/launch"
     	android:theme="@style/Theme.Audinaut.Light">
     	
         <uses-library android:name="android.test.runner" />
 
-		<activity android:name="github.nvllsvm.audinaut.activity.SubsonicFragmentActivity"
+		<activity android:name="net.nullsum.audinaut.activity.SubsonicFragmentActivity"
 				  android:configChanges="orientation|keyboardHidden"
 				  android:launchMode="singleTask">
 			<intent-filter>
@@ -49,11 +49,11 @@
 			</intent-filter>
 		</activity>
 
-        <activity android:name="github.nvllsvm.audinaut.activity.SettingsActivity"
+        <activity android:name="net.nullsum.audinaut.activity.SettingsActivity"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="github.nvllsvm.audinaut.activity.VoiceQueryReceiverActivity"
+        <activity android:name="net.nullsum.audinaut.activity.VoiceQueryReceiverActivity"
                   android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
@@ -61,7 +61,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="github.nvllsvm.audinaut.activity.QueryReceiverActivity"
+        <activity android:name="net.nullsum.audinaut.activity.QueryReceiverActivity"
                   android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH"/>
@@ -70,7 +70,7 @@
         </activity>
 
 		<activity
-			android:name="github.nvllsvm.audinaut.activity.EditPlayActionActivity"
+			android:name="net.nullsum.audinaut.activity.EditPlayActionActivity"
 			android:label="@string/tasker.start_playing"
 			android:icon="@drawable/launch">
 
@@ -83,7 +83,7 @@
                  android:label="Audinaut Playback Service"/>
 
 		<service android:name="org.fourthline.cling.android.AndroidUpnpServiceImpl"/>
-		<service android:name="github.nvllsvm.audinaut.service.sync.AuthenticatorService">
+		<service android:name="net.nullsum.audinaut.service.sync.AuthenticatorService">
 			<intent-filter>
 				<action android:name="android.accounts.AccountAuthenticator"/>
 			</intent-filter>
@@ -92,36 +92,36 @@
 				android:resource="@xml/authenticator" />
 		</service>
 
-		<service android:name="github.nvllsvm.audinaut.service.HeadphoneListenerService"
+		<service android:name="net.nullsum.audinaut.service.HeadphoneListenerService"
 			android:label="Audinaut Headphone Listener"/>
 		<receiver
-			android:name="github.nvllsvm.audinaut.receiver.BootReceiver">
+			android:name="net.nullsum.audinaut.receiver.BootReceiver">
 			<intent-filter>
 				<action
 					android:name="android.intent.action.BOOT_COMPLETED" />
 			</intent-filter>
 		</receiver>
 
-        <receiver android:name="github.nvllsvm.audinaut.receiver.MediaButtonIntentReceiver">
+        <receiver android:name="net.nullsum.audinaut.receiver.MediaButtonIntentReceiver">
         	<intent-filter>
 				<action android:name="android.intent.action.MEDIA_BUTTON" />
 			</intent-filter>
         </receiver>
 
-		<receiver android:name="github.nvllsvm.audinaut.receiver.AudioNoisyReceiver">
+		<receiver android:name="net.nullsum.audinaut.receiver.AudioNoisyReceiver">
 			<intent-filter android:priority="999">
 				<action android:name="android.media.AUDIO_BECOMING_NOISY" />
 			</intent-filter>
 		</receiver>
 		
-		<receiver android:name="github.nvllsvm.audinaut.receiver.A2dpIntentReceiver">
+		<receiver android:name="net.nullsum.audinaut.receiver.A2dpIntentReceiver">
 			<intent-filter>
 				<action android:name="android.music.playstatusrequest"/>
 			</intent-filter>
 		</receiver>
 
         <receiver
-			android:name="github.nvllsvm.audinaut.provider.AudinautWidget4x1"
+			android:name="net.nullsum.audinaut.provider.AudinautWidget4x1"
 			android:label="@string/widget.4x1">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -129,7 +129,7 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget4x1"/>
         </receiver>
 		<receiver
-			android:name="github.nvllsvm.audinaut.provider.AudinautWidget4x2"
+			android:name="net.nullsum.audinaut.provider.AudinautWidget4x2"
 			android:label="@string/widget.4x2">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -137,7 +137,7 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget4x2"/>
         </receiver>
 		<receiver
-			android:name="github.nvllsvm.audinaut.provider.AudinautWidget4x3"
+			android:name="net.nullsum.audinaut.provider.AudinautWidget4x3"
 			android:label="@string/widget.4x3">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -145,7 +145,7 @@
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget4x3"/>
         </receiver>
 		<receiver
-			android:name="github.nvllsvm.audinaut.provider.AudinautWidget4x4"
+			android:name="net.nullsum.audinaut.provider.AudinautWidget4x4"
 			android:label="@string/widget.4x4">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
@@ -154,18 +154,18 @@
         </receiver>
 
 		<receiver
-			android:name="github.nvllsvm.audinaut.receiver.PlayActionReceiver">
+			android:name="net.nullsum.audinaut.receiver.PlayActionReceiver">
 
 			<intent-filter>
 				<action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING" />
 			</intent-filter>
 		</receiver>
 
-        <provider android:name="github.nvllsvm.audinaut.provider.AudinautSearchProvider"
-                  android:authorities="github.nvllsvm.audinaut.provider.AudinautSearchProvider"/>
+        <provider android:name="net.nullsum.audinaut.provider.AudinautSearchProvider"
+                  android:authorities="net.nullsum.audinaut.provider.AudinautSearchProvider"/>
 
         <meta-data android:name="android.app.default_searchable"
-                   android:value="github.nvllsvm.audinaut.activity.QueryReceiverActivity"/>
+                   android:value="net.nullsum.audinaut.activity.QueryReceiverActivity"/>
 	</application>
 
 </manifest>
diff --git a/app/src/main/java/github/nvllsvm/audinaut/activity/EditPlayActionActivity.java b/app/src/main/java/github/nvllsvm/audinaut/activity/EditPlayActionActivity.java
index 47b6ffb..8e42329 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/activity/EditPlayActionActivity.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/activity/EditPlayActionActivity.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.activity;
+package net.nullsum.audinaut.activity;
 
 import android.app.Activity;
 import android.support.v7.app.AlertDialog;
@@ -36,14 +36,14 @@ import android.widget.Spinner;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.service.OfflineException;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.LoadingTask;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.OfflineException;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.LoadingTask;
+import net.nullsum.audinaut.util.Util;
 
 public class EditPlayActionActivity extends SubsonicActivity {
 	private CheckBox shuffleCheckbox;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/activity/QueryReceiverActivity.java b/app/src/main/java/github/nvllsvm/audinaut/activity/QueryReceiverActivity.java
index 52a8f19..cb627bb 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/activity/QueryReceiverActivity.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/activity/QueryReceiverActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.nvllsvm.audinaut.activity;
+package net.nullsum.audinaut.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
@@ -26,10 +26,10 @@ import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
 import android.util.Log;
 
-import github.nvllsvm.audinaut.fragments.SubsonicFragment;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.provider.AudinautSearchProvider;
+import net.nullsum.audinaut.fragments.SubsonicFragment;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.provider.AudinautSearchProvider;
 
 /**
  * Receives search queries and forwards to the SearchFragment.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/activity/SettingsActivity.java b/app/src/main/java/github/nvllsvm/audinaut/activity/SettingsActivity.java
index 06a314b..9b1efae 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/activity/SettingsActivity.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/activity/SettingsActivity.java
@@ -16,17 +16,17 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.activity;
+package net.nullsum.audinaut.activity;
 
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v7.widget.Toolbar;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.fragments.PreferenceCompatFragment;
-import github.nvllsvm.audinaut.fragments.SettingsFragment;
-import github.nvllsvm.audinaut.util.Constants;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.fragments.PreferenceCompatFragment;
+import net.nullsum.audinaut.fragments.SettingsFragment;
+import net.nullsum.audinaut.util.Constants;
 
 public class SettingsActivity extends SubsonicActivity {
 	private static final String TAG = SettingsActivity.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/activity/SubsonicActivity.java b/app/src/main/java/github/nvllsvm/audinaut/activity/SubsonicActivity.java
index 3789292..7dbbaff 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/activity/SubsonicActivity.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/activity/SubsonicActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.activity;
+package net.nullsum.audinaut.activity;
 
 import android.app.UiModeManager;
 import android.content.Context;
@@ -67,20 +67,20 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.fragments.SubsonicFragment;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.HeadphoneListenerService;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.DrawableTint;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.ThemeUtil;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.UpdateView;
-import github.nvllsvm.audinaut.util.UserUtil;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.fragments.SubsonicFragment;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.HeadphoneListenerService;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.DrawableTint;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.ThemeUtil;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.UpdateView;
+import net.nullsum.audinaut.util.UserUtil;
 
 import static android.Manifest.*;
 
@@ -1032,7 +1032,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte
 			PrintWriter printWriter = null;
 			try {
 
-				PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.nvllsvm.audinaut", 0);
+				PackageInfo packageInfo = context.getPackageManager().getPackageInfo("net.nullsum.audinaut", 0);
 				file = new File(Environment.getExternalStorageDirectory(), "audinaut-stacktrace.txt");
 				printWriter = new PrintWriter(file);
 				printWriter.println("Android API level: " + Build.VERSION.SDK);
diff --git a/app/src/main/java/github/nvllsvm/audinaut/activity/SubsonicFragmentActivity.java b/app/src/main/java/github/nvllsvm/audinaut/activity/SubsonicFragmentActivity.java
index 7dca8a4..571ad1e 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/activity/SubsonicFragmentActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.activity;
+package net.nullsum.audinaut.activity;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
@@ -52,27 +52,27 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.PlayerQueue;
-import github.nvllsvm.audinaut.domain.PlayerState;
-import github.nvllsvm.audinaut.fragments.DownloadFragment;
-import github.nvllsvm.audinaut.fragments.NowPlayingFragment;
-import github.nvllsvm.audinaut.fragments.SearchFragment;
-import github.nvllsvm.audinaut.fragments.SelectArtistFragment;
-import github.nvllsvm.audinaut.fragments.SelectDirectoryFragment;
-import github.nvllsvm.audinaut.fragments.SelectPlaylistFragment;
-import github.nvllsvm.audinaut.fragments.SubsonicFragment;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.updates.Updater;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.UserUtil;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.PlayerQueue;
+import net.nullsum.audinaut.domain.PlayerState;
+import net.nullsum.audinaut.fragments.DownloadFragment;
+import net.nullsum.audinaut.fragments.NowPlayingFragment;
+import net.nullsum.audinaut.fragments.SearchFragment;
+import net.nullsum.audinaut.fragments.SelectArtistFragment;
+import net.nullsum.audinaut.fragments.SelectDirectoryFragment;
+import net.nullsum.audinaut.fragments.SelectPlaylistFragment;
+import net.nullsum.audinaut.fragments.SubsonicFragment;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.updates.Updater;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.UserUtil;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * Created by Scott on 10/14/13.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/activity/VoiceQueryReceiverActivity.java b/app/src/main/java/github/nvllsvm/audinaut/activity/VoiceQueryReceiverActivity.java
index 4f22542..49a199b 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/activity/VoiceQueryReceiverActivity.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/activity/VoiceQueryReceiverActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.nvllsvm.audinaut.activity;
+package net.nullsum.audinaut.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
@@ -27,10 +27,10 @@ import android.provider.MediaStore;
 import android.provider.SearchRecentSuggestions;
 import android.util.Log;
 
-import github.nvllsvm.audinaut.fragments.SubsonicFragment;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.provider.AudinautSearchProvider;
+import net.nullsum.audinaut.fragments.SubsonicFragment;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.provider.AudinautSearchProvider;
 
 /**
  * Receives voice search queries and forwards to the SearchFragment.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/adapter/AlphabeticalAlbumAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/AlphabeticalAlbumAdapter.java
index 282562e..b494778 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/AlphabeticalAlbumAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/AlphabeticalAlbumAdapter.java
@@ -13,15 +13,15 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.view.FastScroller;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/adapter/ArtistAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/ArtistAdapter.java
index ef934b3..e13234c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/ArtistAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/ArtistAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.PopupMenu;
@@ -26,16 +26,16 @@ import android.widget.TextView;
 import java.io.Serializable;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
-import github.nvllsvm.audinaut.domain.MusicFolder;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.ArtistView;
-import github.nvllsvm.audinaut.view.FastScroller;
-import github.nvllsvm.audinaut.view.SongView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicDirectory.Entry;
+import net.nullsum.audinaut.domain.MusicFolder;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.ArtistView;
+import net.nullsum.audinaut.view.FastScroller;
+import net.nullsum.audinaut.view.SongView;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/adapter/BasicListAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/BasicListAdapter.java
index c6f7c3b..b3743f4 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/BasicListAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/BasicListAdapter.java
@@ -13,15 +13,15 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.view.ViewGroup;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.view.BasicListView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.view.BasicListView;
+import net.nullsum.audinaut.view.UpdateView;
 
 public class BasicListAdapter extends SectionAdapter<String> {
 	public static int VIEW_TYPE_LINE = 1;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/adapter/DetailsAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/DetailsAdapter.java
index f3ef084..e1828b7 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/DetailsAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/DetailsAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.text.SpannableString;
@@ -27,7 +27,7 @@ import android.widget.TextView;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 public class DetailsAdapter extends ArrayAdapter<String> {
 	private List<String> headers;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/adapter/DownloadFileAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/DownloadFileAdapter.java
index e9b7b49..e127ae5 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/DownloadFileAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/DownloadFileAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.view.Menu;
@@ -25,12 +25,12 @@ import android.widget.ArrayAdapter;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.FastScroller;
-import github.nvllsvm.audinaut.view.SongView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.FastScroller;
+import net.nullsum.audinaut.view.SongView;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/adapter/EntryGridAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/EntryGridAdapter.java
index 88d9a03..b301666 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/EntryGridAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/EntryGridAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.view.Menu;
@@ -24,15 +24,15 @@ import android.view.ViewGroup;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.AlbumView;
-import github.nvllsvm.audinaut.view.SongView;
-import github.nvllsvm.audinaut.view.UpdateView;
-import github.nvllsvm.audinaut.view.UpdateView.UpdateViewHolder;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicDirectory.Entry;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.AlbumView;
+import net.nullsum.audinaut.view.SongView;
+import net.nullsum.audinaut.view.UpdateView;
+import net.nullsum.audinaut.view.UpdateView.UpdateViewHolder;
 
 public class EntryGridAdapter extends SectionAdapter<Entry> {
 	private static String TAG = EntryGridAdapter.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/adapter/EntryInfiniteGridAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/EntryInfiniteGridAdapter.java
index dfd1a4b..978458c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/EntryInfiniteGridAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/EntryInfiniteGridAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -22,15 +22,15 @@ import android.view.ViewGroup;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
-import github.nvllsvm.audinaut.fragments.MainFragment;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicDirectory.Entry;
+import net.nullsum.audinaut.fragments.MainFragment;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.view.UpdateView;
 
 public class EntryInfiniteGridAdapter extends EntryGridAdapter {
 	public static int VIEW_TYPE_LOADING = 4;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/adapter/ExpandableSectionAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/ExpandableSectionAdapter.java
index 6fdf3d4..1b44cb1 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/ExpandableSectionAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/ExpandableSectionAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.util.Log;
@@ -25,10 +25,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.util.DrawableTint;
-import github.nvllsvm.audinaut.view.BasicHeaderView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.util.DrawableTint;
+import net.nullsum.audinaut.view.BasicHeaderView;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/adapter/GenreAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/GenreAdapter.java
index aa97469..d5158b6 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/GenreAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/GenreAdapter.java
@@ -13,14 +13,14 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.view.ViewGroup;
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.view.FastScroller;
-import github.nvllsvm.audinaut.view.GenreView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.view.FastScroller;
+import net.nullsum.audinaut.view.GenreView;
+import net.nullsum.audinaut.view.UpdateView;
 
 import java.util.List;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/adapter/MainAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/MainAdapter.java
index 5a8bca6..965d874 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/MainAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/MainAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.view.View;
@@ -23,12 +23,12 @@ import android.widget.CompoundButton;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.AlbumListCountView;
-import github.nvllsvm.audinaut.view.BasicHeaderView;
-import github.nvllsvm.audinaut.view.BasicListView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.AlbumListCountView;
+import net.nullsum.audinaut.view.BasicHeaderView;
+import net.nullsum.audinaut.view.BasicListView;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/adapter/PlaylistAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/PlaylistAdapter.java
index 9ac61dc..961c439 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/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.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 
 import java.util.List;
 
 import android.view.ViewGroup;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.view.FastScroller;
-import github.nvllsvm.audinaut.view.PlaylistView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.view.FastScroller;
+import net.nullsum.audinaut.view.PlaylistView;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/adapter/SearchAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/SearchAdapter.java
index 1e7376c..d5858c0 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/SearchAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/SearchAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -27,22 +27,22 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
-import github.nvllsvm.audinaut.domain.SearchResult;
-import github.nvllsvm.audinaut.util.DrawableTint;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.AlbumView;
-import github.nvllsvm.audinaut.view.ArtistView;
-import github.nvllsvm.audinaut.view.BasicHeaderView;
-import github.nvllsvm.audinaut.view.SongView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory.Entry;
+import net.nullsum.audinaut.domain.SearchResult;
+import net.nullsum.audinaut.util.DrawableTint;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.AlbumView;
+import net.nullsum.audinaut.view.ArtistView;
+import net.nullsum.audinaut.view.BasicHeaderView;
+import net.nullsum.audinaut.view.SongView;
+import net.nullsum.audinaut.view.UpdateView;
 
-import static github.nvllsvm.audinaut.adapter.ArtistAdapter.VIEW_TYPE_ARTIST;
-import static github.nvllsvm.audinaut.adapter.EntryGridAdapter.VIEW_TYPE_ALBUM_CELL;
-import static github.nvllsvm.audinaut.adapter.EntryGridAdapter.VIEW_TYPE_ALBUM_LINE;
-import static github.nvllsvm.audinaut.adapter.EntryGridAdapter.VIEW_TYPE_SONG;
+import static net.nullsum.audinaut.adapter.ArtistAdapter.VIEW_TYPE_ARTIST;
+import static net.nullsum.audinaut.adapter.EntryGridAdapter.VIEW_TYPE_ALBUM_CELL;
+import static net.nullsum.audinaut.adapter.EntryGridAdapter.VIEW_TYPE_ALBUM_LINE;
+import static net.nullsum.audinaut.adapter.EntryGridAdapter.VIEW_TYPE_SONG;
 
 public class SearchAdapter extends ExpandableSectionAdapter<Serializable> {
 	private ImageLoader imageLoader;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/adapter/SectionAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/SectionAdapter.java
index 238a9aa..2a99425 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/SectionAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/SectionAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -36,14 +36,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.MenuUtil;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.BasicHeaderView;
-import github.nvllsvm.audinaut.view.UpdateView;
-import github.nvllsvm.audinaut.view.UpdateView.UpdateViewHolder;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.MenuUtil;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.BasicHeaderView;
+import net.nullsum.audinaut.view.UpdateView;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/adapter/SettingsAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/adapter/SettingsAdapter.java
index 308b662..5d0764e 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/adapter/SettingsAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/adapter/SettingsAdapter.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.adapter;
+package net.nullsum.audinaut.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,16 +24,16 @@ import android.widget.TextView;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.User;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.UserUtil;
-import github.nvllsvm.audinaut.view.BasicHeaderView;
-import github.nvllsvm.audinaut.view.RecyclingImageView;
-import github.nvllsvm.audinaut.view.SettingView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.User;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.UserUtil;
+import net.nullsum.audinaut.view.BasicHeaderView;
+import net.nullsum.audinaut.view.RecyclingImageView;
+import net.nullsum.audinaut.view.SettingView;
+import net.nullsum.audinaut.view.UpdateView;
 
-import static github.nvllsvm.audinaut.domain.User.Setting;
+import static net.nullsum.audinaut.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/nvllsvm/audinaut/audiofx/AudioEffectsController.java b/app/src/main/java/github/nvllsvm/audinaut/audiofx/AudioEffectsController.java
index a852f93..c23721f 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/audiofx/AudioEffectsController.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/audiofx/AudioEffectsController.java
@@ -16,7 +16,7 @@
 
  Copyright 2014 (C) Scott Jackson
 */
-package github.nvllsvm.audinaut.audiofx;
+package net.nullsum.audinaut.audiofx;
 
 import android.content.Context;
 import android.media.MediaPlayer;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/audiofx/EqualizerController.java b/app/src/main/java/github/nvllsvm/audinaut/audiofx/EqualizerController.java
index 59915a4..5bced61 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/audiofx/EqualizerController.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/audiofx/EqualizerController.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.audiofx;
+package net.nullsum.audinaut.audiofx;
 
 import java.io.Serializable;
 
@@ -25,7 +25,7 @@ import android.media.audiofx.BassBoost;
 import android.media.audiofx.Equalizer;
 import android.os.Build;
 import android.util.Log;
-import github.nvllsvm.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.FileUtil;
 
 /**
  * Backward-compatible wrapper for {@link Equalizer}, which is API Level 9.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/audiofx/LoudnessEnhancerController.java b/app/src/main/java/github/nvllsvm/audinaut/audiofx/LoudnessEnhancerController.java
index 75bfbd4..c0b299c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/audiofx/LoudnessEnhancerController.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/audiofx/LoudnessEnhancerController.java
@@ -16,7 +16,7 @@
 
 	Copyright 2014 (C) Scott Jackson
 */
-package github.nvllsvm.audinaut.audiofx;
+package net.nullsum.audinaut.audiofx;
 
 import android.content.Context;
 import android.media.audiofx.LoudnessEnhancer;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/Artist.java b/app/src/main/java/github/nvllsvm/audinaut/domain/Artist.java
index a183d6b..91955aa 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/Artist.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/Artist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/Genre.java b/app/src/main/java/github/nvllsvm/audinaut/domain/Genre.java
index 77255f0..b40e27c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/Genre.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/Genre.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -8,8 +8,8 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
 
 public class Genre implements Serializable {
 	private String name;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/Indexes.java b/app/src/main/java/github/nvllsvm/audinaut/domain/Indexes.java
index 0de26c2..185d3af 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/Indexes.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/Indexes.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -25,8 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.io.Serializable;
 
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/MusicDirectory.java b/app/src/main/java/github/nvllsvm/audinaut/domain/MusicDirectory.java
index 28f7308..d1c18d3 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/MusicDirectory.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/MusicDirectory.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -35,10 +35,10 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Locale;
 
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.UpdateHelper;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.UpdateHelper;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/MusicFolder.java b/app/src/main/java/github/nvllsvm/audinaut/domain/MusicFolder.java
index 5906e68..8bc2a5f 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/MusicFolder.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/MusicFolder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/PlayerQueue.java b/app/src/main/java/github/nvllsvm/audinaut/domain/PlayerQueue.java
index 6232203..673bb38 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/PlayerQueue.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/PlayerQueue.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/PlayerState.java b/app/src/main/java/github/nvllsvm/audinaut/domain/PlayerState.java
index fe90e89..2c2a403 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/PlayerState.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/PlayerState.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import android.media.RemoteControlClient;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/Playlist.java b/app/src/main/java/github/nvllsvm/audinaut/domain/Playlist.java
index c79021a..5ecf7a1 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/Playlist.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/Playlist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import java.io.Serializable;
 import java.text.ParseException;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/RemoteStatus.java b/app/src/main/java/github/nvllsvm/audinaut/domain/RemoteStatus.java
index eba6a10..f991c8a 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/RemoteStatus.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/RemoteStatus.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/RepeatMode.java b/app/src/main/java/github/nvllsvm/audinaut/domain/RepeatMode.java
index 57f1ec8..1039f15 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/RepeatMode.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/RepeatMode.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/SearchCritera.java b/app/src/main/java/github/nvllsvm/audinaut/domain/SearchCritera.java
index 631a7c5..9dac45b 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/SearchCritera.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/SearchCritera.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import java.util.regex.Pattern;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/SearchResult.java b/app/src/main/java/github/nvllsvm/audinaut/domain/SearchResult.java
index bd15043..68186c7 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/SearchResult.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/SearchResult.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/User.java b/app/src/main/java/github/nvllsvm/audinaut/domain/User.java
index 4a5e88b..02f5399 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/User.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/User.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import android.util.Pair;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/domain/Version.java b/app/src/main/java/github/nvllsvm/audinaut/domain/Version.java
index a069dfd..93d7c7e 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/domain/Version.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/domain/Version.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.domain;
+package net.nullsum.audinaut.domain;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/DownloadFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/DownloadFragment.java
index 1247575..2363e5d 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/DownloadFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/DownloadFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -32,18 +32,18 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.util.DownloadFileItemHelperCallback;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.adapter.DownloadFileAdapter;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.util.DownloadFileItemHelperCallback;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.adapter.DownloadFileAdapter;
+import net.nullsum.audinaut.view.UpdateView;
 
 public class DownloadFragment extends SelectRecyclerFragment<DownloadFile> implements SectionAdapter.OnItemClickedListener<DownloadFile> {
 	private long currentRevision;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/EqualizerFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/EqualizerFragment.java
index c2c477c..66c4804 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/EqualizerFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/EqualizerFragment.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.content.SharedPreferences;
 import android.media.audiofx.BassBoost;
@@ -37,12 +37,12 @@ import android.widget.TextView;
 import java.util.HashMap;
 import java.util.Map;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.audiofx.EqualizerController;
-import github.nvllsvm.audinaut.audiofx.LoudnessEnhancerController;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.audiofx.EqualizerController;
+import net.nullsum.audinaut.audiofx.LoudnessEnhancerController;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * Created by Scott on 10/27/13.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/MainFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/MainFragment.java
index e8d1325..5934225 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/MainFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/MainFragment.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -14,19 +14,19 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.MainAdapter;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.EnvironmentVariables;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.LoadingTask;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.UserUtil;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.MainAdapter;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.EnvironmentVariables;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.LoadingTask;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.UserUtil;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.view.UpdateView;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/NowPlayingFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/NowPlayingFragment.java
index f7c40f0..00f2716 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/NowPlayingFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/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.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -54,30 +54,30 @@ import android.widget.PopupMenu;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.ViewFlipper;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.audiofx.EqualizerController;
-import github.nvllsvm.audinaut.domain.PlayerState;
-import github.nvllsvm.audinaut.domain.RepeatMode;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.DownloadService.OnSongChangedListener;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.service.OfflineException;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.adapter.DownloadFileAdapter;
-import github.nvllsvm.audinaut.view.FadeOutAnimation;
-import github.nvllsvm.audinaut.view.FastScroller;
-import github.nvllsvm.audinaut.view.UpdateView;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.audiofx.EqualizerController;
+import net.nullsum.audinaut.domain.PlayerState;
+import net.nullsum.audinaut.domain.RepeatMode;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.DownloadService.OnSongChangedListener;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.OfflineException;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.adapter.DownloadFileAdapter;
+import net.nullsum.audinaut.view.FadeOutAnimation;
+import net.nullsum.audinaut.view.FastScroller;
+import net.nullsum.audinaut.view.UpdateView;
+import net.nullsum.audinaut.util.Util;
 
-import static github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
-import static github.nvllsvm.audinaut.domain.PlayerState.*;
-import github.nvllsvm.audinaut.util.*;
-import github.nvllsvm.audinaut.view.AutoRepeatButton;
+import static net.nullsum.audinaut.domain.MusicDirectory.Entry;
+import static net.nullsum.audinaut.domain.PlayerState.*;
+import net.nullsum.audinaut.util.*;
+import net.nullsum.audinaut.view.AutoRepeatButton;
 import java.util.ArrayList;
 import java.util.concurrent.ScheduledFuture;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/PreferenceCompatFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/PreferenceCompatFragment.java
index f7084b8..cb79ae8 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/PreferenceCompatFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/PreferenceCompatFragment.java
@@ -17,7 +17,7 @@
 	 Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.app.Activity;
 import android.content.Context;
@@ -38,8 +38,8 @@ import android.widget.ListView;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.util.Constants;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.util.Constants;
 
 public abstract class PreferenceCompatFragment extends SubsonicFragment {
 	private static final String TAG = PreferenceCompatFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/SearchFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SearchFragment.java
index c1a7763..40cbd6a 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SearchFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SearchFragment.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -19,23 +19,23 @@ import android.view.View;
 import android.view.MenuItem;
 import android.net.Uri;
 import android.view.ViewGroup;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.ArtistAdapter;
-import github.nvllsvm.audinaut.adapter.EntryGridAdapter;
-import github.nvllsvm.audinaut.adapter.SearchAdapter;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.SearchCritera;
-import github.nvllsvm.audinaut.domain.SearchResult;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.util.BackgroundTask;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.TabBackgroundTask;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.ArtistAdapter;
+import net.nullsum.audinaut.adapter.EntryGridAdapter;
+import net.nullsum.audinaut.adapter.SearchAdapter;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.SearchCritera;
+import net.nullsum.audinaut.domain.SearchResult;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.util.BackgroundTask;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.TabBackgroundTask;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/fragments/SelectArtistFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectArtistFragment.java
index 81d5f29..7d7498a 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectArtistFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectArtistFragment.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.annotation.TargetApi;
 import android.os.Build;
@@ -11,19 +11,19 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.ArtistAdapter;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.Indexes;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
-import github.nvllsvm.audinaut.domain.MusicFolder;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.ArtistAdapter;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.Indexes;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicDirectory.Entry;
+import net.nullsum.audinaut.domain.MusicFolder;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.UpdateView;
 
 import java.io.Serializable;
 import java.util.ArrayList;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectDirectoryFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectDirectoryFragment.java
index f47f79b..0d35df0 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectDirectoryFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectDirectoryFragment.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.annotation.TargetApi;
 import android.support.v7.app.AlertDialog;
@@ -28,44 +28,44 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.AlphabeticalAlbumAdapter;
-import github.nvllsvm.audinaut.adapter.EntryInfiniteGridAdapter;
-import github.nvllsvm.audinaut.adapter.EntryGridAdapter;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.service.CachedMusicService;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.util.DrawableTint;
-import github.nvllsvm.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.AlphabeticalAlbumAdapter;
+import net.nullsum.audinaut.adapter.EntryInfiniteGridAdapter;
+import net.nullsum.audinaut.adapter.EntryGridAdapter;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.service.CachedMusicService;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.util.DrawableTint;
+import net.nullsum.audinaut.util.ImageLoader;
 
 import java.io.Serializable;
 import java.util.Iterator;
 import java.util.List;
 
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.service.OfflineException;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.LoadingTask;
-import github.nvllsvm.audinaut.util.Pair;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.TabBackgroundTask;
-import github.nvllsvm.audinaut.util.UpdateHelper;
-import github.nvllsvm.audinaut.util.UserUtil;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.FastScroller;
-import github.nvllsvm.audinaut.view.GridSpacingDecoration;
-import github.nvllsvm.audinaut.view.MyLeadingMarginSpan2;
-import github.nvllsvm.audinaut.view.RecyclingImageView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.OfflineException;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.LoadingTask;
+import net.nullsum.audinaut.util.Pair;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.TabBackgroundTask;
+import net.nullsum.audinaut.util.UpdateHelper;
+import net.nullsum.audinaut.util.UserUtil;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.FastScroller;
+import net.nullsum.audinaut.view.GridSpacingDecoration;
+import net.nullsum.audinaut.view.MyLeadingMarginSpan2;
+import net.nullsum.audinaut.view.RecyclingImageView;
+import net.nullsum.audinaut.view.UpdateView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-import static github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
+import static net.nullsum.audinaut.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/nvllsvm/audinaut/fragments/SelectGenreFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectGenreFragment.java
index ca93101..cf4ee86 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectGenreFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectGenreFragment.java
@@ -13,21 +13,21 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.adapter.GenreAdapter;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.adapter.GenreAdapter;
+import net.nullsum.audinaut.view.UpdateView;
 
 import java.util.List;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectPlaylistFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectPlaylistFragment.java
index 2cc6730..fbba454 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectPlaylistFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectPlaylistFragment.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.support.v7.app.AlertDialog;
 import android.content.DialogInterface;
@@ -12,23 +12,23 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.EditText;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.service.OfflineException;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.SyncUtil;
-import github.nvllsvm.audinaut.util.CacheCleaner;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.LoadingTask;
-import github.nvllsvm.audinaut.util.UserUtil;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.adapter.PlaylistAdapter;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.OfflineException;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.SyncUtil;
+import net.nullsum.audinaut.util.CacheCleaner;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.LoadingTask;
+import net.nullsum.audinaut.util.UserUtil;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.adapter.PlaylistAdapter;
+import net.nullsum.audinaut.view.UpdateView;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectRecyclerFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectRecyclerFragment.java
index 61ff449..2af0bbf 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectRecyclerFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectRecyclerFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.app.SearchManager;
 import android.app.SearchableInfo;
@@ -36,14 +36,14 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.TabBackgroundTask;
-import github.nvllsvm.audinaut.view.FastScroller;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.TabBackgroundTask;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/fragments/SelectYearFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectYearFragment.java
index 054c4bc..e502f55 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectYearFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SelectYearFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.os.Bundle;
 import android.view.Menu;
@@ -23,13 +23,13 @@ import android.view.MenuItem;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.BasicListAdapter;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.BasicListAdapter;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.view.UpdateView;
 
 public class SelectYearFragment extends SelectRecyclerFragment<String> {
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/SettingsFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SettingsFragment.java
index a75cbd3..25c463d 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SettingsFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SettingsFragment.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.accounts.Account;
 import android.content.ContentResolver;
@@ -46,18 +46,18 @@ import java.text.DecimalFormat;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.HeadphoneListenerService;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.LoadingTask;
-import github.nvllsvm.audinaut.util.SyncUtil;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.CacheLocationPreference;
-import github.nvllsvm.audinaut.view.ErrorDialog;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.HeadphoneListenerService;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.LoadingTask;
+import net.nullsum.audinaut.util.SyncUtil;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.CacheLocationPreference;
+import net.nullsum.audinaut.view.ErrorDialog;
 
 public class SettingsFragment extends PreferenceCompatFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
 	private final static String TAG = SettingsFragment.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/fragments/SubsonicFragment.java b/app/src/main/java/github/nvllsvm/audinaut/fragments/SubsonicFragment.java
index f4baa44..bdcedbb 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/fragments/SubsonicFragment.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/fragments/SubsonicFragment.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.fragments;
+package net.nullsum.audinaut.fragments;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -54,38 +54,38 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SubsonicActivity;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.MediaStoreService;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.service.OfflineException;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.MenuUtil;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.LoadingTask;
-import github.nvllsvm.audinaut.util.SongDBHandler;
-import github.nvllsvm.audinaut.util.UpdateHelper;
-import github.nvllsvm.audinaut.util.UserUtil;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.view.AlbumView;
-import github.nvllsvm.audinaut.view.ArtistEntryView;
-import github.nvllsvm.audinaut.view.ArtistView;
-import github.nvllsvm.audinaut.view.GridSpacingDecoration;
-import github.nvllsvm.audinaut.view.PlaylistSongView;
-import github.nvllsvm.audinaut.view.SongView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SubsonicActivity;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.MediaStoreService;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.OfflineException;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.MenuUtil;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.LoadingTask;
+import net.nullsum.audinaut.util.SongDBHandler;
+import net.nullsum.audinaut.util.UpdateHelper;
+import net.nullsum.audinaut.util.UserUtil;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.view.AlbumView;
+import net.nullsum.audinaut.view.ArtistEntryView;
+import net.nullsum.audinaut.view.ArtistView;
+import net.nullsum.audinaut.view.GridSpacingDecoration;
+import net.nullsum.audinaut.view.PlaylistSongView;
+import net.nullsum.audinaut.view.SongView;
+import net.nullsum.audinaut.view.UpdateView;
 
 import java.io.File;
 import java.text.DateFormat;
@@ -99,7 +99,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
-import static github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
+import static net.nullsum.audinaut.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/nvllsvm/audinaut/provider/AudinautSearchProvider.java b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautSearchProvider.java
index 0739aa5..292da06 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautSearchProvider.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautSearchProvider.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.provider;
+package net.nullsum.audinaut.provider;
 
 import android.app.SearchManager;
 import android.content.ContentProvider;
@@ -31,14 +31,14 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.SearchCritera;
-import github.nvllsvm.audinaut.domain.SearchResult;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.SearchCritera;
+import net.nullsum.audinaut.domain.SearchResult;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * Provides search suggestions based on recent searches.
@@ -48,7 +48,7 @@ import github.nvllsvm.audinaut.util.Util;
 public class AudinautSearchProvider extends ContentProvider {
 	private static final String TAG = AudinautSearchProvider.class.getSimpleName();
 
-	private static final String RESOURCE_PREFIX = "android.resource://github.nvllsvm.audinaut/";
+	private static final String RESOURCE_PREFIX = "android.resource://net.nullsum.audinaut/";
 	private static final String[] COLUMNS = {"_id",
 			SearchManager.SUGGEST_COLUMN_TEXT_1,
 			SearchManager.SUGGEST_COLUMN_TEXT_2,
diff --git a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x1.java b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x1.java
index 5a81e2a..d5fb721 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x1.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x1.java
@@ -16,9 +16,9 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.provider;
+package net.nullsum.audinaut.provider;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 public class AudinautWidget4x1 extends AudinautWidgetProvider {
 	@Override
diff --git a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x2.java b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x2.java
index df42c92..1149601 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x2.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x2.java
@@ -16,9 +16,9 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.provider;
+package net.nullsum.audinaut.provider;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 public class AudinautWidget4x2 extends AudinautWidgetProvider {
 	@Override
diff --git a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x3.java b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x3.java
index ad9f6da..6f76265 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x3.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x3.java
@@ -16,9 +16,9 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.provider;
+package net.nullsum.audinaut.provider;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 public class AudinautWidget4x3 extends AudinautWidgetProvider {
 	@Override
diff --git a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x4.java b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x4.java
index 8c7ef02..d4935d5 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x4.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidget4x4.java
@@ -16,9 +16,9 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.provider;
+package net.nullsum.audinaut.provider;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 public class AudinautWidget4x4 extends AudinautWidgetProvider {
 	@Override
diff --git a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidgetProvider.java b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidgetProvider.java
index 30341c3..4488bab 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidgetProvider.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/provider/AudinautWidgetProvider.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.provider;
+package net.nullsum.audinaut.provider;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
@@ -38,17 +38,17 @@ import android.os.Environment;
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SubsonicActivity;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.PlayerQueue;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.DownloadServiceLifecycleSupport;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SubsonicActivity;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.PlayerQueue;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.DownloadServiceLifecycleSupport;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * Simple widget to show currently playing album art along
@@ -273,7 +273,7 @@ public class AudinautWidgetProvider extends AppWidgetProvider {
     /**
      * Link up various button actions using {@link PendingIntent}.
      *
-     * @param playerActive @param playerActive True if player is active in background.  Launch {@link github.nvllsvm.audinaut.activity.SubsonicFragmentActivity}.
+     * @param playerActive @param playerActive True if player is active in background.  Launch {@link net.nullsum.audinaut.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/nvllsvm/audinaut/provider/MostRecentStubProvider.java b/app/src/main/java/github/nvllsvm/audinaut/provider/MostRecentStubProvider.java
index a8c0289..b7d797e 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/provider/MostRecentStubProvider.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/provider/MostRecentStubProvider.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.nvllsvm.audinaut.provider;
+package net.nullsum.audinaut.provider;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/provider/PlaylistStubProvider.java b/app/src/main/java/github/nvllsvm/audinaut/provider/PlaylistStubProvider.java
index aa841ed..2ebe077 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/provider/PlaylistStubProvider.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/provider/PlaylistStubProvider.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.nvllsvm.audinaut.provider;
+package net.nullsum.audinaut.provider;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/receiver/A2dpIntentReceiver.java b/app/src/main/java/github/nvllsvm/audinaut/receiver/A2dpIntentReceiver.java
index 0009b53..83422e2 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/receiver/A2dpIntentReceiver.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/receiver/A2dpIntentReceiver.java
@@ -1,10 +1,10 @@
-package github.nvllsvm.audinaut.receiver;
+package net.nullsum.audinaut.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
-import github.nvllsvm.audinaut.service.DownloadService;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/receiver/AudioNoisyReceiver.java b/app/src/main/java/github/nvllsvm/audinaut/receiver/AudioNoisyReceiver.java
index 302598a..733465b 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/receiver/AudioNoisyReceiver.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/receiver/AudioNoisyReceiver.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.receiver;
+package net.nullsum.audinaut.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -22,10 +22,10 @@ import android.content.SharedPreferences;
 import android.media.AudioManager;
 import android.util.Log;
 
-import github.nvllsvm.audinaut.domain.PlayerState;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.domain.PlayerState;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
 
 public class AudioNoisyReceiver extends BroadcastReceiver {
 	private static final String TAG = AudioNoisyReceiver.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/receiver/BootReceiver.java b/app/src/main/java/github/nvllsvm/audinaut/receiver/BootReceiver.java
index ba5915f..5b0a73a 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/receiver/BootReceiver.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/receiver/BootReceiver.java
@@ -13,14 +13,14 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.receiver;
+package net.nullsum.audinaut.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import github.nvllsvm.audinaut.service.HeadphoneListenerService;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.service.HeadphoneListenerService;
+import net.nullsum.audinaut.util.Util;
 
 public class BootReceiver  extends BroadcastReceiver {
 	@Override
diff --git a/app/src/main/java/github/nvllsvm/audinaut/receiver/HeadphonePlugReceiver.java b/app/src/main/java/github/nvllsvm/audinaut/receiver/HeadphonePlugReceiver.java
index a7c0e5c..77f799c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/receiver/HeadphonePlugReceiver.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/receiver/HeadphonePlugReceiver.java
@@ -13,15 +13,15 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.receiver;
+package net.nullsum.audinaut.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.util.Util;
 
 public class HeadphonePlugReceiver extends BroadcastReceiver {
 	private static final String TAG = HeadphonePlugReceiver.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/receiver/MediaButtonIntentReceiver.java b/app/src/main/java/github/nvllsvm/audinaut/receiver/MediaButtonIntentReceiver.java
index a172322..ae36c3d 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/receiver/MediaButtonIntentReceiver.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/receiver/MediaButtonIntentReceiver.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.receiver;
+package net.nullsum.audinaut.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -24,7 +24,7 @@ import android.content.Intent;
 import android.util.Log;
 import android.view.KeyEvent;
 
-import github.nvllsvm.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.DownloadService;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/receiver/PlayActionReceiver.java b/app/src/main/java/github/nvllsvm/audinaut/receiver/PlayActionReceiver.java
index f05ed16..c1298a2 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/receiver/PlayActionReceiver.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/receiver/PlayActionReceiver.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.receiver;
+package net.nullsum.audinaut.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -21,8 +21,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.util.Constants;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.util.Constants;
 
 public class PlayActionReceiver extends BroadcastReceiver {
 	private static final String TAG = PlayActionReceiver.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/CachedMusicService.java b/app/src/main/java/github/nvllsvm/audinaut/service/CachedMusicService.java
index 4badd07..6655bee 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/CachedMusicService.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/CachedMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,25 +33,25 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.util.Log;
 
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.domain.Indexes;
-import github.nvllsvm.audinaut.domain.PlayerQueue;
-import github.nvllsvm.audinaut.domain.RemoteStatus;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicFolder;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.domain.SearchCritera;
-import github.nvllsvm.audinaut.domain.SearchResult;
-import github.nvllsvm.audinaut.domain.User;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.SongDBHandler;
-import github.nvllsvm.audinaut.util.TimeLimitedCache;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.domain.Indexes;
+import net.nullsum.audinaut.domain.PlayerQueue;
+import net.nullsum.audinaut.domain.RemoteStatus;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicFolder;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.domain.SearchCritera;
+import net.nullsum.audinaut.domain.SearchResult;
+import net.nullsum.audinaut.domain.User;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.SongDBHandler;
+import net.nullsum.audinaut.util.TimeLimitedCache;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.Util;
 
-import static github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
+import static net.nullsum.audinaut.domain.MusicDirectory.Entry;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/DownloadFile.java b/app/src/main/java/github/nvllsvm/audinaut/service/DownloadFile.java
index 1f8ed4c..c5305d3 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/DownloadFile.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/DownloadFile.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -30,12 +30,12 @@ import android.net.wifi.WifiManager;
 import android.os.PowerManager;
 import android.util.Log;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.util.CacheCleaner;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.util.CacheCleaner;
 import github.daneren2005.serverproxy.BufferFile;
 
 import org.apache.http.Header;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/DownloadService.java b/app/src/main/java/github/nvllsvm/audinaut/service/DownloadService.java
index b8a377a..9be5a1c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/DownloadService.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/DownloadService.java
@@ -16,36 +16,36 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
-import static github.nvllsvm.audinaut.domain.PlayerState.COMPLETED;
-import static github.nvllsvm.audinaut.domain.PlayerState.DOWNLOADING;
-import static github.nvllsvm.audinaut.domain.PlayerState.IDLE;
-import static github.nvllsvm.audinaut.domain.PlayerState.PAUSED;
-import static github.nvllsvm.audinaut.domain.PlayerState.PAUSED_TEMP;
-import static github.nvllsvm.audinaut.domain.PlayerState.PREPARED;
-import static github.nvllsvm.audinaut.domain.PlayerState.PREPARING;
-import static github.nvllsvm.audinaut.domain.PlayerState.STARTED;
-import static github.nvllsvm.audinaut.domain.PlayerState.STOPPED;
+import static net.nullsum.audinaut.domain.PlayerState.COMPLETED;
+import static net.nullsum.audinaut.domain.PlayerState.DOWNLOADING;
+import static net.nullsum.audinaut.domain.PlayerState.IDLE;
+import static net.nullsum.audinaut.domain.PlayerState.PAUSED;
+import static net.nullsum.audinaut.domain.PlayerState.PAUSED_TEMP;
+import static net.nullsum.audinaut.domain.PlayerState.PREPARED;
+import static net.nullsum.audinaut.domain.PlayerState.PREPARING;
+import static net.nullsum.audinaut.domain.PlayerState.STARTED;
+import static net.nullsum.audinaut.domain.PlayerState.STOPPED;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SubsonicActivity;
-import github.nvllsvm.audinaut.audiofx.AudioEffectsController;
-import github.nvllsvm.audinaut.audiofx.EqualizerController;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.PlayerState;
-import github.nvllsvm.audinaut.domain.RepeatMode;
-import github.nvllsvm.audinaut.receiver.MediaButtonIntentReceiver;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.Notifications;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.ShufflePlayBuffer;
-import github.nvllsvm.audinaut.util.SimpleServiceBinder;
-import github.nvllsvm.audinaut.util.UpdateHelper;
-import github.nvllsvm.audinaut.util.Util;
-import github.nvllsvm.audinaut.util.tags.BastpUtil;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SubsonicActivity;
+import net.nullsum.audinaut.audiofx.AudioEffectsController;
+import net.nullsum.audinaut.audiofx.EqualizerController;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.PlayerState;
+import net.nullsum.audinaut.domain.RepeatMode;
+import net.nullsum.audinaut.receiver.MediaButtonIntentReceiver;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.Notifications;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.ShufflePlayBuffer;
+import net.nullsum.audinaut.util.SimpleServiceBinder;
+import net.nullsum.audinaut.util.UpdateHelper;
+import net.nullsum.audinaut.util.Util;
+import net.nullsum.audinaut.util.tags.BastpUtil;
+import net.nullsum.audinaut.view.UpdateView;
 import github.daneren2005.serverproxy.BufferProxy;
 
 import java.io.File;
@@ -85,14 +85,14 @@ import android.view.KeyEvent;
 public class DownloadService extends Service {
 	private static final String TAG = DownloadService.class.getSimpleName();
 
-	public static final String CMD_PLAY = "github.nvllsvm.audinaut.CMD_PLAY";
-	public static final String CMD_TOGGLEPAUSE = "github.nvllsvm.audinaut.CMD_TOGGLEPAUSE";
-	public static final String CMD_PAUSE = "github.nvllsvm.audinaut.CMD_PAUSE";
-	public static final String CMD_STOP = "github.nvllsvm.audinaut.CMD_STOP";
-	public static final String CMD_PREVIOUS = "github.nvllsvm.audinaut.CMD_PREVIOUS";
-	public static final String CMD_NEXT = "github.nvllsvm.audinaut.CMD_NEXT";
-	public static final String CANCEL_DOWNLOADS = "github.nvllsvm.audinaut.CANCEL_DOWNLOADS";
-	public static final String START_PLAY = "github.nvllsvm.audinaut.START_PLAYING";
+	public static final String CMD_PLAY = "net.nullsum.audinaut.CMD_PLAY";
+	public static final String CMD_TOGGLEPAUSE = "net.nullsum.audinaut.CMD_TOGGLEPAUSE";
+	public static final String CMD_PAUSE = "net.nullsum.audinaut.CMD_PAUSE";
+	public static final String CMD_STOP = "net.nullsum.audinaut.CMD_STOP";
+	public static final String CMD_PREVIOUS = "net.nullsum.audinaut.CMD_PREVIOUS";
+	public static final String CMD_NEXT = "net.nullsum.audinaut.CMD_NEXT";
+	public static final String CANCEL_DOWNLOADS = "net.nullsum.audinaut.CANCEL_DOWNLOADS";
+	public static final String START_PLAY = "net.nullsum.audinaut.START_PLAYING";
 	public static final int FAST_FORWARD = 30000;
 	public static final int REWIND = 10000;
 	private static final long DEFAULT_DELAY_UPDATE_PROGRESS = 1000L;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/DownloadServiceLifecycleSupport.java b/app/src/main/java/github/nvllsvm/audinaut/service/DownloadServiceLifecycleSupport.java
index 3b9b075..0e56cde 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/DownloadServiceLifecycleSupport.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/DownloadServiceLifecycleSupport.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -36,18 +36,18 @@ import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.KeyEvent;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.PlayerQueue;
-import github.nvllsvm.audinaut.domain.PlayerState;
-import github.nvllsvm.audinaut.util.CacheCleaner;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.Pair;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.SongDBHandler;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.PlayerQueue;
+import net.nullsum.audinaut.domain.PlayerState;
+import net.nullsum.audinaut.util.CacheCleaner;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.Pair;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.SongDBHandler;
+import net.nullsum.audinaut.util.Util;
 
-import static github.nvllsvm.audinaut.domain.PlayerState.PREPARING;
+import static net.nullsum.audinaut.domain.PlayerState.PREPARING;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/HeadphoneListenerService.java b/app/src/main/java/github/nvllsvm/audinaut/service/HeadphoneListenerService.java
index 6bcdec6..15ea24e 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/HeadphoneListenerService.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/HeadphoneListenerService.java
@@ -13,15 +13,15 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import android.app.Service;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.IBinder;
 
-import github.nvllsvm.audinaut.receiver.HeadphonePlugReceiver;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.receiver.HeadphonePlugReceiver;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * Created by Scott on 4/6/2015.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/MediaStoreService.java b/app/src/main/java/github/nvllsvm/audinaut/service/MediaStoreService.java
index 94fa79b..8c9e3a8 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/MediaStoreService.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/MediaStoreService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import java.io.File;
 
@@ -27,9 +27,9 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.MediaStore;
 import android.util.Log;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/MusicService.java b/app/src/main/java/github/nvllsvm/audinaut/service/MusicService.java
index b672681..b165725 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/MusicService.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/MusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import java.util.List;
 
@@ -25,19 +25,19 @@ import org.apache.http.HttpResponse;
 import android.content.Context;
 import android.graphics.Bitmap;
 
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.domain.Indexes;
-import github.nvllsvm.audinaut.domain.PlayerQueue;
-import github.nvllsvm.audinaut.domain.RemoteStatus;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicFolder;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.domain.SearchCritera;
-import github.nvllsvm.audinaut.domain.SearchResult;
-import github.nvllsvm.audinaut.domain.User;
-import github.nvllsvm.audinaut.domain.Version;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.domain.Indexes;
+import net.nullsum.audinaut.domain.PlayerQueue;
+import net.nullsum.audinaut.domain.RemoteStatus;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicFolder;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.domain.SearchCritera;
+import net.nullsum.audinaut.domain.SearchResult;
+import net.nullsum.audinaut.domain.User;
+import net.nullsum.audinaut.domain.Version;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.ProgressListener;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/MusicServiceFactory.java b/app/src/main/java/github/nvllsvm/audinaut/service/MusicServiceFactory.java
index 7a30acc..81c12af 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/MusicServiceFactory.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/MusicServiceFactory.java
@@ -16,10 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import android.content.Context;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/OfflineException.java b/app/src/main/java/github/nvllsvm/audinaut/service/OfflineException.java
index d0c7b18..b0a834a 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/OfflineException.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/OfflineException.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 /**
  * Thrown by service methods that are not available in offline mode.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/OfflineMusicService.java b/app/src/main/java/github/nvllsvm/audinaut/service/OfflineMusicService.java
index c6e9bde..a35ca6a 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/OfflineMusicService.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/OfflineMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import java.io.File;
 import java.io.Reader;
@@ -36,25 +36,25 @@ import android.util.Log;
 
 import org.apache.http.HttpResponse;
 
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.domain.Indexes;
-import github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
-import github.nvllsvm.audinaut.domain.PlayerQueue;
-import github.nvllsvm.audinaut.domain.RemoteStatus;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicFolder;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.domain.SearchCritera;
-import github.nvllsvm.audinaut.domain.SearchResult;
-import github.nvllsvm.audinaut.domain.User;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.Pair;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.SongDBHandler;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.domain.Indexes;
+import net.nullsum.audinaut.domain.MusicDirectory.Entry;
+import net.nullsum.audinaut.domain.PlayerQueue;
+import net.nullsum.audinaut.domain.RemoteStatus;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicFolder;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.domain.SearchCritera;
+import net.nullsum.audinaut.domain.SearchResult;
+import net.nullsum.audinaut.domain.User;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.Pair;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.SongDBHandler;
+import net.nullsum.audinaut.util.Util;
 import java.io.*;
 import java.util.Comparator;
 import java.util.SortedSet;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/RESTMusicService.java b/app/src/main/java/github/nvllsvm/audinaut/service/RESTMusicService.java
index b742292..0dcc860 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/RESTMusicService.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/RESTMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service;
+package net.nullsum.audinaut.service;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -70,34 +70,34 @@ import android.net.NetworkInfo;
 import android.os.Looper;
 import android.util.Log;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.*;
-import github.nvllsvm.audinaut.fragments.MainFragment;
-import github.nvllsvm.audinaut.service.parser.EntryListParser;
-import github.nvllsvm.audinaut.service.parser.ErrorParser;
-import github.nvllsvm.audinaut.service.parser.GenreParser;
-import github.nvllsvm.audinaut.service.parser.IndexesParser;
-import github.nvllsvm.audinaut.service.parser.MusicDirectoryParser;
-import github.nvllsvm.audinaut.service.parser.MusicFoldersParser;
-import github.nvllsvm.audinaut.service.parser.PlayQueueParser;
-import github.nvllsvm.audinaut.service.parser.PlaylistParser;
-import github.nvllsvm.audinaut.service.parser.PlaylistsParser;
-import github.nvllsvm.audinaut.service.parser.RandomSongsParser;
-import github.nvllsvm.audinaut.service.parser.ScanStatusParser;
-import github.nvllsvm.audinaut.service.parser.SearchResult2Parser;
-import github.nvllsvm.audinaut.service.parser.SearchResultParser;
-import github.nvllsvm.audinaut.service.parser.TopSongsParser;
-import github.nvllsvm.audinaut.service.parser.UserParser;
-import github.nvllsvm.audinaut.service.ssl.SSLSocketFactory;
-import github.nvllsvm.audinaut.service.ssl.TrustSelfSignedStrategy;
-import github.nvllsvm.audinaut.util.BackgroundTask;
-import github.nvllsvm.audinaut.util.Pair;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.SongDBHandler;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.*;
+import net.nullsum.audinaut.fragments.MainFragment;
+import net.nullsum.audinaut.service.parser.EntryListParser;
+import net.nullsum.audinaut.service.parser.ErrorParser;
+import net.nullsum.audinaut.service.parser.GenreParser;
+import net.nullsum.audinaut.service.parser.IndexesParser;
+import net.nullsum.audinaut.service.parser.MusicDirectoryParser;
+import net.nullsum.audinaut.service.parser.MusicFoldersParser;
+import net.nullsum.audinaut.service.parser.PlayQueueParser;
+import net.nullsum.audinaut.service.parser.PlaylistParser;
+import net.nullsum.audinaut.service.parser.PlaylistsParser;
+import net.nullsum.audinaut.service.parser.RandomSongsParser;
+import net.nullsum.audinaut.service.parser.ScanStatusParser;
+import net.nullsum.audinaut.service.parser.SearchResult2Parser;
+import net.nullsum.audinaut.service.parser.SearchResultParser;
+import net.nullsum.audinaut.service.parser.TopSongsParser;
+import net.nullsum.audinaut.service.parser.UserParser;
+import net.nullsum.audinaut.service.ssl.SSLSocketFactory;
+import net.nullsum.audinaut.service.ssl.TrustSelfSignedStrategy;
+import net.nullsum.audinaut.util.BackgroundTask;
+import net.nullsum.audinaut.util.Pair;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.SongDBHandler;
+import net.nullsum.audinaut.util.Util;
 import java.io.*;
 import java.util.zip.GZIPInputStream;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/AbstractParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/AbstractParser.java
index 2007d6f..ad8eae4 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/AbstractParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/AbstractParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import java.io.IOException;
 import java.io.Reader;
@@ -26,10 +26,10 @@ import org.xmlpull.v1.XmlPullParser;
 import android.content.Context;
 import android.util.Log;
 import android.util.Xml;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Version;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Version;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/EntryListParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/EntryListParser.java
index d49240c..8dcb4b0 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/EntryListParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/EntryListParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/ErrorParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/ErrorParser.java
index 0c1ab2c..3271e57 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/ErrorParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/ErrorParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/GenreParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/GenreParser.java
index ee43fa6..c0089e5 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/GenreParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/GenreParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 import android.text.Html;
 import android.util.Log;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.util.ProgressListener;
 
 import org.xmlpull.v1.XmlPullParser;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/IndexesParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/IndexesParser.java
index 72a5a08..93c40b3 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/IndexesParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/IndexesParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import java.io.Reader;
 import java.util.HashMap;
@@ -28,14 +28,14 @@ import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.Indexes;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.Indexes;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.ProgressListener;
 import android.util.Log;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicDirectoryEntryParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicDirectoryEntryParser.java
index 796714e..8e0ca9d 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicDirectoryEntryParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicDirectoryEntryParser.java
@@ -16,11 +16,11 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicDirectoryParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicDirectoryParser.java
index eb6ca6e..0ead366 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicDirectoryParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicDirectoryParser.java
@@ -16,22 +16,22 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 import android.util.Log;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.ProgressListener;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.util.Util;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 import java.util.HashMap;
 import java.util.Map;
 
-import static github.nvllsvm.audinaut.domain.MusicDirectory.*;
+import static net.nullsum.audinaut.domain.MusicDirectory.*;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicFoldersParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicFoldersParser.java
index dc1898b..c8f784b 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicFoldersParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/MusicFoldersParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import java.io.Reader;
 import java.util.ArrayList;
@@ -25,9 +25,9 @@ import java.util.List;
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicFolder;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicFolder;
+import net.nullsum.audinaut.util.ProgressListener;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlayQueueParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlayQueueParser.java
index a3dac5c..6a8d4e3 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlayQueueParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlayQueueParser.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 
@@ -25,9 +25,9 @@ import java.text.SimpleDateFormat;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.PlayerQueue;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.PlayerQueue;
+import net.nullsum.audinaut.util.ProgressListener;
 
 public class PlayQueueParser extends MusicDirectoryEntryParser {
 	private static final String TAG = PlayQueueParser.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlaylistParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlaylistParser.java
index 62da232..ad8c336 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlaylistParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlaylistParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlaylistsParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlaylistsParser.java
index 36fb942..e7f166b 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlaylistsParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/PlaylistsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/RandomSongsParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/RandomSongsParser.java
index 2e3453c..c45ad34 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/RandomSongsParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/RandomSongsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/ScanStatusParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/ScanStatusParser.java
index e16db38..b2afe49 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/ScanStatusParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/ScanStatusParser.java
@@ -13,15 +13,15 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.util.ProgressListener;
 
 public class ScanStatusParser extends AbstractParser {
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/SearchResult2Parser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/SearchResult2Parser.java
index 24d29d7..24fdf3f 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/SearchResult2Parser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/SearchResult2Parser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.SearchResult;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.SearchResult;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/SearchResultParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/SearchResultParser.java
index 41ee05d..0095da7 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/SearchResultParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/SearchResultParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.SearchResult;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.SearchResult;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/SubsonicRESTException.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/SubsonicRESTException.java
index 561e8eb..4381197 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/SubsonicRESTException.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/SubsonicRESTException.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/TopSongsParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/TopSongsParser.java
index 48650c7..2d45f74 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/TopSongsParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/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.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 
@@ -20,8 +20,8 @@ import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.ProgressListener;
 
 public class TopSongsParser extends MusicDirectoryEntryParser {
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/parser/UserParser.java b/app/src/main/java/github/nvllsvm/audinaut/service/parser/UserParser.java
index dbcdaed..c7a53a2 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/parser/UserParser.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/parser/UserParser.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.service.parser;
+package net.nullsum.audinaut.service.parser;
 
 import android.content.Context;
 import android.util.Log;
@@ -24,13 +24,13 @@ import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.domain.MusicFolder;
-import github.nvllsvm.audinaut.domain.User;
-import github.nvllsvm.audinaut.domain.User.MusicFolderSetting;
-import github.nvllsvm.audinaut.domain.User.Setting;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.util.ProgressListener;
+import net.nullsum.audinaut.domain.MusicFolder;
+import net.nullsum.audinaut.domain.User;
+import net.nullsum.audinaut.domain.User.MusicFolderSetting;
+import net.nullsum.audinaut.domain.User.Setting;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.util.ProgressListener;
 
 public class UserParser extends AbstractParser {
 	private static final String TAG = UserParser.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/ssl/SSLSocketFactory.java b/app/src/main/java/github/nvllsvm/audinaut/service/ssl/SSLSocketFactory.java
index b685ed7..b8ca673 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/ssl/SSLSocketFactory.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/ssl/SSLSocketFactory.java
@@ -25,7 +25,7 @@
  *
  */
 
-package github.nvllsvm.audinaut.service.ssl;
+package net.nullsum.audinaut.service.ssl;
 
 import android.os.Build;
 import android.util.Log;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustManagerDecorator.java b/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustManagerDecorator.java
index f56955c..563b35f 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustManagerDecorator.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustManagerDecorator.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.nvllsvm.audinaut.service.ssl;
+package net.nullsum.audinaut.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustSelfSignedStrategy.java b/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustSelfSignedStrategy.java
index e9c2f08..07aefff 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustSelfSignedStrategy.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustSelfSignedStrategy.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.nvllsvm.audinaut.service.ssl;
+package net.nullsum.audinaut.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustStrategy.java b/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustStrategy.java
index 504407b..aa84047 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustStrategy.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/ssl/TrustStrategy.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.nvllsvm.audinaut.service.ssl;
+package net.nullsum.audinaut.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/sync/AuthenticatorService.java b/app/src/main/java/github/nvllsvm/audinaut/service/sync/AuthenticatorService.java
index 956e5b1..f41ec61 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/sync/AuthenticatorService.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/sync/AuthenticatorService.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.nvllsvm.audinaut.service.sync;
+package net.nullsum.audinaut.service.sync;
 
 import android.accounts.AbstractAccountAuthenticator;
 import android.accounts.Account;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/service/sync/SubsonicSyncAdapter.java b/app/src/main/java/github/nvllsvm/audinaut/service/sync/SubsonicSyncAdapter.java
index fb19e6f..b799667 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/service/sync/SubsonicSyncAdapter.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/service/sync/SubsonicSyncAdapter.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.nvllsvm.audinaut.service.sync;
+package net.nullsum.audinaut.service.sync;
 
 import android.accounts.Account;
 import android.annotation.TargetApi;
@@ -36,12 +36,12 @@ import android.util.Log;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.service.CachedMusicService;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.RESTMusicService;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.service.CachedMusicService;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.RESTMusicService;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * Created by Scott on 9/6/13.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/updates/Updater.java b/app/src/main/java/github/nvllsvm/audinaut/updates/Updater.java
index 6d48f3d..57e00a3 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/updates/Updater.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/updates/Updater.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.updates;
+package net.nullsum.audinaut.updates;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.util.Util;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/updates/UpdaterSongPress.java b/app/src/main/java/github/nvllsvm/audinaut/updates/UpdaterSongPress.java
index 76d3107..658cc37 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/updates/UpdaterSongPress.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/updates/UpdaterSongPress.java
@@ -13,13 +13,13 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.updates;
+package net.nullsum.audinaut.updates;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Util;
 
 public class UpdaterSongPress extends Updater {
 	public UpdaterSongPress() {
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/BackgroundTask.java b/app/src/main/java/github/nvllsvm/audinaut/util/BackgroundTask.java
index 092a087..05eb463 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/BackgroundTask.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/BackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -35,8 +35,8 @@ import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.view.ErrorDialog;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.view.ErrorDialog;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/CacheCleaner.java b/app/src/main/java/github/nvllsvm/audinaut/util/CacheCleaner.java
index ccd2150..c9e9221 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/CacheCleaner.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/CacheCleaner.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -11,10 +11,10 @@ import java.util.Set;
 import android.content.Context;
 import android.util.Log;
 import android.os.StatFs;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.MediaStoreService;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.MediaStoreService;
 
 import java.util.*;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/Constants.java b/app/src/main/java/github/nvllsvm/audinaut/util/Constants.java
index c446755..bde3f47 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/Constants.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/Constants.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 /**
  * @author Sindre Mehus
@@ -161,15 +161,15 @@ public final class Constants {
 	public static final String FRAGMENT_POSITION = "fragmentPosition";
 
     // Name of the preferences file.
-    public static final String PREFERENCES_FILE_NAME = "github.nvllsvm.audinaut_preferences";
-	public static final String OFFLINE_SYNC_NAME = "github.nvllsvm.audinaut.offline";
+    public static final String PREFERENCES_FILE_NAME = "net.nullsum.audinaut_preferences";
+	public static final String OFFLINE_SYNC_NAME = "net.nullsum.audinaut.offline";
 	public static final String OFFLINE_SYNC_DEFAULT = "syncDefaults";
 
 	// Account prefs
 	public static final String SYNC_ACCOUNT_NAME = "Subsonic Account";
 	public static final String SYNC_ACCOUNT_TYPE = "subsonic.org";
-	public static final String SYNC_ACCOUNT_PLAYLIST_AUTHORITY = "github.nvllsvm.audinaut.playlists.provider";
-	public static final String SYNC_ACCOUNT_MOST_RECENT_AUTHORITY = "github.nvllsvm.audinaut.mostrecent.provider";
+	public static final String SYNC_ACCOUNT_PLAYLIST_AUTHORITY = "net.nullsum.audinaut.playlists.provider";
+	public static final String SYNC_ACCOUNT_MOST_RECENT_AUTHORITY = "net.nullsum.audinaut.mostrecent.provider";
 
 	public static final String TASKER_EXTRA_BUNDLE = "com.twofortyfouram.locale.intent.extra.BUNDLE";
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/DownloadFileItemHelperCallback.java b/app/src/main/java/github/nvllsvm/audinaut/util/DownloadFileItemHelperCallback.java
index bde9266..4137c70 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/DownloadFileItemHelperCallback.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/DownloadFileItemHelperCallback.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
@@ -8,12 +8,12 @@ import org.eclipse.jetty.util.ArrayQueue;
 
 import java.util.Queue;
 
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.fragments.SubsonicFragment;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.view.SongView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.fragments.SubsonicFragment;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.view.SongView;
+import net.nullsum.audinaut.view.UpdateView;
 
 public class DownloadFileItemHelperCallback extends ItemTouchHelper.SimpleCallback {
 	private static final String TAG = DownloadFileItemHelperCallback.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/DrawableTint.java b/app/src/main/java/github/nvllsvm/audinaut/util/DrawableTint.java
index d7585b8..f9f1800 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/DrawableTint.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/DrawableTint.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -29,7 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 public class DrawableTint {
 	private static final Map<Integer, Integer> attrMap = new HashMap<>();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/EnvironmentVariables.java b/app/src/main/java/github/nvllsvm/audinaut/util/EnvironmentVariables.java
index 30d6c23..9c82689 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/EnvironmentVariables.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/EnvironmentVariables.java
@@ -13,7 +13,7 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 public final class EnvironmentVariables {
 	public static final String PASTEBIN_DEV_KEY = "";
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/FileUtil.java b/app/src/main/java/github/nvllsvm/audinaut/util/FileUtil.java
index ec4dc7c..a11dfd7 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/FileUtil.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/FileUtil.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -45,13 +45,13 @@ import android.os.Build;
 import android.os.Environment;
 import android.support.v4.content.ContextCompat;
 import android.util.Log;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.Genre;
-import github.nvllsvm.audinaut.domain.Indexes;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicFolder;
-import github.nvllsvm.audinaut.service.MediaStoreService;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.Genre;
+import net.nullsum.audinaut.domain.Indexes;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicFolder;
+import net.nullsum.audinaut.service.MediaStoreService;
 
 import com.esotericsoftware.kryo.Kryo;
 import com.esotericsoftware.kryo.io.Input;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/ImageLoader.java b/app/src/main/java/github/nvllsvm/audinaut/util/ImageLoader.java
index 1f9128c..405d031 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/ImageLoader.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/ImageLoader.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -41,11 +41,11 @@ import android.widget.TextView;
 
 import java.lang.ref.WeakReference;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
 
 /**
  * Asynchronous loading of images, with caching.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/LoadingTask.java b/app/src/main/java/github/nvllsvm/audinaut/util/LoadingTask.java
index 5436e09..a0d607d 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/LoadingTask.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/LoadingTask.java
@@ -1,10 +1,10 @@
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 
-import github.nvllsvm.audinaut.activity.SubsonicActivity;
+import net.nullsum.audinaut.activity.SubsonicActivity;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/MenuUtil.java b/app/src/main/java/github/nvllsvm/audinaut/util/MenuUtil.java
index c690a95..84e41a2 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/MenuUtil.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/MenuUtil.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -22,13 +22,13 @@ import android.view.Menu;
 
 import java.io.File;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.view.AlbumView;
-import github.nvllsvm.audinaut.view.ArtistEntryView;
-import github.nvllsvm.audinaut.view.ArtistView;
-import github.nvllsvm.audinaut.view.SongView;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.view.AlbumView;
+import net.nullsum.audinaut.view.ArtistEntryView;
+import net.nullsum.audinaut.view.ArtistView;
+import net.nullsum.audinaut.view.SongView;
+import net.nullsum.audinaut.view.UpdateView;
 
 public final class MenuUtil {
 	private final static String TAG = MenuUtil.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/Notifications.java b/app/src/main/java/github/nvllsvm/audinaut/util/Notifications.java
index 7a28ecf..9a0e8e7 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/Notifications.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/Notifications.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -33,15 +33,15 @@ import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 import android.widget.TextView;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SubsonicActivity;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.PlayerState;
-import github.nvllsvm.audinaut.provider.AudinautWidgetProvider;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SubsonicActivity;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.PlayerState;
+import net.nullsum.audinaut.provider.AudinautWidgetProvider;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.view.UpdateView;
 
 public final class Notifications {
 	private static final String TAG = Notifications.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/Pair.java b/app/src/main/java/github/nvllsvm/audinaut/util/Pair.java
index 5d45533..0b7994f 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/Pair.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/Pair.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import java.io.Serializable;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/ProgressListener.java b/app/src/main/java/github/nvllsvm/audinaut/util/ProgressListener.java
index aed50d2..933ac8e 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/ProgressListener.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/ProgressListener.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/SettingsBackupAgent.java b/app/src/main/java/github/nvllsvm/audinaut/util/SettingsBackupAgent.java
index bb31699..b3e81fd 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/SettingsBackupAgent.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/SettingsBackupAgent.java
@@ -16,7 +16,7 @@
 	
 	Copyright 2009 (C) Sindre Mehus
 */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.app.backup.BackupAgentHelper;
 import android.app.backup.BackupDataInput;
@@ -26,7 +26,7 @@ import android.os.ParcelFileDescriptor;
 import java.io.IOError;
 import java.io.IOException;
 
-import github.nvllsvm.audinaut.util.Constants;
+import net.nullsum.audinaut.util.Constants;
 
 public class SettingsBackupAgent extends BackupAgentHelper {
 	@Override
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/ShufflePlayBuffer.java b/app/src/main/java/github/nvllsvm/audinaut/util/ShufflePlayBuffer.java
index 284218f..3491e53 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/ShufflePlayBuffer.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/ShufflePlayBuffer.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -28,11 +28,11 @@ import java.util.concurrent.TimeUnit;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.util.FileUtil;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.util.FileUtil;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/SilentBackgroundTask.java b/app/src/main/java/github/nvllsvm/audinaut/util/SilentBackgroundTask.java
index 53e9a89..1947697 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/SilentBackgroundTask.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/SilentBackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/SilentServiceTask.java b/app/src/main/java/github/nvllsvm/audinaut/util/SilentServiceTask.java
index 05c79f0..e0507f8 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/SilentServiceTask.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/SilentServiceTask.java
@@ -17,12 +17,12 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.content.Context;
 
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
 
 public abstract class SilentServiceTask<T> extends SilentBackgroundTask<T> {
 	protected MusicService musicService;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/SimpleServiceBinder.java b/app/src/main/java/github/nvllsvm/audinaut/util/SimpleServiceBinder.java
index eb5fd6d..a7b12a0 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/SimpleServiceBinder.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/SimpleServiceBinder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.os.Binder;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/SongDBHandler.java b/app/src/main/java/github/nvllsvm/audinaut/util/SongDBHandler.java
index 203effd..c2ce277 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/SongDBHandler.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/SongDBHandler.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -25,8 +25,8 @@ import android.database.sqlite.SQLiteOpenHelper;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.service.DownloadFile;
 
 public class SongDBHandler extends SQLiteOpenHelper {
 	private static final String TAG = SongDBHandler.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/SyncUtil.java b/app/src/main/java/github/nvllsvm/audinaut/util/SyncUtil.java
index e3d9873..b06d6ef 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/SyncUtil.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/SyncUtil.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -11,8 +11,8 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
 
 /**
  * Created by Scott on 11/24/13.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/TabBackgroundTask.java b/app/src/main/java/github/nvllsvm/audinaut/util/TabBackgroundTask.java
index bcba00e..2338829 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/TabBackgroundTask.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/TabBackgroundTask.java
@@ -1,6 +1,6 @@
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
-import github.nvllsvm.audinaut.fragments.SubsonicFragment;
+import net.nullsum.audinaut.fragments.SubsonicFragment;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/ThemeUtil.java b/app/src/main/java/github/nvllsvm/audinaut/util/ThemeUtil.java
index 173dfca..487f688 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/ThemeUtil.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/ThemeUtil.java
@@ -13,7 +13,7 @@
 	Copyright 2016 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -21,9 +21,9 @@ import android.content.res.Configuration;
 
 import java.util.Locale;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SettingsActivity;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SettingsActivity;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
 
 public final class ThemeUtil {
 	public static final String THEME_DARK = "dark";
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/TimeLimitedCache.java b/app/src/main/java/github/nvllsvm/audinaut/util/TimeLimitedCache.java
index 072b15b..8884311 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/TimeLimitedCache.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/TimeLimitedCache.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import java.lang.ref.SoftReference;
 import java.util.concurrent.TimeUnit;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/UpdateHelper.java b/app/src/main/java/github/nvllsvm/audinaut/util/UpdateHelper.java
index 212d442..4137710 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/UpdateHelper.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/UpdateHelper.java
@@ -17,7 +17,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.app.Activity;
 import android.content.Context;
@@ -30,17 +30,17 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.MusicDirectory.Entry;
-import github.nvllsvm.audinaut.fragments.SubsonicFragment;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.service.OfflineException;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.MusicDirectory.Entry;
+import net.nullsum.audinaut.fragments.SubsonicFragment;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.OfflineException;
+import net.nullsum.audinaut.view.UpdateView;
 
 public final class UpdateHelper {
 	private static final String TAG = UpdateHelper.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/UserUtil.java b/app/src/main/java/github/nvllsvm/audinaut/util/UserUtil.java
index ece11de..0fa5331 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/UserUtil.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/UserUtil.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.app.Activity;
 import android.support.v7.app.AlertDialog;
@@ -31,16 +31,16 @@ import android.view.View;
 import android.view.WindowManager;
 import android.widget.TextView;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.adapter.SectionAdapter;
-import github.nvllsvm.audinaut.domain.User;
-import github.nvllsvm.audinaut.fragments.SubsonicFragment;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.service.OfflineException;
-import github.nvllsvm.audinaut.adapter.SettingsAdapter;
-import github.nvllsvm.audinaut.view.UpdateView;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.adapter.SectionAdapter;
+import net.nullsum.audinaut.domain.User;
+import net.nullsum.audinaut.fragments.SubsonicFragment;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.service.OfflineException;
+import net.nullsum.audinaut.adapter.SettingsAdapter;
+import net.nullsum.audinaut.view.UpdateView;
 
 public final class UserUtil {
 	private static final String TAG = UserUtil.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/Util.java b/app/src/main/java/github/nvllsvm/audinaut/util/Util.java
index 4f684c4..1556e19 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/Util.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/Util.java
@@ -15,7 +15,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.util;
+package net.nullsum.audinaut.util;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ -56,15 +56,15 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SettingsActivity;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
-import github.nvllsvm.audinaut.adapter.DetailsAdapter;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.PlayerState;
-import github.nvllsvm.audinaut.domain.RepeatMode;
-import github.nvllsvm.audinaut.receiver.MediaButtonIntentReceiver;
-import github.nvllsvm.audinaut.service.DownloadService;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SettingsActivity;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.adapter.DetailsAdapter;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.PlayerState;
+import net.nullsum.audinaut.domain.RepeatMode;
+import net.nullsum.audinaut.receiver.MediaButtonIntentReceiver;
+import net.nullsum.audinaut.service.DownloadService;
 
 import org.apache.http.HttpEntity;
 
@@ -113,8 +113,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.nvllsvm.audinaut.EVENT_META_CHANGED";
-    public static final String EVENT_PLAYSTATE_CHANGED = "github.nvllsvm.audinaut.EVENT_PLAYSTATE_CHANGED";
+    public static final String EVENT_META_CHANGED = "net.nullsum.audinaut.EVENT_META_CHANGED";
+    public static final String EVENT_PLAYSTATE_CHANGED = "net.nullsum.audinaut.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";
@@ -1356,7 +1356,7 @@ public final class Util {
 			intent.putExtra("duration", (long) downloadService.getPlayerDuration());
 			intent.putExtra("position", (long) downloadService.getPlayerPosition());
 			intent.putExtra("coverart", albumArtFile.getAbsolutePath());
-			intent.putExtra("package","github.nvllsvm.audinaut");
+			intent.putExtra("package","net.nullsum.audinaut");
 		} else {
 			intent.putExtra("track", "");
 			intent.putExtra("artist", "");
@@ -1366,7 +1366,7 @@ public final class Util {
 			intent.putExtra("duration", (long) 0);
 			intent.putExtra("position", (long) 0);
 			intent.putExtra("coverart", "");
-			intent.putExtra("package","github.nvllsvm.audinaut");
+			intent.putExtra("package","net.nullsum.audinaut");
 		}
 	}
 	
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/tags/Bastp.java b/app/src/main/java/github/nvllsvm/audinaut/util/tags/Bastp.java
index cb06ced..425afd8 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/tags/Bastp.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/tags/Bastp.java
@@ -16,7 +16,7 @@
  */
 
 
-package github.nvllsvm.audinaut.util.tags;
+package net.nullsum.audinaut.util.tags;
 
 import java.io.RandomAccessFile;
 import java.io.IOException;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/tags/BastpUtil.java b/app/src/main/java/github/nvllsvm/audinaut/util/tags/BastpUtil.java
index a76d824..e5af115 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/tags/BastpUtil.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/tags/BastpUtil.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
  
-package github.nvllsvm.audinaut.util.tags;
+package net.nullsum.audinaut.util.tags;
 
 import android.support.v4.util.LruCache;
 import java.util.HashMap;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/tags/Common.java b/app/src/main/java/github/nvllsvm/audinaut/util/tags/Common.java
index e8d3e79..ed1c606 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/tags/Common.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/tags/Common.java
@@ -16,7 +16,7 @@
  */
 
 
-package github.nvllsvm.audinaut.util.tags;
+package net.nullsum.audinaut.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/tags/FlacFile.java b/app/src/main/java/github/nvllsvm/audinaut/util/tags/FlacFile.java
index a3e2341..2d7db90 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/tags/FlacFile.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/tags/FlacFile.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
 
-package github.nvllsvm.audinaut.util.tags;
+package net.nullsum.audinaut.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/tags/ID3v2File.java b/app/src/main/java/github/nvllsvm/audinaut/util/tags/ID3v2File.java
index 1a77d37..0af9ad4 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/tags/ID3v2File.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/tags/ID3v2File.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
 
-package github.nvllsvm.audinaut.util.tags;
+package net.nullsum.audinaut.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/tags/LameHeader.java b/app/src/main/java/github/nvllsvm/audinaut/util/tags/LameHeader.java
index 340e7e4..4f293d3 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/tags/LameHeader.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/tags/LameHeader.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
 
-package github.nvllsvm.audinaut.util.tags;
+package net.nullsum.audinaut.util.tags;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/util/tags/OggFile.java b/app/src/main/java/github/nvllsvm/audinaut/util/tags/OggFile.java
index 176af00..12b0984 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/util/tags/OggFile.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/util/tags/OggFile.java
@@ -15,7 +15,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. 
  */
 
-package github.nvllsvm.audinaut.util.tags;
+package net.nullsum.audinaut.util.tags;
 
 
 import java.io.IOException;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/AlbumListCountView.java b/app/src/main/java/github/nvllsvm/audinaut/view/AlbumListCountView.java
index 02172d0..44cbce9 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/AlbumListCountView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/AlbumListCountView.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -24,13 +24,13 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.service.MusicService;
-import github.nvllsvm.audinaut.service.MusicServiceFactory;
-import github.nvllsvm.audinaut.util.Constants;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.service.MusicService;
+import net.nullsum.audinaut.service.MusicServiceFactory;
+import net.nullsum.audinaut.util.Constants;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.Util;
 
 public class AlbumListCountView extends UpdateView2<Integer, Void> {
 	private final String TAG = AlbumListCountView.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/AlbumView.java b/app/src/main/java/github/nvllsvm/audinaut/view/AlbumView.java
index 9c120a2..de8c759 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/AlbumView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/AlbumView.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -25,11 +25,11 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.Util;
 
 import java.io.File;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/ArtistEntryView.java b/app/src/main/java/github/nvllsvm/audinaut/view/ArtistEntryView.java
index 7b34f05..99e180a 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/ArtistEntryView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/ArtistEntryView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,9 +24,9 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.util.FileUtil;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.util.FileUtil;
 
 import java.io.File;
 /**
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/ArtistView.java b/app/src/main/java/github/nvllsvm/audinaut/view/ArtistView.java
index afb242c..b8535bc 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/ArtistView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/ArtistView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -24,9 +24,9 @@ import android.view.View;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Artist;
-import github.nvllsvm.audinaut.util.FileUtil;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Artist;
+import net.nullsum.audinaut.util.FileUtil;
 
 import java.io.File;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/AutoRepeatButton.java b/app/src/main/java/github/nvllsvm/audinaut/view/AutoRepeatButton.java
index 2442393..ef8109c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/AutoRepeatButton.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/AutoRepeatButton.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/BasicHeaderView.java b/app/src/main/java/github/nvllsvm/audinaut/view/BasicHeaderView.java
index a104a53..873d406 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/BasicHeaderView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/BasicHeaderView.java
@@ -13,13 +13,13 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.widget.TextView;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 public class BasicHeaderView extends UpdateView<String> {
 	TextView nameView;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/BasicListView.java b/app/src/main/java/github/nvllsvm/audinaut/view/BasicListView.java
index 84221e6..7c70422 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/BasicListView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/BasicListView.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -22,7 +22,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 public class BasicListView extends UpdateView<String> {
 	private TextView titleView;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/CacheLocationPreference.java b/app/src/main/java/github/nvllsvm/audinaut/view/CacheLocationPreference.java
index 52e47e4..c1db6d0 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/CacheLocationPreference.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/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.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.os.Build;
@@ -32,8 +32,8 @@ import android.widget.TextView;
 
 import java.io.File;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.util.FileUtil;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.util.FileUtil;
 
 public class CacheLocationPreference extends EditTextPreference {
 	private static final String TAG = CacheLocationPreference.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/CardView.java b/app/src/main/java/github/nvllsvm/audinaut/view/CardView.java
index 20cd126..74160a9 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/CardView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/CardView.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -11,8 +11,8 @@ import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.util.DrawableTint;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.util.DrawableTint;
 
 public class CardView extends FrameLayout{
 	private static final String TAG = CardView.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/ErrorDialog.java b/app/src/main/java/github/nvllsvm/audinaut/view/ErrorDialog.java
index 96931d7..389ebdd 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/ErrorDialog.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/ErrorDialog.java
@@ -16,16 +16,16 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.app.Activity;
 import android.support.v7.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.activity.SubsonicFragmentActivity;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.activity.SubsonicFragmentActivity;
+import net.nullsum.audinaut.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/FadeOutAnimation.java b/app/src/main/java/github/nvllsvm/audinaut/view/FadeOutAnimation.java
index 6f9f507..4bdc1df 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/FadeOutAnimation.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/FadeOutAnimation.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.view.View;
 import android.view.animation.AlphaAnimation;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/FastScroller.java b/app/src/main/java/github/nvllsvm/audinaut/view/FastScroller.java
index 115e435..5c8e29c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/FastScroller.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/FastScroller.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -34,7 +34,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import github.nvllsvm.audinaut.R;
+import net.nullsum.audinaut.R;
 
 import static android.support.v7.widget.RecyclerView.OnScrollListener;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/GenreView.java b/app/src/main/java/github/nvllsvm/audinaut/view/GenreView.java
index c76b260..683a522 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/GenreView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/GenreView.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Genre;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Genre;
 
 public class GenreView extends UpdateView<Genre> {
 	private static final String TAG = GenreView.class.getSimpleName();
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/GridSpacingDecoration.java b/app/src/main/java/github/nvllsvm/audinaut/view/GridSpacingDecoration.java
index 0713760..8a60d9b 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/GridSpacingDecoration.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/GridSpacingDecoration.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.graphics.Rect;
 import android.support.v7.widget.GridLayoutManager;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/MyLeadingMarginSpan2.java b/app/src/main/java/github/nvllsvm/audinaut/view/MyLeadingMarginSpan2.java
index 3588d97..1823aee 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/MyLeadingMarginSpan2.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/MyLeadingMarginSpan2.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/PlaylistSongView.java b/app/src/main/java/github/nvllsvm/audinaut/view/PlaylistSongView.java
index 5de25ea..bdf955b 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/PlaylistSongView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/PlaylistSongView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -27,11 +27,11 @@ import android.widget.TextView;
 
 import java.util.List;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.util.FileUtil;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.util.FileUtil;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/view/PlaylistView.java b/app/src/main/java/github/nvllsvm/audinaut/view/PlaylistView.java
index 3ce430c..310779b 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/PlaylistView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/PlaylistView.java
@@ -16,17 +16,17 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.Playlist;
-import github.nvllsvm.audinaut.util.ImageLoader;
-import github.nvllsvm.audinaut.util.SyncUtil;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.Playlist;
+import net.nullsum.audinaut.util.ImageLoader;
+import net.nullsum.audinaut.util.SyncUtil;
 
 /**
  * Used to display albums in a {@code ListView}.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/RecyclingImageView.java b/app/src/main/java/github/nvllsvm/audinaut/view/RecyclingImageView.java
index 227635d..0b08275 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/RecyclingImageView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/RecyclingImageView.java
@@ -13,7 +13,7 @@
 	Copyright 2015 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/SeekBarPreference.java b/app/src/main/java/github/nvllsvm/audinaut/view/SeekBarPreference.java
index a45c36a..44d002a 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/SeekBarPreference.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/SeekBarPreference.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -31,8 +31,8 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.util.Constants;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.util.Constants;
 
 /**
  * SeekBar preference to set the shake force threshold.
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/SettingView.java b/app/src/main/java/github/nvllsvm/audinaut/view/SettingView.java
index 0298123..b4d3fe4 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/SettingView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/SettingView.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -21,11 +21,11 @@ import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.User;
-import github.nvllsvm.audinaut.domain.User.MusicFolderSetting;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.User;
+import net.nullsum.audinaut.domain.User.MusicFolderSetting;
 
-import static github.nvllsvm.audinaut.domain.User.Setting;
+import static net.nullsum.audinaut.domain.User.Setting;
 
 public class SettingView extends UpdateView2<Setting, Boolean> {
 	private final TextView titleView;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/SongView.java b/app/src/main/java/github/nvllsvm/audinaut/view/SongView.java
index eaf4bc5..a586531 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/SongView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/SongView.java
@@ -16,21 +16,21 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.*;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.service.DownloadService;
-import github.nvllsvm.audinaut.service.DownloadFile;
-import github.nvllsvm.audinaut.util.DrawableTint;
-import github.nvllsvm.audinaut.util.SongDBHandler;
-import github.nvllsvm.audinaut.util.ThemeUtil;
-import github.nvllsvm.audinaut.util.Util;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.service.DownloadService;
+import net.nullsum.audinaut.service.DownloadFile;
+import net.nullsum.audinaut.util.DrawableTint;
+import net.nullsum.audinaut.util.SongDBHandler;
+import net.nullsum.audinaut.util.ThemeUtil;
+import net.nullsum.audinaut.util.Util;
 
 import java.io.File;
 
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/SquareImageView.java b/app/src/main/java/github/nvllsvm/audinaut/view/SquareImageView.java
index 8b46ebe..3d3b4d8 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/SquareImageView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/SquareImageView.java
@@ -13,7 +13,7 @@
 	Copyright 2014 (C) Scott Jackson
 */
 
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/app/src/main/java/github/nvllsvm/audinaut/view/UpdateView.java b/app/src/main/java/github/nvllsvm/audinaut/view/UpdateView.java
index f1d4882..e496c63 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/UpdateView.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/UpdateView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -35,10 +35,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.WeakHashMap;
 
-import github.nvllsvm.audinaut.domain.MusicDirectory;
-import github.nvllsvm.audinaut.R;
-import github.nvllsvm.audinaut.util.DrawableTint;
-import github.nvllsvm.audinaut.util.SilentBackgroundTask;
+import net.nullsum.audinaut.domain.MusicDirectory;
+import net.nullsum.audinaut.R;
+import net.nullsum.audinaut.util.DrawableTint;
+import net.nullsum.audinaut.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/nvllsvm/audinaut/view/UpdateView2.java b/app/src/main/java/github/nvllsvm/audinaut/view/UpdateView2.java
index 1ec507e..6ce688c 100644
--- a/app/src/main/java/github/nvllsvm/audinaut/view/UpdateView2.java
+++ b/app/src/main/java/github/nvllsvm/audinaut/view/UpdateView2.java
@@ -1,4 +1,4 @@
-package github.nvllsvm.audinaut.view;
+package net.nullsum.audinaut.view;
 
 import android.content.Context;
 import android.widget.ImageView;
diff --git a/app/src/main/res/layout-land/download.xml b/app/src/main/res/layout-land/download.xml
index db1660e..641793b 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.nvllsvm.audinaut.view.RecyclingImageView
+		<net.nullsum.audinaut.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 efe2ece..d134e80 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.nvllsvm.audinaut.view.RecyclingImageView
+	<net.nullsum.audinaut.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 322266e..37568e4 100644
--- a/app/src/main/res/layout-port/download.xml
+++ b/app/src/main/res/layout-port/download.xml
@@ -32,7 +32,7 @@
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content">
 
-						<github.nvllsvm.audinaut.view.RecyclingImageView
+						<net.nullsum.audinaut.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 a34509f..e59664a 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.nvllsvm.audinaut.view.RecyclingImageView
+				<net.nullsum.audinaut.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 f4f6043..81502b0 100644
--- a/app/src/main/res/layout/abstract_recycler_fragment.xml
+++ b/app/src/main/res/layout/abstract_recycler_fragment.xml
@@ -24,7 +24,7 @@
 				android:layout_marginRight="@dimen/FastScroller.NormalBarMargin"
 				android:scrollbarStyle="outsideOverlay"/>
 
-			<github.nvllsvm.audinaut.view.FastScroller
+			<net.nullsum.audinaut.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 ff04f06..82cf71c 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.nvllsvm.audinaut.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<net.nullsum.audinaut.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.nvllsvm.audinaut.view.SquareImageView
+			<net.nullsum.audinaut.view.SquareImageView
 				android:id="@+id/album_coverart"
 				android:layout_width="match_parent"
 				android:layout_height="match_parent"/>
@@ -74,4 +74,4 @@
 		</LinearLayout>
 
 	</LinearLayout>
-</github.nvllsvm.audinaut.view.CardView>
+</net.nullsum.audinaut.view.CardView>
diff --git a/app/src/main/res/layout/album_list_item.xml b/app/src/main/res/layout/album_list_item.xml
index 5e4498f..ee975dc 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.nvllsvm.audinaut.view.RecyclingImageView
+		<net.nullsum.audinaut.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 d29b93e..e9c45fc 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.nvllsvm.audinaut.view.RecyclingImageView
+	<net.nullsum.audinaut.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 dcbb90e..15acfea 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.nvllsvm.audinaut.view.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<net.nullsum.audinaut.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.nvllsvm.audinaut.view.SquareImageView
+		<net.nullsum.audinaut.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.nvllsvm.audinaut.view.CardView>
\ No newline at end of file
+</net.nullsum.audinaut.view.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml
index 2144abc..1c81b48 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.nvllsvm.audinaut.view.AutoRepeatButton
+    <net.nullsum.audinaut.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.nvllsvm.audinaut.view.AutoRepeatButton
+	<net.nullsum.audinaut.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.nvllsvm.audinaut.view.AutoRepeatButton
+	<net.nullsum.audinaut.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.nvllsvm.audinaut.view.AutoRepeatButton
+    <net.nullsum.audinaut.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 a98a225..b05fcd6 100644
--- a/app/src/main/res/layout/download_playlist.xml
+++ b/app/src/main/res/layout/download_playlist.xml
@@ -32,7 +32,7 @@
             android:paddingRight="@dimen/FastScroller.LeftAlignedMargin"
             android:layout_marginRight="@dimen/FastScroller.NormalBarMargin"/>
 
-        <github.nvllsvm.audinaut.view.FastScroller
+        <net.nullsum.audinaut.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 14600b7..0ad69a6 100644
--- a/app/src/main/res/layout/select_album_header.xml
+++ b/app/src/main/res/layout/select_album_header.xml
@@ -71,7 +71,7 @@
 
 		</LinearLayout>
 
-		<github.nvllsvm.audinaut.view.RecyclingImageView
+		<net.nullsum.audinaut.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/xml/playlists_syncadapter.xml b/app/src/main/res/xml/playlists_syncadapter.xml
index 3ef24d9..ad9bdeb 100644
--- a/app/src/main/res/xml/playlists_syncadapter.xml
+++ b/app/src/main/res/xml/playlists_syncadapter.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
-	android:contentAuthority="github.nvllsvm.audinaut.playlists.provider"
+	android:contentAuthority="net.nullsum.audinaut.playlists.provider"
 	android:accountType="subsonic.org"
 	android:userVisible="true"
 	android:supportsUploading="false"
diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
index 9fb86fe..1143812 100644
--- a/app/src/main/res/xml/searchable.xml
+++ b/app/src/main/res/xml/searchable.xml
@@ -4,7 +4,7 @@
             android:hint="@string/search.title"
             android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
             android:voiceLanguageModel="web_search"
-            android:searchSuggestAuthority="github.nvllsvm.audinaut.provider.AudinautSearchProvider"
+            android:searchSuggestAuthority="net.nullsum.audinaut.provider.AudinautSearchProvider"
             android:searchSuggestSelection=" unused"
 			android:searchSuggestIntentAction="android.intent.action.VIEW">
 </searchable>
diff --git a/app/src/main/res/xml/settings_appearance.xml b/app/src/main/res/xml/settings_appearance.xml
index a7b3413..d85c72a 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.nvllsvm.audinaut"
+	xmlns:myns="http://schemas.android.com/apk/res/net.nullsum.audinaut"
 	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 cc0f122..bcd13a0 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.nvllsvm.audinaut"
+	xmlns:myns="http://schemas.android.com/apk/res/net.nullsum.audinaut"
 	android:title="@string/settings.cache_screen_title">
 
 	<PreferenceCategory
@@ -43,7 +43,7 @@
 			android:defaultValue="2000"
 			android:digits="0123456789"/>
 
-		<github.nvllsvm.audinaut.view.CacheLocationPreference
+		<net.nullsum.audinaut.view.CacheLocationPreference
 			android:title="@string/settings.cache_location"
 			android:key="cacheLocation"/>
 
diff --git a/app/src/main/res/xml/settings_playback.xml b/app/src/main/res/xml/settings_playback.xml
index d421e6b..6b493bb 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.nvllsvm.audinaut.view.SeekBarPreference
+		<net.nullsum.audinaut.view.SeekBarPreference
 			android:title="@string/settings.playlist_random_size_title"
 			android:key="randomSize"
 			android:defaultValue="20"
@@ -70,7 +70,7 @@
 			android:entryValues="@array/replayGainTypeValues"
 			android:entries="@array/replayGainTypeNames"/>
 
-		<github.nvllsvm.audinaut.view.SeekBarPreference
+		<net.nullsum.audinaut.view.SeekBarPreference
 			android:key="replayGainBump2"
 			android:dialogLayout="@layout/seekbar_preference"
 			android:title="@string/settings.replay_gain_bump"
@@ -80,7 +80,7 @@
 			myns:stepSize="10"
 			myns:display="%+.1f dB"/>
 
-		<github.nvllsvm.audinaut.view.SeekBarPreference
+		<net.nullsum.audinaut.view.SeekBarPreference
 			android:key="replayGainUntagged2"
 			android:dialogLayout="@layout/seekbar_preference"
 			android:title="@string/settings.replay_gain_untagged"