109 files changed, 591 insertions, 567 deletions
diff --git a/subsonic-android/AndroidManifest.xml b/subsonic-android/AndroidManifest.xml
index a6c33662..2f7f2e36 100644
--- a/subsonic-android/AndroidManifest.xml
+++ b/subsonic-android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="net.sourceforge.subsonic.androidapp"
+          package="github.daneren2005.subphonic"
           android:installLocation="auto"
           android:versionCode="1"
           android:versionName="3.3.1">
@@ -19,7 +19,7 @@
 
     <application android:label="@string/common.appname" android:icon="@drawable/launch" android:theme="@style/Wheat">
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.MainActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.MainActivity"
                   android:label="Subphonic"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="standard">
@@ -29,46 +29,46 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.SelectArtistActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.SelectArtistActivity"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="standard"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.SelectAlbumActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.SelectAlbumActivity"
                   android:configChanges="orientation|keyboardHidden"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.SearchActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.SearchActivity"
                   android:label="@string/search.label"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.SelectPlaylistActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.SelectPlaylistActivity"
                   android:label="@string/playlist.label"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="standard"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.DownloadActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.DownloadActivity"
                   android:configChanges="keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.SettingsActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.SettingsActivity"
                   android:theme="@android:style/Theme"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.HelpActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.HelpActivity"
                   android:label="@string/help.label"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.LyricsActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.LyricsActivity"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.EqualizerActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.EqualizerActivity"
                   android:label="@string/equalizer.label"
                   android:configChanges="orientation|keyboardHidden"
                   android:launchMode="singleTask"/>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.VoiceQueryReceiverActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.VoiceQueryReceiverActivity"
                   android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
@@ -76,7 +76,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="net.sourceforge.subsonic.androidapp.activity.QueryReceiverActivity"
+        <activity android:name="github.daneren2005.subphonic.activity.QueryReceiverActivity"
                   android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH"/>
@@ -84,33 +84,33 @@
             <meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
         </activity>
 
-        <service android:name="net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl"
+        <service android:name="github.daneren2005.subphonic.service.DownloadServiceImpl"
                  android:label="Subsonic Download Service"/>
 
-        <receiver android:name="net.sourceforge.subsonic.androidapp.receiver.MediaButtonIntentReceiver">
+        <receiver android:name="github.daneren2005.subphonic.receiver.MediaButtonIntentReceiver">
             <intent-filter android:priority="999">
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name="net.sourceforge.subsonic.androidapp.receiver.BluetoothIntentReceiver">
+        <receiver android:name="github.daneren2005.subphonic.receiver.BluetoothIntentReceiver">
             <intent-filter>
                 <action android:name="android.bluetooth.a2dp.action.SINK_STATE_CHANGED"/>
             </intent-filter>
         </receiver>
 
-        <receiver android:name="net.sourceforge.subsonic.androidapp.provider.SubsonicAppWidgetProvider" >
+        <receiver android:name="github.daneren2005.subphonic.provider.SubsonicAppWidgetProvider1" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
             <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info"/>
         </receiver>
 
-        <provider android:name="net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider"
-                  android:authorities="net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider"/>
+        <provider android:name="github.daneren2005.subphonic.provider.SearchSuggestionProvider1"
+                  android:authorities="github.daneren2005.subphonic.provider.SearchSuggestionProvider1"/>
 
         <meta-data android:name="android.app.default_searchable"
-                   android:value="net.sourceforge.subsonic.androidapp.activity.QueryReceiverActivity"/>
+                   android:value="github.daneren2005.subphonic.activity.QueryReceiverActivity"/>
 
     </application>
 
diff --git a/subsonic-android/assets/html/en/index.html b/subsonic-android/assets/html/en/index.html
index 6462ef1f..a504da34 100644
--- a/subsonic-android/assets/html/en/index.html
+++ b/subsonic-android/assets/html/en/index.html
@@ -7,10 +7,10 @@
 
 <body>
 
-<h3><img src="../img/subsonic.png" alt=""> Welcome to Subsonic</h3>
+<h3><img src="../img/subsonic.png" alt=""> Welcome to Subphonic</h3>
 
 <p>
-    With <b>Subsonic</b> you can easily stream or download music from your home computer to your Android phone
+    With <b>Subphonic</b> you can easily stream or download music from your home computer to your Android phone
     (and do lots of other cool stuff too).
 </p>
 
diff --git a/subsonic-android/build.properties b/subsonic-android/build.properties
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/subsonic-android/build.properties
diff --git a/subsonic-android/default.properties b/subsonic-android/default.properties
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/subsonic-android/default.properties
diff --git a/subsonic-android/patches/jukebox-patch.txt b/subsonic-android/patches/jukebox-patch.txt
index 5bc92000..3840eb0a 100644
--- a/subsonic-android/patches/jukebox-patch.txt
+++ b/subsonic-android/patches/jukebox-patch.txt
@@ -3,12 +3,12 @@ Index: AndroidManifest.xml
 --- AndroidManifest.xml	(revision 2441)
 +++ AndroidManifest.xml	(working copy)
 @@ -114,7 +114,8 @@
-                   a:authorities="net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider"/>
+                   a:authorities="github.daneren2005.subphonic.provider.SearchSuggestionProvider"/>
  
          <meta-data a:name="android.app.default_searchable"
--                   a:value="net.sourceforge.subsonic.androidapp.activity.QueryReceiverActivity"/>
-+                   a:value="net.sourceforge.subsonic.androidapp.activity.QueryReceiverActivity"/>
-+        <activity a:name="net.sourceforge.subsonic.androidapp.activity.JukeboxActivity" a:launchMode="singleTask" a:configChanges="keyboardHidden"></activity>
+-                   a:value="github.daneren2005.subphonic.activity.QueryReceiverActivity"/>
++                   a:value="github.daneren2005.subphonic.activity.QueryReceiverActivity"/>
++        <activity a:name="github.daneren2005.subphonic.activity.JukeboxActivity" a:launchMode="singleTask" a:configChanges="keyboardHidden"></activity>
  
      </application>
  
@@ -224,21 +224,21 @@ Index: src/net/sourceforge/subsonic/androidapp/activity/JukeboxActivity.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package net.sourceforge.subsonic.androidapp.activity;
++package github.daneren2005.subphonic.activity;
 +
 +import java.util.List;
 +
-+import net.sourceforge.subsonic.androidapp.R;
-+import net.sourceforge.subsonic.androidapp.domain.Jukebox;
-+import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-+import net.sourceforge.subsonic.androidapp.domain.MusicDirectory.Entry;
-+import net.sourceforge.subsonic.androidapp.service.MusicService;
-+import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-+import net.sourceforge.subsonic.androidapp.util.BackgroundTask;
-+import net.sourceforge.subsonic.androidapp.util.JukeboxSongView;
-+import net.sourceforge.subsonic.androidapp.util.ProgressListener;
-+import net.sourceforge.subsonic.androidapp.util.TabActivityBackgroundTask;
-+import net.sourceforge.subsonic.androidapp.util.Util;
++import github.daneren2005.subphonic.R;
++import github.daneren2005.subphonic.domain.Jukebox;
++import github.daneren2005.subphonic.domain.MusicDirectory;
++import github.daneren2005.subphonic.domain.MusicDirectory.Entry;
++import github.daneren2005.subphonic.service.MusicService;
++import github.daneren2005.subphonic.service.MusicServiceFactory;
++import github.daneren2005.subphonic.util.BackgroundTask;
++import github.daneren2005.subphonic.util.JukeboxSongView;
++import github.daneren2005.subphonic.util.ProgressListener;
++import github.daneren2005.subphonic.util.TabActivityBackgroundTask;
++import github.daneren2005.subphonic.util.Util;
 +import android.os.Bundle;
 +import android.view.ContextMenu;
 +import android.view.MenuInflater;
@@ -485,16 +485,16 @@ Index: src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java
  import java.util.LinkedList;
  import java.util.List;
  
-+import net.sourceforge.subsonic.androidapp.R;
-+import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-+import net.sourceforge.subsonic.androidapp.service.DownloadService;
-+import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
-+import net.sourceforge.subsonic.androidapp.service.MusicService;
-+import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-+import net.sourceforge.subsonic.androidapp.util.Constants;
-+import net.sourceforge.subsonic.androidapp.util.ImageLoader;
-+import net.sourceforge.subsonic.androidapp.util.ModalBackgroundTask;
-+import net.sourceforge.subsonic.androidapp.util.Util;
++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 android.app.Activity;
  import android.content.Context;
  import android.content.Intent;
@@ -502,16 +502,16 @@ Index: src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java
  import android.view.View;
  import android.view.Window;
  import android.widget.TextView;
