Changed package name to subdroid to avoid getting banned by Google for being to similar to subphonic

95 files changed, 431 insertions, 422 deletions

diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/DownloadActivity.java
index 80c264f5..7e431d16 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/DownloadActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.PlayerState;
-import github.daneren2005.subphonic.domain.RepeatMode;
-import github.daneren2005.subphonic.service.DownloadFile;
-import github.daneren2005.subphonic.service.DownloadService;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.HorizontalSlider;
-import github.daneren2005.subphonic.util.SilentBackgroundTask;
-import github.daneren2005.subphonic.util.SongView;
-import github.daneren2005.subphonic.util.Util;
-import github.daneren2005.subphonic.view.VisualizerView;
-
-import static github.daneren2005.subphonic.domain.PlayerState.*;
+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 java.util.ArrayList;
 
 public class DownloadActivity extends SubsonicTabActivity implements OnGestureListener {
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/EqualizerActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/EqualizerActivity.java
index 4b706984..d96b360a 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/EqualizerActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/EqualizerActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.audiofx.EqualizerController;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.audiofx.EqualizerController;
+import github.daneren2005.subdroid.service.DownloadServiceImpl;
 
 /**
  * Equalizer controls.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/HelpActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/HelpActivity.java
index ea382887..a6deab05 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/HelpActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/HelpActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.util.Util;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.util.Util;
 
 /**
  * An HTML-based help screen with Back and Done buttons at the bottom.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/LyricsActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/LyricsActivity.java
index 10c5ee59..0666f2af 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/LyricsActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/LyricsActivity.java
@@ -17,17 +17,17 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.activity;
 
 import android.os.Bundle;
 import android.widget.TextView;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.Lyrics;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.util.BackgroundTask;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.TabActivityBackgroundTask;
+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;
 
 /**
  * Displays song lyrics.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/MainActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/MainActivity.java
index 89f2d4ae..88d4543a 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/MainActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/MainActivity.java
@@ -17,17 +17,18 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.activity;
 
 import java.util.Arrays;
 
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.service.DownloadService;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.MergeAdapter;
-import github.daneren2005.subphonic.util.Util;
-import github.daneren2005.subphonic.util.FileUtil;
+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 android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -40,6 +41,7 @@ import android.widget.AdapterView;
 import android.widget.ImageButton;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.PopupWindow;
 
 public class MainActivity extends SubsonicTabActivity {
 
@@ -156,6 +158,13 @@ public class MainActivity extends SubsonicTabActivity {
             @Override
             public void onClick(View view) {
             	startActivity(new Intent(MainActivity.this, SettingsActivity.class));
+				
+				/*LayoutInflater inflater = (LayoutInflater)MainActivity.this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+				PopupWindow pw = new PopupWindow(inflater.inflate(R.layout.overflow_menu, null, false), 100, 100, true);
+				pw.showAsDropDown(findViewById(R.id.action_button_4));*/
+				
+				/*PopupWindow window = new PopupWindow(findViewById(R.layout.overflow_menu));
+				window.showAsDropDown(findViewById(R.id.action_button_2));*/
             }
         });
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/PlayVideoActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/PlayVideoActivity.java
index a393d3a8..4c1dbc68 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/PlayVideoActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/PlayVideoActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.Util;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.service.MusicServiceFactory;
+import github.daneren2005.subdroid.util.Constants;
+import github.daneren2005.subdroid.util.Util;
 
 /**
  * Plays videos in a web page.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/QueryReceiverActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/QueryReceiverActivity.java
index cabae1ce..b52e78c8 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/QueryReceiverActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/QueryReceiverActivity.java
@@ -17,16 +17,16 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.Util;
-import github.daneren2005.subphonic.provider.SearchSuggestionProvider1;
+import github.daneren2005.subdroid.util.Constants;
+import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.subdroid.provider.SearchSuggestionProvider1;
 
 /**
  * Receives search queries and forwards to the SelectAlbumActivity.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/SearchActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/SearchActivity.java
index 0c3e1dc5..02d3e8b3 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/SearchActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/SearchActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.Artist;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.SearchCritera;
-import github.daneren2005.subphonic.domain.SearchResult;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.service.DownloadService;
-import github.daneren2005.subphonic.util.ArtistAdapter;
-import github.daneren2005.subphonic.util.BackgroundTask;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.EntryAdapter;
-import github.daneren2005.subphonic.util.MergeAdapter;
-import github.daneren2005.subphonic.util.TabActivityBackgroundTask;
-import github.daneren2005.subphonic.util.Util;
+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;
 
 /**
  * Performs searches and displays the matching artists, albums and songs.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/SelectAlbumActivity.java
index 7e6c0f70..84c3ae52 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/SelectAlbumActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.service.DownloadFile;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.EntryAdapter;
-import github.daneren2005.subphonic.util.Pair;
-import github.daneren2005.subphonic.util.TabActivityBackgroundTask;
-import github.daneren2005.subphonic.util.Util;
+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 java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/SelectArtistActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/SelectArtistActivity.java
index 4bd525d8..db66f989 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/SelectArtistActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/SelectArtistActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.Artist;
-import github.daneren2005.subphonic.domain.Indexes;
-import github.daneren2005.subphonic.domain.MusicFolder;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.util.ArtistAdapter;
-import github.daneren2005.subphonic.util.BackgroundTask;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.TabActivityBackgroundTask;
-import github.daneren2005.subphonic.util.Util;
+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 java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/SelectPlaylistActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/SelectPlaylistActivity.java
index 6903eaba..e4a3c4ad 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/SelectPlaylistActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/SelectPlaylistActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.Playlist;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.util.BackgroundTask;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.PlaylistAdapter;
-import github.daneren2005.subphonic.util.TabActivityBackgroundTask;
-import github.daneren2005.subphonic.util.Util;
+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 java.util.List;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/SettingsActivity.java
index 3c362f1b..1f3b6322 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/SettingsActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/SettingsActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.provider.SearchSuggestionProvider1;
-import github.daneren2005.subphonic.service.DownloadService;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.ErrorDialog;
-import github.daneren2005.subphonic.util.FileUtil;
-import github.daneren2005.subphonic.util.ModalBackgroundTask;
-import github.daneren2005.subphonic.util.Util;
+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 java.io.File;
 import java.net.URL;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/SubsonicTabActivity.java
index 8d3543aa..d8348b75 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/SubsonicTabActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.service.DownloadService;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.ImageLoader;
-import github.daneren2005.subphonic.util.ModalBackgroundTask;
-import github.daneren2005.subphonic.util.Util;
+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;
 
 /**
  * @author Sindre Mehus
@@ -344,7 +344,7 @@ public class SubsonicTabActivity extends Activity {
             PrintWriter printWriter = null;
             try {
 
-                PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.subphonic", 0);
+                PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.subdroid", 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/subphonic/activity/VoiceQueryReceiverActivity.java b/subsonic-android/src/github/daneren2005/subdroid/activity/VoiceQueryReceiverActivity.java
index 2ae9a1b4..a9c64df3 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/activity/VoiceQueryReceiverActivity.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/activity/VoiceQueryReceiverActivity.java
@@ -17,16 +17,16 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package github.daneren2005.subphonic.activity;
+package github.daneren2005.subdroid.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.Util;
-import github.daneren2005.subphonic.provider.SearchSuggestionProvider1;
+import github.daneren2005.subdroid.util.Constants;
+import github.daneren2005.subdroid.util.Util;
+import github.daneren2005.subdroid.provider.SearchSuggestionProvider1;
 
 /**
  * Receives voice search queries and forwards to the SearchActivity.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/audiofx/EqualizerController.java b/subsonic-android/src/github/daneren2005/subdroid/audiofx/EqualizerController.java
index f2dbc352..f51a3c99 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/audiofx/EqualizerController.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/audiofx/EqualizerController.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.audiofx;
+package github.daneren2005.subdroid.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.subphonic.util.FileUtil;
+import github.daneren2005.subdroid.util.FileUtil;
 
 /**
  * Backward-compatible wrapper for {@link Equalizer}, which is API Level 9.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/audiofx/VisualizerController.java b/subsonic-android/src/github/daneren2005/subdroid/audiofx/VisualizerController.java
index 79c7f596..f4034715 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/audiofx/VisualizerController.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/audiofx/VisualizerController.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.audiofx;
+package github.daneren2005.subdroid.audiofx;
 
 import android.content.Context;
 import android.media.MediaPlayer;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/Artist.java b/subsonic-android/src/github/daneren2005/subdroid/domain/Artist.java
index 416b8b0a..1fb640a6 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/Artist.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/Artist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/Indexes.java b/subsonic-android/src/github/daneren2005/subdroid/domain/Indexes.java
index fd42379b..1c3a90b7 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/Indexes.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/Indexes.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 import java.util.List;
 import java.io.Serializable;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/JukeboxStatus.java b/subsonic-android/src/github/daneren2005/subdroid/domain/JukeboxStatus.java
index 6aa8c584..57c657b2 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/JukeboxStatus.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/JukeboxStatus.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/Lyrics.java b/subsonic-android/src/github/daneren2005/subdroid/domain/Lyrics.java
index 7d9422da..f28d818c 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/Lyrics.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/Lyrics.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 /**
  * Song lyrics.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/MusicDirectory.java b/subsonic-android/src/github/daneren2005/subdroid/domain/MusicDirectory.java
index 52201032..591befba 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/MusicDirectory.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/MusicDirectory.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/MusicFolder.java b/subsonic-android/src/github/daneren2005/subdroid/domain/MusicFolder.java
index 8a72e93e..3cc48fc0 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/MusicFolder.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/MusicFolder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/PlayerState.java b/subsonic-android/src/github/daneren2005/subdroid/domain/PlayerState.java
index 98fd3c4b..81b29e09 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/PlayerState.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/PlayerState.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/Playlist.java b/subsonic-android/src/github/daneren2005/subdroid/domain/Playlist.java
index e4413620..003fc75f 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/Playlist.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/Playlist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/RepeatMode.java b/subsonic-android/src/github/daneren2005/subdroid/domain/RepeatMode.java
index 41421ef2..5c092093 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/RepeatMode.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/RepeatMode.java
@@ -1,4 +1,4 @@
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/SearchCritera.java b/subsonic-android/src/github/daneren2005/subdroid/domain/SearchCritera.java
index a577ce60..93a022de 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/SearchCritera.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/SearchCritera.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 /**
  * The criteria for a music search.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/SearchResult.java b/subsonic-android/src/github/daneren2005/subdroid/domain/SearchResult.java
index 8dc08bc0..fef3672f 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/SearchResult.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/SearchResult.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 import java.util.List;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/ServerInfo.java b/subsonic-android/src/github/daneren2005/subdroid/domain/ServerInfo.java
index fc0252af..db9aedfd 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/ServerInfo.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/ServerInfo.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 /**
  * Information about the Subsonic server.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/domain/Version.java b/subsonic-android/src/github/daneren2005/subdroid/domain/Version.java
index e827c95a..c79117d2 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/domain/Version.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/domain/Version.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.domain;
+package github.daneren2005.subdroid.domain;
 
 /**
  * Represents the version number of the Subsonic Android app.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/provider/SearchSuggestionProvider1.java b/subsonic-android/src/github/daneren2005/subdroid/provider/SearchSuggestionProvider1.java
index 8cf8b8c7..2edf82f1 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/provider/SearchSuggestionProvider1.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/provider/SearchSuggestionProvider1.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.provider;
+package github.daneren2005.subdroid.provider;
 
 import android.content.SearchRecentSuggestionsProvider;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/provider/SubsonicAppWidgetProvider1.java b/subsonic-android/src/github/daneren2005/subdroid/provider/SubsonicAppWidgetProvider1.java
index b0ffdc3a..99ef21ac 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/provider/SubsonicAppWidgetProvider1.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/provider/SubsonicAppWidgetProvider1.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.provider;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.activity.DownloadActivity;
-import github.daneren2005.subphonic.activity.MainActivity;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.service.DownloadService;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
-import github.daneren2005.subphonic.util.FileUtil;
+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;
 
 /**
  * Simple widget to show currently playing album art along
diff --git a/subsonic-android/src/github/daneren2005/subphonic/receiver/BluetoothIntentReceiver.java b/subsonic-android/src/github/daneren2005/subdroid/receiver/BluetoothIntentReceiver.java
index f643375e..97003b6a 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/receiver/BluetoothIntentReceiver.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/receiver/BluetoothIntentReceiver.java
@@ -16,14 +16,14 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.receiver;
+package github.daneren2005.subdroid.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
-import github.daneren2005.subphonic.util.Util;
+import github.daneren2005.subdroid.service.DownloadServiceImpl;
+import github.daneren2005.subdroid.util.Util;
 
 /**
  * Request media button focus when connected to Bluetooth A2DP.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/receiver/MediaButtonIntentReceiver.java b/subsonic-android/src/github/daneren2005/subdroid/receiver/MediaButtonIntentReceiver.java
index f1c2a01a..6bd83e7c 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/receiver/MediaButtonIntentReceiver.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/receiver/MediaButtonIntentReceiver.java
@@ -16,14 +16,14 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.receiver;
+package github.daneren2005.subdroid.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 import android.view.KeyEvent;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
+import github.daneren2005.subdroid.service.DownloadServiceImpl;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/CachedMusicService.java b/subsonic-android/src/github/daneren2005/subdroid/service/CachedMusicService.java
index 2d0ebf55..e9e1df42 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/CachedMusicService.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/CachedMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.domain.Indexes;
-import github.daneren2005.subphonic.domain.JukeboxStatus;
-import github.daneren2005.subphonic.domain.Lyrics;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.MusicFolder;
-import github.daneren2005.subphonic.domain.Playlist;
-import github.daneren2005.subphonic.domain.SearchCritera;
-import github.daneren2005.subphonic.domain.SearchResult;
-import github.daneren2005.subphonic.domain.Version;
-import github.daneren2005.subphonic.util.CancellableTask;
-import github.daneren2005.subphonic.util.LRUCache;
-import github.daneren2005.subphonic.util.ProgressListener;
-import github.daneren2005.subphonic.util.TimeLimitedCache;
-import github.daneren2005.subphonic.util.Util;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/DownloadFile.java b/subsonic-android/src/github/daneren2005/subdroid/service/DownloadFile.java
index 192bd823..3519cce3 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/DownloadFile.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/DownloadFile.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.util.CancellableTask;
-import github.daneren2005.subphonic.util.FileUtil;
-import github.daneren2005.subphonic.util.Util;
-import github.daneren2005.subphonic.util.CacheCleaner;
+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 org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/DownloadService.java b/subsonic-android/src/github/daneren2005/subdroid/service/DownloadService.java
index 1301464f..20812aa1 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/DownloadService.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/DownloadService.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.service;
 
 import java.util.List;
 
-import github.daneren2005.subphonic.audiofx.EqualizerController;
-import github.daneren2005.subphonic.audiofx.VisualizerController;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.PlayerState;
-import github.daneren2005.subphonic.domain.RepeatMode;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/subdroid/service/DownloadServiceImpl.java
index 70438ad8..fef09220 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/DownloadServiceImpl.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/DownloadServiceImpl.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.audiofx.EqualizerController;
-import github.daneren2005.subphonic.audiofx.VisualizerController;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.PlayerState;
-import github.daneren2005.subphonic.domain.RepeatMode;
-import github.daneren2005.subphonic.util.CancellableTask;
-import github.daneren2005.subphonic.util.LRUCache;
-import github.daneren2005.subphonic.util.ShufflePlayBuffer;
-import github.daneren2005.subphonic.util.SimpleServiceBinder;
-import github.daneren2005.subphonic.util.Util;
+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 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.subphonic.domain.PlayerState.*;
-import github.daneren2005.subphonic.util.*;
+import static github.daneren2005.subdroid.domain.PlayerState.*;
+import github.daneren2005.subdroid.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.subphonic.CMD_PLAY";
-    public static final String CMD_TOGGLEPAUSE = "github.daneren2005.subphonic.CMD_TOGGLEPAUSE";
-    public static final String CMD_PAUSE = "github.daneren2005.subphonic.CMD_PAUSE";
-    public static final String CMD_STOP = "github.daneren2005.subphonic.CMD_STOP";
-    public static final String CMD_PREVIOUS = "github.daneren2005.subphonic.CMD_PREVIOUS";
-    public static final String CMD_NEXT = "github.daneren2005.subphonic.CMD_NEXT";
+    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";
 
     private final IBinder binder = new SimpleServiceBinder<DownloadService>(this);
     private MediaPlayer mediaPlayer;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/DownloadServiceLifecycleSupport.java b/subsonic-android/src/github/daneren2005/subdroid/service/DownloadServiceLifecycleSupport.java
index c58fca6d..3741af8c 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/DownloadServiceLifecycleSupport.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/DownloadServiceLifecycleSupport.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.PlayerState;
-import github.daneren2005.subphonic.util.CacheCleaner;
-import github.daneren2005.subphonic.util.FileUtil;
-import github.daneren2005.subphonic.util.Util;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/JukeboxService.java b/subsonic-android/src/github/daneren2005/subdroid/service/JukeboxService.java
index cf2f5dba..aa363438 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/JukeboxService.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/JukeboxService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.JukeboxStatus;
-import github.daneren2005.subphonic.domain.PlayerState;
-import github.daneren2005.subphonic.service.parser.SubsonicRESTException;
-import github.daneren2005.subphonic.util.Util;
+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 java.util.ArrayList;
 import java.util.Iterator;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/MediaStoreService.java b/subsonic-android/src/github/daneren2005/subdroid/service/MediaStoreService.java
index c330f18c..0cb27742 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/MediaStoreService.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/MediaStoreService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.util.FileUtil;
+import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.subdroid.util.FileUtil;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/MusicService.java b/subsonic-android/src/github/daneren2005/subdroid/service/MusicService.java
index b74af3d4..0d744b69 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/MusicService.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/MusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.domain.Indexes;
-import github.daneren2005.subphonic.domain.JukeboxStatus;
-import github.daneren2005.subphonic.domain.Lyrics;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.MusicFolder;
-import github.daneren2005.subphonic.domain.Playlist;
-import github.daneren2005.subphonic.domain.SearchCritera;
-import github.daneren2005.subphonic.domain.SearchResult;
-import github.daneren2005.subphonic.domain.Version;
-import github.daneren2005.subphonic.util.CancellableTask;
-import github.daneren2005.subphonic.util.ProgressListener;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/MusicServiceFactory.java b/subsonic-android/src/github/daneren2005/subdroid/service/MusicServiceFactory.java
index 9181f1c8..a7dbc2df 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/MusicServiceFactory.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/MusicServiceFactory.java
@@ -16,10 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.service;
 
 import android.content.Context;
-import github.daneren2005.subphonic.util.Util;
+import github.daneren2005.subdroid.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/OfflineException.java b/subsonic-android/src/github/daneren2005/subdroid/service/OfflineException.java
index 714cc7e9..21f30e24 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/OfflineException.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/OfflineException.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.service;
 
 /**
  * Thrown by service methods that are not available in offline mode.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/OfflineMusicService.java b/subsonic-android/src/github/daneren2005/subdroid/service/OfflineMusicService.java
index 56d18414..2701be27 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/OfflineMusicService.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/OfflineMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.domain.Artist;
-import github.daneren2005.subphonic.domain.Indexes;
-import github.daneren2005.subphonic.domain.JukeboxStatus;
-import github.daneren2005.subphonic.domain.Lyrics;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.MusicFolder;
-import github.daneren2005.subphonic.domain.Playlist;
-import github.daneren2005.subphonic.domain.SearchCritera;
-import github.daneren2005.subphonic.domain.SearchResult;
-import github.daneren2005.subphonic.service.parser.PlaylistParser;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.FileUtil;
-import github.daneren2005.subphonic.util.ProgressListener;
-import github.daneren2005.subphonic.util.Util;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/RESTMusicService.java b/subsonic-android/src/github/daneren2005/subdroid/service/RESTMusicService.java
index 133c165a..12f91189 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/RESTMusicService.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/RESTMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.Indexes;
-import github.daneren2005.subphonic.domain.JukeboxStatus;
-import github.daneren2005.subphonic.domain.Lyrics;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.MusicFolder;
-import github.daneren2005.subphonic.domain.Playlist;
-import github.daneren2005.subphonic.domain.SearchCritera;
-import github.daneren2005.subphonic.domain.SearchResult;
-import github.daneren2005.subphonic.domain.ServerInfo;
-import github.daneren2005.subphonic.domain.Version;
-import github.daneren2005.subphonic.service.parser.AlbumListParser;
-import github.daneren2005.subphonic.service.parser.ErrorParser;
-import github.daneren2005.subphonic.service.parser.IndexesParser;
-import github.daneren2005.subphonic.service.parser.JukeboxStatusParser;
-import github.daneren2005.subphonic.service.parser.LicenseParser;
-import github.daneren2005.subphonic.service.parser.LyricsParser;
-import github.daneren2005.subphonic.service.parser.MusicDirectoryParser;
-import github.daneren2005.subphonic.service.parser.MusicFoldersParser;
-import github.daneren2005.subphonic.service.parser.PlaylistParser;
-import github.daneren2005.subphonic.service.parser.PlaylistsParser;
-import github.daneren2005.subphonic.service.parser.RandomSongsParser;
-import github.daneren2005.subphonic.service.parser.SearchResult2Parser;
-import github.daneren2005.subphonic.service.parser.SearchResultParser;
-import github.daneren2005.subphonic.service.parser.VersionParser;
-import github.daneren2005.subphonic.service.ssl.SSLSocketFactory;
-import github.daneren2005.subphonic.service.ssl.TrustSelfSignedStrategy;
-import github.daneren2005.subphonic.util.CancellableTask;
-import github.daneren2005.subphonic.util.Constants;
-import github.daneren2005.subphonic.util.FileUtil;
-import github.daneren2005.subphonic.util.ProgressListener;
-import github.daneren2005.subphonic.util.Util;
+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;
 
 /**
  * @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.subphonic", 0);
+        PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.subdroid", 0);
         return new Version(packageInfo.versionName);
     }
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/Scrobbler.java b/subsonic-android/src/github/daneren2005/subdroid/service/Scrobbler.java
index de0e9980..be6e9fc8 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/Scrobbler.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/Scrobbler.java
@@ -1,8 +1,8 @@
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.service;
 
 import android.content.Context;
 import android.util.Log;
-import github.daneren2005.subphonic.util.Util;
+import github.daneren2005.subdroid.util.Util;
 
 /**
  * Scrobbles played songs to Last.fm.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/ServerTooOldException.java b/subsonic-android/src/github/daneren2005/subdroid/service/ServerTooOldException.java
index 2417eb10..8c48192d 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/ServerTooOldException.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/ServerTooOldException.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service;
+package github.daneren2005.subdroid.service;
 
-import github.daneren2005.subphonic.domain.Version;
+import github.daneren2005.subdroid.domain.Version;
 
 /**
  * Thrown if the REST API version implemented by the server is too old.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/AbstractParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/AbstractParser.java
index 59acb60f..8f136e1c 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/AbstractParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/AbstractParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.Version;
-import github.daneren2005.subphonic.util.ProgressListener;
-import github.daneren2005.subphonic.util.Util;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.Version;
+import github.daneren2005.subdroid.util.ProgressListener;
+import github.daneren2005.subdroid.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/AlbumListParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/AlbumListParser.java
index f021fc68..a1b3a5aa 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/AlbumListParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/AlbumListParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.subdroid.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/ErrorParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/ErrorParser.java
index 5e2bc154..6323eeb6 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/ErrorParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/ErrorParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/IndexesParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/IndexesParser.java
index 7a9d8385..6ffc7a5d 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/IndexesParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/IndexesParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.Artist;
-import github.daneren2005.subphonic.domain.Indexes;
-import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.Artist;
+import github.daneren2005.subdroid.domain.Indexes;
+import github.daneren2005.subdroid.util.ProgressListener;
 import android.util.Log;
 
 /**
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/JukeboxStatusParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/JukeboxStatusParser.java
index eed7e4a6..2d3a0e88 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/JukeboxStatusParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/JukeboxStatusParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import java.io.Reader;
 
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.domain.JukeboxStatus;
+import github.daneren2005.subdroid.domain.JukeboxStatus;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/LicenseParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/LicenseParser.java
index 22b82f24..695c4744 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/LicenseParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/LicenseParser.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 
-import github.daneren2005.subphonic.domain.ServerInfo;
-import github.daneren2005.subphonic.domain.Version;
+import github.daneren2005.subdroid.domain.ServerInfo;
+import github.daneren2005.subdroid.domain.Version;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/LyricsParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/LyricsParser.java
index be0c498a..5fef9ce2 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/LyricsParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/LyricsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.Lyrics;
-import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.Lyrics;
+import github.daneren2005.subdroid.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicDirectoryEntryParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicDirectoryEntryParser.java
index 22b8a2da..01ba1081 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicDirectoryEntryParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicDirectoryEntryParser.java
@@ -16,10 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subdroid.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicDirectoryParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicDirectoryParser.java
index feffce37..d705991c 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicDirectoryParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicDirectoryParser.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
 import android.util.Log;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.subdroid.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicFoldersParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicFoldersParser.java
index e3447ddf..e043aeb4 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicFoldersParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/MusicFoldersParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicFolder;
-import github.daneren2005.subphonic.domain.Playlist;
-import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.MusicFolder;
+import github.daneren2005.subdroid.domain.Playlist;
+import github.daneren2005.subdroid.util.ProgressListener;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/PlaylistParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/PlaylistParser.java
index 84be75ff..7826a712 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/PlaylistParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/PlaylistParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.subdroid.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/PlaylistsParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/PlaylistsParser.java
index 16592ced..bd8a5bfe 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/PlaylistsParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/PlaylistsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.Playlist;
-import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.Playlist;
+import github.daneren2005.subdroid.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/RandomSongsParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/RandomSongsParser.java
index 9a318754..eaeb7214 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/RandomSongsParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/RandomSongsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.subdroid.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/SearchResult2Parser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/SearchResult2Parser.java
index 535ea8ac..cb2f9ec2 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/SearchResult2Parser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/SearchResult2Parser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.SearchResult;
-import github.daneren2005.subphonic.domain.Artist;
-import github.daneren2005.subphonic.util.ProgressListener;
+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 org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/SearchResultParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/SearchResultParser.java
index 57a19d16..7a899011 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/SearchResultParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/SearchResultParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 import android.content.Context;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.SearchResult;
-import github.daneren2005.subphonic.domain.Artist;
-import github.daneren2005.subphonic.util.ProgressListener;
+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 org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/SubsonicRESTException.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/SubsonicRESTException.java
index 0a651ef2..a694eeea 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/SubsonicRESTException.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/SubsonicRESTException.java
@@ -1,4 +1,4 @@
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/parser/VersionParser.java b/subsonic-android/src/github/daneren2005/subdroid/service/parser/VersionParser.java
index 6d28ff7e..3ccd4f9a 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/parser/VersionParser.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/parser/VersionParser.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.service.parser;
+package github.daneren2005.subdroid.service.parser;
 
-import github.daneren2005.subphonic.domain.Version;
+import github.daneren2005.subdroid.domain.Version;
 
 import java.io.BufferedReader;
 import java.io.Reader;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/ssl/SSLSocketFactory.java b/subsonic-android/src/github/daneren2005/subdroid/service/ssl/SSLSocketFactory.java
index f715ff37..c7ee8950 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/ssl/SSLSocketFactory.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/ssl/SSLSocketFactory.java
@@ -25,7 +25,7 @@
  *
  */
 
