105 files changed, 555 insertions, 555 deletions
diff --git a/subsonic-android/AndroidManifest.xml b/subsonic-android/AndroidManifest.xml
index 919c3c8c..f414bd17 100644
--- a/subsonic-android/AndroidManifest.xml
+++ b/subsonic-android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="github.daneren2005.subdroid"
+          package="github.daneren2005.dsub"
           android:installLocation="auto"
           android:versionCode="6"
           android:versionName="3.3.3.1">
@@ -20,8 +20,8 @@
 
     <application android:label="@string/common.appname" android:icon="@drawable/launch2" android:theme="@style/Wheat">
 
-        <activity android:name="github.daneren2005.subdroid.activity.MainActivity"
-                  android:label="Sub Droid"
+        <activity android:name="github.daneren2005.dsub.activity.MainActivity"
+                  android:label="DSub"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="standard">
             <intent-filter>
@@ -30,46 +30,46 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="github.daneren2005.subdroid.activity.SelectArtistActivity"
+        <activity android:name="github.daneren2005.dsub.activity.SelectArtistActivity"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="standard"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.SelectAlbumActivity"
+        <activity android:name="github.daneren2005.dsub.activity.SelectAlbumActivity"
                   android:configChanges="orientation|keyboardHidden"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.SearchActivity"
+        <activity android:name="github.daneren2005.dsub.activity.SearchActivity"
                   android:label="@string/search.label"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.SelectPlaylistActivity"
+        <activity android:name="github.daneren2005.dsub.activity.SelectPlaylistActivity"
                   android:label="@string/playlist.label"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="standard"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.DownloadActivity"
+        <activity android:name="github.daneren2005.dsub.activity.DownloadActivity"
                   android:configChanges="keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.SettingsActivity"
+        <activity android:name="github.daneren2005.dsub.activity.SettingsActivity"
                   android:theme="@android:style/Theme"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.HelpActivity"
+        <activity android:name="github.daneren2005.dsub.activity.HelpActivity"
                   android:label="@string/help.label"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.LyricsActivity"
+        <activity android:name="github.daneren2005.dsub.activity.LyricsActivity"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.EqualizerActivity"
+        <activity android:name="github.daneren2005.dsub.activity.EqualizerActivity"
                   android:label="@string/equalizer.label"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="github.daneren2005.subdroid.activity.VoiceQueryReceiverActivity"
+        <activity android:name="github.daneren2005.dsub.activity.VoiceQueryReceiverActivity"
                   android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
@@ -77,7 +77,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="github.daneren2005.subdroid.activity.QueryReceiverActivity"
+        <activity android:name="github.daneren2005.dsub.activity.QueryReceiverActivity"
                   android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH"/>
@@ -85,33 +85,33 @@
             <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
         </activity>
 
-        <service android:name="github.daneren2005.subdroid.service.DownloadServiceImpl"
+        <service android:name="github.daneren2005.dsub.service.DownloadServiceImpl"
                  android:label="Subsonic Download Service"/>
 
-        <receiver android:name="github.daneren2005.subdroid.receiver.MediaButtonIntentReceiver">
+        <receiver android:name="github.daneren2005.dsub.receiver.MediaButtonIntentReceiver">
             <intent-filter android:priority="999">
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name="github.daneren2005.subdroid.receiver.BluetoothIntentReceiver">
+        <receiver android:name="github.daneren2005.dsub.receiver.BluetoothIntentReceiver">
             <intent-filter>
                 <action android:name="android.bluetooth.a2dp.action.SINK_STATE_CHANGED"/>
             </intent-filter>
         </receiver>
 
-        <receiver android:name="github.daneren2005.subdroid.provider.SubsonicAppWidgetProvider1" >
+        <receiver android:name="github.daneren2005.dsub.provider.SubsonicAppWidgetProvider1" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info"/>
         </receiver>
 
-        <provider android:name="github.daneren2005.subdroid.provider.SearchSuggestionProvider1"
-                  android:authorities="github.daneren2005.subdroid.provider.SearchSuggestionProvider1"/>
+        <provider android:name="github.daneren2005.dsub.provider.SearchSuggestionProvider1"
+                  android:authorities="github.daneren2005.dsub.provider.SearchSuggestionProvider1"/>
 
         <meta-data android:name="android.app.default_searchable"
-                   android:value="github.daneren2005.subdroid.activity.QueryReceiverActivity"/>
+                   android:value="github.daneren2005.dsub.activity.QueryReceiverActivity"/>
 
     </application>
 
diff --git a/subsonic-android/assets/html/en/index.html b/subsonic-android/assets/html/en/index.html
index 00c2da36..9ad7542c 100644
--- a/subsonic-android/assets/html/en/index.html
+++ b/subsonic-android/assets/html/en/index.html
@@ -1,16 +1,16 @@
 <html>
 <head>
-    <title>Sub Droid Help</title>
+    <title>DSub Help</title>
     <link rel="stylesheet" href="../style.css" type="text/css">
 
 </head>
 
 <body>
 
-<h3><img src="../img/subsonic.png" alt=""> Welcome to Sub Droid!</h3>
+<h3><img src="../img/subsonic.png" alt=""> Welcome to DSub!</h3>
 
 <p>
-    With <b>Sub Droid</b> you can easily stream or download music from your home computer to your Android phone
+    With <b>DSub</b> you can easily stream or download music from your home computer to your Android phone
     (and do lots of other cool stuff too).
 </p>
 
diff --git a/subsonic-android/patches/jukebox-patch.txt b/subsonic-android/patches/jukebox-patch.txt
index fb370ca4..cbbeb40b 100644
--- a/subsonic-android/patches/jukebox-patch.txt
+++ b/subsonic-android/patches/jukebox-patch.txt
@@ -3,12 +3,12 @@ Index: AndroidManifest.xml
 --- AndroidManifest.xml	(revision 2441)
 +++ AndroidManifest.xml	(working copy)
 @@ -114,7 +114,8 @@
-                   a:authorities="github.daneren2005.subdroid.provider.SearchSuggestionProvider"/>
+                   a:authorities="github.daneren2005.dsub.provider.SearchSuggestionProvider"/>
  
          <meta-data a:name="android.app.default_searchable"
--                   a:value="github.daneren2005.subdroid.activity.QueryReceiverActivity"/>
-+                   a:value="github.daneren2005.subdroid.activity.QueryReceiverActivity"/>
-+        <activity a:name="github.daneren2005.subdroid.activity.JukeboxActivity" a:launchMode="singleTask" a:configChanges="keyboardHidden"></activity>
+-                   a:value="github.daneren2005.dsub.activity.QueryReceiverActivity"/>
++                   a:value="github.daneren2005.dsub.activity.QueryReceiverActivity"/>
++        <activity a:name="github.daneren2005.dsub.activity.JukeboxActivity" a:launchMode="singleTask" a:configChanges="keyboardHidden"></activity>
  
      </application>
  
@@ -224,21 +224,21 @@ Index: src/net/sourceforge/subsonic/androidapp/activity/JukeboxActivity.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package github.daneren2005.subdroid.activity;
++package github.daneren2005.dsub.activity;
 +
 +import java.util.List;
 +
-+import github.daneren2005.subdroid.R;
-+import github.daneren2005.subdroid.domain.Jukebox;
-+import github.daneren2005.subdroid.domain.MusicDirectory;
-+import github.daneren2005.subdroid.domain.MusicDirectory.Entry;
-+import github.daneren2005.subdroid.service.MusicService;
-+import github.daneren2005.subdroid.service.MusicServiceFactory;
-+import github.daneren2005.subdroid.util.BackgroundTask;
-+import github.daneren2005.subdroid.util.JukeboxSongView;
-+import github.daneren2005.subdroid.util.ProgressListener;
-+import github.daneren2005.subdroid.util.TabActivityBackgroundTask;
-+import github.daneren2005.subdroid.util.Util;
++import github.daneren2005.dsub.R;
++import github.daneren2005.dsub.domain.Jukebox;
++import github.daneren2005.dsub.domain.MusicDirectory;
++import github.daneren2005.dsub.domain.MusicDirectory.Entry;
++import github.daneren2005.dsub.service.MusicService;
++import github.daneren2005.dsub.service.MusicServiceFactory;
++import github.daneren2005.dsub.util.BackgroundTask;
++import github.daneren2005.dsub.util.JukeboxSongView;
++import github.daneren2005.dsub.util.ProgressListener;
++import github.daneren2005.dsub.util.TabActivityBackgroundTask;
++import github.daneren2005.dsub.util.Util;
 +import android.os.Bundle;
 +import android.view.ContextMenu;
 +import android.view.MenuInflater;
@@ -485,16 +485,16 @@ Index: src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java
  import java.util.LinkedList;
  import java.util.List;
  
-+import github.daneren2005.subdroid.R;
-+import github.daneren2005.subdroid.domain.MusicDirectory;
-+import github.daneren2005.subdroid.service.DownloadService;
-+import github.daneren2005.subdroid.service.DownloadServiceImpl;
-+import github.daneren2005.subdroid.service.MusicService;
-+import github.daneren2005.subdroid.service.MusicServiceFactory;
-+import github.daneren2005.subdroid.util.Constants;
-+import github.daneren2005.subdroid.util.ImageLoader;
-+import github.daneren2005.subdroid.util.ModalBackgroundTask;
-+import github.daneren2005.subdroid.util.Util;
++import github.daneren2005.dsub.R;
++import github.daneren2005.dsub.domain.MusicDirectory;
++import github.daneren2005.dsub.service.DownloadService;
++import github.daneren2005.dsub.service.DownloadServiceImpl;
++import github.daneren2005.dsub.service.MusicService;
++import github.daneren2005.dsub.service.MusicServiceFactory;
++import github.daneren2005.dsub.util.Constants;
++import github.daneren2005.dsub.util.ImageLoader;
++import github.daneren2005.dsub.util.ModalBackgroundTask;
++import github.daneren2005.dsub.util.Util;
  import android.app.Activity;
  import android.content.Context;
  import android.content.Intent;