--import net.sourceforge.subsonic.androidapp.R;
--import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
--import net.sourceforge.subsonic.androidapp.service.DownloadService;
--import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
--import net.sourceforge.subsonic.androidapp.service.MusicService;
--import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
--import net.sourceforge.subsonic.androidapp.util.Constants;
--import net.sourceforge.subsonic.androidapp.util.ImageLoader;
--import net.sourceforge.subsonic.androidapp.util.ModalBackgroundTask;
--import net.sourceforge.subsonic.androidapp.util.Util;
+-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;
  
  /**
   * @author Sindre Mehus
@@ -653,7 +653,7 @@ Index: src/net/sourceforge/subsonic/androidapp/domain/Jukebox.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package net.sourceforge.subsonic.androidapp.domain;
++package github.daneren2005.subphonic.domain;
 +
 +import java.io.Serializable;
 +import java.util.List;
@@ -789,7 +789,7 @@ Index: src/net/sourceforge/subsonic/androidapp/domain/User.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package net.sourceforge.subsonic.androidapp.domain;
++package github.daneren2005.subphonic.domain;
 +
 +import java.io.Serializable;
 +
@@ -820,15 +820,15 @@ Index: src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java
 @@ -21,9 +21,11 @@
  import android.content.Context;
  import android.graphics.Bitmap;
- import net.sourceforge.subsonic.androidapp.domain.Indexes;
-+import net.sourceforge.subsonic.androidapp.domain.Jukebox;
- import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
- import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
- import net.sourceforge.subsonic.androidapp.domain.Playlist;
-+import net.sourceforge.subsonic.androidapp.domain.User;
- import net.sourceforge.subsonic.androidapp.domain.Version;
- import net.sourceforge.subsonic.androidapp.domain.SearchResult;
- import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
+ import github.daneren2005.subphonic.domain.Indexes;
++import github.daneren2005.subphonic.domain.Jukebox;
+ import github.daneren2005.subphonic.domain.MusicDirectory;
+ import github.daneren2005.subphonic.domain.MusicFolder;
+ import github.daneren2005.subphonic.domain.Playlist;
++import github.daneren2005.subphonic.domain.User;
+ import github.daneren2005.subphonic.domain.Version;
+ import github.daneren2005.subphonic.domain.SearchResult;
+ import github.daneren2005.subphonic.domain.SearchCritera;
 @@ -199,4 +201,17 @@
              restUrl = newUrl;
          }
@@ -854,15 +854,15 @@ Index: src/net/sourceforge/subsonic/androidapp/service/MusicService.java
 @@ -21,9 +21,11 @@
  import android.content.Context;
  import android.graphics.Bitmap;
- import net.sourceforge.subsonic.androidapp.domain.Indexes;
-+import net.sourceforge.subsonic.androidapp.domain.Jukebox;
- import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
- import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
- import net.sourceforge.subsonic.androidapp.domain.Playlist;
-+import net.sourceforge.subsonic.androidapp.domain.User;
- import net.sourceforge.subsonic.androidapp.domain.Version;
- import net.sourceforge.subsonic.androidapp.domain.SearchResult;
- import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
+ import github.daneren2005.subphonic.domain.Indexes;
++import github.daneren2005.subphonic.domain.Jukebox;
+ import github.daneren2005.subphonic.domain.MusicDirectory;
+ import github.daneren2005.subphonic.domain.MusicFolder;
+ import github.daneren2005.subphonic.domain.Playlist;
++import github.daneren2005.subphonic.domain.User;
+ import github.daneren2005.subphonic.domain.Version;
+ import github.daneren2005.subphonic.domain.SearchResult;
+ import github.daneren2005.subphonic.domain.SearchCritera;
 @@ -74,4 +76,8 @@
      Version getLatestVersion(Context context, ProgressListener progressListener) throws Exception;
  
@@ -879,33 +879,33 @@ Index: src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java
 +++ src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java	(working copy)
 @@ -28,6 +28,7 @@
  import android.util.Log;
- import net.sourceforge.subsonic.androidapp.R;
- import net.sourceforge.subsonic.androidapp.domain.Indexes;
-+import net.sourceforge.subsonic.androidapp.domain.Jukebox;
- import net.sourceforge.subsonic.androidapp.domain.Lyrics;
- import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
- import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
+ import github.daneren2005.subphonic.R;
+ import github.daneren2005.subphonic.domain.Indexes;
++import github.daneren2005.subphonic.domain.Jukebox;
+ import github.daneren2005.subphonic.domain.Lyrics;
+ import github.daneren2005.subphonic.domain.MusicDirectory;
+ import github.daneren2005.subphonic.domain.MusicFolder;
 @@ -35,10 +36,12 @@
- import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
- import net.sourceforge.subsonic.androidapp.domain.SearchResult;
- import net.sourceforge.subsonic.androidapp.domain.ServerInfo;
-+import net.sourceforge.subsonic.androidapp.domain.User;
- import net.sourceforge.subsonic.androidapp.domain.Version;
- import net.sourceforge.subsonic.androidapp.service.parser.AlbumListParser;
- import net.sourceforge.subsonic.androidapp.service.parser.ErrorParser;
- import net.sourceforge.subsonic.androidapp.service.parser.IndexesParser;
-+import net.sourceforge.subsonic.androidapp.service.parser.JukeboxParser;
- import net.sourceforge.subsonic.androidapp.service.parser.LicenseParser;
- import net.sourceforge.subsonic.androidapp.service.parser.LyricsParser;
- import net.sourceforge.subsonic.androidapp.service.parser.MusicDirectoryParser;
+ import github.daneren2005.subphonic.domain.SearchCritera;
+ import github.daneren2005.subphonic.domain.SearchResult;
+ import github.daneren2005.subphonic.domain.ServerInfo;
++import github.daneren2005.subphonic.domain.User;
+ 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.JukeboxParser;
+ import github.daneren2005.subphonic.service.parser.LicenseParser;
+ import github.daneren2005.subphonic.service.parser.LyricsParser;
+ import github.daneren2005.subphonic.service.parser.MusicDirectoryParser;
 @@ -48,6 +51,7 @@
- import net.sourceforge.subsonic.androidapp.service.parser.RandomSongsParser;
- import net.sourceforge.subsonic.androidapp.service.parser.SearchResult2Parser;
- import net.sourceforge.subsonic.androidapp.service.parser.SearchResultParser;
-+import net.sourceforge.subsonic.androidapp.service.parser.UserParser;
- import net.sourceforge.subsonic.androidapp.service.parser.VersionParser;
- import net.sourceforge.subsonic.androidapp.service.ssl.SSLSocketFactory;
- import net.sourceforge.subsonic.androidapp.service.ssl.TrustSelfSignedStrategy;
+ 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.UserParser;
+ import github.daneren2005.subphonic.service.parser.VersionParser;
+ import github.daneren2005.subphonic.service.ssl.SSLSocketFactory;
+ import github.daneren2005.subphonic.service.ssl.TrustSelfSignedStrategy;
 @@ -195,6 +199,53 @@
              Util.close(reader);
          }
@@ -1000,14 +1000,14 @@ Index: src/net/sourceforge/subsonic/androidapp/service/parser/JukeboxParser.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package net.sourceforge.subsonic.androidapp.service.parser;
++package github.daneren2005.subphonic.service.parser;
 +
 +import java.io.Reader;
 +
-+import net.sourceforge.subsonic.androidapp.R;
-+import net.sourceforge.subsonic.androidapp.domain.Jukebox;
-+import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-+import net.sourceforge.subsonic.androidapp.util.ProgressListener;
++import github.daneren2005.subphonic.R;
++import github.daneren2005.subphonic.domain.Jukebox;
++import github.daneren2005.subphonic.domain.MusicDirectory;
++import github.daneren2005.subphonic.util.ProgressListener;
 +
 +import org.xmlpull.v1.XmlPullParser;
 +
@@ -1091,13 +1091,13 @@ Index: src/net/sourceforge/subsonic/androidapp/service/parser/UserParser.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package net.sourceforge.subsonic.androidapp.service.parser;
++package github.daneren2005.subphonic.service.parser;
 +
 +import java.io.Reader;
 +
-+import net.sourceforge.subsonic.androidapp.R;
-+import net.sourceforge.subsonic.androidapp.domain.User;
-+import net.sourceforge.subsonic.androidapp.util.ProgressListener;
++import github.daneren2005.subphonic.R;
++import github.daneren2005.subphonic.domain.User;
++import github.daneren2005.subphonic.util.ProgressListener;
 +
 +import org.xmlpull.v1.XmlPullParser;
 +
@@ -1163,10 +1163,10 @@ Index: src/net/sourceforge/subsonic/androidapp/util/JukeboxSongView.java
 + Copyright 2009 (C) Sindre Mehus
 + */
 +
-+package net.sourceforge.subsonic.androidapp.util;
++package github.daneren2005.subphonic.util;
 +