-package github.daneren2005.subphonic.service.ssl;
+package github.daneren2005.subdroid.service.ssl;
 
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.scheme.HostNameResolver;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustManagerDecorator.java b/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustManagerDecorator.java
index b8966c59..a99f2608 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustManagerDecorator.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustManagerDecorator.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.daneren2005.subphonic.service.ssl;
+package github.daneren2005.subdroid.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustSelfSignedStrategy.java b/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustSelfSignedStrategy.java
index 7a583a95..5aa1344c 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustSelfSignedStrategy.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustSelfSignedStrategy.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.daneren2005.subphonic.service.ssl;
+package github.daneren2005.subdroid.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustStrategy.java b/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustStrategy.java
index 93cac139..75ae6e54 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustStrategy.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/service/ssl/TrustStrategy.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package github.daneren2005.subphonic.service.ssl;
+package github.daneren2005.subdroid.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/AlbumView.java b/subsonic-android/src/github/daneren2005/subdroid/util/AlbumView.java
index 84fdd6d9..27cfc77b 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/AlbumView.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/AlbumView.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.MusicDirectory;
 
 /**
  * Used to display albums in a {@code ListView}.
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/ArtistAdapter.java b/subsonic-android/src/github/daneren2005/subdroid/util/ArtistAdapter.java
index 6e60d1d8..6973af8c 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/ArtistAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/ArtistAdapter.java
@@ -16,10 +16,10 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
-import github.daneren2005.subphonic.domain.Artist;
-import github.daneren2005.subphonic.R;
+import github.daneren2005.subdroid.domain.Artist;
+import github.daneren2005.subdroid.R;
 import android.widget.ArrayAdapter;
 import android.widget.SectionIndexer;
 import android.content.Context;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/BackgroundTask.java b/subsonic-android/src/github/daneren2005/subdroid/util/BackgroundTask.java
index 92521aa0..ac8c9da7 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/BackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/BackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic.R;
+import github.daneren2005.subdroid.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/CacheCleaner.java b/subsonic-android/src/github/daneren2005/subdroid/util/CacheCleaner.java
index f66ae910..66c8b959 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/CacheCleaner.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/CacheCleaner.java
@@ -1,4 +1,4 @@
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic.service.DownloadFile;
-import github.daneren2005.subphonic.service.DownloadService;
+import github.daneren2005.subdroid.service.DownloadFile;
+import github.daneren2005.subdroid.service.DownloadService;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/CancellableTask.java b/subsonic-android/src/github/daneren2005/subdroid/util/CancellableTask.java
index 1886e4d0..be30a08b 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/CancellableTask.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/CancellableTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/Constants.java b/subsonic-android/src/github/daneren2005/subdroid/util/Constants.java
index c6cd6df6..1b49cd4a 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/Constants.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/Constants.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic_preferences";
+    public static final String PREFERENCES_FILE_NAME = "github.daneren2005.subdroid_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/subphonic/util/EntryAdapter.java b/subsonic-android/src/github/daneren2005/subdroid/util/EntryAdapter.java
index ba675a1a..66250165 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/EntryAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/EntryAdapter.java
@@ -16,15 +16,15 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import java.util.List;
 
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import github.daneren2005.subphonic.activity.SubsonicTabActivity;
-import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subdroid.activity.SubsonicTabActivity;
+import github.daneren2005.subdroid.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/ErrorDialog.java b/subsonic-android/src/github/daneren2005/subdroid/util/ErrorDialog.java
index 9adddccd..3f2138be 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/ErrorDialog.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/ErrorDialog.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import github.daneren2005.subphonic.R;
+import github.daneren2005.subdroid.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/FileUtil.java b/subsonic-android/src/github/daneren2005/subdroid/util/FileUtil.java
index a97d13a5..a36b9e9f 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/FileUtil.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/FileUtil.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic.domain.MusicDirectory;
+import github.daneren2005.subdroid.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/HorizontalSlider.java b/subsonic-android/src/github/daneren2005/subdroid/util/HorizontalSlider.java
index f6c5f841..01e24fd5 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/HorizontalSlider.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/HorizontalSlider.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic.R;
+import github.daneren2005.subdroid.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/ImageLoader.java b/subsonic-android/src/github/daneren2005/subdroid/util/ImageLoader.java
index 5a649250..0ac08f1f 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/ImageLoader.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/ImageLoader.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.subdroid.service.MusicService;
+import github.daneren2005.subdroid.service.MusicServiceFactory;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/LRUCache.java b/subsonic-android/src/github/daneren2005/subdroid/util/LRUCache.java
index 3e008da4..f9516e04 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/LRUCache.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/LRUCache.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import java.lang.ref.SoftReference;
 import java.util.HashMap;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/MergeAdapter.java b/subsonic-android/src/github/daneren2005/subdroid/util/MergeAdapter.java
index 0002cb57..c83cfb7b 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/MergeAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/MergeAdapter.java
@@ -13,7 +13,7 @@
  limitations under the License.
  */
 
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.database.DataSetObserver;
 import android.view.View;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/ModalBackgroundTask.java b/subsonic-android/src/github/daneren2005/subdroid/util/ModalBackgroundTask.java