@@ -502,16 +502,16 @@ Index: src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java
  import android.view.View;
  import android.view.Window;
  import android.widget.TextView;
--import github.daneren2005.subdroid.R;
--import github.daneren2005.subdroid.domain.MusicDirectory;
--import github.daneren2005.subdroid.service.DownloadService;
--import github.daneren2005.subdroid.service.DownloadServiceImpl;
--import github.daneren2005.subdroid.service.MusicService;
--import github.daneren2005.subdroid.service.MusicServiceFactory;
--import github.daneren2005.subdroid.util.Constants;
--import github.daneren2005.subdroid.util.ImageLoader;
--import github.daneren2005.subdroid.util.ModalBackgroundTask;
--import github.daneren2005.subdroid.util.Util;
+-import github.daneren2005.dsub.R;
+-import github.daneren2005.dsub.domain.MusicDirectory;
+-import github.daneren2005.dsub.service.DownloadService;
+-import github.daneren2005.dsub.service.DownloadServiceImpl;
+-import github.daneren2005.dsub.service.MusicService;
+-import github.daneren2005.dsub.service.MusicServiceFactory;
+-import github.daneren2005.dsub.util.Constants;
+-import github.daneren2005.dsub.util.ImageLoader;
+-import github.daneren2005.dsub.util.ModalBackgroundTask;
+-import github.daneren2005.dsub.util.Util;
  
  /**
   * @author Sindre Mehus
@@ -653,7 +653,7 @@ Index: src/net/sourceforge/subsonic/androidapp/domain/Jukebox.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package github.daneren2005.subdroid.domain;
++package github.daneren2005.dsub.domain;
 +
 +import java.io.Serializable;
 +import java.util.List;
@@ -789,7 +789,7 @@ Index: src/net/sourceforge/subsonic/androidapp/domain/User.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package github.daneren2005.subdroid.domain;
++package github.daneren2005.dsub.domain;
 +
 +import java.io.Serializable;
 +
@@ -820,15 +820,15 @@ Index: src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java
 @@ -21,9 +21,11 @@
  import android.content.Context;
  import android.graphics.Bitmap;
- import github.daneren2005.subdroid.domain.Indexes;
-+import github.daneren2005.subdroid.domain.Jukebox;
- import github.daneren2005.subdroid.domain.MusicDirectory;
- import github.daneren2005.subdroid.domain.MusicFolder;
- import github.daneren2005.subdroid.domain.Playlist;
-+import github.daneren2005.subdroid.domain.User;
- import github.daneren2005.subdroid.domain.Version;
- import github.daneren2005.subdroid.domain.SearchResult;
- import github.daneren2005.subdroid.domain.SearchCritera;
+ import github.daneren2005.dsub.domain.Indexes;
++import github.daneren2005.dsub.domain.Jukebox;
+ import github.daneren2005.dsub.domain.MusicDirectory;
+ import github.daneren2005.dsub.domain.MusicFolder;
+ import github.daneren2005.dsub.domain.Playlist;
++import github.daneren2005.dsub.domain.User;
+ import github.daneren2005.dsub.domain.Version;
+ import github.daneren2005.dsub.domain.SearchResult;
+ import github.daneren2005.dsub.domain.SearchCritera;
 @@ -199,4 +201,17 @@
              restUrl = newUrl;
          }
@@ -854,15 +854,15 @@ Index: src/net/sourceforge/subsonic/androidapp/service/MusicService.java
 @@ -21,9 +21,11 @@
  import android.content.Context;
  import android.graphics.Bitmap;
- import github.daneren2005.subdroid.domain.Indexes;
-+import github.daneren2005.subdroid.domain.Jukebox;
- import github.daneren2005.subdroid.domain.MusicDirectory;
- import github.daneren2005.subdroid.domain.MusicFolder;
- import github.daneren2005.subdroid.domain.Playlist;
-+import github.daneren2005.subdroid.domain.User;
- import github.daneren2005.subdroid.domain.Version;
- import github.daneren2005.subdroid.domain.SearchResult;
- import github.daneren2005.subdroid.domain.SearchCritera;
+ import github.daneren2005.dsub.domain.Indexes;
++import github.daneren2005.dsub.domain.Jukebox;
+ import github.daneren2005.dsub.domain.MusicDirectory;
+ import github.daneren2005.dsub.domain.MusicFolder;
+ import github.daneren2005.dsub.domain.Playlist;
++import github.daneren2005.dsub.domain.User;
+ import github.daneren2005.dsub.domain.Version;
+ import github.daneren2005.dsub.domain.SearchResult;
+ import github.daneren2005.dsub.domain.SearchCritera;
 @@ -74,4 +76,8 @@
      Version getLatestVersion(Context context, ProgressListener progressListener) throws Exception;
  
@@ -879,33 +879,33 @@ Index: src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java
 +++ src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java	(working copy)
 @@ -28,6 +28,7 @@
  import android.util.Log;
- import github.daneren2005.subdroid.R;
- import github.daneren2005.subdroid.domain.Indexes;
-+import github.daneren2005.subdroid.domain.Jukebox;
- import github.daneren2005.subdroid.domain.Lyrics;
- import github.daneren2005.subdroid.domain.MusicDirectory;
- import github.daneren2005.subdroid.domain.MusicFolder;
+ import github.daneren2005.dsub.R;
+ import github.daneren2005.dsub.domain.Indexes;
++import github.daneren2005.dsub.domain.Jukebox;
+ import github.daneren2005.dsub.domain.Lyrics;
+ import github.daneren2005.dsub.domain.MusicDirectory;
+ import github.daneren2005.dsub.domain.MusicFolder;
 @@ -35,10 +36,12 @@
- import github.daneren2005.subdroid.domain.SearchCritera;
- import github.daneren2005.subdroid.domain.SearchResult;
- import github.daneren2005.subdroid.domain.ServerInfo;
-+import github.daneren2005.subdroid.domain.User;
- import github.daneren2005.subdroid.domain.Version;
- import github.daneren2005.subdroid.service.parser.AlbumListParser;
- import github.daneren2005.subdroid.service.parser.ErrorParser;
- import github.daneren2005.subdroid.service.parser.IndexesParser;
-+import github.daneren2005.subdroid.service.parser.JukeboxParser;
- import github.daneren2005.subdroid.service.parser.LicenseParser;
- import github.daneren2005.subdroid.service.parser.LyricsParser;
- import github.daneren2005.subdroid.service.parser.MusicDirectoryParser;
+ import github.daneren2005.dsub.domain.SearchCritera;
+ import github.daneren2005.dsub.domain.SearchResult;
+ import github.daneren2005.dsub.domain.ServerInfo;
++import github.daneren2005.dsub.domain.User;
+ import github.daneren2005.dsub.domain.Version;
+ import github.daneren2005.dsub.service.parser.AlbumListParser;
+ import github.daneren2005.dsub.service.parser.ErrorParser;
+ import github.daneren2005.dsub.service.parser.IndexesParser;
++import github.daneren2005.dsub.service.parser.JukeboxParser;
+ import github.daneren2005.dsub.service.parser.LicenseParser;
+ import github.daneren2005.dsub.service.parser.LyricsParser;
+ import github.daneren2005.dsub.service.parser.MusicDirectoryParser;
 @@ -48,6 +51,7 @@
- import github.daneren2005.subdroid.service.parser.RandomSongsParser;
- import github.daneren2005.subdroid.service.parser.SearchResult2Parser;
- import github.daneren2005.subdroid.service.parser.SearchResultParser;
-+import github.daneren2005.subdroid.service.parser.UserParser;
- import github.daneren2005.subdroid.service.parser.VersionParser;
- import github.daneren2005.subdroid.service.ssl.SSLSocketFactory;
- import github.daneren2005.subdroid.service.ssl.TrustSelfSignedStrategy;
+ import github.daneren2005.dsub.service.parser.RandomSongsParser;
+ import github.daneren2005.dsub.service.parser.SearchResult2Parser;
+ import github.daneren2005.dsub.service.parser.SearchResultParser;
++import github.daneren2005.dsub.service.parser.UserParser;
+ import github.daneren2005.dsub.service.parser.VersionParser;
+ import github.daneren2005.dsub.service.ssl.SSLSocketFactory;
+ import github.daneren2005.dsub.service.ssl.TrustSelfSignedStrategy;
 @@ -195,6 +199,53 @@
              Util.close(reader);
          }
@@ -1000,14 +1000,14 @@ Index: src/net/sourceforge/subsonic/androidapp/service/parser/JukeboxParser.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package github.daneren2005.subdroid.service.parser;
++package github.daneren2005.dsub.service.parser;
 +
 +import java.io.Reader;
 +
-+import github.daneren2005.subdroid.R;
-+import github.daneren2005.subdroid.domain.Jukebox;
-+import github.daneren2005.subdroid.domain.MusicDirectory;
-+import github.daneren2005.subdroid.util.ProgressListener;
++import github.daneren2005.dsub.R;
++import github.daneren2005.dsub.domain.Jukebox;
++import github.daneren2005.dsub.domain.MusicDirectory;
++import github.daneren2005.dsub.util.ProgressListener;
 +
 +import org.xmlpull.v1.XmlPullParser;
 +
@@ -1091,13 +1091,13 @@ Index: src/net/sourceforge/subsonic/androidapp/service/parser/UserParser.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package github.daneren2005.subdroid.service.parser;
++package github.daneren2005.dsub.service.parser;
 +
 +import java.io.Reader;
 +
-+import github.daneren2005.subdroid.R;
-+import github.daneren2005.subdroid.domain.User;
-+import github.daneren2005.subdroid.util.ProgressListener;
++import github.daneren2005.dsub.R;
++import github.daneren2005.dsub.domain.User;
++import github.daneren2005.dsub.util.ProgressListener;
 +
 +import org.xmlpull.v1.XmlPullParser;
 +
@@ -1163,10 +1163,10 @@ Index: src/net/sourceforge/subsonic/androidapp/util/JukeboxSongView.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package github.daneren2005.subdroid.util;
++package github.daneren2005.dsub.util;
 +
-+import github.daneren2005.subdroid.R;
-+import github.daneren2005.subdroid.domain.MusicDirectory;
++import github.daneren2005.dsub.R;
++import github.daneren2005.dsub.domain.MusicDirectory;
 +import android.content.Context;
 +import android.view.LayoutInflater;
 +import android.view.View;
diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml
index 5f4f3915..01a9b68d 100644
--- a/subsonic-android/res/layout-land/download.xml
+++ b/subsonic-android/res/layout-land/download.xml
@@ -165,7 +165,7 @@
 
         </RelativeLayout>
 
-        <github.daneren2005.subdroid.util.MyViewFlipper
+        <github.daneren2005.dsub.util.MyViewFlipper
                 android:id="@+id/download_playlist_flipper"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
@@ -196,7 +196,7 @@
 
             <include layout="@layout/download_playlist"/>
 
-        </github.daneren2005.subdroid.util.MyViewFlipper>
+        </github.daneren2005.dsub.util.MyViewFlipper>
 
     </RelativeLayout>
 
diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml
index d74fa553..e2a198a2 100644
--- a/subsonic-android/res/layout-port/download.xml
+++ b/subsonic-android/res/layout-port/download.xml
@@ -4,7 +4,7 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <github.daneren2005.subdroid.util.MyViewFlipper
+    <github.daneren2005.dsub.util.MyViewFlipper
                  android:id="@+id/download_playlist_flipper"
                  android:layout_width="fill_parent"
                  android:layout_height="0dip"
@@ -121,7 +121,7 @@
 
         <include layout="@layout/download_playlist"/>
 
-    </github.daneren2005.subdroid.util.MyViewFlipper>
+    </github.daneren2005.dsub.util.MyViewFlipper>
 
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="fill_parent"
diff --git a/subsonic-android/res/layout/download_button_bar_flipper.xml b/subsonic-android/res/layout/download_button_bar_flipper.xml
index 160d4422..80ee0bf8 100644
--- a/subsonic-android/res/layout/download_button_bar_flipper.xml
+++ b/subsonic-android/res/layout/download_button_bar_flipper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<github.daneren2005.subdroid.util.MyViewFlipper
+<github.daneren2005.dsub.util.MyViewFlipper
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/download_button_bar_flipper"
         android:layout_width="fill_parent"
@@ -60,7 +60,7 @@
 
     <include layout="@layout/button_bar"/>
 
-</github.daneren2005.subdroid.util.MyViewFlipper>
+</github.daneren2005.dsub.util.MyViewFlipper>
 
 
 
diff --git a/subsonic-android/res/layout/download_slider.xml b/subsonic-android/res/layout/download_slider.xml
index eefe3dca..ad05c856 100644
--- a/subsonic-android/res/layout/download_slider.xml
+++ b/subsonic-android/res/layout/download_slider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<github.daneren2005.subdroid.util.HorizontalSlider
+<github.daneren2005.dsub.util.HorizontalSlider
         xmlns:android="http://schemas.android.com/apk/res/android"
         style="?android:attr/progressBarStyleHorizontal"
         android:id="@+id/download_progress_bar"
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index 1566fa05..7f9f6728 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">Sub Droid</string>
+    <string name="common.appname">DSub</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Save</string>
     <string name="common.cancel">Cancel</string>
@@ -13,14 +13,14 @@
     <string name="common.unpin">Unpin</string>
     <string name="common.delete">Delete</string>
 
-    <string name="button_bar.home">Sub Droid home</string>
+    <string name="button_bar.home">DSub home</string>
     <string name="button_bar.browse">Media library</string>
     <string name="button_bar.search">Search</string>
     <string name="button_bar.playlists">Playlists</string>
     <string name="button_bar.now_playing">Now playing</string>
 
     <string name="main.welcome_title">Welcome!</string>
-    <string name="main.welcome_text">Welcome to Sub Droid! The app is currently configured to use the Subsonic demo server. After you\'ve
+    <string name="main.welcome_text">Welcome to DSub! The app is currently configured to use the Subsonic demo server. After you\'ve
         set up your personal server (available from <b>subsonic.org</b>), please go to <b>Settings</b> and change the configuration to connect to it.</string>
     <string name="main.select_server">Select server</string>
     <string name="main.shuffle">Shuffle play</string>
@@ -40,7 +40,7 @@
     <string name="playlist.label">Playlists</string>
 
     <string name="help.label">Help</string>
-    <string name="help.title">Welcome to Sub Droid!</string>
+    <string name="help.title">Welcome to DSub!</string>
     <string name="help.back">Back</string>
     <string name="help.close">Close</string>
     <string name="help.url">file:///android_asset/html/en/index.html</string>
@@ -118,7 +118,7 @@
 
     <string name="error.label">Error</string>
 
-    <string name="settings.title">Sub Droid settings</string>
+    <string name="settings.title">DSub settings</string>
     <string name="settings.test_connection_title">Test connection</string>
     <string name="settings.servers_title">Servers</string>
     <string name="settings.server_unused1">Unused 1</string>
@@ -175,7 +175,7 @@
     <string name="settings.search_history_cleared">Search history cleared</string>
     <string name="settings.other_title">Other settings</string>
     <string name="settings.scrobble_title">Scrobble to Last.fm</string>
-    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Sub Droid server</string>
+    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the DSub server</string>
     <string name="settings.hide_media_title">Hide from other</string>
     <string name="settings.hide_media_summary">Hide music files from other apps.</string>
     <string name="settings.hide_media_toast">Takes effect next time Android scans your phone for music.</string>
@@ -199,7 +199,7 @@
 
     <string name="parser.reading">Reading from server.</string>
     <string name="parser.reading_done">Reading from server. Done!</string>
-    <string name="parser.upgrade_client">Incompatible versions. Please upgrade Sub Droid Android app.</string>
+    <string name="parser.upgrade_client">Incompatible versions. Please upgrade DSub Android app.</string>
     <string name="parser.upgrade_server">Incompatible versions. Please upgrade Subsonic server.</string>
     <string name="parser.not_authenticated">Wrong username or password.</string>
     <string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>
diff --git a/subsonic-android/res/xml/searchable.xml b/subsonic-android/res/xml/searchable.xml
index b6ad1a49..fd68a3ed 100644
--- a/subsonic-android/res/xml/searchable.xml
+++ b/subsonic-android/res/xml/searchable.xml
@@ -4,6 +4,6 @@
             android:hint="@string/search.title"
             android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
             android:voiceLanguageModel="web_search"
-            android:searchSuggestAuthority="github.daneren2005.subdroid.provider.SearchSuggestionProvider"
+            android:searchSuggestAuthority="github.daneren2005.dsub.provider.SearchSuggestionProvider"
             android:searchSuggestSelection=" ?" >
 </searchable>
 \ No newline at end of file
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
index 7e431d16..a657b7eb 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/DownloadActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -58,22 +58,22 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.ViewFlipper;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.PlayerState;
-import github.daneren2005.subdroid.domain.RepeatMode;
-import github.daneren2005.subdroid.service.DownloadFile;
-import github.daneren2005.subdroid.service.DownloadService;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.HorizontalSlider;
-import github.daneren2005.subdroid.util.SilentBackgroundTask;
-import github.daneren2005.subdroid.util.SongView;
-import github.daneren2005.subdroid.util.Util;
-import github.daneren2005.subdroid.view.VisualizerView;
-
-import static github.daneren2005.subdroid.domain.PlayerState.*;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.PlayerState;
+import github.daneren2005.dsub.domain.RepeatMode;
+import github.daneren2005.dsub.service.DownloadFile;
+import github.daneren2005.dsub.service.DownloadService;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.HorizontalSlider;
+import github.daneren2005.dsub.util.SilentBackgroundTask;
+import github.daneren2005.dsub.util.SongView;
+import github.daneren2005.dsub.util.Util;
+import github.daneren2005.dsub.view.VisualizerView;
+
+import static github.daneren2005.dsub.domain.PlayerState.*;
 import java.util.ArrayList;
 
 public class DownloadActivity extends SubsonicTabActivity implements OnGestureListener {
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/EqualizerActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/EqualizerActivity.java
index d96b360a..9906673a 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/EqualizerActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/EqualizerActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,9 +33,9 @@ import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.audiofx.EqualizerController;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.audiofx.EqualizerController;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
 
 /**
  * Equalizer controls.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/HelpActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/HelpActivity.java
index a6deab05..6dc516bf 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/HelpActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/HelpActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -27,8 +27,8 @@ import android.view.Window;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Button;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * An HTML-based help screen with Back and Done buttons at the bottom.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/LyricsActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/LyricsActivity.java
index 0666f2af..56e59b8c 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/LyricsActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/LyricsActivity.java
@@ -17,17 +17,17 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import android.os.Bundle;
 import android.widget.TextView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Lyrics;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.util.BackgroundTask;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.TabActivityBackgroundTask;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Lyrics;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.util.BackgroundTask;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.TabActivityBackgroundTask;
 
 /**
  * Displays song lyrics.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/MainActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
index 88d4543a..e5958e57 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/MainActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/MainActivity.java
@@ -17,17 +17,17 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import java.util.Arrays;
 
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.service.DownloadService;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.MergeAdapter;
-import github.daneren2005.subdroid.util.Util;
-import github.daneren2005.subdroid.util.FileUtil;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.service.DownloadService;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.MergeAdapter;
+import github.daneren2005.dsub.util.Util;
+import github.daneren2005.dsub.util.FileUtil;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/PlayVideoActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/PlayVideoActivity.java
index 4c1dbc68..7a77736e 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/PlayVideoActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/PlayVideoActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import java.lang.reflect.Method;
 
@@ -31,10 +31,10 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * Plays videos in a web page.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/QueryReceiverActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/QueryReceiverActivity.java
index b52e78c8..fcce2de9 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/QueryReceiverActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/QueryReceiverActivity.java
@@ -17,16 +17,16 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.Util;
-import github.daneren2005.subdroid.provider.SearchSuggestionProvider1;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.Util;
+import github.daneren2005.dsub.provider.SearchSuggestionProvider1;
 
 /**
  * Receives search queries and forwards to the SelectAlbumActivity.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/SearchActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SearchActivity.java
index 02d3e8b3..3ea0cabf 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/SearchActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SearchActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -36,21 +36,21 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.net.Uri;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Artist;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.SearchCritera;
-import github.daneren2005.subdroid.domain.SearchResult;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.service.DownloadService;
-import github.daneren2005.subdroid.util.ArtistAdapter;
-import github.daneren2005.subdroid.util.BackgroundTask;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.EntryAdapter;
-import github.daneren2005.subdroid.util.MergeAdapter;
-import github.daneren2005.subdroid.util.TabActivityBackgroundTask;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.SearchCritera;
+import github.daneren2005.dsub.domain.SearchResult;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.service.DownloadService;
+import github.daneren2005.dsub.util.ArtistAdapter;
+import github.daneren2005.dsub.util.BackgroundTask;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.EntryAdapter;
+import github.daneren2005.dsub.util.MergeAdapter;
+import github.daneren2005.dsub.util.TabActivityBackgroundTask;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * Performs searches and displays the matching artists, albums and songs.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
index 84c3ae52..108dcf9c 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectAlbumActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -34,16 +34,16 @@ import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.service.DownloadFile;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.EntryAdapter;
-import github.daneren2005.subdroid.util.Pair;
-import github.daneren2005.subdroid.util.TabActivityBackgroundTask;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.service.DownloadFile;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.EntryAdapter;
+import github.daneren2005.dsub.util.Pair;
+import github.daneren2005.dsub.util.TabActivityBackgroundTask;
+import github.daneren2005.dsub.util.Util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/SelectArtistActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java
index db66f989..8b32ff3a 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/SelectArtistActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectArtistActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -30,17 +30,17 @@ import android.widget.AdapterView;
 import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Artist;
-import github.daneren2005.subdroid.domain.Indexes;
-import github.daneren2005.subdroid.domain.MusicFolder;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.util.ArtistAdapter;
-import github.daneren2005.subdroid.util.BackgroundTask;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.TabActivityBackgroundTask;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.domain.Indexes;
+import github.daneren2005.dsub.domain.MusicFolder;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.util.ArtistAdapter;
+import github.daneren2005.dsub.util.BackgroundTask;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.TabActivityBackgroundTask;
+import github.daneren2005.dsub.util.Util;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/SelectPlaylistActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
index e4a3c4ad..a299b84b 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/SelectPlaylistActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SelectPlaylistActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -28,15 +28,15 @@ import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ImageButton;
 import android.widget.ListView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Playlist;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.util.BackgroundTask;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.PlaylistAdapter;
-import github.daneren2005.subdroid.util.TabActivityBackgroundTask;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Playlist;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.util.BackgroundTask;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.PlaylistAdapter;
+import github.daneren2005.dsub.util.TabActivityBackgroundTask;
+import github.daneren2005.dsub.util.Util;
 
 import java.util.List;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
index 1f3b6322..0e69ac8f 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/SettingsActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -27,17 +27,17 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.provider.SearchRecentSuggestions;
 import android.util.Log;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.provider.SearchSuggestionProvider1;
-import github.daneren2005.subdroid.service.DownloadService;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.ErrorDialog;
-import github.daneren2005.subdroid.util.FileUtil;
-import github.daneren2005.subdroid.util.ModalBackgroundTask;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.provider.SearchSuggestionProvider1;
+import github.daneren2005.dsub.service.DownloadService;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.ErrorDialog;
+import github.daneren2005.dsub.util.FileUtil;
+import github.daneren2005.dsub.util.ModalBackgroundTask;
+import github.daneren2005.dsub.util.Util;
 
 import java.io.File;
 import java.net.URL;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
index d8348b75..6afe842b 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/SubsonicTabActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import java.io.File;
 import java.io.PrintWriter;
@@ -40,16 +40,16 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
 import android.widget.TextView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.service.DownloadService;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.ImageLoader;
-import github.daneren2005.subdroid.util.ModalBackgroundTask;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.service.DownloadService;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.ImageLoader;
+import github.daneren2005.dsub.util.ModalBackgroundTask;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * @author Sindre Mehus
@@ -344,7 +344,7 @@ public class SubsonicTabActivity extends Activity {
             PrintWriter printWriter = null;
             try {
 
-                PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.subdroid", 0);
+                PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.dsub", 0);
                 file = new File(Environment.getExternalStorageDirectory(), "subsonic-stacktrace.txt");
                 printWriter = new PrintWriter(file);
                 printWriter.println("Android API level: " + Build.VERSION.SDK);
diff --git a/subsonic-android/src/github/daneren2005/subdroid/activity/VoiceQueryReceiverActivity.java b/subsonic-android/src/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java
index a9c64df3..dba6793b 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/activity/VoiceQueryReceiverActivity.java
+++ b/subsonic-android/src/github/daneren2005/dsub/activity/VoiceQueryReceiverActivity.java
@@ -17,16 +17,16 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subdroid.activity;
+package github.daneren2005.dsub.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.Util;
-import github.daneren2005.subdroid.provider.SearchSuggestionProvider1;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.Util;
+import github.daneren2005.dsub.provider.SearchSuggestionProvider1;
 
 /**
  * Receives voice search queries and forwards to the SearchActivity.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/audiofx/EqualizerController.java b/subsonic-android/src/github/daneren2005/dsub/audiofx/EqualizerController.java
index f51a3c99..f16ff968 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/audiofx/EqualizerController.java
+++ b/subsonic-android/src/github/daneren2005/dsub/audiofx/EqualizerController.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.audiofx;
+package github.daneren2005.dsub.audiofx;
 
 import java.io.Serializable;
 
@@ -24,7 +24,7 @@ import android.content.Context;
 import android.media.MediaPlayer;
 import android.media.audiofx.Equalizer;
 import android.util.Log;
-import github.daneren2005.subdroid.util.FileUtil;
+import github.daneren2005.dsub.util.FileUtil;
 
 /**
  * Backward-compatible wrapper for {@link Equalizer}, which is API Level 9.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/audiofx/VisualizerController.java b/subsonic-android/src/github/daneren2005/dsub/audiofx/VisualizerController.java
index f4034715..184aeb51 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/audiofx/VisualizerController.java
+++ b/subsonic-android/src/github/daneren2005/dsub/audiofx/VisualizerController.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.audiofx;
+package github.daneren2005.dsub.audiofx;
 
 import android.content.Context;
 import android.media.MediaPlayer;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/Artist.java b/subsonic-android/src/github/daneren2005/dsub/domain/Artist.java
index 1fb640a6..29e6ad34 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/Artist.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/Artist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/Indexes.java b/subsonic-android/src/github/daneren2005/dsub/domain/Indexes.java
index 1c3a90b7..0bc44158 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/Indexes.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/Indexes.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 import java.util.List;
 import java.io.Serializable;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/JukeboxStatus.java b/subsonic-android/src/github/daneren2005/dsub/domain/JukeboxStatus.java
index 57c657b2..7b229f49 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/JukeboxStatus.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/JukeboxStatus.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/Lyrics.java b/subsonic-android/src/github/daneren2005/dsub/domain/Lyrics.java
index f28d818c..feb75cd6 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/Lyrics.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/Lyrics.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 /**
  * Song lyrics.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/MusicDirectory.java b/subsonic-android/src/github/daneren2005/dsub/domain/MusicDirectory.java
index 591befba..420ce813 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/MusicDirectory.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/MusicDirectory.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/MusicFolder.java b/subsonic-android/src/github/daneren2005/dsub/domain/MusicFolder.java
index 3cc48fc0..68a22bcc 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/MusicFolder.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/MusicFolder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/PlayerState.java b/subsonic-android/src/github/daneren2005/dsub/domain/PlayerState.java
index 81b29e09..6a4fd06c 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/PlayerState.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/PlayerState.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/Playlist.java b/subsonic-android/src/github/daneren2005/dsub/domain/Playlist.java
index 003fc75f..e13f2eeb 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/Playlist.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/Playlist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/RepeatMode.java b/subsonic-android/src/github/daneren2005/dsub/domain/RepeatMode.java
index 5c092093..7139029c 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/RepeatMode.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/RepeatMode.java
@@ -1,4 +1,4 @@
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/SearchCritera.java b/subsonic-android/src/github/daneren2005/dsub/domain/SearchCritera.java
index 93a022de..20d46aa0 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/SearchCritera.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/SearchCritera.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 /**
  * The criteria for a music search.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/SearchResult.java b/subsonic-android/src/github/daneren2005/dsub/domain/SearchResult.java
index fef3672f..11a56540 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/SearchResult.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/SearchResult.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 import java.util.List;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/ServerInfo.java b/subsonic-android/src/github/daneren2005/dsub/domain/ServerInfo.java
index db9aedfd..43c7319a 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/ServerInfo.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/ServerInfo.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 /**
  * Information about the Subsonic server.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/domain/Version.java b/subsonic-android/src/github/daneren2005/dsub/domain/Version.java
index c79117d2..65391572 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/domain/Version.java
+++ b/subsonic-android/src/github/daneren2005/dsub/domain/Version.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.domain;
+package github.daneren2005.dsub.domain;
 
 /**
  * Represents the version number of the Subsonic Android app.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/provider/SearchSuggestionProvider1.java b/subsonic-android/src/github/daneren2005/dsub/provider/SearchSuggestionProvider1.java
index 2edf82f1..87560e96 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/provider/SearchSuggestionProvider1.java
+++ b/subsonic-android/src/github/daneren2005/dsub/provider/SearchSuggestionProvider1.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.provider;
+package github.daneren2005.dsub.provider;
 
 import android.content.SearchRecentSuggestionsProvider;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/provider/SubsonicAppWidgetProvider1.java b/subsonic-android/src/github/daneren2005/dsub/provider/SubsonicAppWidgetProvider1.java
index 99ef21ac..40655b9d 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/provider/SubsonicAppWidgetProvider1.java
+++ b/subsonic-android/src/github/daneren2005/dsub/provider/SubsonicAppWidgetProvider1.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.provider;
+package github.daneren2005.dsub.provider;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;
@@ -37,13 +37,13 @@ import android.os.Environment;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.widget.RemoteViews;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.activity.DownloadActivity;
-import github.daneren2005.subdroid.activity.MainActivity;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.service.DownloadService;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
-import github.daneren2005.subdroid.util.FileUtil;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.activity.DownloadActivity;
+import github.daneren2005.dsub.activity.MainActivity;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.service.DownloadService;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
+import github.daneren2005.dsub.util.FileUtil;
 
 /**
  * Simple widget to show currently playing album art along
diff --git a/subsonic-android/src/github/daneren2005/subdroid/receiver/BluetoothIntentReceiver.java b/subsonic-android/src/github/daneren2005/dsub/receiver/BluetoothIntentReceiver.java
index 97003b6a..b87b6c6c 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/receiver/BluetoothIntentReceiver.java
+++ b/subsonic-android/src/github/daneren2005/dsub/receiver/BluetoothIntentReceiver.java
@@ -16,14 +16,14 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.receiver;
+package github.daneren2005.dsub.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * Request media button focus when connected to Bluetooth A2DP.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/receiver/MediaButtonIntentReceiver.java b/subsonic-android/src/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java
index 6bd83e7c..da4a4998 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/receiver/MediaButtonIntentReceiver.java
+++ b/subsonic-android/src/github/daneren2005/dsub/receiver/MediaButtonIntentReceiver.java
@@ -16,14 +16,14 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.receiver;
+package github.daneren2005.dsub.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 import android.view.KeyEvent;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/CachedMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/CachedMusicService.java
index e9e1df42..094c959f 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/CachedMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/CachedMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -25,20 +25,20 @@ import org.apache.http.HttpResponse;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import github.daneren2005.subdroid.domain.Indexes;
-import github.daneren2005.subdroid.domain.JukeboxStatus;
-import github.daneren2005.subdroid.domain.Lyrics;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.MusicFolder;
-import github.daneren2005.subdroid.domain.Playlist;
-import github.daneren2005.subdroid.domain.SearchCritera;
-import github.daneren2005.subdroid.domain.SearchResult;
-import github.daneren2005.subdroid.domain.Version;
-import github.daneren2005.subdroid.util.CancellableTask;
-import github.daneren2005.subdroid.util.LRUCache;
-import github.daneren2005.subdroid.util.ProgressListener;
-import github.daneren2005.subdroid.util.TimeLimitedCache;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.domain.Indexes;
+import github.daneren2005.dsub.domain.JukeboxStatus;
+import github.daneren2005.dsub.domain.Lyrics;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.MusicFolder;
+import github.daneren2005.dsub.domain.Playlist;
+import github.daneren2005.dsub.domain.SearchCritera;
+import github.daneren2005.dsub.domain.SearchResult;
+import github.daneren2005.dsub.domain.Version;
+import github.daneren2005.dsub.util.CancellableTask;
+import github.daneren2005.dsub.util.LRUCache;
+import github.daneren2005.dsub.util.ProgressListener;
+import github.daneren2005.dsub.util.TimeLimitedCache;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/DownloadFile.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadFile.java
index 3519cce3..20200607 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/DownloadFile.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadFile.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -28,11 +28,11 @@ import android.content.Context;
 import android.os.PowerManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.util.CancellableTask;
-import github.daneren2005.subdroid.util.FileUtil;
-import github.daneren2005.subdroid.util.Util;
-import github.daneren2005.subdroid.util.CacheCleaner;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.util.CancellableTask;
+import github.daneren2005.dsub.util.FileUtil;
+import github.daneren2005.dsub.util.Util;
+import github.daneren2005.dsub.util.CacheCleaner;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/DownloadService.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadService.java
index 20812aa1..d9d1ed0d 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/DownloadService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadService.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import java.util.List;
 
-import github.daneren2005.subdroid.audiofx.EqualizerController;
-import github.daneren2005.subdroid.audiofx.VisualizerController;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.PlayerState;
-import github.daneren2005.subdroid.domain.RepeatMode;
+import github.daneren2005.dsub.audiofx.EqualizerController;
+import github.daneren2005.dsub.audiofx.VisualizerController;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.PlayerState;
+import github.daneren2005.dsub.domain.RepeatMode;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
index fef09220..8c2be5ee 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/DownloadServiceImpl.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceImpl.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import android.app.Service;
 import android.content.Context;
@@ -28,16 +28,16 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.util.Log;
-import github.daneren2005.subdroid.audiofx.EqualizerController;
-import github.daneren2005.subdroid.audiofx.VisualizerController;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.PlayerState;
-import github.daneren2005.subdroid.domain.RepeatMode;
-import github.daneren2005.subdroid.util.CancellableTask;
-import github.daneren2005.subdroid.util.LRUCache;
-import github.daneren2005.subdroid.util.ShufflePlayBuffer;
-import github.daneren2005.subdroid.util.SimpleServiceBinder;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.audiofx.EqualizerController;
+import github.daneren2005.dsub.audiofx.VisualizerController;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.PlayerState;
+import github.daneren2005.dsub.domain.RepeatMode;
+import github.daneren2005.dsub.util.CancellableTask;
+import github.daneren2005.dsub.util.LRUCache;
+import github.daneren2005.dsub.util.ShufflePlayBuffer;
+import github.daneren2005.dsub.util.SimpleServiceBinder;
+import github.daneren2005.dsub.util.Util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -45,8 +45,8 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import static github.daneren2005.subdroid.domain.PlayerState.*;
-import github.daneren2005.subdroid.util.*;
+import static github.daneren2005.dsub.domain.PlayerState.*;
+import github.daneren2005.dsub.util.*;
 
 /**
  * @author Sindre Mehus
@@ -56,12 +56,12 @@ public class DownloadServiceImpl extends Service implements DownloadService {
 
     private static final String TAG = DownloadServiceImpl.class.getSimpleName();
 
-    public static final String CMD_PLAY = "github.daneren2005.subdroid.CMD_PLAY";
-    public static final String CMD_TOGGLEPAUSE = "github.daneren2005.subdroid.CMD_TOGGLEPAUSE";
-    public static final String CMD_PAUSE = "github.daneren2005.subdroid.CMD_PAUSE";
-    public static final String CMD_STOP = "github.daneren2005.subdroid.CMD_STOP";
-    public static final String CMD_PREVIOUS = "github.daneren2005.subdroid.CMD_PREVIOUS";
-    public static final String CMD_NEXT = "github.daneren2005.subdroid.CMD_NEXT";
+    public static final String CMD_PLAY = "github.daneren2005.dsub.CMD_PLAY";
+    public static final String CMD_TOGGLEPAUSE = "github.daneren2005.dsub.CMD_TOGGLEPAUSE";
+    public static final String CMD_PAUSE = "github.daneren2005.dsub.CMD_PAUSE";
+    public static final String CMD_STOP = "github.daneren2005.dsub.CMD_STOP";
+    public static final String CMD_PREVIOUS = "github.daneren2005.dsub.CMD_PREVIOUS";
+    public static final String CMD_NEXT = "github.daneren2005.dsub.CMD_NEXT";
 
     private final IBinder binder = new SimpleServiceBinder<DownloadService>(this);
     private MediaPlayer mediaPlayer;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/DownloadServiceLifecycleSupport.java b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
index 3741af8c..7e06eb1e 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/DownloadServiceLifecycleSupport.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/DownloadServiceLifecycleSupport.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -33,11 +33,11 @@ import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.view.KeyEvent;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.PlayerState;
-import github.daneren2005.subdroid.util.CacheCleaner;
-import github.daneren2005.subdroid.util.FileUtil;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.PlayerState;
+import github.daneren2005.dsub.util.CacheCleaner;
+import github.daneren2005.dsub.util.FileUtil;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/JukeboxService.java b/subsonic-android/src/github/daneren2005/dsub/service/JukeboxService.java
index aa363438..feeae2a7 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/JukeboxService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/JukeboxService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import android.content.Context;
 import android.os.Handler;
@@ -26,11 +26,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ProgressBar;
 import android.widget.Toast;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.JukeboxStatus;
-import github.daneren2005.subdroid.domain.PlayerState;
-import github.daneren2005.subdroid.service.parser.SubsonicRESTException;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.JukeboxStatus;
+import github.daneren2005.dsub.domain.PlayerState;
+import github.daneren2005.dsub.service.parser.SubsonicRESTException;
+import github.daneren2005.dsub.util.Util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/MediaStoreService.java b/subsonic-android/src/github/daneren2005/dsub/service/MediaStoreService.java
index 0cb27742..4de77bf2 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/MediaStoreService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/MediaStoreService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import java.io.File;
 
@@ -27,8 +27,8 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.MediaStore;
 import android.util.Log;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.util.FileUtil;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.util.FileUtil;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/MusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/MusicService.java
index 0d744b69..e8fca8f0 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/MusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/MusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import java.util.List;
 
@@ -24,17 +24,17 @@ import org.apache.http.HttpResponse;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import github.daneren2005.subdroid.domain.Indexes;
-import github.daneren2005.subdroid.domain.JukeboxStatus;
-import github.daneren2005.subdroid.domain.Lyrics;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.MusicFolder;
-import github.daneren2005.subdroid.domain.Playlist;
-import github.daneren2005.subdroid.domain.SearchCritera;
-import github.daneren2005.subdroid.domain.SearchResult;
-import github.daneren2005.subdroid.domain.Version;
-import github.daneren2005.subdroid.util.CancellableTask;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.domain.Indexes;
+import github.daneren2005.dsub.domain.JukeboxStatus;
+import github.daneren2005.dsub.domain.Lyrics;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.MusicFolder;
+import github.daneren2005.dsub.domain.Playlist;
+import github.daneren2005.dsub.domain.SearchCritera;
+import github.daneren2005.dsub.domain.SearchResult;
+import github.daneren2005.dsub.domain.Version;
+import github.daneren2005.dsub.util.CancellableTask;
+import github.daneren2005.dsub.util.ProgressListener;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/MusicServiceFactory.java b/subsonic-android/src/github/daneren2005/dsub/service/MusicServiceFactory.java
index a7dbc2df..e04522ff 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/MusicServiceFactory.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/MusicServiceFactory.java
@@ -16,10 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import android.content.Context;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/OfflineException.java b/subsonic-android/src/github/daneren2005/dsub/service/OfflineException.java
index 21f30e24..e3a8d460 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/OfflineException.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/OfflineException.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 /**
  * Thrown by service methods that are not available in offline mode.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/OfflineMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java
index 2701be27..9c49d550 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/OfflineMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/OfflineMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,20 +34,20 @@ import java.util.Set;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import github.daneren2005.subdroid.domain.Artist;
-import github.daneren2005.subdroid.domain.Indexes;
-import github.daneren2005.subdroid.domain.JukeboxStatus;
-import github.daneren2005.subdroid.domain.Lyrics;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.MusicFolder;
-import github.daneren2005.subdroid.domain.Playlist;
-import github.daneren2005.subdroid.domain.SearchCritera;
-import github.daneren2005.subdroid.domain.SearchResult;
-import github.daneren2005.subdroid.service.parser.PlaylistParser;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.FileUtil;
-import github.daneren2005.subdroid.util.ProgressListener;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.domain.Indexes;
+import github.daneren2005.dsub.domain.JukeboxStatus;
+import github.daneren2005.dsub.domain.Lyrics;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.MusicFolder;
+import github.daneren2005.dsub.domain.Playlist;
+import github.daneren2005.dsub.domain.SearchCritera;
+import github.daneren2005.dsub.domain.SearchResult;
+import github.daneren2005.dsub.service.parser.PlaylistParser;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.FileUtil;
+import github.daneren2005.dsub.util.ProgressListener;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/RESTMusicService.java b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
index 12f91189..748eacee 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/RESTMusicService.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/RESTMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -69,38 +69,38 @@ import android.graphics.BitmapFactory;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.util.Log;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Indexes;
-import github.daneren2005.subdroid.domain.JukeboxStatus;
-import github.daneren2005.subdroid.domain.Lyrics;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.MusicFolder;
-import github.daneren2005.subdroid.domain.Playlist;
-import github.daneren2005.subdroid.domain.SearchCritera;
-import github.daneren2005.subdroid.domain.SearchResult;
-import github.daneren2005.subdroid.domain.ServerInfo;
-import github.daneren2005.subdroid.domain.Version;
-import github.daneren2005.subdroid.service.parser.AlbumListParser;
-import github.daneren2005.subdroid.service.parser.ErrorParser;
-import github.daneren2005.subdroid.service.parser.IndexesParser;
-import github.daneren2005.subdroid.service.parser.JukeboxStatusParser;
-import github.daneren2005.subdroid.service.parser.LicenseParser;
-import github.daneren2005.subdroid.service.parser.LyricsParser;
-import github.daneren2005.subdroid.service.parser.MusicDirectoryParser;
-import github.daneren2005.subdroid.service.parser.MusicFoldersParser;
-import github.daneren2005.subdroid.service.parser.PlaylistParser;
-import github.daneren2005.subdroid.service.parser.PlaylistsParser;
-import github.daneren2005.subdroid.service.parser.RandomSongsParser;
-import github.daneren2005.subdroid.service.parser.SearchResult2Parser;
-import github.daneren2005.subdroid.service.parser.SearchResultParser;
-import github.daneren2005.subdroid.service.parser.VersionParser;
-import github.daneren2005.subdroid.service.ssl.SSLSocketFactory;
-import github.daneren2005.subdroid.service.ssl.TrustSelfSignedStrategy;
-import github.daneren2005.subdroid.util.CancellableTask;
-import github.daneren2005.subdroid.util.Constants;
-import github.daneren2005.subdroid.util.FileUtil;
-import github.daneren2005.subdroid.util.ProgressListener;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Indexes;
+import github.daneren2005.dsub.domain.JukeboxStatus;
+import github.daneren2005.dsub.domain.Lyrics;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.MusicFolder;
+import github.daneren2005.dsub.domain.Playlist;
+import github.daneren2005.dsub.domain.SearchCritera;
+import github.daneren2005.dsub.domain.SearchResult;
+import github.daneren2005.dsub.domain.ServerInfo;
+import github.daneren2005.dsub.domain.Version;
+import github.daneren2005.dsub.service.parser.AlbumListParser;
+import github.daneren2005.dsub.service.parser.ErrorParser;
+import github.daneren2005.dsub.service.parser.IndexesParser;
+import github.daneren2005.dsub.service.parser.JukeboxStatusParser;
+import github.daneren2005.dsub.service.parser.LicenseParser;
+import github.daneren2005.dsub.service.parser.LyricsParser;
+import github.daneren2005.dsub.service.parser.MusicDirectoryParser;
+import github.daneren2005.dsub.service.parser.MusicFoldersParser;
+import github.daneren2005.dsub.service.parser.PlaylistParser;
+import github.daneren2005.dsub.service.parser.PlaylistsParser;
+import github.daneren2005.dsub.service.parser.RandomSongsParser;
+import github.daneren2005.dsub.service.parser.SearchResult2Parser;
+import github.daneren2005.dsub.service.parser.SearchResultParser;
+import github.daneren2005.dsub.service.parser.VersionParser;
+import github.daneren2005.dsub.service.ssl.SSLSocketFactory;
+import github.daneren2005.dsub.service.ssl.TrustSelfSignedStrategy;
+import github.daneren2005.dsub.util.CancellableTask;
+import github.daneren2005.dsub.util.Constants;
+import github.daneren2005.dsub.util.FileUtil;
+import github.daneren2005.dsub.util.ProgressListener;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * @author Sindre Mehus
@@ -429,7 +429,7 @@ public class RESTMusicService implements MusicService {
 
     @Override
     public Version getLocalVersion(Context context) throws Exception {
-        PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.subdroid", 0);
+        PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.dsub", 0);
         return new Version(packageInfo.versionName);
     }
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/Scrobbler.java b/subsonic-android/src/github/daneren2005/dsub/service/Scrobbler.java
index be6e9fc8..222c78c8 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/Scrobbler.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/Scrobbler.java
@@ -1,8 +1,8 @@
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
 import android.content.Context;
 import android.util.Log;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * Scrobbles played songs to Last.fm.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/ServerTooOldException.java b/subsonic-android/src/github/daneren2005/dsub/service/ServerTooOldException.java
index 8c48192d..874b8053 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/ServerTooOldException.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/ServerTooOldException.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service;
+package github.daneren2005.dsub.service;
 
-import github.daneren2005.subdroid.domain.Version;
+import github.daneren2005.dsub.domain.Version;
 
 /**
  * Thrown if the REST API version implemented by the server is too old.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/AbstractParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/AbstractParser.java
index 8f136e1c..188d4a21 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/AbstractParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/AbstractParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import java.io.Reader;
 
@@ -24,10 +24,10 @@ import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
 import android.util.Xml;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Version;
-import github.daneren2005.subdroid.util.ProgressListener;
-import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Version;
+import github.daneren2005.dsub.util.ProgressListener;
+import github.daneren2005.dsub.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/AlbumListParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/AlbumListParser.java
index a1b3a5aa..6cc33783 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/AlbumListParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/AlbumListParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/ErrorParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/ErrorParser.java
index 6323eeb6..3463687d 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/ErrorParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/ErrorParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/IndexesParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/IndexesParser.java
index 6ffc7a5d..d33021cd 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/IndexesParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/IndexesParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import java.io.Reader;
 import java.util.List;
@@ -25,10 +25,10 @@ import java.util.ArrayList;
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Artist;
-import github.daneren2005.subdroid.domain.Indexes;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.domain.Indexes;
+import github.daneren2005.dsub.util.ProgressListener;
 import android.util.Log;
 
 /**
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/JukeboxStatusParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/JukeboxStatusParser.java
index 2d3a0e88..8526e635 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/JukeboxStatusParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/JukeboxStatusParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import java.io.Reader;
 
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.domain.JukeboxStatus;
+import github.daneren2005.dsub.domain.JukeboxStatus;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/LicenseParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/LicenseParser.java
index 695c4744..e7b200fd 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/LicenseParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/LicenseParser.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 
-import github.daneren2005.subdroid.domain.ServerInfo;
-import github.daneren2005.subdroid.domain.Version;
+import github.daneren2005.dsub.domain.ServerInfo;
+import github.daneren2005.dsub.domain.Version;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/LyricsParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/LyricsParser.java
index 5fef9ce2..98b0f6a0 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/LyricsParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/LyricsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Lyrics;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Lyrics;
+import github.daneren2005.dsub.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicDirectoryEntryParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/MusicDirectoryEntryParser.java
index 01ba1081..3a1826e5 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicDirectoryEntryParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/MusicDirectoryEntryParser.java
@@ -16,10 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicDirectoryParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
index d705991c..f34f1a81 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicDirectoryParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
 import android.util.Log;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicFoldersParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java
index e043aeb4..5dfebf27 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicFoldersParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import java.io.Reader;
 import java.util.ArrayList;
@@ -25,10 +25,10 @@ import java.util.List;
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicFolder;
-import github.daneren2005.subdroid.domain.Playlist;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicFolder;
+import github.daneren2005.dsub.domain.Playlist;
+import github.daneren2005.dsub.util.ProgressListener;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/PlaylistParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/PlaylistParser.java
index 7826a712..b6f3ec39 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/PlaylistParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/PlaylistParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/PlaylistsParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java
index bd8a5bfe..079c35f5 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/PlaylistsParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Playlist;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Playlist;
+import github.daneren2005.dsub.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/RandomSongsParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/RandomSongsParser.java
index eaeb7214..bcddc0c7 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/RandomSongsParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/RandomSongsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/SearchResult2Parser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/SearchResult2Parser.java
index cb2f9ec2..171bd065 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/SearchResult2Parser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/SearchResult2Parser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.SearchResult;
-import github.daneren2005.subdroid.domain.Artist;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.SearchResult;
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/SearchResultParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/SearchResultParser.java
index 7a899011..6b10047f 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/SearchResultParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/SearchResultParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.SearchResult;
-import github.daneren2005.subdroid.domain.Artist;
-import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.SearchResult;
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/SubsonicRESTException.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/SubsonicRESTException.java
index a694eeea..096597a1 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/SubsonicRESTException.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/SubsonicRESTException.java
@@ -1,4 +1,4 @@
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/parser/VersionParser.java b/subsonic-android/src/github/daneren2005/dsub/service/parser/VersionParser.java
index 3ccd4f9a..1b646206 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/parser/VersionParser.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/parser/VersionParser.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.service.parser;
+package github.daneren2005.dsub.service.parser;
 
-import github.daneren2005.subdroid.domain.Version;
+import github.daneren2005.dsub.domain.Version;
 
 import java.io.BufferedReader;
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/ssl/SSLSocketFactory.java b/subsonic-android/src/github/daneren2005/dsub/service/ssl/SSLSocketFactory.java
index c7ee8950..2ffed048 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/ssl/SSLSocketFactory.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/ssl/SSLSocketFactory.java
@@ -25,7 +25,7 @@
  *
  */
 