-+import net.sourceforge.subsonic.androidapp.R;
-+import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
++import github.daneren2005.subphonic.R;
++import github.daneren2005.subphonic.domain.MusicDirectory;
 +import android.content.Context;
 +import android.view.LayoutInflater;
 +import android.view.View;
diff --git a/subsonic-android/private/cache/retriever/catalog.xml b/subsonic-android/private/cache/retriever/catalog.xml
new file mode 100644
index 00000000..9a13de23
--- /dev/null
+++ b/subsonic-android/private/cache/retriever/catalog.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+    <system systemId="http://schemas.android.com/apk/res/android" uri="www.website-unavailable.com/.wc_EAhrEwp7BXRIAwpyAwkdFBUJThUHEQ___url_schemas.android.com/apk/res/android"/>
+</catalog>
+\ No newline at end of file
diff --git a/subsonic-android/proguard-project.txt b/subsonic-android/proguard-project.txt
new file mode 100644
index 00000000..b60ae7ea
--- /dev/null
+++ b/subsonic-android/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/subsonic-android/res/layout-land/download.xml b/subsonic-android/res/layout-land/download.xml
index 79dcc650..a63e7d9e 100644
--- a/subsonic-android/res/layout-land/download.xml
+++ b/subsonic-android/res/layout-land/download.xml
@@ -165,7 +165,7 @@
 
         </RelativeLayout>
 
-        <net.sourceforge.subsonic.androidapp.util.MyViewFlipper
+        <github.daneren2005.subphonic.util.MyViewFlipper
                 android:id="@+id/download_playlist_flipper"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
@@ -196,7 +196,7 @@
 
             <include layout="@layout/download_playlist"/>
 
-        </net.sourceforge.subsonic.androidapp.util.MyViewFlipper>
+        </github.daneren2005.subphonic.util.MyViewFlipper>
 
     </RelativeLayout>
 
diff --git a/subsonic-android/res/layout-port/download.xml b/subsonic-android/res/layout-port/download.xml
index 73e94eb9..c2ca0a4a 100644
--- a/subsonic-android/res/layout-port/download.xml
+++ b/subsonic-android/res/layout-port/download.xml
@@ -4,7 +4,7 @@
               android:layout_width="fill_parent"
               android:layout_height="fill_parent">
 
-    <net.sourceforge.subsonic.androidapp.util.MyViewFlipper
+    <github.daneren2005.subphonic.util.MyViewFlipper
                  android:id="@+id/download_playlist_flipper"
                  android:layout_width="fill_parent"
                  android:layout_height="0dip"
@@ -121,7 +121,7 @@
 
         <include layout="@layout/download_playlist"/>
 
-    </net.sourceforge.subsonic.androidapp.util.MyViewFlipper>
+    </github.daneren2005.subphonic.util.MyViewFlipper>
 
     <LinearLayout android:orientation="horizontal"
                   android:layout_width="fill_parent"
diff --git a/subsonic-android/res/layout/download_button_bar_flipper.xml b/subsonic-android/res/layout/download_button_bar_flipper.xml
index 216f5802..8069f52b 100644
--- a/subsonic-android/res/layout/download_button_bar_flipper.xml
+++ b/subsonic-android/res/layout/download_button_bar_flipper.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<net.sourceforge.subsonic.androidapp.util.MyViewFlipper
+<github.daneren2005.subphonic.util.MyViewFlipper
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/download_button_bar_flipper"
         android:layout_width="fill_parent"
@@ -60,7 +60,7 @@
 
     <include layout="@layout/button_bar"/>
 
-</net.sourceforge.subsonic.androidapp.util.MyViewFlipper>
+</github.daneren2005.subphonic.util.MyViewFlipper>
 
 
 
diff --git a/subsonic-android/res/layout/download_slider.xml b/subsonic-android/res/layout/download_slider.xml
index a4c62ca2..98b54df3 100644
--- a/subsonic-android/res/layout/download_slider.xml
+++ b/subsonic-android/res/layout/download_slider.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<net.sourceforge.subsonic.androidapp.util.HorizontalSlider
+<github.daneren2005.subphonic.util.HorizontalSlider
         xmlns:android="http://schemas.android.com/apk/res/android"
         style="?android:attr/progressBarStyleHorizontal"
         android:id="@+id/download_progress_bar"
diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml
index c6a372c3..2a067124 100644
--- a/subsonic-android/res/values/strings.xml
+++ b/subsonic-android/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="common.appname">Subsonic</string>
+    <string name="common.appname">Subphonic</string>
     <string name="common.ok">OK</string>
     <string name="common.save">Save</string>
     <string name="common.cancel">Cancel</string>
@@ -12,14 +12,14 @@
     <string name="common.unpin">Unpin</string>
     <string name="common.delete">Delete</string>
 
-    <string name="button_bar.home">Subsonic home</string>
+    <string name="button_bar.home">Subphonic home</string>
     <string name="button_bar.browse">Media library</string>
     <string name="button_bar.search">Search</string>
     <string name="button_bar.playlists">Playlists</string>
     <string name="button_bar.now_playing">Now playing</string>
 
     <string name="main.welcome_title">Welcome!</string>
-    <string name="main.welcome_text">Welcome to Subsonic! The app is currently configured to use the Subsonic demo server. After you\'ve
+    <string name="main.welcome_text">Welcome to Subphonic! The app is currently configured to use the Subsonic demo server. After you\'ve
         set up your personal server (available from <b>subsonic.org</b>), please go to <b>Settings</b> and change the configuration to connect to it.</string>
     <string name="main.select_server">Select server</string>
     <string name="main.shuffle">Shuffle play</string>
@@ -39,7 +39,7 @@
     <string name="playlist.label">Playlists</string>
 
     <string name="help.label">Help</string>
-    <string name="help.title">Welcome to Subsonic!</string>
+    <string name="help.title">Welcome to Subphonic!</string>
     <string name="help.back">Back</string>
     <string name="help.close">Close</string>
     <string name="help.url">file:///android_asset/html/en/index.html</string>
@@ -116,7 +116,7 @@
 
     <string name="error.label">Error</string>
 
-    <string name="settings.title">Subsonic settings</string>
+    <string name="settings.title">Subphonic settings</string>
     <string name="settings.test_connection_title">Test connection</string>
     <string name="settings.servers_title">Servers</string>
     <string name="settings.server_unused1">Unused 1</string>
@@ -176,7 +176,7 @@
     <string name="settings.search_history_cleared">Search history cleared</string>
     <string name="settings.other_title">Other settings</string>
     <string name="settings.scrobble_title">Scrobble to Last.fm</string>
-    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Subsonic server</string>
+    <string name="settings.scrobble_summary">Remember to set up your Last.fm user and password on the Subphonic server</string>
     <string name="settings.hide_media_title">Hide from other</string>
     <string name="settings.hide_media_summary">Hide music files from other apps.</string>
     <string name="settings.hide_media_toast">Takes effect next time Android scans your phone for music.</string>
@@ -198,7 +198,7 @@
 
     <string name="parser.reading">Reading from server.</string>
     <string name="parser.reading_done">Reading from server. Done!</string>
-    <string name="parser.upgrade_client">Incompatible versions. Please upgrade Subsonic Android app.</string>
+    <string name="parser.upgrade_client">Incompatible versions. Please upgrade Subphonic Android app.</string>
     <string name="parser.upgrade_server">Incompatible versions. Please upgrade Subsonic server.</string>
     <string name="parser.not_authenticated">Wrong username or password.</string>
     <string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>
diff --git a/subsonic-android/res/xml/searchable.xml b/subsonic-android/res/xml/searchable.xml
index 7822e98c..b8040e24 100644
--- a/subsonic-android/res/xml/searchable.xml
+++ b/subsonic-android/res/xml/searchable.xml
@@ -4,6 +4,6 @@
             android:hint="@string/search.title"
             android:voiceSearchMode="showVoiceSearchButton|launchRecognizer"
             android:voiceLanguageModel="web_search"