index 4bd384db..0733355f 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/ModalBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/ModalBackgroundTask.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.util.Log;
-import github.daneren2005.subphonic.R;
+import github.daneren2005.subdroid.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/MyViewFlipper.java b/subsonic-android/src/github/daneren2005/subdroid/util/MyViewFlipper.java
index 18d0f362..31710593 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/MyViewFlipper.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/MyViewFlipper.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/Pair.java b/subsonic-android/src/github/daneren2005/subdroid/util/Pair.java
index 1f40fdf1..e4bc7ee5 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/Pair.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/Pair.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/PlaylistAdapter.java b/subsonic-android/src/github/daneren2005/subdroid/util/PlaylistAdapter.java
index c434479a..e446bf04 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/PlaylistAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/PlaylistAdapter.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.content.Context;
 import android.widget.ArrayAdapter;
 import android.widget.SectionIndexer;
-import github.daneren2005.subphonic.R;
-import github.daneren2005.subphonic.domain.Playlist;
+import github.daneren2005.subdroid.R;
+import github.daneren2005.subdroid.domain.Playlist;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/ProgressListener.java b/subsonic-android/src/github/daneren2005/subdroid/util/ProgressListener.java
index 0742b6f6..1381eaf6 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/ProgressListener.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/ProgressListener.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/SackOfViewsAdapter.java b/subsonic-android/src/github/daneren2005/subdroid/util/SackOfViewsAdapter.java
index 426d14a2..645e3e49 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/SackOfViewsAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/SackOfViewsAdapter.java
@@ -12,7 +12,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/ShufflePlayBuffer.java b/subsonic-android/src/github/daneren2005/subdroid/util/ShufflePlayBuffer.java
index c6bbf785..a4108f0a 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/ShufflePlayBuffer.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/ShufflePlayBuffer.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.service.MusicService;
-import github.daneren2005.subphonic.service.MusicServiceFactory;
+import github.daneren2005.subdroid.domain.MusicDirectory;
+import github.daneren2005.subdroid.service.MusicService;
+import github.daneren2005.subdroid.service.MusicServiceFactory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/SilentBackgroundTask.java b/subsonic-android/src/github/daneren2005/subdroid/util/SilentBackgroundTask.java
index 56abbec4..b8592a66 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/SilentBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/SilentBackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.app.Activity;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/SimpleServiceBinder.java b/subsonic-android/src/github/daneren2005/subdroid/util/SimpleServiceBinder.java
index 864ca662..25b46b5a 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/SimpleServiceBinder.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/SimpleServiceBinder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import android.os.Binder;
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/SongView.java b/subsonic-android/src/github/daneren2005/subdroid/util/SongView.java
index 1d89f0d2..7c29c331 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/SongView.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/SongView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.service.DownloadService;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
-import github.daneren2005.subphonic.service.DownloadFile;
+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 java.io.File;
 import java.util.WeakHashMap;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/TabActivityBackgroundTask.java b/subsonic-android/src/github/daneren2005/subdroid/util/TabActivityBackgroundTask.java