-package github.daneren2005.subdroid.service.ssl;
+package github.daneren2005.dsub.service.ssl;
 
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.scheme.HostNameResolver;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustManagerDecorator.java b/subsonic-android/src/github/daneren2005/dsub/service/ssl/TrustManagerDecorator.java
index a99f2608..f2364368 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustManagerDecorator.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/ssl/TrustManagerDecorator.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.daneren2005.subdroid.service.ssl;
+package github.daneren2005.dsub.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustSelfSignedStrategy.java b/subsonic-android/src/github/daneren2005/dsub/service/ssl/TrustSelfSignedStrategy.java
index 5aa1344c..637a8931 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustSelfSignedStrategy.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/ssl/TrustSelfSignedStrategy.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.daneren2005.subdroid.service.ssl;
+package github.daneren2005.dsub.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustStrategy.java b/subsonic-android/src/github/daneren2005/dsub/service/ssl/TrustStrategy.java
index 75ae6e54..334a97c5 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustStrategy.java
+++ b/subsonic-android/src/github/daneren2005/dsub/service/ssl/TrustStrategy.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.daneren2005.subdroid.service.ssl;
+package github.daneren2005.dsub.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/AlbumView.java b/subsonic-android/src/github/daneren2005/dsub/util/AlbumView.java
index 27cfc77b..98bd500f 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/AlbumView.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/AlbumView.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
 
 /**
  * Used to display albums in a {@code ListView}.
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/ArtistAdapter.java b/subsonic-android/src/github/daneren2005/dsub/util/ArtistAdapter.java
index 6973af8c..adb54ce7 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/ArtistAdapter.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ArtistAdapter.java
@@ -16,10 +16,10 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
-import github.daneren2005.subdroid.domain.Artist;
-import github.daneren2005.subdroid.R;
+import github.daneren2005.dsub.domain.Artist;
+import github.daneren2005.dsub.R;
 import android.widget.ArrayAdapter;
 import android.widget.SectionIndexer;
 import android.content.Context;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/BackgroundTask.java b/subsonic-android/src/github/daneren2005/dsub/util/BackgroundTask.java
index ac8c9da7..c407a336 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/BackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/BackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -26,7 +26,7 @@ import org.xmlpull.v1.XmlPullParserException;
 import android.app.Activity;
 import android.os.Handler;
 import android.util.Log;
-import github.daneren2005.subdroid.R;
+import github.daneren2005.dsub.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/CacheCleaner.java b/subsonic-android/src/github/daneren2005/dsub/util/CacheCleaner.java
index 66c8b959..63e5d1be 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/CacheCleaner.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/CacheCleaner.java
@@ -1,4 +1,4 @@
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -11,8 +11,8 @@ import java.util.Set;
 import android.content.Context;
 import android.util.Log;
 import android.os.StatFs;
-import github.daneren2005.subdroid.service.DownloadFile;
-import github.daneren2005.subdroid.service.DownloadService;
+import github.daneren2005.dsub.service.DownloadFile;
+import github.daneren2005.dsub.service.DownloadService;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/CancellableTask.java b/subsonic-android/src/github/daneren2005/dsub/util/CancellableTask.java
index be30a08b..7678d0f7 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/CancellableTask.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/CancellableTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/Constants.java b/subsonic-android/src/github/daneren2005/dsub/util/Constants.java
index 1b49cd4a..79c1ed17 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/Constants.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/Constants.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 /**
  * @author Sindre Mehus
@@ -78,7 +78,7 @@ public final class Constants {
 	public static final String PREFERENCES_KEY_RANDOM_SIZE = "randomSize";
 
     // Name of the preferences file.
-    public static final String PREFERENCES_FILE_NAME = "github.daneren2005.subdroid_preferences";
+    public static final String PREFERENCES_FILE_NAME = "github.daneren2005.dsub_preferences";
 
     // Number of free trial days for non-licensed servers.
     public static final int FREE_TRIAL_DAYS = 30;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/EntryAdapter.java b/subsonic-android/src/github/daneren2005/dsub/util/EntryAdapter.java
index 66250165..e66c95cd 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/EntryAdapter.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/EntryAdapter.java
@@ -16,15 +16,15 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.util.List;
 
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import github.daneren2005.subdroid.activity.SubsonicTabActivity;
-import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.dsub.activity.SubsonicTabActivity;
+import github.daneren2005.dsub.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/ErrorDialog.java b/subsonic-android/src/github/daneren2005/dsub/util/ErrorDialog.java
index 3f2138be..2928e93f 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/ErrorDialog.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ErrorDialog.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import github.daneren2005.subdroid.R;
+import github.daneren2005.dsub.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/FileUtil.java b/subsonic-android/src/github/daneren2005/dsub/util/FileUtil.java
index a36b9e9f..777124bd 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/FileUtil.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/FileUtil.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -35,7 +35,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Environment;
 import android.util.Log;
-import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/HorizontalSlider.java b/subsonic-android/src/github/daneren2005/dsub/util/HorizontalSlider.java
index 01e24fd5..7c639293 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/HorizontalSlider.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/HorizontalSlider.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -26,7 +26,7 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ProgressBar;
-import github.daneren2005.subdroid.R;
+import github.daneren2005.dsub.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/ImageLoader.java b/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java
index 0ac08f1f..a3c36493 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/ImageLoader.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ImageLoader.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -34,10 +34,10 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/LRUCache.java b/subsonic-android/src/github/daneren2005/dsub/util/LRUCache.java
index f9516e04..9b12a204 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/LRUCache.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/LRUCache.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.lang.ref.SoftReference;
 import java.util.HashMap;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/MergeAdapter.java b/subsonic-android/src/github/daneren2005/dsub/util/MergeAdapter.java
index c83cfb7b..22655406 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/MergeAdapter.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/MergeAdapter.java
@@ -13,7 +13,7 @@
  limitations under the License.
  */
 
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.database.DataSetObserver;
 import android.view.View;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/ModalBackgroundTask.java b/subsonic-android/src/github/daneren2005/dsub/util/ModalBackgroundTask.java