-            android:searchSuggestAuthority="net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider"
+            android:searchSuggestAuthority="github.daneren2005.subphonic.provider.SearchSuggestionProvider"
             android:searchSuggestSelection=" ?" >
 </searchable>
 \ No newline at end of file
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/DownloadActivity.java
index 68144481..3c2d7b04 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/DownloadActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/DownloadActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.PlayerState;
-import net.sourceforge.subsonic.androidapp.domain.RepeatMode;
-import net.sourceforge.subsonic.androidapp.service.DownloadFile;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.HorizontalSlider;
-import net.sourceforge.subsonic.androidapp.util.SilentBackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.SongView;
-import net.sourceforge.subsonic.androidapp.util.Util;
-import net.sourceforge.subsonic.androidapp.view.VisualizerView;
-
-import static net.sourceforge.subsonic.androidapp.domain.PlayerState.*;
+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.*;
 
 public class DownloadActivity extends SubsonicTabActivity implements OnGestureListener {
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/EqualizerActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/EqualizerActivity.java
index daf6193e..4b706984 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/EqualizerActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/EqualizerActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.audiofx.EqualizerController;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.audiofx.EqualizerController;
+import github.daneren2005.subphonic.service.DownloadServiceImpl;
 
 /**
  * Equalizer controls.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/HelpActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/HelpActivity.java
index 4b2eb63b..ea382887 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/HelpActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/HelpActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.util.Util;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.util.Util;
 
 /**
  * An HTML-based help screen with Back and Done buttons at the bottom.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/LyricsActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/LyricsActivity.java
index 0ec75e2c..10c5ee59 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/LyricsActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/LyricsActivity.java
@@ -17,17 +17,17 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.activity;
 
 import android.os.Bundle;
 import android.widget.TextView;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Lyrics;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.util.BackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.TabActivityBackgroundTask;
+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;
 
 /**
  * Displays song lyrics.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/MainActivity.java
index c63a391b..7ad621ef 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/MainActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/MainActivity.java
@@ -17,17 +17,17 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.activity;
 
 import java.util.Arrays;
 
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.MergeAdapter;
-import net.sourceforge.subsonic.androidapp.util.Util;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
+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 android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/PlayVideoActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/PlayVideoActivity.java
index ea332ca0..a393d3a8 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/PlayVideoActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/PlayVideoActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.Util;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.service.MusicServiceFactory;
+import github.daneren2005.subphonic.util.Constants;
+import github.daneren2005.subphonic.util.Util;
 
 /**
  * Plays videos in a web page.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/QueryReceiverActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/QueryReceiverActivity.java
index 35b5ccaf..cabae1ce 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/QueryReceiverActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/QueryReceiverActivity.java
@@ -17,16 +17,16 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.Util;
-import net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider;
+import github.daneren2005.subphonic.util.Constants;
+import github.daneren2005.subphonic.util.Util;
+import github.daneren2005.subphonic.provider.SearchSuggestionProvider1;
 
 /**
  * Receives search queries and forwards to the SelectAlbumActivity.
@@ -42,8 +42,8 @@ public class QueryReceiverActivity extends Activity {
         String query = getIntent().getStringExtra(SearchManager.QUERY);
 
         if (query != null) {
-            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, SearchSuggestionProvider.AUTHORITY,
-                                                                              SearchSuggestionProvider.MODE);
+            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, SearchSuggestionProvider1.AUTHORITY,
+                                                                              SearchSuggestionProvider1.MODE);
             suggestions.saveRecentQuery(query, null);
 
             Intent intent = new Intent(QueryReceiverActivity.this, SearchActivity.class);
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SearchActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/SearchActivity.java
index 73b787a0..a9d64fda 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SearchActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/SearchActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Artist;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
-import net.sourceforge.subsonic.androidapp.domain.SearchResult;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
-import net.sourceforge.subsonic.androidapp.util.ArtistAdapter;
-import net.sourceforge.subsonic.androidapp.util.BackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.EntryAdapter;
-import net.sourceforge.subsonic.androidapp.util.MergeAdapter;
-import net.sourceforge.subsonic.androidapp.util.TabActivityBackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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;
 
 /**
  * Performs searches and displays the matching artists, albums and songs.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/SelectAlbumActivity.java
index 070bed0b..1fd3fa71 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SelectAlbumActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/SelectAlbumActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.service.DownloadFile;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.EntryAdapter;
-import net.sourceforge.subsonic.androidapp.util.Pair;
-import net.sourceforge.subsonic.androidapp.util.TabActivityBackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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 java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/SelectArtistActivity.java
index 959066ab..91f2c7bf 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SelectArtistActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/SelectArtistActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Artist;
-import net.sourceforge.subsonic.androidapp.domain.Indexes;
-import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.util.ArtistAdapter;
-import net.sourceforge.subsonic.androidapp.util.BackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.TabActivityBackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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 java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/SelectPlaylistActivity.java
index 253124b5..9882fad0 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SelectPlaylistActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/SelectPlaylistActivity.java
@@ -17,7 +17,7 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Playlist;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.util.BackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.PlaylistAdapter;
-import net.sourceforge.subsonic.androidapp.util.TabActivityBackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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 java.util.List;
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SettingsActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/SettingsActivity.java
index f726a2af..5eb32b62 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SettingsActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/SettingsActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.ErrorDialog;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
-import net.sourceforge.subsonic.androidapp.util.ModalBackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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 java.io.File;
 import java.net.URL;
@@ -95,7 +95,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
         findPreference("clearSearchHistory").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                SearchRecentSuggestions suggestions = new SearchRecentSuggestions(SettingsActivity.this, SearchSuggestionProvider.AUTHORITY, SearchSuggestionProvider.MODE);
+                SearchRecentSuggestions suggestions = new SearchRecentSuggestions(SettingsActivity.this, SearchSuggestionProvider1.AUTHORITY, SearchSuggestionProvider1.MODE);
                 suggestions.clearHistory();
                 Util.toast(SettingsActivity.this, R.string.settings_search_history_cleared);
                 return false;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/SubsonicTabActivity.java
index f75e39fc..81145264 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/SubsonicTabActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/SubsonicTabActivity.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.ImageLoader;
-import net.sourceforge.subsonic.androidapp.util.ModalBackgroundTask;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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;
 
 /**
  * @author Sindre Mehus
@@ -358,7 +358,7 @@ public class SubsonicTabActivity extends Activity {
             PrintWriter printWriter = null;
             try {
 
-                PackageInfo packageInfo = context.getPackageManager().getPackageInfo("net.sourceforge.subsonic.androidapp", 0);
+                PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.subphonic", 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/net/sourceforge/subsonic/androidapp/activity/VoiceQueryReceiverActivity.java b/subsonic-android/src/github/daneren2005/subphonic/activity/VoiceQueryReceiverActivity.java
index 205c2fe7..2ae9a1b4 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/activity/VoiceQueryReceiverActivity.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/activity/VoiceQueryReceiverActivity.java
@@ -17,16 +17,16 @@
  Copyright 2009 (C) Sindre Mehus
  */
 
-package net.sourceforge.subsonic.androidapp.activity;
+package github.daneren2005.subphonic.activity;
 
 import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.Util;
-import net.sourceforge.subsonic.androidapp.provider.SearchSuggestionProvider;
+import github.daneren2005.subphonic.util.Constants;
+import github.daneren2005.subphonic.util.Util;
+import github.daneren2005.subphonic.provider.SearchSuggestionProvider1;
 
 /**
  * Receives voice search queries and forwards to the SearchActivity.
@@ -44,8 +44,8 @@ public class VoiceQueryReceiverActivity extends Activity {
         String query = getIntent().getStringExtra(SearchManager.QUERY);
 
         if (query != null) {
-            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, SearchSuggestionProvider.AUTHORITY,
-                                                                              SearchSuggestionProvider.MODE);
+            SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this, SearchSuggestionProvider1.AUTHORITY,
+                                                                              SearchSuggestionProvider1.MODE);
             suggestions.saveRecentQuery(query, null);
 
             Intent intent = new Intent(VoiceQueryReceiverActivity.this, SearchActivity.class);
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/audiofx/EqualizerController.java b/subsonic-android/src/github/daneren2005/subphonic/audiofx/EqualizerController.java
index 77a270ed..f2dbc352 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/audiofx/EqualizerController.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/audiofx/EqualizerController.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.audiofx;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.util.FileUtil;
+import github.daneren2005.subphonic.util.FileUtil;
 
 /**
  * Backward-compatible wrapper for {@link Equalizer}, which is API Level 9.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/audiofx/VisualizerController.java b/subsonic-android/src/github/daneren2005/subphonic/audiofx/VisualizerController.java
index 9a211b58..79c7f596 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/audiofx/VisualizerController.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/audiofx/VisualizerController.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.audiofx;
+package github.daneren2005.subphonic.audiofx;
 
 import android.content.Context;
 import android.media.MediaPlayer;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Artist.java b/subsonic-android/src/github/daneren2005/subphonic/domain/Artist.java
index fce7b628..416b8b0a 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Artist.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/Artist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Indexes.java b/subsonic-android/src/github/daneren2005/subphonic/domain/Indexes.java
index f16861be..fd42379b 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Indexes.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/Indexes.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 import java.util.List;
 import java.io.Serializable;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/JukeboxStatus.java b/subsonic-android/src/github/daneren2005/subphonic/domain/JukeboxStatus.java
index 53a901ad..6aa8c584 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/JukeboxStatus.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/JukeboxStatus.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Lyrics.java b/subsonic-android/src/github/daneren2005/subphonic/domain/Lyrics.java
index c1a4c7c0..7d9422da 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Lyrics.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/Lyrics.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 /**
  * Song lyrics.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/MusicDirectory.java b/subsonic-android/src/github/daneren2005/subphonic/domain/MusicDirectory.java
index 4d4d265b..52201032 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/MusicDirectory.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/MusicDirectory.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/MusicFolder.java b/subsonic-android/src/github/daneren2005/subphonic/domain/MusicFolder.java
index 595f2b5e..8a72e93e 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/MusicFolder.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/MusicFolder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/PlayerState.java b/subsonic-android/src/github/daneren2005/subphonic/domain/PlayerState.java
index 0e13159b..98fd3c4b 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/PlayerState.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/PlayerState.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Playlist.java b/subsonic-android/src/github/daneren2005/subphonic/domain/Playlist.java
index 8bb29f76..e4413620 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Playlist.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/Playlist.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/RepeatMode.java b/subsonic-android/src/github/daneren2005/subphonic/domain/RepeatMode.java
index be2ad061..41421ef2 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/RepeatMode.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/RepeatMode.java
@@ -1,4 +1,4 @@
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/SearchCritera.java b/subsonic-android/src/github/daneren2005/subphonic/domain/SearchCritera.java
index 8f944b1a..a577ce60 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/SearchCritera.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/SearchCritera.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 /**
  * The criteria for a music search.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/SearchResult.java b/subsonic-android/src/github/daneren2005/subphonic/domain/SearchResult.java
index 54c91628..8dc08bc0 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/SearchResult.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/SearchResult.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 import java.util.List;
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/ServerInfo.java b/subsonic-android/src/github/daneren2005/subphonic/domain/ServerInfo.java
index 9212c585..fc0252af 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/ServerInfo.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/ServerInfo.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 /**
  * Information about the Subsonic server.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Version.java b/subsonic-android/src/github/daneren2005/subphonic/domain/Version.java
index bd1643b5..e827c95a 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/domain/Version.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/domain/Version.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.domain;
+package github.daneren2005.subphonic.domain;
 
 /**
  * Represents the version number of the Subsonic Android app.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/provider/SearchSuggestionProvider.java b/subsonic-android/src/github/daneren2005/subphonic/provider/SearchSuggestionProvider1.java
index d3ba4f5c..8cf8b8c7 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/provider/SearchSuggestionProvider.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/provider/SearchSuggestionProvider1.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.provider;
+package github.daneren2005.subphonic.provider;
 
 import android.content.SearchRecentSuggestionsProvider;
 
@@ -25,12 +25,12 @@ import android.content.SearchRecentSuggestionsProvider;
  *
  * @author Sindre Mehus
  */
-public class SearchSuggestionProvider extends SearchRecentSuggestionsProvider {
+public class SearchSuggestionProvider1 extends SearchRecentSuggestionsProvider {
 
-    public static final String AUTHORITY = SearchSuggestionProvider.class.getName();
+    public static final String AUTHORITY = SearchSuggestionProvider1.class.getName();
     public static final int MODE = DATABASE_MODE_QUERIES;
 
-    public SearchSuggestionProvider() {
+    public SearchSuggestionProvider1() {
         setupSuggestions(AUTHORITY, MODE);
     }
 }
 \ No newline at end of file
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.java b/subsonic-android/src/github/daneren2005/subphonic/provider/SubsonicAppWidgetProvider1.java
index dba3bdcd..b0ffdc3a 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/provider/SubsonicAppWidgetProvider.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/provider/SubsonicAppWidgetProvider1.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.provider;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.activity.DownloadActivity;
-import net.sourceforge.subsonic.androidapp.activity.MainActivity;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
+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;
 
 /**
  * Simple widget to show currently playing album art along
@@ -53,14 +53,14 @@ import net.sourceforge.subsonic.androidapp.util.FileUtil;
  *
  * @author Sindre Mehus
  */
-public class SubsonicAppWidgetProvider extends AppWidgetProvider {
+public class SubsonicAppWidgetProvider1 extends AppWidgetProvider {
 
-    private static SubsonicAppWidgetProvider instance;
-    private static final String TAG = SubsonicAppWidgetProvider.class.getSimpleName();
+    private static SubsonicAppWidgetProvider1 instance;
+    private static final String TAG = SubsonicAppWidgetProvider1.class.getSimpleName();
 
-    public static synchronized SubsonicAppWidgetProvider getInstance() {
+    public static synchronized SubsonicAppWidgetProvider1 getInstance() {
         if (instance == null) {
-            instance = new SubsonicAppWidgetProvider();
+            instance = new SubsonicAppWidgetProvider1();
         }
         return instance;
     }
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/receiver/BluetoothIntentReceiver.java b/subsonic-android/src/github/daneren2005/subphonic/receiver/BluetoothIntentReceiver.java
index 6bf17ac2..f643375e 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/receiver/BluetoothIntentReceiver.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/receiver/BluetoothIntentReceiver.java
@@ -16,14 +16,14 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.receiver;
+package github.daneren2005.subphonic.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
-import net.sourceforge.subsonic.androidapp.util.Util;
+import github.daneren2005.subphonic.service.DownloadServiceImpl;
+import github.daneren2005.subphonic.util.Util;
 
 /**
  * Request media button focus when connected to Bluetooth A2DP.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/receiver/MediaButtonIntentReceiver.java b/subsonic-android/src/github/daneren2005/subphonic/receiver/MediaButtonIntentReceiver.java
index 5287d933..f1c2a01a 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/receiver/MediaButtonIntentReceiver.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/receiver/MediaButtonIntentReceiver.java
@@ -16,14 +16,14 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.receiver;
+package github.daneren2005.subphonic.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 import android.view.KeyEvent;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
+import github.daneren2005.subphonic.service.DownloadServiceImpl;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java b/subsonic-android/src/github/daneren2005/subphonic/service/CachedMusicService.java
index 14aed954..2d0ebf55 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/CachedMusicService.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/CachedMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.domain.Indexes;
-import net.sourceforge.subsonic.androidapp.domain.JukeboxStatus;
-import net.sourceforge.subsonic.androidapp.domain.Lyrics;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
-import net.sourceforge.subsonic.androidapp.domain.Playlist;
-import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
-import net.sourceforge.subsonic.androidapp.domain.SearchResult;
-import net.sourceforge.subsonic.androidapp.domain.Version;
-import net.sourceforge.subsonic.androidapp.util.CancellableTask;
-import net.sourceforge.subsonic.androidapp.util.LRUCache;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
-import net.sourceforge.subsonic.androidapp.util.TimeLimitedCache;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/DownloadFile.java b/subsonic-android/src/github/daneren2005/subphonic/service/DownloadFile.java
index 46373afe..192bd823 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/DownloadFile.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/DownloadFile.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.util.CancellableTask;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
-import net.sourceforge.subsonic.androidapp.util.Util;
-import net.sourceforge.subsonic.androidapp.util.CacheCleaner;
+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 org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/DownloadService.java b/subsonic-android/src/github/daneren2005/subphonic/service/DownloadService.java
index b136bdbc..f6b5b3ee 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/DownloadService.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/DownloadService.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.service;
 
 import java.util.List;
 
-import net.sourceforge.subsonic.androidapp.audiofx.EqualizerController;
-import net.sourceforge.subsonic.androidapp.audiofx.VisualizerController;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.PlayerState;
-import net.sourceforge.subsonic.androidapp.domain.RepeatMode;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java b/subsonic-android/src/github/daneren2005/subphonic/service/DownloadServiceImpl.java
index 2e668fea..d4670cb2 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/DownloadServiceImpl.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/DownloadServiceImpl.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.service;
 
 import android.app.Service;
 import android.content.Context;
@@ -27,16 +27,16 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.util.Log;
-import net.sourceforge.subsonic.androidapp.audiofx.EqualizerController;
-import net.sourceforge.subsonic.androidapp.audiofx.VisualizerController;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.PlayerState;
-import net.sourceforge.subsonic.androidapp.domain.RepeatMode;
-import net.sourceforge.subsonic.androidapp.util.CancellableTask;
-import net.sourceforge.subsonic.androidapp.util.LRUCache;
-import net.sourceforge.subsonic.androidapp.util.ShufflePlayBuffer;
-import net.sourceforge.subsonic.androidapp.util.SimpleServiceBinder;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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 java.io.File;
 import java.util.ArrayList;
@@ -44,7 +44,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import static net.sourceforge.subsonic.androidapp.domain.PlayerState.*;
+import static github.daneren2005.subphonic.domain.PlayerState.*;
 
 /**
  * @author Sindre Mehus
@@ -54,12 +54,12 @@ public class DownloadServiceImpl extends Service implements DownloadService {
 
     private static final String TAG = DownloadServiceImpl.class.getSimpleName();
 
-    public static final String CMD_PLAY = "net.sourceforge.subsonic.androidapp.CMD_PLAY";
-    public static final String CMD_TOGGLEPAUSE = "net.sourceforge.subsonic.androidapp.CMD_TOGGLEPAUSE";
-    public static final String CMD_PAUSE = "net.sourceforge.subsonic.androidapp.CMD_PAUSE";
-    public static final String CMD_STOP = "net.sourceforge.subsonic.androidapp.CMD_STOP";
-    public static final String CMD_PREVIOUS = "net.sourceforge.subsonic.androidapp.CMD_PREVIOUS";
-    public static final String CMD_NEXT = "net.sourceforge.subsonic.androidapp.CMD_NEXT";
+    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";
 
     private final IBinder binder = new SimpleServiceBinder<DownloadService>(this);
     private MediaPlayer mediaPlayer;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/DownloadServiceLifecycleSupport.java b/subsonic-android/src/github/daneren2005/subphonic/service/DownloadServiceLifecycleSupport.java
index f6076059..1fdd3add 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/DownloadServiceLifecycleSupport.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/DownloadServiceLifecycleSupport.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.PlayerState;
-import net.sourceforge.subsonic.androidapp.util.CacheCleaner;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/JukeboxService.java b/subsonic-android/src/github/daneren2005/subphonic/service/JukeboxService.java
index e3145f4e..cf2f5dba 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/JukeboxService.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/JukeboxService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.JukeboxStatus;
-import net.sourceforge.subsonic.androidapp.domain.PlayerState;
-import net.sourceforge.subsonic.androidapp.service.parser.SubsonicRESTException;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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 java.util.ArrayList;
 import java.util.Iterator;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/MediaStoreService.java b/subsonic-android/src/github/daneren2005/subphonic/service/MediaStoreService.java
index 775fa3f5..c330f18c 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/MediaStoreService.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/MediaStoreService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
+import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subphonic.util.FileUtil;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/MusicService.java b/subsonic-android/src/github/daneren2005/subphonic/service/MusicService.java
index cb0c5709..b74af3d4 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/MusicService.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/MusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.service;
 
 import java.util.List;
 
@@ -24,17 +24,17 @@ import org.apache.http.HttpResponse;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import net.sourceforge.subsonic.androidapp.domain.Indexes;
-import net.sourceforge.subsonic.androidapp.domain.JukeboxStatus;
-import net.sourceforge.subsonic.androidapp.domain.Lyrics;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
-import net.sourceforge.subsonic.androidapp.domain.Playlist;
-import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
-import net.sourceforge.subsonic.androidapp.domain.SearchResult;
-import net.sourceforge.subsonic.androidapp.domain.Version;
-import net.sourceforge.subsonic.androidapp.util.CancellableTask;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/MusicServiceFactory.java b/subsonic-android/src/github/daneren2005/subphonic/service/MusicServiceFactory.java
index 552d1d32..9181f1c8 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/MusicServiceFactory.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/MusicServiceFactory.java
@@ -16,10 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.service;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.util.Util;
+import github.daneren2005.subphonic.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/OfflineException.java b/subsonic-android/src/github/daneren2005/subphonic/service/OfflineException.java
index 49c000bf..714cc7e9 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/OfflineException.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/OfflineException.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.service;
 
 /**
  * Thrown by service methods that are not available in offline mode.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/OfflineMusicService.java b/subsonic-android/src/github/daneren2005/subphonic/service/OfflineMusicService.java
index 79fee6d2..0b79e02d 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/OfflineMusicService.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/OfflineMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.domain.Artist;
-import net.sourceforge.subsonic.androidapp.domain.Indexes;
-import net.sourceforge.subsonic.androidapp.domain.JukeboxStatus;
-import net.sourceforge.subsonic.androidapp.domain.Lyrics;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
-import net.sourceforge.subsonic.androidapp.domain.Playlist;
-import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
-import net.sourceforge.subsonic.androidapp.domain.SearchResult;
-import net.sourceforge.subsonic.androidapp.service.parser.PlaylistParser;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java b/subsonic-android/src/github/daneren2005/subphonic/service/RESTMusicService.java
index a939feef..7a7d1415 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/RESTMusicService.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/RESTMusicService.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Indexes;
-import net.sourceforge.subsonic.androidapp.domain.JukeboxStatus;
-import net.sourceforge.subsonic.androidapp.domain.Lyrics;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
-import net.sourceforge.subsonic.androidapp.domain.Playlist;
-import net.sourceforge.subsonic.androidapp.domain.SearchCritera;
-import net.sourceforge.subsonic.androidapp.domain.SearchResult;
-import net.sourceforge.subsonic.androidapp.domain.ServerInfo;
-import net.sourceforge.subsonic.androidapp.domain.Version;
-import net.sourceforge.subsonic.androidapp.service.parser.AlbumListParser;
-import net.sourceforge.subsonic.androidapp.service.parser.ErrorParser;
-import net.sourceforge.subsonic.androidapp.service.parser.IndexesParser;
-import net.sourceforge.subsonic.androidapp.service.parser.JukeboxStatusParser;
-import net.sourceforge.subsonic.androidapp.service.parser.LicenseParser;
-import net.sourceforge.subsonic.androidapp.service.parser.LyricsParser;
-import net.sourceforge.subsonic.androidapp.service.parser.MusicDirectoryParser;
-import net.sourceforge.subsonic.androidapp.service.parser.MusicFoldersParser;
-import net.sourceforge.subsonic.androidapp.service.parser.PlaylistParser;
-import net.sourceforge.subsonic.androidapp.service.parser.PlaylistsParser;
-import net.sourceforge.subsonic.androidapp.service.parser.RandomSongsParser;
-import net.sourceforge.subsonic.androidapp.service.parser.SearchResult2Parser;
-import net.sourceforge.subsonic.androidapp.service.parser.SearchResultParser;
-import net.sourceforge.subsonic.androidapp.service.parser.VersionParser;
-import net.sourceforge.subsonic.androidapp.service.ssl.SSLSocketFactory;
-import net.sourceforge.subsonic.androidapp.service.ssl.TrustSelfSignedStrategy;
-import net.sourceforge.subsonic.androidapp.util.CancellableTask;
-import net.sourceforge.subsonic.androidapp.util.Constants;
-import net.sourceforge.subsonic.androidapp.util.FileUtil;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
-import net.sourceforge.subsonic.androidapp.util.Util;
+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;
 
 /**
  * @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("net.sourceforge.subsonic.androidapp", 0);
+        PackageInfo packageInfo = context.getPackageManager().getPackageInfo("github.daneren2005.subphonic", 0);
         return new Version(packageInfo.versionName);
     }
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/Scrobbler.java b/subsonic-android/src/github/daneren2005/subphonic/service/Scrobbler.java
index ce121a4b..de0e9980 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/Scrobbler.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/Scrobbler.java
@@ -1,8 +1,8 @@
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.service;
 
 import android.content.Context;
 import android.util.Log;
-import net.sourceforge.subsonic.androidapp.util.Util;
+import github.daneren2005.subphonic.util.Util;
 
 /**
  * Scrobbles played songs to Last.fm.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ServerTooOldException.java b/subsonic-android/src/github/daneren2005/subphonic/service/ServerTooOldException.java
index 9d433385..2417eb10 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ServerTooOldException.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/ServerTooOldException.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service;
+package github.daneren2005.subphonic.service;
 
-import net.sourceforge.subsonic.androidapp.domain.Version;
+import github.daneren2005.subphonic.domain.Version;
 
 /**
  * Thrown if the REST API version implemented by the server is too old.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/AbstractParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/AbstractParser.java
index 4ddff7e9..59acb60f 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/AbstractParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/AbstractParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import java.io.Reader;
 
@@ -24,10 +24,10 @@ import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
 import android.util.Xml;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Version;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
-import net.sourceforge.subsonic.androidapp.util.Util;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.Version;
+import github.daneren2005.subphonic.util.ProgressListener;
+import github.daneren2005.subphonic.util.Util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/AlbumListParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/AlbumListParser.java
index 298ef114..f021fc68 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/AlbumListParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/AlbumListParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subphonic.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/ErrorParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/ErrorParser.java
index b2c61c5b..5e2bc154 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/ErrorParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/ErrorParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/IndexesParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/IndexesParser.java
index 83ef3e77..7a9d8385 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/IndexesParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/IndexesParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Artist;
-import net.sourceforge.subsonic.androidapp.domain.Indexes;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.Artist;
+import github.daneren2005.subphonic.domain.Indexes;
+import github.daneren2005.subphonic.util.ProgressListener;
 import android.util.Log;
 
 /**
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/JukeboxStatusParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/JukeboxStatusParser.java
index 2a61508d..eed7e4a6 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/JukeboxStatusParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/JukeboxStatusParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import java.io.Reader;
 
 import org.xmlpull.v1.XmlPullParser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.domain.JukeboxStatus;
+import github.daneren2005.subphonic.domain.JukeboxStatus;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/LicenseParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/LicenseParser.java
index 636c3e6e..22b82f24 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/LicenseParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/LicenseParser.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
 
-import net.sourceforge.subsonic.androidapp.domain.ServerInfo;
-import net.sourceforge.subsonic.androidapp.domain.Version;
+import github.daneren2005.subphonic.domain.ServerInfo;
+import github.daneren2005.subphonic.domain.Version;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/LyricsParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/LyricsParser.java
index 698fb4b8..be0c498a 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/LyricsParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/LyricsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Lyrics;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.Lyrics;
+import github.daneren2005.subphonic.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/MusicDirectoryEntryParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicDirectoryEntryParser.java
index 3da90613..22b8a2da 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/MusicDirectoryEntryParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicDirectoryEntryParser.java
@@ -16,10 +16,10 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
+import github.daneren2005.subphonic.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/MusicDirectoryParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicDirectoryParser.java
index b818fc3d..feffce37 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/MusicDirectoryParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicDirectoryParser.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
 import android.util.Log;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subphonic.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/MusicFoldersParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicFoldersParser.java
index 35057bd9..e3447ddf 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/MusicFoldersParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/MusicFoldersParser.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicFolder;
-import net.sourceforge.subsonic.androidapp.domain.Playlist;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.MusicFolder;
+import github.daneren2005.subphonic.domain.Playlist;
+import github.daneren2005.subphonic.util.ProgressListener;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/PlaylistParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/PlaylistParser.java
index ee829639..84be75ff 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/PlaylistParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/PlaylistParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subphonic.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/PlaylistsParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/PlaylistsParser.java
index c1b88b8c..16592ced 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/PlaylistsParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/PlaylistsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Playlist;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.Playlist;
+import github.daneren2005.subphonic.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/RandomSongsParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/RandomSongsParser.java
index 0bf422b7..9a318754 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/RandomSongsParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/RandomSongsParser.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subphonic.util.ProgressListener;
 import org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/SearchResult2Parser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/SearchResult2Parser.java
index 01052f25..535ea8ac 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/SearchResult2Parser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/SearchResult2Parser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.SearchResult;
-import net.sourceforge.subsonic.androidapp.domain.Artist;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+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 org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/SearchResultParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/SearchResultParser.java
index c38b077f..57a19d16 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/SearchResultParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/SearchResultParser.java
@@ -16,14 +16,14 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 import android.content.Context;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.SearchResult;
-import net.sourceforge.subsonic.androidapp.domain.Artist;
-import net.sourceforge.subsonic.androidapp.util.ProgressListener;
+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 org.xmlpull.v1.XmlPullParser;
 
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/SubsonicRESTException.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/SubsonicRESTException.java
index b46b6f22..0a651ef2 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/SubsonicRESTException.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/SubsonicRESTException.java
@@ -1,4 +1,4 @@
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/VersionParser.java b/subsonic-android/src/github/daneren2005/subphonic/service/parser/VersionParser.java
index b8a05531..6d28ff7e 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/parser/VersionParser.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/parser/VersionParser.java
@@ -16,9 +16,9 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.service.parser;
+package github.daneren2005.subphonic.service.parser;
 
-import net.sourceforge.subsonic.androidapp.domain.Version;
+import github.daneren2005.subphonic.domain.Version;
 
 import java.io.BufferedReader;
 import java.io.Reader;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ssl/SSLSocketFactory.java b/subsonic-android/src/github/daneren2005/subphonic/service/ssl/SSLSocketFactory.java
index 0e146650..f715ff37 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ssl/SSLSocketFactory.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/ssl/SSLSocketFactory.java
@@ -25,7 +25,7 @@
  *
  */
 
-package net.sourceforge.subsonic.androidapp.service.ssl;
+package github.daneren2005.subphonic.service.ssl;
 
 import org.apache.http.conn.ConnectTimeoutException;
 import org.apache.http.conn.scheme.HostNameResolver;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ssl/TrustManagerDecorator.java b/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustManagerDecorator.java
index 41d98249..b8966c59 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ssl/TrustManagerDecorator.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustManagerDecorator.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package net.sourceforge.subsonic.androidapp.service.ssl;
+package github.daneren2005.subphonic.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ssl/TrustSelfSignedStrategy.java b/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustSelfSignedStrategy.java
index 4fdaaba2..7a583a95 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ssl/TrustSelfSignedStrategy.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustSelfSignedStrategy.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package net.sourceforge.subsonic.androidapp.service.ssl;
+package github.daneren2005.subphonic.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ssl/TrustStrategy.java b/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustStrategy.java
index 3cf75b68..93cac139 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/service/ssl/TrustStrategy.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/service/ssl/TrustStrategy.java
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package net.sourceforge.subsonic.androidapp.service.ssl;
+package github.daneren2005.subphonic.service.ssl;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/AlbumView.java b/subsonic-android/src/github/daneren2005/subphonic/util/AlbumView.java
index a4dd3acd..84fdd6d9 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/AlbumView.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/AlbumView.java
@@ -16,15 +16,15 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.MusicDirectory;
 
 /**
  * Used to display albums in a {@code ListView}.
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ArtistAdapter.java b/subsonic-android/src/github/daneren2005/subphonic/util/ArtistAdapter.java
index 98ed3c9b..6e60d1d8 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ArtistAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/ArtistAdapter.java
@@ -16,10 +16,10 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
-import net.sourceforge.subsonic.androidapp.domain.Artist;
-import net.sourceforge.subsonic.androidapp.R;
+import github.daneren2005.subphonic.domain.Artist;
+import github.daneren2005.subphonic.R;
 import android.widget.ArrayAdapter;
 import android.widget.SectionIndexer;
 import android.content.Context;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/BackgroundTask.java b/subsonic-android/src/github/daneren2005/subphonic/util/BackgroundTask.java
index 1db2fdc1..92521aa0 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/BackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/BackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
+import github.daneren2005.subphonic.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/CacheCleaner.java b/subsonic-android/src/github/daneren2005/subphonic/util/CacheCleaner.java
index 46459571..f66ae910 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/CacheCleaner.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/CacheCleaner.java
@@ -1,4 +1,4 @@
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.service.DownloadFile;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
+import github.daneren2005.subphonic.service.DownloadFile;
+import github.daneren2005.subphonic.service.DownloadService;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/CancellableTask.java b/subsonic-android/src/github/daneren2005/subphonic/util/CancellableTask.java
index 9c8b06e1..1886e4d0 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/CancellableTask.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/CancellableTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/Constants.java b/subsonic-android/src/github/daneren2005/subphonic/util/Constants.java
index bebe49ce..c9b339d6 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/Constants.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/Constants.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 /**
  * @author Sindre Mehus
@@ -76,7 +76,7 @@ public final class Constants {
     public static final String PREFERENCES_KEY_WIFI_REQUIRED_FOR_DOWNLOAD = "wifiRequiredForDownload";
 
     // Name of the preferences file.
-    public static final String PREFERENCES_FILE_NAME = "net.sourceforge.subsonic.androidapp_preferences";
+    public static final String PREFERENCES_FILE_NAME = "github.daneren2005.subphonic_preferences";
 
     // Number of free trial days for non-licensed servers.
     public static final int FREE_TRIAL_DAYS = 30;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/EntryAdapter.java b/subsonic-android/src/github/daneren2005/subphonic/util/EntryAdapter.java
index 1b4d72cf..ba675a1a 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/EntryAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/EntryAdapter.java
@@ -16,15 +16,15 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import java.util.List;
 
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import net.sourceforge.subsonic.androidapp.activity.SubsonicTabActivity;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
+import github.daneren2005.subphonic.activity.SubsonicTabActivity;
+import github.daneren2005.subphonic.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ErrorDialog.java b/subsonic-android/src/github/daneren2005/subphonic/util/ErrorDialog.java
index b1c51573..9adddccd 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ErrorDialog.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/ErrorDialog.java
@@ -16,12 +16,12 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import net.sourceforge.subsonic.androidapp.R;
+import github.daneren2005.subphonic.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/FileUtil.java b/subsonic-android/src/github/daneren2005/subphonic/util/FileUtil.java
index 88d10d3e..a97d13a5 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/FileUtil.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/FileUtil.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
+import github.daneren2005.subphonic.domain.MusicDirectory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.java b/subsonic-android/src/github/daneren2005/subphonic/util/HorizontalSlider.java
index 6a79a0a0..f6c5f841 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/HorizontalSlider.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/HorizontalSlider.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
+import github.daneren2005.subphonic.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ImageLoader.java b/subsonic-android/src/github/daneren2005/subphonic/util/ImageLoader.java
index 5cbd8c9f..5a649250 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ImageLoader.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/ImageLoader.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subphonic.service.MusicService;
+import github.daneren2005.subphonic.service.MusicServiceFactory;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/LRUCache.java b/subsonic-android/src/github/daneren2005/subphonic/util/LRUCache.java
index f6145fb7..3e008da4 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/LRUCache.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/LRUCache.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import java.lang.ref.SoftReference;
 import java.util.HashMap;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/MergeAdapter.java b/subsonic-android/src/github/daneren2005/subphonic/util/MergeAdapter.java
index 97dbc125..0002cb57 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/MergeAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/MergeAdapter.java
@@ -13,7 +13,7 @@
  limitations under the License.
  */
 
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.database.DataSetObserver;
 import android.view.View;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ModalBackgroundTask.java b/subsonic-android/src/github/daneren2005/subphonic/util/ModalBackgroundTask.java
index 15e2add2..4bd384db 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ModalBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/ModalBackgroundTask.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.util.Log;
-import net.sourceforge.subsonic.androidapp.R;
+import github.daneren2005.subphonic.R;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/MyViewFlipper.java b/subsonic-android/src/github/daneren2005/subphonic/util/MyViewFlipper.java
index 94f217ff..18d0f362 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/MyViewFlipper.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/MyViewFlipper.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/Pair.java b/subsonic-android/src/github/daneren2005/subphonic/util/Pair.java
index 73dc3224..1f40fdf1 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/Pair.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/Pair.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import java.io.Serializable;
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/PlaylistAdapter.java b/subsonic-android/src/github/daneren2005/subphonic/util/PlaylistAdapter.java
index 16028c12..c434479a 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/PlaylistAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/PlaylistAdapter.java
@@ -16,13 +16,13 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.content.Context;
 import android.widget.ArrayAdapter;
 import android.widget.SectionIndexer;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.Playlist;
+import github.daneren2005.subphonic.R;
+import github.daneren2005.subphonic.domain.Playlist;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ProgressListener.java b/subsonic-android/src/github/daneren2005/subphonic/util/ProgressListener.java
index 0d2924f7..0742b6f6 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ProgressListener.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/ProgressListener.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/SackOfViewsAdapter.java b/subsonic-android/src/github/daneren2005/subphonic/util/SackOfViewsAdapter.java
index ca825e55..426d14a2 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/SackOfViewsAdapter.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/SackOfViewsAdapter.java
@@ -12,7 +12,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ShufflePlayBuffer.java b/subsonic-android/src/github/daneren2005/subphonic/util/ShufflePlayBuffer.java
index 825fcc44..c6bbf785 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/ShufflePlayBuffer.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/ShufflePlayBuffer.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.service.MusicService;
-import net.sourceforge.subsonic.androidapp.service.MusicServiceFactory;
+import github.daneren2005.subphonic.domain.MusicDirectory;
+import github.daneren2005.subphonic.service.MusicService;
+import github.daneren2005.subphonic.service.MusicServiceFactory;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/SilentBackgroundTask.java b/subsonic-android/src/github/daneren2005/subphonic/util/SilentBackgroundTask.java
index 7aa85d7c..56abbec4 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/SilentBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/SilentBackgroundTask.java
@@ -16,7 +16,7 @@
 
  Copyright 2010 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.app.Activity;
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/SimpleServiceBinder.java b/subsonic-android/src/github/daneren2005/subphonic/util/SimpleServiceBinder.java
index 9ddf9903..864ca662 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/SimpleServiceBinder.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/SimpleServiceBinder.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.os.Binder;
 
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/SongView.java b/subsonic-android/src/github/daneren2005/subphonic/util/SongView.java
index 22902a11..1d89f0d2 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/SongView.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/SongView.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
-import net.sourceforge.subsonic.androidapp.service.DownloadFile;
+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 java.io.File;
 import java.util.WeakHashMap;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/TabActivityBackgroundTask.java b/subsonic-android/src/github/daneren2005/subphonic/util/TabActivityBackgroundTask.java
index 033a51ad..62066a91 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/TabActivityBackgroundTask.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/TabActivityBackgroundTask.java
@@ -1,6 +1,6 @@
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
-import net.sourceforge.subsonic.androidapp.activity.SubsonicTabActivity;
+import github.daneren2005.subphonic.activity.SubsonicTabActivity;
 
 /**
  * @author Sindre Mehus
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/TimeLimitedCache.java b/subsonic-android/src/github/daneren2005/subphonic/util/TimeLimitedCache.java
index 5df5901e..4d1220f6 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/TimeLimitedCache.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/TimeLimitedCache.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import java.lang.ref.SoftReference;
 import java.util.concurrent.TimeUnit;
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/Util.java b/subsonic-android/src/github/daneren2005/subphonic/util/Util.java
index 9a8c692d..c8711a77 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/util/Util.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/util/Util.java
@@ -16,7 +16,7 @@
 
  Copyright 2009 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.util;
+package github.daneren2005.subphonic.util;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -45,15 +45,15 @@ import android.widget.LinearLayout;
 import android.widget.RemoteViews;
 import android.widget.TextView;
 import android.widget.Toast;
-import net.sourceforge.subsonic.androidapp.R;
-import net.sourceforge.subsonic.androidapp.activity.DownloadActivity;
-import net.sourceforge.subsonic.androidapp.domain.MusicDirectory;
-import net.sourceforge.subsonic.androidapp.domain.PlayerState;
-import net.sourceforge.subsonic.androidapp.domain.RepeatMode;
-import net.sourceforge.subsonic.androidapp.domain.Version;
-import net.sourceforge.subsonic.androidapp.provider.SubsonicAppWidgetProvider;
-import net.sourceforge.subsonic.androidapp.receiver.MediaButtonIntentReceiver;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
+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 org.apache.http.HttpEntity;
 
 import java.io.ByteArrayOutputStream;
@@ -90,8 +90,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 = "net.sourceforge.subsonic.androidapp.EVENT_META_CHANGED";
-    public static final String EVENT_PLAYSTATE_CHANGED = "net.sourceforge.subsonic.androidapp.EVENT_PLAYSTATE_CHANGED";
+    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";
 
     private static final Map<Integer, Version> SERVER_REST_VERSIONS = new ConcurrentHashMap<Integer, Version>();
 
@@ -619,7 +619,7 @@ public final class Util {
         });
 
         // Update widget
-        SubsonicAppWidgetProvider.getInstance().notifyChange(context, downloadService, true);
+        SubsonicAppWidgetProvider1.getInstance().notifyChange(context, downloadService, true);
     }
 
     public static void hidePlayingNotification(final Context context, final DownloadServiceImpl downloadService, Handler handler) {
@@ -633,7 +633,7 @@ public final class Util {
         });
 
         // Update widget
-        SubsonicAppWidgetProvider.getInstance().notifyChange(context, downloadService, false);
+        SubsonicAppWidgetProvider1.getInstance().notifyChange(context, downloadService, false);
     }
 
     public static void sleepQuietly(long millis) {
diff --git a/subsonic-android/src/net/sourceforge/subsonic/androidapp/view/VisualizerView.java b/subsonic-android/src/github/daneren2005/subphonic/view/VisualizerView.java
index 76a45253..c0da92a9 100644
--- a/subsonic-android/src/net/sourceforge/subsonic/androidapp/view/VisualizerView.java
+++ b/subsonic-android/src/github/daneren2005/subphonic/view/VisualizerView.java
@@ -16,7 +16,7 @@
 
  Copyright 2011 (C) Sindre Mehus
  */
-package net.sourceforge.subsonic.androidapp.view;
+package github.daneren2005.subphonic.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 net.sourceforge.subsonic.androidapp.audiofx.VisualizerController;
-import net.sourceforge.subsonic.androidapp.domain.PlayerState;
-import net.sourceforge.subsonic.androidapp.service.DownloadService;
-import net.sourceforge.subsonic.androidapp.service.DownloadServiceImpl;
+import github.daneren2005.subphonic.audiofx.VisualizerController;
+import github.daneren2005.subphonic.domain.PlayerState;
+import github.daneren2005.subphonic.service.DownloadService;
+import github.daneren2005.subphonic.service.DownloadServiceImpl;
 
 /**
  * A simple class that draws waveform data received from a
diff --git a/subsonic-android/tests/AndroidManifest.xml b/subsonic-android/tests/AndroidManifest.xml
index 58fb1e95..1007b9aa 100644
--- a/subsonic-android/tests/AndroidManifest.xml
+++ b/subsonic-android/tests/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="net.sourceforge.subsonic.androidapp.tests"
+          package="github.daneren2005.subphonic.tests"
           android:versionCode="1"
           android:versionName="1.0">
     <!-- We add an application tag here just so that we can indicate that