index 62066a91..0372920f 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/TabActivityBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/TabActivityBackgroundTask.java
@@ -1,6 +1,6 @@
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
-import github.daneren2005.subphonic.activity.SubsonicTabActivity;
+import github.daneren2005.subdroid.activity.SubsonicTabActivity;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/TimeLimitedCache.java b/subsonic-android/src/github/daneren2005/subdroid/util/TimeLimitedCache.java
index 4d1220f6..0dd1efaf 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/TimeLimitedCache.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/TimeLimitedCache.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.util;
 
 import java.lang.ref.SoftReference;
 import java.util.concurrent.TimeUnit;
diff --git a/subsonic-android/src/github/daneren2005/subphonic/util/Util.java b/subsonic-android/src/github/daneren2005/subdroid/util/Util.java
index 468cbbdf..178afd28 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/util/Util.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/util/Util.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.util;
+package github.daneren2005.subdroid.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.subphonic.R;
-import github.daneren2005.subphonic.activity.DownloadActivity;
-import github.daneren2005.subphonic.domain.MusicDirectory;
-import github.daneren2005.subphonic.domain.PlayerState;
-import github.daneren2005.subphonic.domain.RepeatMode;
-import github.daneren2005.subphonic.domain.Version;
-import github.daneren2005.subphonic.provider.SubsonicAppWidgetProvider1;
-import github.daneren2005.subphonic.receiver.MediaButtonIntentReceiver;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
+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 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.subphonic.EVENT_META_CHANGED";
-    public static final String EVENT_PLAYSTATE_CHANGED = "github.daneren2005.subphonic.EVENT_PLAYSTATE_CHANGED";
+    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";
 
     private static final Map<Integer, Version> SERVER_REST_VERSIONS = new ConcurrentHashMap<Integer, Version>();
 
diff --git a/subsonic-android/src/github/daneren2005/subphonic/view/VisualizerView.java b/subsonic-android/src/github/daneren2005/subdroid/view/VisualizerView.java
index c0da92a9..942d96c9 100644
--- a/subsonic-android/src/github/daneren2005/subphonic/view/VisualizerView.java
+++ b/subsonic-android/src/github/daneren2005/subdroid/view/VisualizerView.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package github.daneren2005.subphonic.view;
+package github.daneren2005.subdroid.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.subphonic.audiofx.VisualizerController;
-import github.daneren2005.subphonic.domain.PlayerState;
-import github.daneren2005.subphonic.service.DownloadService;
-import github.daneren2005.subphonic.service.DownloadServiceImpl;
+import github.daneren2005.subdroid.audiofx.VisualizerController;
+import github.daneren2005.subdroid.domain.PlayerState;
+import github.daneren2005.subdroid.service.DownloadService;
+import github.daneren2005.subdroid.service.DownloadServiceImpl;
 
 /**
  * A simple class that draws waveform data received from a