index 0733355f..973f4ead 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/ModalBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ModalBackgroundTask.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.util.Log;
-import github.daneren2005.subdroid.R;
+import github.daneren2005.dsub.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/MyViewFlipper.java b/subsonic-android/src/github/daneren2005/dsub/util/MyViewFlipper.java
index 31710593..55f01672 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/MyViewFlipper.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/MyViewFlipper.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/Pair.java b/subsonic-android/src/github/daneren2005/dsub/util/Pair.java
index e4bc7ee5..54386a62 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/Pair.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/Pair.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/PlaylistAdapter.java b/subsonic-android/src/github/daneren2005/dsub/util/PlaylistAdapter.java
index e446bf04..f4dcb230 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/PlaylistAdapter.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/PlaylistAdapter.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.content.Context;
 import android.widget.ArrayAdapter;
 import android.widget.SectionIndexer;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.Playlist;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.Playlist;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/ProgressListener.java b/subsonic-android/src/github/daneren2005/dsub/util/ProgressListener.java
index 1381eaf6..c6d58f42 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/ProgressListener.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ProgressListener.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/SackOfViewsAdapter.java b/subsonic-android/src/github/daneren2005/dsub/util/SackOfViewsAdapter.java
index 645e3e49..3fa96bbb 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/SackOfViewsAdapter.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/SackOfViewsAdapter.java
@@ -12,7 +12,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/ShufflePlayBuffer.java b/subsonic-android/src/github/daneren2005/dsub/util/ShufflePlayBuffer.java
index a4108f0a..673af466 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/ShufflePlayBuffer.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/ShufflePlayBuffer.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,9 +26,9 @@ import java.util.concurrent.TimeUnit;
 
 import android.content.Context;
 import android.util.Log;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.service.MusicService;
-import github.daneren2005.subdroid.service.MusicServiceFactory;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.service.MusicService;
+import github.daneren2005.dsub.service.MusicServiceFactory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/SilentBackgroundTask.java b/subsonic-android/src/github/daneren2005/dsub/util/SilentBackgroundTask.java
index b8592a66..7bceb467 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/SilentBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/SilentBackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.app.Activity;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/SimpleServiceBinder.java b/subsonic-android/src/github/daneren2005/dsub/util/SimpleServiceBinder.java
index 25b46b5a..9c0b36a9 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/SimpleServiceBinder.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/SimpleServiceBinder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.os.Binder;
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/SongView.java b/subsonic-android/src/github/daneren2005/dsub/util/SongView.java
index 7c29c331..61846c27 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/SongView.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/SongView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.content.Context;
 import android.os.Handler;
@@ -27,11 +27,11 @@ import android.widget.Checkable;
 import android.widget.CheckedTextView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.service.DownloadService;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
-import github.daneren2005.subdroid.service.DownloadFile;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.service.DownloadService;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
+import github.daneren2005.dsub.service.DownloadFile;
 
 import java.io.File;
 import java.util.WeakHashMap;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/TabActivityBackgroundTask.java b/subsonic-android/src/github/daneren2005/dsub/util/TabActivityBackgroundTask.java
index 0372920f..f5cf94b9 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/TabActivityBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/TabActivityBackgroundTask.java
@@ -1,6 +1,6 @@
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
-import github.daneren2005.subdroid.activity.SubsonicTabActivity;
+import github.daneren2005.dsub.activity.SubsonicTabActivity;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/TimeLimitedCache.java b/subsonic-android/src/github/daneren2005/dsub/util/TimeLimitedCache.java
index 0dd1efaf..8b7df783 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/TimeLimitedCache.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/TimeLimitedCache.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import java.lang.ref.SoftReference;
 import java.util.concurrent.TimeUnit;
diff --git a/subsonic-android/src/github/daneren2005/subdroid/util/Util.java b/subsonic-android/src/github/daneren2005/dsub/util/Util.java
index 178afd28..cd91af3c 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/util/Util.java
+++ b/subsonic-android/src/github/daneren2005/dsub/util/Util.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.util;
+package github.daneren2005.dsub.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -46,15 +46,15 @@ import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 import android.widget.TextView;
 import android.widget.Toast;
-import github.daneren2005.subdroid.R;
-import github.daneren2005.subdroid.activity.DownloadActivity;
-import github.daneren2005.subdroid.domain.MusicDirectory;
-import github.daneren2005.subdroid.domain.PlayerState;
-import github.daneren2005.subdroid.domain.RepeatMode;
-import github.daneren2005.subdroid.domain.Version;
-import github.daneren2005.subdroid.provider.SubsonicAppWidgetProvider1;
-import github.daneren2005.subdroid.receiver.MediaButtonIntentReceiver;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
+import github.daneren2005.dsub.R;
+import github.daneren2005.dsub.activity.DownloadActivity;
+import github.daneren2005.dsub.domain.MusicDirectory;
+import github.daneren2005.dsub.domain.PlayerState;
+import github.daneren2005.dsub.domain.RepeatMode;
+import github.daneren2005.dsub.domain.Version;
+import github.daneren2005.dsub.provider.SubsonicAppWidgetProvider1;
+import github.daneren2005.dsub.receiver.MediaButtonIntentReceiver;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
 import org.apache.http.HttpEntity;
 
 import java.io.ByteArrayOutputStream;
@@ -91,8 +91,8 @@ public final class Util {
     private static DecimalFormat KILO_BYTE_LOCALIZED_FORMAT = null;
     private static DecimalFormat BYTE_LOCALIZED_FORMAT = null;
 
-    public static final String EVENT_META_CHANGED = "github.daneren2005.subdroid.EVENT_META_CHANGED";
-    public static final String EVENT_PLAYSTATE_CHANGED = "github.daneren2005.subdroid.EVENT_PLAYSTATE_CHANGED";
+    public static final String EVENT_META_CHANGED = "github.daneren2005.dsub.EVENT_META_CHANGED";
+    public static final String EVENT_PLAYSTATE_CHANGED = "github.daneren2005.dsub.EVENT_PLAYSTATE_CHANGED";
 
     private static final Map<Integer, Version> SERVER_REST_VERSIONS = new ConcurrentHashMap<Integer, Version>();
 
diff --git a/subsonic-android/src/github/daneren2005/subdroid/view/VisualizerView.java b/subsonic-android/src/github/daneren2005/dsub/view/VisualizerView.java
index 942d96c9..9bff3a2d 100644
--- a/subsonic-android/src/github/daneren2005/subdroid/view/VisualizerView.java
+++ b/subsonic-android/src/github/daneren2005/dsub/view/VisualizerView.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.subdroid.view;
+package github.daneren2005.dsub.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -25,10 +25,10 @@ import android.graphics.Paint;
 import android.media.audiofx.Visualizer;
 import android.util.AttributeSet;
 import android.view.View;
-import github.daneren2005.subdroid.audiofx.VisualizerController;
-import github.daneren2005.subdroid.domain.PlayerState;
-import github.daneren2005.subdroid.service.DownloadService;
-import github.daneren2005.subdroid.service.DownloadServiceImpl;
+import github.daneren2005.dsub.audiofx.VisualizerController;
+import github.daneren2005.dsub.domain.PlayerState;
+import github.daneren2005.dsub.service.DownloadService;
+import github.daneren2005.dsub.service.DownloadServiceImpl;
 
 /**
  * A simple class that draws waveform data received from a
diff --git a/subsonic-android/tests/AndroidManifest.xml b/subsonic-android/tests/AndroidManifest.xml
index 9665fee9..fe239732 100644
--- a/subsonic-android/tests/AndroidManifest.xml
+++ b/subsonic-android/tests/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="github.daneren2005.subdroid.tests"
+          package="github.daneren2005.dsub.tests"
           android:versionCode="1"
           android:versionName="1.0">
     <!-- We add an application tag here just so that we can indicate that