Update Eleven headers and namespace for open source

Change-Id: I82caf2ebf991998e67f546ff2ac7eaf2b30dc6be

191 files changed, 2048 insertions, 1233 deletions

diff --git a/src/com/cyngn/eleven/Config.java b/src/com/cyanogenmod/eleven/Config.java
index b538d6c..708b0f0 100644
--- a/src/com/cyngn/eleven/Config.java
+++ b/src/com/cyanogenmod/eleven/Config.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven;
+package com.cyanogenmod.eleven;
 
 /**
  * App-wide constants.
diff --git a/src/com/cyngn/eleven/ElevenApplication.java b/src/com/cyanogenmod/eleven/ElevenApplication.java
index 1d3d79f..09d639e 100644
--- a/src/com/cyngn/eleven/ElevenApplication.java
+++ b/src/com/cyanogenmod/eleven/ElevenApplication.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,13 +11,12 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven;
+package com.cyanogenmod.eleven;
 
 import android.app.Application;
 import android.os.StrictMode;
 
-import com.cyngn.eleven.cache.ImageCache;
-import com.cyngn.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.cache.ImageCache;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/src/com/cyngn/eleven/IElevenService.aidl b/src/com/cyanogenmod/eleven/IElevenService.aidl
index c50d246..82a7a97 100644
--- a/src/com/cyngn/eleven/IElevenService.aidl
+++ b/src/com/cyanogenmod/eleven/IElevenService.aidl
@@ -1,6 +1,6 @@
-package com.cyngn.eleven;
+package com.cyanogenmod.eleven;
 
-import com.cyngn.eleven.service.MusicPlaybackTrack;
+import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
 
 interface IElevenService
 {
diff --git a/src/com/cyngn/eleven/MediaButtonIntentReceiver.java b/src/com/cyanogenmod/eleven/MediaButtonIntentReceiver.java
index 2f2c6ae..b2b2c2d 100644
--- a/src/com/cyngn/eleven/MediaButtonIntentReceiver.java
+++ b/src/com/cyanogenmod/eleven/MediaButtonIntentReceiver.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven;
+package com.cyanogenmod.eleven;
 
 import android.content.Context;
 import android.content.Intent;
@@ -22,7 +22,7 @@ import android.support.v4.content.WakefulBroadcastReceiver;
 import android.util.Log;
 import android.view.KeyEvent;
 
-import com.cyngn.eleven.ui.activities.HomeActivity;
+import com.cyanogenmod.eleven.ui.activities.HomeActivity;
 
 /**
  * Used to control headset playback.
diff --git a/src/com/cyngn/eleven/MusicPlaybackService.java b/src/com/cyanogenmod/eleven/MusicPlaybackService.java
index 3a202d1..1db35dd 100644
--- a/src/com/cyngn/eleven/MusicPlaybackService.java
+++ b/src/com/cyanogenmod/eleven/MusicPlaybackService.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven;
+package com.cyanogenmod.eleven;
 
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
@@ -49,19 +51,19 @@ import android.provider.MediaStore.Audio.AudioColumns;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyngn.eleven.Config.IdType;
-import com.cyngn.eleven.appwidgets.AppWidgetLarge;
-import com.cyngn.eleven.appwidgets.AppWidgetLargeAlternate;
-import com.cyngn.eleven.appwidgets.AppWidgetSmall;
-import com.cyngn.eleven.cache.ImageCache;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.provider.MusicPlaybackState;
-import com.cyngn.eleven.provider.RecentStore;
-import com.cyngn.eleven.provider.SongPlayCount;
-import com.cyngn.eleven.service.MusicPlaybackTrack;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.SrtManager;
+import com.cyanogenmod.eleven.Config.IdType;
+import com.cyanogenmod.eleven.appwidgets.AppWidgetLarge;
+import com.cyanogenmod.eleven.appwidgets.AppWidgetLargeAlternate;
+import com.cyanogenmod.eleven.appwidgets.AppWidgetSmall;
+import com.cyanogenmod.eleven.cache.ImageCache;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.provider.MusicPlaybackState;
+import com.cyanogenmod.eleven.provider.RecentStore;
+import com.cyanogenmod.eleven.provider.SongPlayCount;
+import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.SrtManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -84,96 +86,96 @@ public class MusicPlaybackService extends Service {
     /**
      * Indicates that the music has paused or resumed
      */
-    public static final String PLAYSTATE_CHANGED = "com.cyngn.eleven.playstatechanged";
+    public static final String PLAYSTATE_CHANGED = "com.cyanogenmod.eleven.playstatechanged";
 
     /**
      * Indicates that music playback position within
      * a title was changed
      */
-    public static final String POSITION_CHANGED = "com.cyngn.eleven.positionchanged";
+    public static final String POSITION_CHANGED = "com.cyanogenmod.eleven.positionchanged";
 
     /**
      * Indicates the meta data has changed in some way, like a track change
      */
-    public static final String META_CHANGED = "com.cyngn.eleven.metachanged";
+    public static final String META_CHANGED = "com.cyanogenmod.eleven.metachanged";
 
     /**
      * Indicates the queue has been updated
      */
-    public static final String QUEUE_CHANGED = "com.cyngn.eleven.queuechanged";
+    public static final String QUEUE_CHANGED = "com.cyanogenmod.eleven.queuechanged";
 
     /**
      * Indicates the queue has been updated
      */
-    public static final String PLAYLIST_CHANGED = "com.cyngn.eleven.playlistchanged";
+    public static final String PLAYLIST_CHANGED = "com.cyanogenmod.eleven.playlistchanged";
 
     /**
      * Indicates the repeat mode chaned
      */
-    public static final String REPEATMODE_CHANGED = "com.cyngn.eleven.repeatmodechanged";
+    public static final String REPEATMODE_CHANGED = "com.cyanogenmod.eleven.repeatmodechanged";
 
     /**
      * Indicates the shuffle mode chaned
      */
-    public static final String SHUFFLEMODE_CHANGED = "com.cyngn.eleven.shufflemodechanged";
+    public static final String SHUFFLEMODE_CHANGED = "com.cyanogenmod.eleven.shufflemodechanged";
 
     /**
      * For backwards compatibility reasons, also provide sticky
      * broadcasts under the music package
      */
-    public static final String ELEVEN_PACKAGE_NAME = "com.cyngn.eleven";
+    public static final String ELEVEN_PACKAGE_NAME = "com.cyanogenmod.eleven";
     public static final String MUSIC_PACKAGE_NAME = "com.android.music";
 
     /**
      * Called to indicate a general service commmand. Used in
      * {@link MediaButtonIntentReceiver}
      */
-    public static final String SERVICECMD = "com.cyngn.eleven.musicservicecommand";
+    public static final String SERVICECMD = "com.cyanogenmod.eleven.musicservicecommand";
 
     /**
      * Called to go toggle between pausing and playing the music
      */
-    public static final String TOGGLEPAUSE_ACTION = "com.cyngn.eleven.togglepause";
+    public static final String TOGGLEPAUSE_ACTION = "com.cyanogenmod.eleven.togglepause";
 
     /**
      * Called to go to pause the playback
      */
-    public static final String PAUSE_ACTION = "com.cyngn.eleven.pause";
+    public static final String PAUSE_ACTION = "com.cyanogenmod.eleven.pause";
 
     /**
      * Called to go to stop the playback
      */
-    public static final String STOP_ACTION = "com.cyngn.eleven.stop";
+    public static final String STOP_ACTION = "com.cyanogenmod.eleven.stop";
 
     /**
      * Called to go to the previous track or the beginning of the track if partway through the track
      */
-    public static final String PREVIOUS_ACTION = "com.cyngn.eleven.previous";
+    public static final String PREVIOUS_ACTION = "com.cyanogenmod.eleven.previous";
 
     /**
      * Called to go to the previous track regardless of how far in the current track the playback is
      */
-    public static final String PREVIOUS_FORCE_ACTION = "com.cyngn.eleven.previous.force";
+    public static final String PREVIOUS_FORCE_ACTION = "com.cyanogenmod.eleven.previous.force";
 
     /**
      * Called to go to the next track
      */
-    public static final String NEXT_ACTION = "com.cyngn.eleven.next";
+    public static final String NEXT_ACTION = "com.cyanogenmod.eleven.next";
 
     /**
      * Called to change the repeat mode
      */
-    public static final String REPEAT_ACTION = "com.cyngn.eleven.repeat";
+    public static final String REPEAT_ACTION = "com.cyanogenmod.eleven.repeat";
 
     /**
      * Called to change the shuffle mode
      */
-    public static final String SHUFFLE_ACTION = "com.cyngn.eleven.shuffle";
+    public static final String SHUFFLE_ACTION = "com.cyanogenmod.eleven.shuffle";
 
     /**
      * Called to update the service about the foreground state of Apollo's activities
      */
-    public static final String FOREGROUND_STATE_CHANGED = "com.cyngn.eleven.fgstatechanged";
+    public static final String FOREGROUND_STATE_CHANGED = "com.cyanogenmod.eleven.fgstatechanged";
 
     public static final String NOW_IN_FOREGROUND = "nowinforeground";
 
@@ -183,22 +185,22 @@ public class MusicPlaybackService extends Service {
      * Used to easily notify a list that it should refresh. i.e. A playlist
      * changes
      */
-    public static final String REFRESH = "com.cyngn.eleven.refresh";
+    public static final String REFRESH = "com.cyanogenmod.eleven.refresh";
 
     /**
      * Used by the alarm intent to shutdown the service after being idle
      */
-    private static final String SHUTDOWN = "com.cyngn.eleven.shutdown";
+    private static final String SHUTDOWN = "com.cyanogenmod.eleven.shutdown";
 
     /**
      * Called to notify of a timed text
      */
-    public static final String NEW_LYRICS = "com.cyngn.eleven.lyrics";
+    public static final String NEW_LYRICS = "com.cyanogenmod.eleven.lyrics";
 
     /**
      * Called to update the remote control client
      */
-    public static final String UPDATE_LOCKSCREEN = "com.cyngn.eleven.updatelockscreen";
+    public static final String UPDATE_LOCKSCREEN = "com.cyanogenmod.eleven.updatelockscreen";
 
     public static final String CMDNAME = "command";
 
diff --git a/src/com/cyanogenmod/eleven/MusicStateListener.java b/src/com/cyanogenmod/eleven/MusicStateListener.java
new file mode 100644
index 0000000..84bd99d
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/MusicStateListener.java
@@ -0,0 +1,38 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven;
+
+/**
+ * Listens for playback changes to send the the fragments bound to this activity
+ */
+public interface MusicStateListener {
+
+    /**
+     * Called when {@link MusicPlaybackService#REFRESH} is invoked
+     */
+    public void restartLoader();
+
+    /**
+     * Called when {@link MusicPlaybackService#PLAYLIST_CHANGED} is invoked
+     */
+    public void onPlaylistChanged();
+
+    /**
+     * Called when {@link MusicPlaybackService#META_CHANGED} is invoked
+     */
+    public void onMetaChanged();
+
+}
diff --git a/src/com/cyngn/eleven/NotificationHelper.java b/src/com/cyanogenmod/eleven/NotificationHelper.java
index 0bce28f..b119387 100644
--- a/src/com/cyngn/eleven/NotificationHelper.java
+++ b/src/com/cyanogenmod/eleven/NotificationHelper.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven;
+package com.cyanogenmod.eleven;
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
@@ -20,10 +22,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.support.v4.app.NotificationCompat;
-import android.util.Log;
 import android.widget.RemoteViews;
 
-import com.cyngn.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
 
 /**
  * Builds the notification for Apollo's service. Jelly Bean and higher uses the
@@ -145,7 +146,7 @@ public class NotificationHelper {
      * Open to the now playing screen
      */
     private PendingIntent getPendingIntent() {
-        return PendingIntent.getActivity(mService, 0, new Intent("com.cyngn.eleven.AUDIO_PLAYER")
+        return PendingIntent.getActivity(mService, 0, new Intent("com.cyanogenmod.eleven.AUDIO_PLAYER")
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK), 0);
     }
 
diff --git a/src/com/cyngn/eleven/adapters/AlbumAdapter.java b/src/com/cyanogenmod/eleven/adapters/AlbumAdapter.java
index 762930b..2d750b5 100644
--- a/src/com/cyngn/eleven/adapters/AlbumAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/AlbumAdapter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.adapters;
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -19,13 +21,13 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.ui.MusicHolder;
-import com.cyngn.eleven.ui.MusicHolder.DataHolder;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.ui.MusicHolder;
+import com.cyanogenmod.eleven.ui.MusicHolder.DataHolder;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/adapters/AlbumArtPagerAdapter.java b/src/com/cyanogenmod/eleven/adapters/AlbumArtPagerAdapter.java
index 996231b..111350d 100644
--- a/src/com/cyngn/eleven/adapters/AlbumArtPagerAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/AlbumArtPagerAdapter.java
@@ -1,8 +1,20 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-
-package com.cyngn.eleven.adapters;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.cyanogenmod.eleven.adapters;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -15,14 +27,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ICacheListener;
-import com.cyngn.eleven.cache.ImageCache;
-import com.cyngn.eleven.model.AlbumArtistDetails;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.SquareImageView;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ICacheListener;
+import com.cyanogenmod.eleven.cache.ImageCache;
+import com.cyanogenmod.eleven.model.AlbumArtistDetails;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.SquareImageView;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -140,7 +152,7 @@ public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter {
      * and handles loading the album art for a given audio id
      */
     public static class AlbumArtFragment extends Fragment implements ICacheListener {
-        private static final String ID = "com.cyngn.eleven.adapters.AlbumArtPagerAdapter.AlbumArtFragment.ID";
+        private static final String ID = "com.cyanogenmod.eleven.adapters.AlbumArtPagerAdapter.AlbumArtFragment.ID";
 
         private View mRootView;
         private AlbumArtistLoader mTask;
diff --git a/src/com/cyngn/eleven/adapters/AlbumDetailSongAdapter.java b/src/com/cyanogenmod/eleven/adapters/AlbumDetailSongAdapter.java
index 431bffe..063b468 100644
--- a/src/com/cyngn/eleven/adapters/AlbumDetailSongAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/AlbumDetailSongAdapter.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.adapters;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -7,13 +22,13 @@ import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.TextView;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.loaders.AlbumSongLoader;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.ui.fragments.AlbumDetailFragment;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.loaders.AlbumSongLoader;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.ui.fragments.AlbumDetailFragment;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 import java.util.List;
 
diff --git a/src/com/cyngn/eleven/adapters/ArtistAdapter.java b/src/com/cyanogenmod/eleven/adapters/ArtistAdapter.java
index 500529a..6eb0267 100644
--- a/src/com/cyngn/eleven/adapters/ArtistAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/ArtistAdapter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,29 +11,24 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.adapters;
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
-import android.content.res.Resources;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.model.Artist;
-import com.cyngn.eleven.sectionadapter.SectionAdapter;
-import com.cyngn.eleven.sectionadapter.SectionAdapter.BasicAdapter;
-import com.cyngn.eleven.ui.MusicHolder;
-import com.cyngn.eleven.ui.MusicHolder.DataHolder;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
+
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.model.Artist;
+import com.cyanogenmod.eleven.sectionadapter.SectionAdapter.BasicAdapter;
+import com.cyanogenmod.eleven.ui.MusicHolder;
+import com.cyanogenmod.eleven.ui.MusicHolder.DataHolder;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the artists on a user's
diff --git a/src/com/cyngn/eleven/adapters/ArtistDetailAlbumAdapter.java b/src/com/cyanogenmod/eleven/adapters/ArtistDetailAlbumAdapter.java
index f4fb4f3..1b7aed6 100644
--- a/src/com/cyngn/eleven/adapters/ArtistDetailAlbumAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/ArtistDetailAlbumAdapter.java
@@ -1,7 +1,21 @@
-package com.cyngn.eleven.adapters;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.Loader;
@@ -12,15 +26,15 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.loaders.ArtistAlbumLoader;
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.NavUtils;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.PopupMenuButton;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.loaders.ArtistAlbumLoader;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.PopupMenuButton;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/adapters/ArtistDetailSongAdapter.java b/src/com/cyanogenmod/eleven/adapters/ArtistDetailSongAdapter.java
index f5d0f4f..b2ed587 100644
--- a/src/com/cyngn/eleven/adapters/ArtistDetailSongAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/ArtistDetailSongAdapter.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.adapters;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -7,11 +22,11 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.loaders.ArtistSongLoader;
-import com.cyngn.eleven.model.Song;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.loaders.ArtistSongLoader;
+import com.cyanogenmod.eleven.model.Song;
 
 import java.util.List;
 
diff --git a/src/com/cyngn/eleven/adapters/DetailSongAdapter.java b/src/com/cyanogenmod/eleven/adapters/DetailSongAdapter.java
index ee17968..49157af 100644
--- a/src/com/cyngn/eleven/adapters/DetailSongAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/DetailSongAdapter.java
@@ -1,4 +1,4 @@
-package com.cyngn.eleven.adapters;
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
@@ -12,15 +12,15 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.service.MusicPlaybackTrack;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.PopupMenuButton;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.PopupMenuButton;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/adapters/PagerAdapter.java b/src/com/cyanogenmod/eleven/adapters/PagerAdapter.java
index c9f540c..176a772 100644
--- a/src/com/cyngn/eleven/adapters/PagerAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/PagerAdapter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,24 +11,22 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.adapters;
+package com.cyanogenmod.eleven.adapters;
 
-import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.util.SparseArray;
 import android.view.ViewGroup;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.fragments.AlbumFragment;
-import com.cyngn.eleven.ui.fragments.ArtistFragment;
-import com.cyngn.eleven.ui.fragments.PlaylistFragment;
-import com.cyngn.eleven.ui.fragments.SongFragment;
-import com.cyngn.eleven.utils.Lists;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.fragments.AlbumFragment;
+import com.cyanogenmod.eleven.ui.fragments.ArtistFragment;
+import com.cyanogenmod.eleven.ui.fragments.PlaylistFragment;
+import com.cyanogenmod.eleven.ui.fragments.SongFragment;
+import com.cyanogenmod.eleven.utils.Lists;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/adapters/PlaylistAdapter.java b/src/com/cyanogenmod/eleven/adapters/PlaylistAdapter.java
index bb9785b..dab9344 100644
--- a/src/com/cyngn/eleven/adapters/PlaylistAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/PlaylistAdapter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.adapters;
+package com.cyanogenmod.eleven.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -17,15 +19,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.model.Playlist;
-import com.cyngn.eleven.ui.MusicHolder;
-import com.cyngn.eleven.ui.MusicHolder.DataHolder;
-import com.cyngn.eleven.ui.fragments.PlaylistFragment;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.model.Playlist;
+import com.cyanogenmod.eleven.ui.MusicHolder;
+import com.cyanogenmod.eleven.ui.MusicHolder.DataHolder;
+import com.cyanogenmod.eleven.ui.fragments.PlaylistFragment;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the playlists on a user's
diff --git a/src/com/cyngn/eleven/adapters/ProfileSongAdapter.java b/src/com/cyanogenmod/eleven/adapters/ProfileSongAdapter.java
index c4318e8..6b16c55 100644
--- a/src/com/cyngn/eleven/adapters/ProfileSongAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/ProfileSongAdapter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.adapters;
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
 import android.view.LayoutInflater;
@@ -17,14 +19,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.model.Song;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.model.Song;
 
 import java.util.Collection;
 
 /**
  * This {@link ArrayAdapter} is used to display the songs for a particular playlist
- * {@link com.cyngn.eleven.ui.fragments.PlaylistDetailFragment}
+ * {@link com.cyanogenmod.eleven.ui.fragments.PlaylistDetailFragment}
  * 
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
diff --git a/src/com/cyngn/eleven/adapters/SongAdapter.java b/src/com/cyanogenmod/eleven/adapters/SongAdapter.java
index 3d6ed83..80f8006 100644
--- a/src/com/cyngn/eleven/adapters/SongAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/SongAdapter.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.adapters;
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -18,20 +20,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.model.Artist;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.sectionadapter.SectionAdapter;
-import com.cyngn.eleven.service.MusicPlaybackTrack;
-import com.cyngn.eleven.ui.MusicHolder;
-import com.cyngn.eleven.ui.MusicHolder.DataHolder;
-import com.cyngn.eleven.ui.fragments.QueueFragment;
-import com.cyngn.eleven.ui.fragments.SongFragment;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.PlayPauseProgressButton;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.model.Artist;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
+import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import com.cyanogenmod.eleven.ui.MusicHolder;
+import com.cyanogenmod.eleven.ui.MusicHolder.DataHolder;
+import com.cyanogenmod.eleven.ui.fragments.QueueFragment;
+import com.cyanogenmod.eleven.ui.fragments.SongFragment;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the songs on a user's
diff --git a/src/com/cyngn/eleven/adapters/SummarySearchAdapter.java b/src/com/cyanogenmod/eleven/adapters/SummarySearchAdapter.java
index 8072f3f..fa12c8f 100644
--- a/src/com/cyngn/eleven/adapters/SummarySearchAdapter.java
+++ b/src/com/cyanogenmod/eleven/adapters/SummarySearchAdapter.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.adapters;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.adapters;
 
 import android.app.Activity;
 import android.text.TextUtils;
@@ -11,15 +23,15 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.format.PrefixHighlighter;
-import com.cyngn.eleven.model.SearchResult;
-import com.cyngn.eleven.sectionadapter.SectionAdapter;
-import com.cyngn.eleven.ui.MusicHolder;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.format.PrefixHighlighter;
+import com.cyanogenmod.eleven.model.SearchResult;
+import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
+import com.cyanogenmod.eleven.ui.MusicHolder;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
 
 import java.util.Locale;
 
diff --git a/src/com/cyngn/eleven/appwidgets/AppWidgetBase.java b/src/com/cyanogenmod/eleven/appwidgets/AppWidgetBase.java
index 89be2f2..e72f303 100644
--- a/src/com/cyngn/eleven/appwidgets/AppWidgetBase.java
+++ b/src/com/cyanogenmod/eleven/appwidgets/AppWidgetBase.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.appwidgets;
+package com.cyanogenmod.eleven.appwidgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetProvider;
@@ -17,7 +19,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 
-import com.cyngn.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.MusicPlaybackService;
 
 public abstract class AppWidgetBase extends AppWidgetProvider {
 
diff --git a/src/com/cyngn/eleven/appwidgets/AppWidgetLarge.java b/src/com/cyanogenmod/eleven/appwidgets/AppWidgetLarge.java
index 5a22e75..093f55f 100644
--- a/src/com/cyngn/eleven/appwidgets/AppWidgetLarge.java
+++ b/src/com/cyanogenmod/eleven/appwidgets/AppWidgetLarge.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.appwidgets;
+package com.cyanogenmod.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -20,11 +22,10 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.widget.RemoteViews;
 
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.activities.HomeActivity;
-import com.cyngn.eleven.ui.fragments.AudioPlayerFragment;
-import com.cyngn.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
 
 /**
  * 4x2 App-Widget
diff --git a/src/com/cyngn/eleven/appwidgets/AppWidgetLargeAlternate.java b/src/com/cyanogenmod/eleven/appwidgets/AppWidgetLargeAlternate.java
index 7dc3888..4f67d4e 100644
--- a/src/com/cyngn/eleven/appwidgets/AppWidgetLargeAlternate.java
+++ b/src/com/cyanogenmod/eleven/appwidgets/AppWidgetLargeAlternate.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.appwidgets;
+package com.cyanogenmod.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -20,13 +22,12 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.widget.RemoteViews;
 
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.activities.HomeActivity;
-import com.cyngn.eleven.ui.fragments.AudioPlayerFragment;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.widgets.RepeatButton;
-import com.cyngn.eleven.widgets.ShuffleButton;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.widgets.RepeatButton;
+import com.cyanogenmod.eleven.widgets.ShuffleButton;
 
 /**
  * 4x2 App-Widget
diff --git a/src/com/cyngn/eleven/appwidgets/AppWidgetSmall.java b/src/com/cyanogenmod/eleven/appwidgets/AppWidgetSmall.java
index a131f0f..e9478a5 100644
--- a/src/com/cyngn/eleven/appwidgets/AppWidgetSmall.java
+++ b/src/com/cyanogenmod/eleven/appwidgets/AppWidgetSmall.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.appwidgets;
+package com.cyanogenmod.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -22,11 +24,10 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;
 
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.activities.HomeActivity;
-import com.cyngn.eleven.ui.fragments.AudioPlayerFragment;
-import com.cyngn.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
 
 /**
  * 4x1 App-Widget
diff --git a/src/com/cyngn/eleven/cache/BitmapWorkerTask.java b/src/com/cyanogenmod/eleven/cache/BitmapWorkerTask.java
index c340508..c7ab842 100644
--- a/src/com/cyngn/eleven/cache/BitmapWorkerTask.java
+++ b/src/com/cyanogenmod/eleven/cache/BitmapWorkerTask.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.cache;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.cache;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -11,7 +23,7 @@ import android.graphics.drawable.TransitionDrawable;
 import android.os.AsyncTask;
 import android.widget.ImageView;
 
-import com.cyngn.eleven.cache.ImageWorker.ImageType;
+import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/cyngn/eleven/cache/BlurBitmapWorkerTask.java b/src/com/cyanogenmod/eleven/cache/BlurBitmapWorkerTask.java
index bd4bc6a..2fe88ea 100644
--- a/src/com/cyngn/eleven/cache/BlurBitmapWorkerTask.java
+++ b/src/com/cyanogenmod/eleven/cache/BlurBitmapWorkerTask.java
@@ -1,12 +1,22 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.cache;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.cache;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.support.v8.renderscript.Allocation;
@@ -15,8 +25,8 @@ import android.support.v8.renderscript.RenderScript;
 import android.support.v8.renderscript.ScriptIntrinsicBlur;
 import android.widget.ImageView;
 
-import com.cyngn.eleven.cache.ImageWorker.ImageType;
-import com.cyngn.eleven.widgets.BlurScrimImage;
+import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
+import com.cyanogenmod.eleven.widgets.BlurScrimImage;
 
 import java.lang.ref.WeakReference;
 
@@ -40,7 +50,7 @@ public class BlurBitmapWorkerTask extends BitmapWorkerTask<String, Void, BlurBit
     }
 
     /**
-     * The {@link com.cyngn.eleven.widgets.BlurScrimImage} used to set the result
+     * The {@link com.cyanogenmod.eleven.widgets.BlurScrimImage} used to set the result
      */
     private final WeakReference<BlurScrimImage> mBlurScrimImage;
 
diff --git a/src/com/cyngn/eleven/cache/DiskLruCache.java b/src/com/cyanogenmod/eleven/cache/DiskLruCache.java
index 1b73447..4d29ded 100644
--- a/src/com/cyngn/eleven/cache/DiskLruCache.java
+++ b/src/com/cyanogenmod/eleven/cache/DiskLruCache.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.cache;
+package com.cyanogenmod.eleven.cache;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
diff --git a/src/com/cyanogenmod/eleven/cache/ICacheListener.java b/src/com/cyanogenmod/eleven/cache/ICacheListener.java
new file mode 100644
index 0000000..89b88ac
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/cache/ICacheListener.java
@@ -0,0 +1,20 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.cache;
+
+public interface ICacheListener {
+    void onCacheUnpaused();
+}
diff --git a/src/com/cyngn/eleven/cache/ImageCache.java b/src/com/cyanogenmod/eleven/cache/ImageCache.java
index cb37f6a..0859054 100644
--- a/src/com/cyngn/eleven/cache/ImageCache.java
+++ b/src/com/cyanogenmod/eleven/cache/ImageCache.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.cache;
+package com.cyanogenmod.eleven.cache;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -25,15 +27,13 @@ import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Looper;
 import android.os.ParcelFileDescriptor;
-import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyngn.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
 
 import java.io.File;
 import java.io.FileDescriptor;
diff --git a/src/com/cyngn/eleven/cache/ImageFetcher.java b/src/com/cyanogenmod/eleven/cache/ImageFetcher.java
index c0a51c8..d6300bd 100644
--- a/src/com/cyngn/eleven/cache/ImageFetcher.java
+++ b/src/com/cyanogenmod/eleven/cache/ImageFetcher.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.cache;
+package com.cyanogenmod.eleven.cache;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -17,12 +19,12 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.widget.ImageView;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.BlurScrimImage;
-import com.cyngn.eleven.widgets.LetterTileDrawable;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.BlurScrimImage;
+import com.cyanogenmod.eleven.widgets.LetterTileDrawable;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/com/cyngn/eleven/cache/ImageWorker.java b/src/com/cyanogenmod/eleven/cache/ImageWorker.java
index e3cea92..e8ea9d8 100644
--- a/src/com/cyngn/eleven/cache/ImageWorker.java
+++ b/src/com/cyanogenmod/eleven/cache/ImageWorker.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.cache;
+package com.cyanogenmod.eleven.cache;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -20,17 +22,17 @@ import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.support.v8.renderscript.RenderScript;
-import android.util.Log;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.provider.PlaylistArtworkStore;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.ImageUtils;
-import com.cyngn.eleven.widgets.BlurScrimImage;
-import com.cyngn.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
-import com.cyngn.eleven.widgets.LetterTileDrawable;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.provider.PlaylistArtworkStore;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.ImageUtils;
+import com.cyanogenmod.eleven.widgets.BlurScrimImage;
+import com.cyanogenmod.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
+import com.cyanogenmod.eleven.widgets.LetterTileDrawable;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
diff --git a/src/com/cyngn/eleven/cache/LruCache.java b/src/com/cyanogenmod/eleven/cache/LruCache.java
index bc7debf..2144b93 100644
--- a/src/com/cyngn/eleven/cache/LruCache.java
+++ b/src/com/cyanogenmod/eleven/cache/LruCache.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.cache;
+package com.cyanogenmod.eleven.cache;
 
 // NOTE: upstream of this class is android.util.LruCache, changes below
 // expose trimToSize() to be called externally.
diff --git a/src/com/cyngn/eleven/cache/PlaylistWorkerTask.java b/src/com/cyanogenmod/eleven/cache/PlaylistWorkerTask.java
index 011b6f6..c35ad00 100644
--- a/src/com/cyngn/eleven/cache/PlaylistWorkerTask.java
+++ b/src/com/cyanogenmod/eleven/cache/PlaylistWorkerTask.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.cache;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.cache;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -13,11 +25,12 @@ import android.graphics.drawable.TransitionDrawable;
 import android.provider.MediaStore;
 import android.widget.ImageView;
 
-import com.cyngn.eleven.cache.ImageWorker.ImageType;
-import com.cyngn.eleven.loaders.PlaylistSongLoader;
-import com.cyngn.eleven.loaders.SortedCursor;
-import com.cyngn.eleven.provider.PlaylistArtworkStore;
-import com.cyngn.eleven.provider.SongPlayCount;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
+import com.cyanogenmod.eleven.loaders.PlaylistSongLoader;
+import com.cyanogenmod.eleven.loaders.SortedCursor;
+import com.cyanogenmod.eleven.provider.PlaylistArtworkStore;
+import com.cyanogenmod.eleven.provider.SongPlayCount;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/com/cyngn/eleven/cache/SimpleBitmapWorkerTask.java b/src/com/cyanogenmod/eleven/cache/SimpleBitmapWorkerTask.java
index 4f50914..027eb7f 100644
--- a/src/com/cyngn/eleven/cache/SimpleBitmapWorkerTask.java
+++ b/src/com/cyanogenmod/eleven/cache/SimpleBitmapWorkerTask.java
@@ -1,15 +1,27 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.cache;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.cache;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.widget.ImageView;
-import com.cyngn.eleven.cache.ImageWorker.ImageType;
-import com.cyngn.eleven.utils.ImageUtils;
+import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
+import com.cyanogenmod.eleven.utils.ImageUtils;
 
 /**
  * The actual {@link android.os.AsyncTask} that will process the image.
diff --git a/src/com/cyngn/eleven/dragdrop/DragSortController.java b/src/com/cyanogenmod/eleven/dragdrop/DragSortController.java
index c14e6b1..6f7380f 100644
--- a/src/com/cyngn/eleven/dragdrop/DragSortController.java
+++ b/src/com/cyanogenmod/eleven/dragdrop/DragSortController.java
@@ -1,5 +1,5 @@
 
-package com.cyngn.eleven.dragdrop;
+package com.cyanogenmod.eleven.dragdrop;
 
 import android.graphics.Point;
 import android.view.GestureDetector;
diff --git a/src/com/cyngn/eleven/dragdrop/DragSortListView.java b/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java
index 1e7acc1..85a2fbb 100644
--- a/src/com/cyngn/eleven/dragdrop/DragSortListView.java
+++ b/src/com/cyanogenmod/eleven/dragdrop/DragSortListView.java
@@ -10,7 +10,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.dragdrop;
+package com.cyanogenmod.eleven.dragdrop;
 
 import android.content.Context;
 import android.database.DataSetObserver;
@@ -30,7 +30,7 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/com/cyngn/eleven/dragdrop/SimpleFloatViewManager.java b/src/com/cyanogenmod/eleven/dragdrop/SimpleFloatViewManager.java
index 1cf0d49..f7be4f2 100644
--- a/src/com/cyngn/eleven/dragdrop/SimpleFloatViewManager.java
+++ b/src/com/cyanogenmod/eleven/dragdrop/SimpleFloatViewManager.java
@@ -1,5 +1,5 @@
 
-package com.cyngn.eleven.dragdrop;
+package com.cyanogenmod.eleven.dragdrop;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/src/com/cyngn/eleven/format/Capitalize.java b/src/com/cyanogenmod/eleven/format/Capitalize.java
index 3d3a381..9872fe4 100644
--- a/src/com/cyngn/eleven/format/Capitalize.java
+++ b/src/com/cyanogenmod/eleven/format/Capitalize.java
@@ -1,5 +1,5 @@
 
-package com.cyngn.eleven.format;
+package com.cyanogenmod.eleven.format;
 
 import android.text.TextUtils;
 
diff --git a/src/com/cyngn/eleven/format/PrefixHighlighter.java b/src/com/cyanogenmod/eleven/format/PrefixHighlighter.java
index e1367f2..191aed8 100644
--- a/src/com/cyngn/eleven/format/PrefixHighlighter.java
+++ b/src/com/cyanogenmod/eleven/format/PrefixHighlighter.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.format;
+package com.cyanogenmod.eleven.format;
 
 import android.content.Context;
 import android.text.SpannableString;
@@ -17,7 +17,7 @@ import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.widget.TextView;
 
-import com.cyngn.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
 
 /**
  * Highlights the text in a text field.
diff --git a/src/com/cyngn/eleven/lastfm/Album.java b/src/com/cyanogenmod/eleven/lastfm/Album.java
index cd657de..87c6dbb 100644
--- a/src/com/cyngn/eleven/lastfm/Album.java
+++ b/src/com/cyanogenmod/eleven/lastfm/Album.java
@@ -19,11 +19,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import android.content.Context;
 
-import com.cyngn.eleven.Config;
+import com.cyanogenmod.eleven.Config;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/com/cyngn/eleven/lastfm/Artist.java b/src/com/cyanogenmod/eleven/lastfm/Artist.java
index 0ffaf8c..580752f 100644
--- a/src/com/cyngn/eleven/lastfm/Artist.java
+++ b/src/com/cyanogenmod/eleven/lastfm/Artist.java
@@ -19,11 +19,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import android.content.Context;
 
-import com.cyngn.eleven.Config;
+import com.cyanogenmod.eleven.Config;
 
 import java.util.Locale;
 import java.util.Map;
diff --git a/src/com/cyngn/eleven/lastfm/Caller.java b/src/com/cyanogenmod/eleven/lastfm/Caller.java
index f5e6c45..e17926f 100644
--- a/src/com/cyngn/eleven/lastfm/Caller.java
+++ b/src/com/cyanogenmod/eleven/lastfm/Caller.java
@@ -19,15 +19,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
-import static com.cyngn.eleven.lastfm.StringUtilities.encode;
-import static com.cyngn.eleven.lastfm.StringUtilities.map;
+import static com.cyanogenmod.eleven.lastfm.StringUtilities.encode;
+import static com.cyanogenmod.eleven.lastfm.StringUtilities.map;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.cyngn.eleven.lastfm.Result.Status;
+import com.cyanogenmod.eleven.lastfm.Result.Status;
 
 import org.apache.http.HttpStatus;
 import org.w3c.dom.Document;
diff --git a/src/com/cyngn/eleven/lastfm/DomElement.java b/src/com/cyanogenmod/eleven/lastfm/DomElement.java
index bd26351..d3ace9a 100644
--- a/src/com/cyngn/eleven/lastfm/DomElement.java
+++ b/src/com/cyanogenmod/eleven/lastfm/DomElement.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/src/com/cyngn/eleven/lastfm/Image.java b/src/com/cyanogenmod/eleven/lastfm/Image.java
index 84ba206..b733f58 100644
--- a/src/com/cyngn/eleven/lastfm/Image.java
+++ b/src/com/cyanogenmod/eleven/lastfm/Image.java
@@ -19,9 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
-
-import java.util.Locale;
+package com.cyanogenmod.eleven.lastfm;
 
 /**
  * An <code>Image</code> contains metadata and URLs for an artist's image.
diff --git a/src/com/cyngn/eleven/lastfm/ImageHolder.java b/src/com/cyanogenmod/eleven/lastfm/ImageHolder.java
index 8b2b11e..d4bf590 100644
--- a/src/com/cyngn/eleven/lastfm/ImageHolder.java
+++ b/src/com/cyanogenmod/eleven/lastfm/ImageHolder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/src/com/cyngn/eleven/lastfm/ImageSize.java b/src/com/cyanogenmod/eleven/lastfm/ImageSize.java
index 6f05f22..ec2f6ac 100644
--- a/src/com/cyngn/eleven/lastfm/ImageSize.java
+++ b/src/com/cyanogenmod/eleven/lastfm/ImageSize.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 /**
  * @author Janni Kovacs
diff --git a/src/com/cyngn/eleven/lastfm/ItemFactory.java b/src/com/cyanogenmod/eleven/lastfm/ItemFactory.java
index 5e699fd..858dbdf 100644
--- a/src/com/cyngn/eleven/lastfm/ItemFactory.java
+++ b/src/com/cyanogenmod/eleven/lastfm/ItemFactory.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 /**
  * An <code>ItemFactory</code> can be used to instantiate a value object - such
@@ -27,7 +27,7 @@ package com.cyngn.eleven.lastfm;
  * {@link ItemFactoryBuilder} to obtain item factories for a specific type.
  * 
  * @author Janni Kovacs
- * @see com.cyngn.eleven.lastfm.api.ItemFactoryBuilder
+ * @see com.cyanogenmod.eleven.lastfm.api.ItemFactoryBuilder
  * @see ResponseBuilder
  */
 interface ItemFactory<T> {
diff --git a/src/com/cyngn/eleven/lastfm/ItemFactoryBuilder.java b/src/com/cyanogenmod/eleven/lastfm/ItemFactoryBuilder.java
index bdf2211..f182bdd 100644
--- a/src/com/cyngn/eleven/lastfm/ItemFactoryBuilder.java
+++ b/src/com/cyanogenmod/eleven/lastfm/ItemFactoryBuilder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/com/cyngn/eleven/lastfm/MapUtilities.java b/src/com/cyanogenmod/eleven/lastfm/MapUtilities.java
index 3056f35..d42e841 100644
--- a/src/com/cyngn/eleven/lastfm/MapUtilities.java
+++ b/src/com/cyanogenmod/eleven/lastfm/MapUtilities.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import java.util.Map;
 
diff --git a/src/com/cyngn/eleven/lastfm/MusicEntry.java b/src/com/cyanogenmod/eleven/lastfm/MusicEntry.java
index 557cd0d..6ffc635 100644
--- a/src/com/cyngn/eleven/lastfm/MusicEntry.java
+++ b/src/com/cyanogenmod/eleven/lastfm/MusicEntry.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 /**
  * <code>MusicEntry</code> is the abstract superclass for {@link Track},
diff --git a/src/com/cyngn/eleven/lastfm/PaginatedResult.java b/src/com/cyanogenmod/eleven/lastfm/PaginatedResult.java
index 4872abe..66bcdac 100644
--- a/src/com/cyngn/eleven/lastfm/PaginatedResult.java
+++ b/src/com/cyanogenmod/eleven/lastfm/PaginatedResult.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/com/cyngn/eleven/lastfm/ResponseBuilder.java b/src/com/cyanogenmod/eleven/lastfm/ResponseBuilder.java
index b0ceb90..ffb528d 100644
--- a/src/com/cyngn/eleven/lastfm/ResponseBuilder.java
+++ b/src/com/cyanogenmod/eleven/lastfm/ResponseBuilder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/cyngn/eleven/lastfm/Result.java b/src/com/cyanogenmod/eleven/lastfm/Result.java
index 824e204..f3df2d2 100644
--- a/src/com/cyngn/eleven/lastfm/Result.java
+++ b/src/com/cyanogenmod/eleven/lastfm/Result.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import org.w3c.dom.Document;
 
diff --git a/src/com/cyngn/eleven/lastfm/StringUtilities.java b/src/com/cyanogenmod/eleven/lastfm/StringUtilities.java
index 982ea5f..4343d0d 100644
--- a/src/com/cyngn/eleven/lastfm/StringUtilities.java
+++ b/src/com/cyanogenmod/eleven/lastfm/StringUtilities.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyngn.eleven.lastfm;
+package com.cyanogenmod.eleven.lastfm;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/src/com/cyngn/eleven/loaders/AlbumLoader.java b/src/com/cyanogenmod/eleven/loaders/AlbumLoader.java
index 4be993a..b66145a 100644
--- a/src/com/cyngn/eleven/loaders/AlbumLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/AlbumLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -17,12 +19,12 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AlbumColumns;
 
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.PreferenceUtils;
-import com.cyngn.eleven.utils.SortOrder;
-import com.cyngn.eleven.utils.SortUtils;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.utils.SortOrder;
+import com.cyanogenmod.eleven.utils.SortUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/AlbumSongLoader.java b/src/com/cyanogenmod/eleven/loaders/AlbumSongLoader.java
index d2634d6..d4d5b49 100644
--- a/src/com/cyngn/eleven/loaders/AlbumSongLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/AlbumSongLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -17,9 +19,9 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/ArtistAlbumLoader.java b/src/com/cyanogenmod/eleven/loaders/ArtistAlbumLoader.java
index 0525eca..74b3dec 100644
--- a/src/com/cyngn/eleven/loaders/ArtistAlbumLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/ArtistAlbumLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -18,12 +20,10 @@ import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AlbumColumns;
 import android.util.Log;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.AlbumArtPagerAdapter;
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/ArtistLoader.java b/src/com/cyanogenmod/eleven/loaders/ArtistLoader.java
index c5928f7..b5f57d4 100644
--- a/src/com/cyngn/eleven/loaders/ArtistLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/ArtistLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -17,12 +19,12 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.ArtistColumns;
 
-import com.cyngn.eleven.model.Artist;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.PreferenceUtils;
-import com.cyngn.eleven.utils.SortOrder;
-import com.cyngn.eleven.utils.SortUtils;
+import com.cyanogenmod.eleven.model.Artist;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.utils.SortOrder;
+import com.cyanogenmod.eleven.utils.SortUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/ArtistSongLoader.java b/src/com/cyanogenmod/eleven/loaders/ArtistSongLoader.java
index a8048c1..9941bfd 100644
--- a/src/com/cyngn/eleven/loaders/ArtistSongLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/ArtistSongLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -17,9 +19,9 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/AsyncHandler.java b/src/com/cyanogenmod/eleven/loaders/AsyncHandler.java
index 7788f35..1710abb 100644
--- a/src/com/cyngn/eleven/loaders/AsyncHandler.java
+++ b/src/com/cyanogenmod/eleven/loaders/AsyncHandler.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.os.Handler;
 import android.os.HandlerThread;
diff --git a/src/com/cyngn/eleven/loaders/LastAddedLoader.java b/src/com/cyanogenmod/eleven/loaders/LastAddedLoader.java
index 42d1fb7..f774394 100644
--- a/src/com/cyngn/eleven/loaders/LastAddedLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/LastAddedLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -17,10 +19,10 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/NowPlayingCursor.java b/src/com/cyanogenmod/eleven/loaders/NowPlayingCursor.java
index 9ba333b..e0ba08a 100644
--- a/src/com/cyngn/eleven/loaders/NowPlayingCursor.java
+++ b/src/com/cyanogenmod/eleven/loaders/NowPlayingCursor.java
@@ -1,7 +1,7 @@
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
-import static com.cyngn.eleven.utils.MusicUtils.mService;
+import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -12,8 +12,7 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 import java.util.Arrays;
 
diff --git a/src/com/cyngn/eleven/loaders/PlaylistLoader.java b/src/com/cyanogenmod/eleven/loaders/PlaylistLoader.java
index 259eeee..4f8263c 100644
--- a/src/com/cyngn/eleven/loaders/PlaylistLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/PlaylistLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -18,10 +20,10 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.PlaylistsColumns;
 
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.model.Playlist;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.model.Playlist;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/PlaylistSongLoader.java b/src/com/cyanogenmod/eleven/loaders/PlaylistSongLoader.java
index 13dd9be..d60af42 100644
--- a/src/com/cyngn/eleven/loaders/PlaylistSongLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/PlaylistSongLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.ContentProviderOperation;
 import android.content.Context;
@@ -22,8 +24,8 @@ import android.provider.MediaStore.Audio.AudioColumns;
 import android.provider.MediaStore.Audio.Playlists;
 import android.util.Log;
 
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.utils.Lists;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/QueueLoader.java b/src/com/cyanogenmod/eleven/loaders/QueueLoader.java
index 0ed7095..cab279c 100644
--- a/src/com/cyngn/eleven/loaders/QueueLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/QueueLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,13 +11,13 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.utils.Lists;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/SearchLoader.java b/src/com/cyanogenmod/eleven/loaders/SearchLoader.java
index 4bdd95d..c87c051 100644
--- a/src/com/cyngn/eleven/loaders/SearchLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/SearchLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -18,8 +20,8 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.utils.Lists;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/SongLoader.java b/src/com/cyanogenmod/eleven/loaders/SongLoader.java
index 717804d..ca1d828 100644
--- a/src/com/cyngn/eleven/loaders/SongLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/SongLoader.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -17,13 +19,13 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PreferenceUtils;
-import com.cyngn.eleven.utils.SortOrder;
-import com.cyngn.eleven.utils.SortUtils;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.utils.SortOrder;
+import com.cyanogenmod.eleven.utils.SortUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/loaders/SortedCursor.java b/src/com/cyanogenmod/eleven/loaders/SortedCursor.java
index 6c71ad9..e73b7ce 100644
--- a/src/com/cyngn/eleven/loaders/SortedCursor.java
+++ b/src/com/cyanogenmod/eleven/loaders/SortedCursor.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.loaders;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.loaders;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
diff --git a/src/com/cyngn/eleven/loaders/TopTracksLoader.java b/src/com/cyanogenmod/eleven/loaders/TopTracksLoader.java
index 90e1c11..a1d79d0 100644
--- a/src/com/cyngn/eleven/loaders/TopTracksLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/TopTracksLoader.java
@@ -1,16 +1,28 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-
-package com.cyngn.eleven.loaders;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.BaseColumns;
 
-import com.cyngn.eleven.provider.RecentStore;
-import com.cyngn.eleven.provider.SongPlayCount;
-import com.cyngn.eleven.provider.SongPlayCount.SongPlayCountColumns;
+import com.cyanogenmod.eleven.provider.RecentStore;
+import com.cyanogenmod.eleven.provider.SongPlayCount;
+import com.cyanogenmod.eleven.provider.SongPlayCount.SongPlayCountColumns;
 
 import java.util.ArrayList;
 
diff --git a/src/com/cyngn/eleven/loaders/WrappedAsyncTaskLoader.java b/src/com/cyanogenmod/eleven/loaders/WrappedAsyncTaskLoader.java
index 50d3f27..48d584e 100644
--- a/src/com/cyngn/eleven/loaders/WrappedAsyncTaskLoader.java
+++ b/src/com/cyanogenmod/eleven/loaders/WrappedAsyncTaskLoader.java
@@ -1,5 +1,5 @@
 
-package com.cyngn.eleven.loaders;
+package com.cyanogenmod.eleven.loaders;
 
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
diff --git a/src/com/cyngn/eleven/menu/BasePlaylistDialog.java b/src/com/cyanogenmod/eleven/menu/BasePlaylistDialog.java
index e08ed9e..0d9d7fe 100644
--- a/src/com/cyngn/eleven/menu/BasePlaylistDialog.java
+++ b/src/com/cyanogenmod/eleven/menu/BasePlaylistDialog.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.menu;
+package com.cyanogenmod.eleven.menu;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -24,8 +26,8 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * A simple base class for the playlist dialogs.
diff --git a/src/com/cyngn/eleven/menu/ConfirmDialog.java b/src/com/cyanogenmod/eleven/menu/ConfirmDialog.java
index 47d734f..908f3fc 100644
--- a/src/com/cyngn/eleven/menu/ConfirmDialog.java
+++ b/src/com/cyanogenmod/eleven/menu/ConfirmDialog.java
@@ -1,6 +1,20 @@
-/* Copyright (C) 2014 Cyngen, Inc. */
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
 
-package com.cyngn.eleven.menu;
+package com.cyanogenmod.eleven.menu;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -9,9 +23,8 @@ import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
-import android.util.Log;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /** Dialog to confirm a non-reversible action */
 public class ConfirmDialog extends DialogFragment {
diff --git a/src/com/cyngn/eleven/menu/CreateNewPlaylist.java b/src/com/cyanogenmod/eleven/menu/CreateNewPlaylist.java
index 4b7ad76..84a72c4 100644
--- a/src/com/cyngn/eleven/menu/CreateNewPlaylist.java
+++ b/src/com/cyanogenmod/eleven/menu/CreateNewPlaylist.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.menu;
+package com.cyanogenmod.eleven.menu;
 
 import android.app.Dialog;
 import android.content.ContentResolver;
@@ -17,9 +19,9 @@ import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.MediaStore;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.format.Capitalize;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.format.Capitalize;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * @author Andrew Neal (andrewdneal@gmail.com) TODO - The playlist names are
diff --git a/src/com/cyngn/eleven/menu/DeleteDialog.java b/src/com/cyanogenmod/eleven/menu/DeleteDialog.java
index 41c1422..be22fc7 100644
--- a/src/com/cyngn/eleven/menu/DeleteDialog.java
+++ b/src/com/cyanogenmod/eleven/menu/DeleteDialog.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.menu;
+package com.cyanogenmod.eleven.menu;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -18,11 +20,11 @@ import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * Alert dialog used to delete tracks.
diff --git a/src/com/cyngn/eleven/menu/FragmentMenuItems.java b/src/com/cyanogenmod/eleven/menu/FragmentMenuItems.java
index fca257f..ff9d4c8 100644
--- a/src/com/cyngn/eleven/menu/FragmentMenuItems.java
+++ b/src/com/cyanogenmod/eleven/menu/FragmentMenuItems.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.menu;
+package com.cyanogenmod.eleven.menu;
 
 /**
  * Several of the context menu items used in Apollo are reused. This class helps
diff --git a/src/com/cyngn/eleven/menu/PhotoSelectionDialog.java b/src/com/cyanogenmod/eleven/menu/PhotoSelectionDialog.java
index 7d27da8..e0286fd 100644
--- a/src/com/cyngn/eleven/menu/PhotoSelectionDialog.java
+++ b/src/com/cyanogenmod/eleven/menu/PhotoSelectionDialog.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.menu;
+package com.cyanogenmod.eleven.menu;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -18,13 +20,13 @@ import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
-import android.widget.Toast;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.activities.HomeActivity;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.MusicUtils;
+
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 import java.util.ArrayList;
 
diff --git a/src/com/cyngn/eleven/menu/RenamePlaylist.java b/src/com/cyanogenmod/eleven/menu/RenamePlaylist.java
index 75c18e4..a3b8f9e 100644
--- a/src/com/cyngn/eleven/menu/RenamePlaylist.java
+++ b/src/com/cyanogenmod/eleven/menu/RenamePlaylist.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.menu;
+package com.cyanogenmod.eleven.menu;
 
 import android.app.Dialog;
 import android.content.ContentResolver;
@@ -19,9 +21,9 @@ import android.os.Bundle;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.format.Capitalize;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.format.Capitalize;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * Alert dialog used to rename playlits.
diff --git a/src/com/cyngn/eleven/model/Album.java b/src/com/cyanogenmod/eleven/model/Album.java
index 14c8031..b84cb76 100644
--- a/src/com/cyngn/eleven/model/Album.java
+++ b/src/com/cyanogenmod/eleven/model/Album.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.model;
+package com.cyanogenmod.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/com/cyanogenmod/eleven/model/AlbumArtistDetails.java b/src/com/cyanogenmod/eleven/model/AlbumArtistDetails.java
new file mode 100644
index 0000000..28dfe0c
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/model/AlbumArtistDetails.java
@@ -0,0 +1,26 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.model;
+
+/**
+ * Simple containing class to query for album art
+ */
+public class AlbumArtistDetails {
+    public long mAudioId;
+    public long mAlbumId;
+    public String mAlbumName;
+    public String mArtistName;
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/model/Artist.java b/src/com/cyanogenmod/eleven/model/Artist.java
index c4db64e..ed47553 100644
--- a/src/com/cyngn/eleven/model/Artist.java
+++ b/src/com/cyanogenmod/eleven/model/Artist.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.model;
+package com.cyanogenmod.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/com/cyngn/eleven/model/Genre.java b/src/com/cyanogenmod/eleven/model/Genre.java
index 3a95f26..49d9089 100644
--- a/src/com/cyngn/eleven/model/Genre.java
+++ b/src/com/cyanogenmod/eleven/model/Genre.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.model;
+package com.cyanogenmod.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/com/cyngn/eleven/model/Playlist.java b/src/com/cyanogenmod/eleven/model/Playlist.java
index 30b1c87..2cba48f 100644
--- a/src/com/cyngn/eleven/model/Playlist.java
+++ b/src/com/cyanogenmod/eleven/model/Playlist.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.model;
+package com.cyanogenmod.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/com/cyngn/eleven/model/SearchResult.java b/src/com/cyanogenmod/eleven/model/SearchResult.java
index f5736b1..278705d 100644
--- a/src/com/cyngn/eleven/model/SearchResult.java
+++ b/src/com/cyanogenmod/eleven/model/SearchResult.java
@@ -1,14 +1,25 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.model;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.model;
 
 import android.database.Cursor;
 import android.provider.MediaStore;
 import android.util.Log;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.Config;
 
 import java.util.Comparator;
 
diff --git a/src/com/cyngn/eleven/model/Song.java b/src/com/cyanogenmod/eleven/model/Song.java
index 53040a1..aac99ea 100644
--- a/src/com/cyngn/eleven/model/Song.java
+++ b/src/com/cyanogenmod/eleven/model/Song.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.model;
+package com.cyanogenmod.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/com/cyngn/eleven/provider/MusicDB.java b/src/com/cyanogenmod/eleven/provider/MusicDB.java
index c8b7c23..1b7d3cb 100644
--- a/src/com/cyngn/eleven/provider/MusicDB.java
+++ b/src/com/cyanogenmod/eleven/provider/MusicDB.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.provider;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.provider;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/src/com/cyngn/eleven/provider/MusicPlaybackState.java b/src/com/cyanogenmod/eleven/provider/MusicPlaybackState.java
index dfead29..ca5e404 100644
--- a/src/com/cyngn/eleven/provider/MusicPlaybackState.java
+++ b/src/com/cyanogenmod/eleven/provider/MusicPlaybackState.java
@@ -1,16 +1,28 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.provider;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.service.MusicPlaybackTrack;
-import com.cyngn.eleven.utils.Lists;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import com.cyanogenmod.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/com/cyngn/eleven/provider/PlaylistArtworkStore.java b/src/com/cyanogenmod/eleven/provider/PlaylistArtworkStore.java
index ee8faf2..1ad2ea2 100644
--- a/src/com/cyngn/eleven/provider/PlaylistArtworkStore.java
+++ b/src/com/cyanogenmod/eleven/provider/PlaylistArtworkStore.java
@@ -1,14 +1,26 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.provider;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * This db stores the details to generate the playlist artwork including when it was
diff --git a/src/com/cyngn/eleven/provider/RecentStore.java b/src/com/cyanogenmod/eleven/provider/RecentStore.java
index b3c3b09..3ccc44c 100644
--- a/src/com/cyngn/eleven/provider/RecentStore.java
+++ b/src/com/cyanogenmod/eleven/provider/RecentStore.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.provider;
+package com.cyanogenmod.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/cyngn/eleven/provider/SearchHistory.java b/src/com/cyanogenmod/eleven/provider/SearchHistory.java
index 8f86f8d..4ca1b40 100644
--- a/src/com/cyngn/eleven/provider/SearchHistory.java
+++ b/src/com/cyanogenmod/eleven/provider/SearchHistory.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.provider;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/cyngn/eleven/provider/SongPlayCount.java b/src/com/cyanogenmod/eleven/provider/SongPlayCount.java
index 2bf77b4..082dfc2 100644
--- a/src/com/cyngn/eleven/provider/SongPlayCount.java
+++ b/src/com/cyanogenmod/eleven/provider/SongPlayCount.java
@@ -1,8 +1,20 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-
-package com.cyngn.eleven.provider;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.cyanogenmod.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/com/cyngn/eleven/recycler/RecycleHolder.java b/src/com/cyanogenmod/eleven/recycler/RecycleHolder.java
index 812f176..d3b5a4e 100644
--- a/src/com/cyngn/eleven/recycler/RecycleHolder.java
+++ b/src/com/cyanogenmod/eleven/recycler/RecycleHolder.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,13 +11,13 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.recycler;
+package com.cyanogenmod.eleven.recycler;
 
 import android.view.View;
 import android.widget.AbsListView.RecyclerListener;
 
-import com.cyngn.eleven.cache.ImageWorker;
-import com.cyngn.eleven.ui.MusicHolder;
+import com.cyanogenmod.eleven.cache.ImageWorker;
+import com.cyanogenmod.eleven.ui.MusicHolder;
 
 /**
  * A @ {@link RecyclerListener} for {@link MusicHolder}'s views.
diff --git a/src/com/cyngn/eleven/sectionadapter/SectionAdapter.java b/src/com/cyanogenmod/eleven/sectionadapter/SectionAdapter.java
index 3af7245..870382a 100644
--- a/src/com/cyngn/eleven/sectionadapter/SectionAdapter.java
+++ b/src/com/cyanogenmod/eleven/sectionadapter/SectionAdapter.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.sectionadapter;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.sectionadapter;
 
 import android.app.Activity;
 import android.content.Context;
@@ -12,11 +24,11 @@ import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.MusicHolder;
-import com.cyngn.eleven.utils.SectionCreatorUtils.Section;
-import com.cyngn.eleven.utils.SectionCreatorUtils.SectionType;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.MusicHolder;
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils.Section;
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils.SectionType;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
 
 import java.util.TreeMap;
 
diff --git a/src/com/cyngn/eleven/sectionadapter/SectionCreator.java b/src/com/cyanogenmod/eleven/sectionadapter/SectionCreator.java
index 36fe74c..16e7e09 100644
--- a/src/com/cyngn/eleven/sectionadapter/SectionCreator.java
+++ b/src/com/cyanogenmod/eleven/sectionadapter/SectionCreator.java
@@ -1,13 +1,24 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.sectionadapter;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.sectionadapter;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
 
-import com.cyngn.eleven.loaders.WrappedAsyncTaskLoader;
-import com.cyngn.eleven.utils.SectionCreatorUtils;
+import com.cyanogenmod.eleven.loaders.WrappedAsyncTaskLoader;
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
 
 import java.util.List;
 import java.util.TreeMap;
diff --git a/src/com/cyanogenmod/eleven/sectionadapter/SectionListContainer.java b/src/com/cyanogenmod/eleven/sectionadapter/SectionListContainer.java
new file mode 100644
index 0000000..486bf84
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/sectionadapter/SectionListContainer.java
@@ -0,0 +1,36 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.sectionadapter;
+
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
+
+import java.util.List;
+import java.util.TreeMap;
+
+/**
+ * Simple Container that contains a list of T items as well as the map of section information
+ * @param <T> the type of item that the list contains
+ */
+public class SectionListContainer<T> {
+    public TreeMap<Integer, SectionCreatorUtils.Section> mSections;
+    public List<T> mListResults;
+
+    public SectionListContainer(final TreeMap<Integer, SectionCreatorUtils.Section> sections,
+                                final List<T> results) {
+        mSections = sections;
+        mListResults = results;
+    }
+}
diff --git a/src/com/cyanogenmod/eleven/service/MusicPlaybackTrack.aidl b/src/com/cyanogenmod/eleven/service/MusicPlaybackTrack.aidl
new file mode 100644
index 0000000..9ad8f16
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/service/MusicPlaybackTrack.aidl
@@ -0,0 +1,3 @@
+package com.cyanogenmod.eleven.service;
+
+parcelable MusicPlaybackTrack;
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/service/MusicPlaybackTrack.java b/src/com/cyanogenmod/eleven/service/MusicPlaybackTrack.java
index 71e5795..2c9832a 100644
--- a/src/com/cyngn/eleven/service/MusicPlaybackTrack.java
+++ b/src/com/cyanogenmod/eleven/service/MusicPlaybackTrack.java
@@ -1,12 +1,24 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.service;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.service;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.cyngn.eleven.Config;
+import com.cyanogenmod.eleven.Config;
 
 /**
  * This is used by the music playback service to track the music tracks it is playing
diff --git a/src/com/cyngn/eleven/slidinguppanel/SlidingUpPanelLayout.java b/src/com/cyanogenmod/eleven/slidinguppanel/SlidingUpPanelLayout.java
index 4df7cfa..55bd4d3 100644
--- a/src/com/cyngn/eleven/slidinguppanel/SlidingUpPanelLayout.java
+++ b/src/com/cyanogenmod/eleven/slidinguppanel/SlidingUpPanelLayout.java
@@ -1,4 +1,4 @@
-package com.cyngn.eleven.slidinguppanel;
+package com.cyanogenmod.eleven.slidinguppanel;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -18,7 +18,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 public class SlidingUpPanelLayout extends ViewGroup {
 
diff --git a/src/com/cyngn/eleven/slidinguppanel/ViewDragHelper.java b/src/com/cyanogenmod/eleven/slidinguppanel/ViewDragHelper.java
index 1f642af..938593d 100644
--- a/src/com/cyngn/eleven/slidinguppanel/ViewDragHelper.java
+++ b/src/com/cyanogenmod/eleven/slidinguppanel/ViewDragHelper.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.cyngn.eleven.slidinguppanel;
+package com.cyanogenmod.eleven.slidinguppanel;
 
 import java.util.Arrays;
 
diff --git a/src/com/cyngn/eleven/ui/HeaderBar.java b/src/com/cyanogenmod/eleven/ui/HeaderBar.java
index cbc9cba..3d4abbb 100644
--- a/src/com/cyngn/eleven/ui/HeaderBar.java
+++ b/src/com/cyanogenmod/eleven/ui/HeaderBar.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.ui;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui;
 
 import android.content.Context;
 import android.support.v4.app.Fragment;
@@ -15,13 +27,13 @@ import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.loaders.NowPlayingCursor;
-import com.cyngn.eleven.loaders.QueueLoader;
-import com.cyngn.eleven.menu.CreateNewPlaylist;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.NavUtils;
-import com.cyngn.eleven.widgets.theme.HoloSelector;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.loaders.NowPlayingCursor;
+import com.cyanogenmod.eleven.loaders.QueueLoader;
+import com.cyanogenmod.eleven.menu.CreateNewPlaylist;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.widgets.theme.HoloSelector;
 
 /**
  * Simple Header bar wrapper class that also has its own menu bar button.
diff --git a/src/com/cyngn/eleven/ui/MusicHolder.java b/src/com/cyanogenmod/eleven/ui/MusicHolder.java
index 9c4ce78..68815b8 100644
--- a/src/com/cyngn/eleven/ui/MusicHolder.java
+++ b/src/com/cyanogenmod/eleven/ui/MusicHolder.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,18 +11,17 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui;
+package com.cyanogenmod.eleven.ui;
 
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.widgets.PlayPauseProgressButton;
-import com.cyngn.eleven.widgets.PopupMenuButton;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
+import com.cyanogenmod.eleven.widgets.PopupMenuButton;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/cyngn/eleven/ui/activities/BaseActivity.java b/src/com/cyanogenmod/eleven/ui/activities/BaseActivity.java
index e813ac4..d5df47f 100644
--- a/src/com/cyngn/eleven/ui/activities/BaseActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/BaseActivity.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,9 +11,9 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.activities;
+package com.cyanogenmod.eleven.ui.activities;
 
-import static com.cyngn.eleven.utils.MusicUtils.mService;
+import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
 
 import android.app.ActionBar;
 import android.content.BroadcastReceiver;
@@ -33,18 +35,18 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyngn.eleven.IElevenService;
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.MusicStateListener;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ICacheListener;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.Lists;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.MusicUtils.ServiceToken;
-import com.cyngn.eleven.utils.NavUtils;
-import com.cyngn.eleven.widgets.PlayPauseProgressButton;
+import com.cyanogenmod.eleven.IElevenService;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.MusicStateListener;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ICacheListener;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.Lists;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils.ServiceToken;
+import com.cyanogenmod.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/src/com/cyngn/eleven/ui/activities/HomeActivity.java b/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
index b346436..bf805a6 100644
--- a/src/com/cyngn/eleven/ui/activities/HomeActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/HomeActivity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyngn.eleven.ui.activities;
+package com.cyanogenmod.eleven.ui.activities;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -28,21 +28,21 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.ui.fragments.AlbumDetailFragment;
-import com.cyngn.eleven.ui.fragments.ArtistDetailFragment;
-import com.cyngn.eleven.ui.fragments.IChildFragment;
-import com.cyngn.eleven.ui.fragments.ISetupActionBar;
-import com.cyngn.eleven.ui.fragments.PlaylistDetailFragment;
-import com.cyngn.eleven.ui.fragments.RecentFragment;
-import com.cyngn.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
-import com.cyngn.eleven.ui.fragments.profile.LastAddedFragment;
-import com.cyngn.eleven.ui.fragments.profile.TopTracksFragment;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.ui.fragments.AlbumDetailFragment;
+import com.cyanogenmod.eleven.ui.fragments.ArtistDetailFragment;
+import com.cyanogenmod.eleven.ui.fragments.IChildFragment;
+import com.cyanogenmod.eleven.ui.fragments.ISetupActionBar;
+import com.cyanogenmod.eleven.ui.fragments.PlaylistDetailFragment;
+import com.cyanogenmod.eleven.ui.fragments.RecentFragment;
+import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
+import com.cyanogenmod.eleven.ui.fragments.profile.LastAddedFragment;
+import com.cyanogenmod.eleven.ui.fragments.profile.TopTracksFragment;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.NavUtils;
 
 public class HomeActivity extends SlidingPanelActivity {
     private static final String TAG = "HomeActivity";
diff --git a/src/com/cyngn/eleven/ui/activities/SearchActivity.java b/src/com/cyanogenmod/eleven/ui/activities/SearchActivity.java
index 6f9a264..14594af 100644
--- a/src/com/cyngn/eleven/ui/activities/SearchActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/SearchActivity.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.activities;
+package com.cyanogenmod.eleven.ui.activities;
 
 import android.app.ActionBar;
 import android.app.SearchManager;
@@ -44,31 +46,31 @@ import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.SearchView.OnQueryTextListener;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.IElevenService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.SummarySearchAdapter;
-import com.cyngn.eleven.loaders.WrappedAsyncTaskLoader;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.model.AlbumArtistDetails;
-import com.cyngn.eleven.model.SearchResult;
-import com.cyngn.eleven.model.SearchResult.ResultType;
-import com.cyngn.eleven.provider.SearchHistory;
-import com.cyngn.eleven.recycler.RecycleHolder;
-import com.cyngn.eleven.sectionadapter.SectionAdapter;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.sectionadapter.SectionCreator.SimpleListLoader;
-import com.cyngn.eleven.sectionadapter.SectionListContainer;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.MusicUtils.ServiceToken;
-import com.cyngn.eleven.utils.NavUtils;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.utils.SectionCreatorUtils;
-import com.cyngn.eleven.utils.SectionCreatorUtils.IItemCompare;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
-import com.cyngn.eleven.widgets.NoResultsContainer;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.IElevenService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.SummarySearchAdapter;
+import com.cyanogenmod.eleven.loaders.WrappedAsyncTaskLoader;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.model.AlbumArtistDetails;
+import com.cyanogenmod.eleven.model.SearchResult;
+import com.cyanogenmod.eleven.model.SearchResult.ResultType;
+import com.cyanogenmod.eleven.provider.SearchHistory;
+import com.cyanogenmod.eleven.recycler.RecycleHolder;
+import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator.SimpleListLoader;
+import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils.ServiceToken;
+import com.cyanogenmod.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils.IItemCompare;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.widgets.NoResultsContainer;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -76,7 +78,7 @@ import java.util.List;
 import java.util.TreeSet;
 
 import static android.view.View.OnTouchListener;
-import static com.cyngn.eleven.utils.MusicUtils.mService;
+import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
 
 /**
  * Provides the search interface for Apollo.
diff --git a/src/com/cyngn/eleven/ui/activities/SettingsActivity.java b/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java
index d3ea339..762f222 100644
--- a/src/com/cyngn/eleven/ui/activities/SettingsActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/SettingsActivity.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,25 +11,20 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.activities;
+package com.cyanogenmod.eleven.ui.activities;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Bundle;
-import android.preference.CheckBoxPreference;
 import android.preference.Preference;
-import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.view.MenuItem;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * Settings.
diff --git a/src/com/cyngn/eleven/ui/activities/SlidingPanelActivity.java b/src/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java
index eb9b904..35b67f9 100644
--- a/src/com/cyngn/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/com/cyanogenmod/eleven/ui/activities/SlidingPanelActivity.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.activities;
+package com.cyanogenmod.eleven.ui.activities;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -18,15 +20,15 @@ import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.slidinguppanel.SlidingUpPanelLayout;
-import com.cyngn.eleven.slidinguppanel.SlidingUpPanelLayout.SimplePanelSlideListener;
-import com.cyngn.eleven.ui.HeaderBar;
-import com.cyngn.eleven.ui.fragments.AudioPlayerFragment;
-import com.cyngn.eleven.ui.fragments.QueueFragment;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.BlurScrimImage;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout;
+import com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout.SimplePanelSlideListener;
+import com.cyanogenmod.eleven.ui.HeaderBar;
+import com.cyanogenmod.eleven.ui.fragments.AudioPlayerFragment;
+import com.cyanogenmod.eleven.ui.fragments.QueueFragment;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.BlurScrimImage;
 
 import java.util.HashSet;
 
diff --git a/src/com/cyngn/eleven/ui/fragments/AlbumDetailFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/AlbumDetailFragment.java
index a9a18d3..5aeb70f 100644
--- a/src/com/cyngn/eleven/ui/fragments/AlbumDetailFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/AlbumDetailFragment.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.ui.fragments;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
@@ -6,22 +21,21 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.AlbumDetailSongAdapter;
-import com.cyngn.eleven.adapters.DetailSongAdapter;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.ui.activities.BaseActivity;
-import com.cyngn.eleven.utils.AlbumPopupMenuHelper;
-import com.cyngn.eleven.utils.GenreFetcher;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.utils.SongPopupMenuHelper;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.AlbumDetailSongAdapter;
+import com.cyanogenmod.eleven.adapters.DetailSongAdapter;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.utils.AlbumPopupMenuHelper;
+import com.cyanogenmod.eleven.utils.GenreFetcher;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.utils.SongPopupMenuHelper;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.List;
 
diff --git a/src/com/cyngn/eleven/ui/fragments/AlbumFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/AlbumFragment.java
index d459fc0..cc8e6cf 100644
--- a/src/com/cyngn/eleven/ui/fragments/AlbumFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/AlbumFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments;
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -24,24 +26,24 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 
-import com.cyngn.eleven.MusicStateListener;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.AlbumAdapter;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.loaders.AlbumLoader;
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.recycler.RecycleHolder;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.sectionadapter.SectionListContainer;
-import com.cyngn.eleven.ui.activities.BaseActivity;
-import com.cyngn.eleven.ui.fragments.phone.MusicBrowserFragment;
-import com.cyngn.eleven.utils.AlbumPopupMenuHelper;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.NavUtils;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.MusicStateListener;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.AlbumAdapter;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.loaders.AlbumLoader;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.recycler.RecycleHolder;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
+import com.cyanogenmod.eleven.ui.activities.BaseActivity;
+import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserFragment;
+import com.cyanogenmod.eleven.utils.AlbumPopupMenuHelper;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
 import com.viewpagerindicator.TitlePageIndicator;
 
 /**
diff --git a/src/com/cyngn/eleven/ui/fragments/ArtistDetailFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/ArtistDetailFragment.java
index b67088f..ef4d46f 100644
--- a/src/com/cyngn/eleven/ui/fragments/ArtistDetailFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/ArtistDetailFragment.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.ui.fragments;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -11,23 +26,23 @@ import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.ListView;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.ArtistDetailAlbumAdapter;
-import com.cyngn.eleven.adapters.ArtistDetailSongAdapter;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.model.Artist;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.utils.AlbumPopupMenuHelper;
-import com.cyngn.eleven.utils.ArtistPopupMenuHelper;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.utils.SongPopupMenuHelper;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.ArtistDetailAlbumAdapter;
+import com.cyanogenmod.eleven.adapters.ArtistDetailSongAdapter;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.model.Artist;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.utils.AlbumPopupMenuHelper;
+import com.cyanogenmod.eleven.utils.ArtistPopupMenuHelper;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.utils.SongPopupMenuHelper;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/com/cyngn/eleven/ui/fragments/ArtistFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/ArtistFragment.java
index 3decf6c..a759576 100644
--- a/src/com/cyngn/eleven/ui/fragments/ArtistFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/ArtistFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments;
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -26,26 +28,26 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.cyngn.eleven.MusicStateListener;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.ArtistAdapter;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.loaders.ArtistLoader;
-import com.cyngn.eleven.model.Artist;
-import com.cyngn.eleven.recycler.RecycleHolder;
-import com.cyngn.eleven.sectionadapter.SectionAdapter;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.sectionadapter.SectionListContainer;
-import com.cyngn.eleven.ui.activities.BaseActivity;
-import com.cyngn.eleven.ui.fragments.phone.MusicBrowserFragment;
-import com.cyngn.eleven.utils.ArtistPopupMenuHelper;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.NavUtils;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.utils.SectionCreatorUtils;
-import com.cyngn.eleven.utils.SectionCreatorUtils.IItemCompare;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.MusicStateListener;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.ArtistAdapter;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.loaders.ArtistLoader;
+import com.cyanogenmod.eleven.model.Artist;
+import com.cyanogenmod.eleven.recycler.RecycleHolder;
+import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
+import com.cyanogenmod.eleven.ui.activities.BaseActivity;
+import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserFragment;
+import com.cyanogenmod.eleven.utils.ArtistPopupMenuHelper;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils.IItemCompare;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
 import com.viewpagerindicator.TitlePageIndicator;
 
 /**
diff --git a/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
index 5fd0ca3..d7ff5b2 100644
--- a/src/com/cyngn/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/AudioPlayerFragment.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.ui.fragments;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -31,34 +43,34 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.AlbumArtPagerAdapter;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.loaders.NowPlayingCursor;
-import com.cyngn.eleven.loaders.QueueLoader;
-import com.cyngn.eleven.menu.CreateNewPlaylist;
-import com.cyngn.eleven.menu.DeleteDialog;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.ui.activities.SlidingPanelActivity;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.NavUtils;
-import com.cyngn.eleven.utils.PreferenceUtils;
-import com.cyngn.eleven.widgets.BrowseButton;
-import com.cyngn.eleven.widgets.EqualizerView;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
-import com.cyngn.eleven.widgets.NoResultsContainer;
-import com.cyngn.eleven.widgets.PlayPauseProgressButton;
-import com.cyngn.eleven.widgets.QueueButton;
-import com.cyngn.eleven.widgets.RepeatButton;
-import com.cyngn.eleven.widgets.RepeatingImageButton;
-import com.cyngn.eleven.widgets.ShuffleButton;
-import com.cyngn.eleven.widgets.theme.HoloSelector;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.AlbumArtPagerAdapter;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.loaders.NowPlayingCursor;
+import com.cyanogenmod.eleven.loaders.QueueLoader;
+import com.cyanogenmod.eleven.menu.CreateNewPlaylist;
+import com.cyanogenmod.eleven.menu.DeleteDialog;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.widgets.BrowseButton;
+import com.cyanogenmod.eleven.widgets.EqualizerView;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.widgets.NoResultsContainer;
+import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
+import com.cyanogenmod.eleven.widgets.QueueButton;
+import com.cyanogenmod.eleven.widgets.RepeatButton;
+import com.cyanogenmod.eleven.widgets.RepeatingImageButton;
+import com.cyanogenmod.eleven.widgets.ShuffleButton;
+import com.cyanogenmod.eleven.widgets.theme.HoloSelector;
 
 import java.lang.ref.WeakReference;
 
-import static com.cyngn.eleven.utils.MusicUtils.mService;
+import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
 
 public class AudioPlayerFragment extends Fragment implements ServiceConnection,
         SlidingPanelActivity.ISlidingPanelListener {
diff --git a/src/com/cyngn/eleven/ui/fragments/BaseFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/BaseFragment.java
index 062415d..bdbd454 100644
--- a/src/com/cyngn/eleven/ui/fragments/BaseFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/BaseFragment.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.ui.fragments;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -7,9 +22,9 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyngn.eleven.MusicStateListener;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.activities.HomeActivity;
+import com.cyanogenmod.eleven.MusicStateListener;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.activities.HomeActivity;
 
 public abstract class BaseFragment extends Fragment implements MusicStateListener,
     ISetupActionBar {
diff --git a/src/com/cyngn/eleven/ui/fragments/DetailFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/DetailFragment.java
index 51e3360..43e5274 100644
--- a/src/com/cyngn/eleven/ui/fragments/DetailFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/DetailFragment.java
@@ -1,11 +1,26 @@
-package com.cyngn.eleven.ui.fragments;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
 
 public abstract class DetailFragment extends BaseFragment {
     protected PopupMenuHelper mActionMenuHelper;
diff --git a/src/com/cyngn/eleven/ui/fragments/FadingBarFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/FadingBarFragment.java
index 5c3404e..81c4009 100644
--- a/src/com/cyngn/eleven/ui/fragments/FadingBarFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/FadingBarFragment.java
@@ -1,10 +1,25 @@
-package com.cyngn.eleven.ui.fragments;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 
-import com.cyngn.eleven.ui.activities.HomeActivity;
+import com.cyanogenmod.eleven.ui.activities.HomeActivity;
 
 public abstract class FadingBarFragment extends DetailFragment implements OnScrollListener {
     protected static final int ACTION_BAR_DEFAULT_OPACITY = 100;
diff --git a/src/com/cyanogenmod/eleven/ui/fragments/IChildFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/IChildFragment.java
new file mode 100644
index 0000000..f1b5fb7
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/ui/fragments/IChildFragment.java
@@ -0,0 +1,22 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
+
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+
+public interface IChildFragment {
+    PagerAdapter.MusicFragments getMusicFragmentParent();
+}
diff --git a/src/com/cyanogenmod/eleven/ui/fragments/ISetupActionBar.java b/src/com/cyanogenmod/eleven/ui/fragments/ISetupActionBar.java
new file mode 100644
index 0000000..6ce191b
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/ui/fragments/ISetupActionBar.java
@@ -0,0 +1,20 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
+
+public interface ISetupActionBar {
+    public void setupActionBar();
+}
diff --git a/src/com/cyngn/eleven/ui/fragments/PlaylistDetailFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/PlaylistDetailFragment.java
index b1e7a04..4461b27 100644
--- a/src/com/cyngn/eleven/ui/fragments/PlaylistDetailFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/PlaylistDetailFragment.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.ui.fragments;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.database.Cursor;
 import android.net.Uri;
@@ -13,28 +28,28 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.adapters.ProfileSongAdapter;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.dragdrop.DragSortListView;
-import com.cyngn.eleven.dragdrop.DragSortListView.DragScrollProfile;
-import com.cyngn.eleven.dragdrop.DragSortListView.DropListener;
-import com.cyngn.eleven.dragdrop.DragSortListView.RemoveListener;
-import com.cyngn.eleven.loaders.PlaylistSongLoader;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.model.Playlist;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.recycler.RecycleHolder;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PlaylistPopupMenuHelper;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.utils.PopupMenuHelper.PopupMenuType;
-import com.cyngn.eleven.utils.SongPopupMenuHelper;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
-import com.cyngn.eleven.widgets.NoResultsContainer;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.adapters.ProfileSongAdapter;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.dragdrop.DragSortListView;
+import com.cyanogenmod.eleven.dragdrop.DragSortListView.DragScrollProfile;
+import com.cyanogenmod.eleven.dragdrop.DragSortListView.DropListener;
+import com.cyanogenmod.eleven.dragdrop.DragSortListView.RemoveListener;
+import com.cyanogenmod.eleven.loaders.PlaylistSongLoader;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.model.Playlist;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.recycler.RecycleHolder;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PlaylistPopupMenuHelper;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper.PopupMenuType;
+import com.cyanogenmod.eleven.utils.SongPopupMenuHelper;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.widgets.NoResultsContainer;
 
 import java.util.List;
 import java.util.TreeSet;
diff --git a/src/com/cyngn/eleven/ui/fragments/PlaylistFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/PlaylistFragment.java
index 9ccb95c..6625963 100644
--- a/src/com/cyngn/eleven/ui/fragments/PlaylistFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/PlaylistFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments;
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -22,21 +24,21 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.MusicStateListener;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.adapters.PlaylistAdapter;
-import com.cyngn.eleven.loaders.PlaylistLoader;
-import com.cyngn.eleven.model.Playlist;
-import com.cyngn.eleven.recycler.RecycleHolder;
-import com.cyngn.eleven.ui.activities.BaseActivity;
-import com.cyngn.eleven.ui.fragments.phone.MusicBrowserFragment;
-import com.cyngn.eleven.utils.NavUtils;
-import com.cyngn.eleven.utils.PlaylistPopupMenuHelper;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.MusicStateListener;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.adapters.PlaylistAdapter;
+import com.cyanogenmod.eleven.loaders.PlaylistLoader;
+import com.cyanogenmod.eleven.model.Playlist;
+import com.cyanogenmod.eleven.recycler.RecycleHolder;
+import com.cyanogenmod.eleven.ui.activities.BaseActivity;
+import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserFragment;
+import com.cyanogenmod.eleven.utils.NavUtils;
+import com.cyanogenmod.eleven.utils.PlaylistPopupMenuHelper;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.List;
 
diff --git a/src/com/cyngn/eleven/ui/fragments/QueueFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/QueueFragment.java
index 87c5f6c..35229bc 100644
--- a/src/com/cyngn/eleven/ui/fragments/QueueFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/QueueFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,9 +11,9 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments;
+package com.cyanogenmod.eleven.ui.fragments;
 
-import static com.cyngn.eleven.utils.MusicUtils.mService;
+import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -31,28 +33,28 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.SongAdapter;
-import com.cyngn.eleven.dragdrop.DragSortListView;
-import com.cyngn.eleven.dragdrop.DragSortListView.DragScrollProfile;
-import com.cyngn.eleven.dragdrop.DragSortListView.DropListener;
-import com.cyngn.eleven.dragdrop.DragSortListView.RemoveListener;
-import com.cyngn.eleven.loaders.NowPlayingCursor;
-import com.cyngn.eleven.loaders.QueueLoader;
-import com.cyngn.eleven.menu.DeleteDialog;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.recycler.RecycleHolder;
-import com.cyngn.eleven.service.MusicPlaybackTrack;
-import com.cyngn.eleven.ui.activities.SlidingPanelActivity;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
-import com.cyngn.eleven.widgets.NoResultsContainer;
-import com.cyngn.eleven.widgets.PlayPauseProgressButton;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.SongAdapter;
+import com.cyanogenmod.eleven.dragdrop.DragSortListView;
+import com.cyanogenmod.eleven.dragdrop.DragSortListView.DragScrollProfile;
+import com.cyanogenmod.eleven.dragdrop.DragSortListView.DropListener;
+import com.cyanogenmod.eleven.dragdrop.DragSortListView.RemoveListener;
+import com.cyanogenmod.eleven.loaders.NowPlayingCursor;
+import com.cyanogenmod.eleven.loaders.QueueLoader;
+import com.cyanogenmod.eleven.menu.DeleteDialog;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.recycler.RecycleHolder;
+import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.widgets.NoResultsContainer;
+import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
diff --git a/src/com/cyngn/eleven/ui/fragments/RecentFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java
index ad13a50..35f70ff 100644
--- a/src/com/cyngn/eleven/ui/fragments/RecentFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/RecentFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,25 +11,25 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments;
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.content.Loader;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.SongAdapter;
-import com.cyngn.eleven.loaders.TopTracksLoader;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.sectionadapter.SectionListContainer;
-import com.cyngn.eleven.ui.activities.BaseActivity;
-import com.cyngn.eleven.ui.fragments.profile.SmartPlaylistFragment;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.NoResultsContainer;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.SongAdapter;
+import com.cyanogenmod.eleven.loaders.TopTracksLoader;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
+import com.cyanogenmod.eleven.ui.activities.BaseActivity;
+import com.cyanogenmod.eleven.ui.fragments.profile.SmartPlaylistFragment;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.NoResultsContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/com/cyngn/eleven/ui/fragments/SongFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/SongFragment.java
index 2fc29bc..597ee3e 100644
--- a/src/com/cyngn/eleven/ui/fragments/SongFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/SongFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,23 +11,22 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments;
+package com.cyanogenmod.eleven.ui.fragments;
 
 import android.content.Context;
-import android.database.Cursor;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.loaders.SongLoader;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.sectionadapter.SectionListContainer;
-import com.cyngn.eleven.ui.fragments.profile.BasicSongFragment;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.SectionCreatorUtils;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.loaders.SongLoader;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
+import com.cyanogenmod.eleven.ui.fragments.profile.BasicSongFragment;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
 import com.viewpagerindicator.TitlePageIndicator;
 
 /**
diff --git a/src/com/cyngn/eleven/ui/fragments/phone/MusicBrowserFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserFragment.java
index 4a5510d..0d01e5f 100644
--- a/src/com/cyngn/eleven/ui/fragments/phone/MusicBrowserFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserFragment.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.ui.fragments.phone;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
diff --git a/src/com/cyngn/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
index c63e016..b5751ad 100644
--- a/src/com/cyngn/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments.phone;
+package com.cyanogenmod.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -18,17 +20,17 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.adapters.PagerAdapter.MusicFragments;
-import com.cyngn.eleven.menu.CreateNewPlaylist;
-import com.cyngn.eleven.ui.fragments.AlbumFragment;
-import com.cyngn.eleven.ui.fragments.ArtistFragment;
-import com.cyngn.eleven.ui.fragments.BaseFragment;
-import com.cyngn.eleven.ui.fragments.SongFragment;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PreferenceUtils;
-import com.cyngn.eleven.utils.SortOrder;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.adapters.PagerAdapter.MusicFragments;
+import com.cyanogenmod.eleven.menu.CreateNewPlaylist;
+import com.cyanogenmod.eleven.ui.fragments.AlbumFragment;
+import com.cyanogenmod.eleven.ui.fragments.ArtistFragment;
+import com.cyanogenmod.eleven.ui.fragments.BaseFragment;
+import com.cyanogenmod.eleven.ui.fragments.SongFragment;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.utils.SortOrder;
 import com.viewpagerindicator.TabPageIndicator;
 
 /**
diff --git a/src/com/cyngn/eleven/ui/fragments/profile/BasicSongFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/profile/BasicSongFragment.java
index af80ff2..ba9d815 100644
--- a/src/com/cyngn/eleven/ui/fragments/profile/BasicSongFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/profile/BasicSongFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments.profile;
+package com.cyanogenmod.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -25,22 +27,22 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.MusicStateListener;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.SongAdapter;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.recycler.RecycleHolder;
-import com.cyngn.eleven.sectionadapter.SectionAdapter;
-import com.cyngn.eleven.sectionadapter.SectionListContainer;
-import com.cyngn.eleven.service.MusicPlaybackTrack;
-import com.cyngn.eleven.ui.activities.BaseActivity;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.utils.SongPopupMenuHelper;
-import com.cyngn.eleven.widgets.IPopupMenuCallback;
-import com.cyngn.eleven.widgets.LoadingEmptyContainer;
-import com.cyngn.eleven.widgets.NoResultsContainer;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.MusicStateListener;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.SongAdapter;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.recycler.RecycleHolder;
+import com.cyanogenmod.eleven.sectionadapter.SectionAdapter;
+import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
+import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import com.cyanogenmod.eleven.ui.activities.BaseActivity;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.utils.SongPopupMenuHelper;
+import com.cyanogenmod.eleven.widgets.IPopupMenuCallback;
+import com.cyanogenmod.eleven.widgets.LoadingEmptyContainer;
+import com.cyanogenmod.eleven.widgets.NoResultsContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/com/cyngn/eleven/ui/fragments/profile/LastAddedFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java
index 761fc2a..6721cca 100644
--- a/src/com/cyngn/eleven/ui/fragments/profile/LastAddedFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/profile/LastAddedFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,22 +11,22 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments.profile;
+package com.cyanogenmod.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.support.v4.content.Loader;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.loaders.LastAddedLoader;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.sectionadapter.SectionListContainer;
-import com.cyngn.eleven.ui.activities.BaseActivity;
-import com.cyngn.eleven.ui.fragments.ISetupActionBar;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.NoResultsContainer;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.loaders.LastAddedLoader;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
+import com.cyanogenmod.eleven.ui.activities.BaseActivity;
+import com.cyanogenmod.eleven.ui.fragments.ISetupActionBar;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.NoResultsContainer;
 
 /**
  * This class is used to display all of the songs the user put on their device
diff --git a/src/com/cyngn/eleven/ui/fragments/profile/SmartPlaylistFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java
index 1418f2c..f3907ee 100644
--- a/src/com/cyngn/eleven/ui/fragments/profile/SmartPlaylistFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/profile/SmartPlaylistFragment.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.ui.fragments.profile;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -8,18 +23,17 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.SongAdapter;
-import com.cyngn.eleven.adapters.PagerAdapter;
-import com.cyngn.eleven.menu.ConfirmDialog;
-import com.cyngn.eleven.model.Playlist;
-import com.cyngn.eleven.ui.fragments.IChildFragment;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PlaylistPopupMenuHelper;
-import com.cyngn.eleven.utils.PopupMenuHelper;
-import com.cyngn.eleven.utils.PopupMenuHelper.PopupMenuType;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import com.cyanogenmod.eleven.menu.ConfirmDialog;
+import com.cyanogenmod.eleven.model.Playlist;
+import com.cyanogenmod.eleven.ui.fragments.IChildFragment;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PlaylistPopupMenuHelper;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import com.cyanogenmod.eleven.utils.PopupMenuHelper.PopupMenuType;
 
 public abstract class SmartPlaylistFragment extends BasicSongFragment
         implements ConfirmDialog.ConfirmCallback, IChildFragment {
diff --git a/src/com/cyngn/eleven/ui/fragments/profile/TopTracksFragment.java b/src/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java
index 643fd5b..6891cda 100644
--- a/src/com/cyngn/eleven/ui/fragments/profile/TopTracksFragment.java
+++ b/src/com/cyanogenmod/eleven/ui/fragments/profile/TopTracksFragment.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.ui.fragments.profile;
+package com.cyanogenmod.eleven.ui.fragments.profile;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -18,19 +20,18 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.adapters.SongAdapter;
-import com.cyngn.eleven.loaders.TopTracksLoader;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.sectionadapter.SectionAdapter;
-import com.cyngn.eleven.sectionadapter.SectionCreator;
-import com.cyngn.eleven.sectionadapter.SectionListContainer;
-import com.cyngn.eleven.ui.activities.BaseActivity;
-import com.cyngn.eleven.ui.fragments.ISetupActionBar;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.NoResultsContainer;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.adapters.SongAdapter;
+import com.cyanogenmod.eleven.loaders.TopTracksLoader;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.sectionadapter.SectionCreator;
+import com.cyanogenmod.eleven.sectionadapter.SectionListContainer;
+import com.cyanogenmod.eleven.ui.activities.BaseActivity;
+import com.cyanogenmod.eleven.ui.fragments.ISetupActionBar;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.NoResultsContainer;
 
 /**
  * This class is used to display all of the songs the user put on their device
diff --git a/src/com/cyngn/eleven/utils/AlbumPopupMenuHelper.java b/src/com/cyanogenmod/eleven/utils/AlbumPopupMenuHelper.java
index 20c233e..5d47393 100644
--- a/src/com/cyngn/eleven/utils/AlbumPopupMenuHelper.java
+++ b/src/com/cyanogenmod/eleven/utils/AlbumPopupMenuHelper.java
@@ -1,19 +1,31 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.utils;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import android.app.Activity;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
 import android.view.MenuItem;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.menu.DeleteDialog;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.menu.PhotoSelectionDialog;
-import com.cyngn.eleven.model.Album;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.menu.DeleteDialog;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.menu.PhotoSelectionDialog;
+import com.cyanogenmod.eleven.model.Album;
 
 import java.util.TreeSet;
 
diff --git a/src/com/cyngn/eleven/utils/ApolloUtils.java b/src/com/cyanogenmod/eleven/utils/ApolloUtils.java
index d8d7a3f..eb8a9a1 100644
--- a/src/com/cyngn/eleven/utils/ApolloUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/ApolloUtils.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,19 +11,13 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
 import android.content.res.Configuration;
 import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.net.ConnectivityManager;
@@ -35,17 +31,11 @@ import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.webkit.WebView;
-import android.widget.LinearLayout;
 import android.widget.Toast;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageCache;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.widgets.ColorPickerView;
+import com.cyanogenmod.eleven.cache.ImageCache;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
 
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
diff --git a/src/com/cyngn/eleven/utils/ArtistPopupMenuHelper.java b/src/com/cyanogenmod/eleven/utils/ArtistPopupMenuHelper.java
index 8085053..7e88662 100644
--- a/src/com/cyngn/eleven/utils/ArtistPopupMenuHelper.java
+++ b/src/com/cyanogenmod/eleven/utils/ArtistPopupMenuHelper.java
@@ -1,14 +1,29 @@
-package com.cyngn.eleven.utils;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import android.app.Activity;
 import android.support.v4.app.FragmentManager;
 
 import android.view.MenuItem;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.menu.DeleteDialog;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.menu.PhotoSelectionDialog;
-import com.cyngn.eleven.model.Artist;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.menu.DeleteDialog;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.menu.PhotoSelectionDialog;
+import com.cyanogenmod.eleven.model.Artist;
 
 public abstract class ArtistPopupMenuHelper extends PopupMenuHelper {
     private Artist mArtist;
diff --git a/src/com/cyngn/eleven/utils/BitmapUtils.java b/src/com/cyanogenmod/eleven/utils/BitmapUtils.java
index a26e474..71ebe3c 100644
--- a/src/com/cyngn/eleven/utils/BitmapUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/BitmapUtils.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,12 +11,10 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.ColorMatrix;
-import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
 
 /**
diff --git a/src/com/cyngn/eleven/utils/CustomToast.java b/src/com/cyanogenmod/eleven/utils/CustomToast.java
index 5c93076..11c567f 100644
--- a/src/com/cyngn/eleven/utils/CustomToast.java
+++ b/src/com/cyanogenmod/eleven/utils/CustomToast.java
@@ -1,4 +1,4 @@
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import android.app.Activity;
 import android.view.Gravity;
@@ -6,7 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /**
  * Ancillary utilities class to customize the appearance of Toast messages
diff --git a/src/com/cyngn/eleven/utils/GenreFetcher.java b/src/com/cyanogenmod/eleven/utils/GenreFetcher.java
index 21713e1..bef40fb 100644
--- a/src/com/cyngn/eleven/utils/GenreFetcher.java
+++ b/src/com/cyanogenmod/eleven/utils/GenreFetcher.java
@@ -1,4 +1,4 @@
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/com/cyngn/eleven/utils/ImageUtils.java b/src/com/cyanogenmod/eleven/utils/ImageUtils.java
index 409045e..12fb4ab 100644
--- a/src/com/cyngn/eleven/utils/ImageUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/ImageUtils.java
@@ -1,22 +1,29 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.utils;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
 import android.widget.ImageView;
 
-import com.cyngn.eleven.cache.BitmapWorkerTask;
-import com.cyngn.eleven.cache.ImageCache;
-import com.cyngn.eleven.cache.ImageWorker;
-import com.cyngn.eleven.lastfm.Album;
-import com.cyngn.eleven.lastfm.Artist;
-import com.cyngn.eleven.lastfm.ImageSize;
-import com.cyngn.eleven.lastfm.MusicEntry;
+import com.cyanogenmod.eleven.cache.ImageCache;
+import com.cyanogenmod.eleven.cache.ImageWorker;
+import com.cyanogenmod.eleven.lastfm.ImageSize;
+import com.cyanogenmod.eleven.lastfm.MusicEntry;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/src/com/cyngn/eleven/utils/Lists.java b/src/com/cyanogenmod/eleven/utils/Lists.java
index 97f1503..7e4f670 100644
--- a/src/com/cyngn/eleven/utils/Lists.java
+++ b/src/com/cyanogenmod/eleven/utils/Lists.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/com/cyngn/eleven/utils/LocaleUtils.java b/src/com/cyanogenmod/eleven/utils/LocaleUtils.java
index 5ef06c0..e246cc6 100644
--- a/src/com/cyngn/eleven/utils/LocaleUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/LocaleUtils.java
@@ -14,24 +14,16 @@
  * limitations under the License
  */
 
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
-import android.provider.ContactsContract.FullNameStyle;
-import android.provider.ContactsContract.PhoneticNameStyle;
-import android.text.TextUtils;
 import android.util.Log;
 
-import java.lang.Character.UnicodeBlock;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Locale;
-import java.util.Set;
 
 import libcore.icu.AlphabeticIndex;
 import libcore.icu.AlphabeticIndex.ImmutableIndex;
-import libcore.icu.Transliterator;
 
 /**
  * This utility class provides specialized handling for locale specific
diff --git a/src/com/cyngn/eleven/utils/MusicUtils.java b/src/com/cyanogenmod/eleven/utils/MusicUtils.java
index d3c76bf..5ab0067 100644
--- a/src/com/cyngn/eleven/utils/MusicUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/MusicUtils.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -37,25 +39,25 @@ import android.provider.Settings;
 import android.util.Log;
 import android.view.Menu;
 
-import com.cyngn.eleven.Config.IdType;
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.IElevenService;
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.loaders.LastAddedLoader;
-import com.cyngn.eleven.loaders.PlaylistLoader;
-import com.cyngn.eleven.loaders.PlaylistSongLoader;
-import com.cyngn.eleven.loaders.SongLoader;
-import com.cyngn.eleven.loaders.TopTracksLoader;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.model.AlbumArtistDetails;
-import com.cyngn.eleven.model.Artist;
-import com.cyngn.eleven.model.Song;
-import com.cyngn.eleven.provider.RecentStore;
-import com.cyngn.eleven.provider.SongPlayCount;
-import com.cyngn.eleven.service.MusicPlaybackTrack;
+import com.cyanogenmod.eleven.Config.IdType;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.IElevenService;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.loaders.LastAddedLoader;
+import com.cyanogenmod.eleven.loaders.PlaylistLoader;
+import com.cyanogenmod.eleven.loaders.PlaylistSongLoader;
+import com.cyanogenmod.eleven.loaders.SongLoader;
+import com.cyanogenmod.eleven.loaders.TopTracksLoader;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.model.AlbumArtistDetails;
+import com.cyanogenmod.eleven.model.Artist;
+import com.cyanogenmod.eleven.model.Song;
+import com.cyanogenmod.eleven.provider.RecentStore;
+import com.cyanogenmod.eleven.provider.SongPlayCount;
+import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/src/com/cyngn/eleven/utils/NavUtils.java b/src/com/cyanogenmod/eleven/utils/NavUtils.java
index afa54a4..ea80c40 100644
--- a/src/com/cyngn/eleven/utils/NavUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/NavUtils.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import android.app.Activity;
 import android.app.SearchManager;
@@ -19,11 +21,11 @@ import android.media.audiofx.AudioEffect;
 import android.os.Bundle;
 import android.provider.MediaStore;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.activities.HomeActivity;
-import com.cyngn.eleven.ui.activities.SearchActivity;
-import com.cyngn.eleven.ui.activities.SettingsActivity;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import com.cyanogenmod.eleven.ui.activities.SearchActivity;
+import com.cyanogenmod.eleven.ui.activities.SettingsActivity;
 
 /**
  * Various navigation helpers.
@@ -134,7 +136,7 @@ public final class NavUtils {
     }
 
     /**
-     * Opens to {@link com.cyngn.eleven.ui.activities.SearchActivity}.
+     * Opens to {@link com.cyanogenmod.eleven.ui.activities.SearchActivity}.
      * 
      * @param activity The {@link Activity} to use.
      * @param query The search query.
@@ -148,7 +150,7 @@ public final class NavUtils {
     }
 
     /**
-     * Opens to {@link com.cyngn.eleven.ui.activities.HomeActivity}.
+     * Opens to {@link com.cyanogenmod.eleven.ui.activities.HomeActivity}.
      * 
      * @param activity The {@link Activity} to use.
      */
diff --git a/src/com/cyngn/eleven/utils/PlaylistPopupMenuHelper.java b/src/com/cyanogenmod/eleven/utils/PlaylistPopupMenuHelper.java
index 4e3ce18..9da5703 100644
--- a/src/com/cyngn/eleven/utils/PlaylistPopupMenuHelper.java
+++ b/src/com/cyanogenmod/eleven/utils/PlaylistPopupMenuHelper.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.utils;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -9,10 +24,10 @@ import android.net.Uri;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.Config.SmartPlaylistType;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.model.Playlist;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.Config.SmartPlaylistType;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.model.Playlist;
 
 public abstract class PlaylistPopupMenuHelper extends PopupMenuHelper {
     private Playlist mPlaylist;
diff --git a/src/com/cyngn/eleven/utils/PopupMenuHelper.java b/src/com/cyanogenmod/eleven/utils/PopupMenuHelper.java
index 857da4e..910ee83 100644
--- a/src/com/cyngn/eleven/utils/PopupMenuHelper.java
+++ b/src/com/cyanogenmod/eleven/utils/PopupMenuHelper.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.utils;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import android.app.Activity;
 import android.support.v4.app.FragmentManager;
@@ -9,16 +21,15 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.PopupMenu;
-import android.widget.Toast;
+
 import com.android.internal.view.menu.ContextMenuBuilder;
 import com.android.internal.view.menu.MenuBuilder;
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.menu.CreateNewPlaylist;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.menu.PhotoSelectionDialog;
-import com.cyngn.eleven.menu.RenamePlaylist;
-import com.cyngn.eleven.provider.RecentStore;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.menu.CreateNewPlaylist;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.menu.RenamePlaylist;
+import com.cyanogenmod.eleven.provider.RecentStore;
 
 import java.util.TreeSet;
 
diff --git a/src/com/cyngn/eleven/utils/PreferenceUtils.java b/src/com/cyanogenmod/eleven/utils/PreferenceUtils.java
index 30fef3b..27823c3 100644
--- a/src/com/cyngn/eleven/utils/PreferenceUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/PreferenceUtils.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,18 +11,18 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.ui.fragments.AlbumFragment;
-import com.cyngn.eleven.ui.fragments.ArtistFragment;
-import com.cyngn.eleven.ui.fragments.SongFragment;
-import com.cyngn.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.ui.fragments.AlbumFragment;
+import com.cyanogenmod.eleven.ui.fragments.ArtistFragment;
+import com.cyanogenmod.eleven.ui.fragments.SongFragment;
+import com.cyanogenmod.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
 
 /**
  * A collection of helpers designed to get and set various preferences across
@@ -244,7 +246,7 @@ public final class PreferenceUtils {
 
     /**
      * @return The sort order used for the artist album list in
-     *         {@link com.cyngn.eleven.ui.fragments.ArtistDetailFragment}
+     *         {@link com.cyanogenmod.eleven.ui.fragments.ArtistDetailFragment}
      */
     public final String getArtistAlbumSortOrder() {
         return mPreferences.getString(ARTIST_ALBUM_SORT_ORDER,
diff --git a/src/com/cyngn/eleven/utils/SectionCreatorUtils.java b/src/com/cyanogenmod/eleven/utils/SectionCreatorUtils.java
index 8c8bac3..cefc258 100644
--- a/src/com/cyngn/eleven/utils/SectionCreatorUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/SectionCreatorUtils.java
@@ -1,17 +1,29 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.utils;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import android.content.Context;
 import android.text.TextUtils;
 
-import com.cyngn.eleven.Config;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.model.Album;
-import com.cyngn.eleven.model.Artist;
-import com.cyngn.eleven.model.SearchResult;
-import com.cyngn.eleven.model.Song;
+import com.cyanogenmod.eleven.Config;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.model.Album;
+import com.cyanogenmod.eleven.model.Artist;
+import com.cyanogenmod.eleven.model.SearchResult;
+import com.cyanogenmod.eleven.model.Song;
 
 import java.util.List;
 import java.util.TreeMap;
diff --git a/src/com/cyngn/eleven/utils/SongPopupMenuHelper.java b/src/com/cyanogenmod/eleven/utils/SongPopupMenuHelper.java
index 9046b93..e8b01a5 100644
--- a/src/com/cyngn/eleven/utils/SongPopupMenuHelper.java
+++ b/src/com/cyanogenmod/eleven/utils/SongPopupMenuHelper.java
@@ -1,16 +1,28 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.utils;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 
 import android.app.Activity;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
-import com.cyngn.eleven.menu.DeleteDialog;
-import com.cyngn.eleven.menu.FragmentMenuItems;
-import com.cyngn.eleven.model.Song;
+import com.cyanogenmod.eleven.menu.DeleteDialog;
+import com.cyanogenmod.eleven.menu.FragmentMenuItems;
+import com.cyanogenmod.eleven.model.Song;
 
 import java.util.TreeSet;
 
diff --git a/src/com/cyngn/eleven/utils/SortOrder.java b/src/com/cyanogenmod/eleven/utils/SortOrder.java
index a71bce5..3c9fe83 100644
--- a/src/com/cyngn/eleven/utils/SortOrder.java
+++ b/src/com/cyanogenmod/eleven/utils/SortOrder.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.utils;
+package com.cyanogenmod.eleven.utils;
 
 import android.provider.MediaStore;
 
diff --git a/src/com/cyngn/eleven/utils/SortUtils.java b/src/com/cyanogenmod/eleven/utils/SortUtils.java
index 07cab1e..a2010e1 100644
--- a/src/com/cyngn/eleven/utils/SortUtils.java
+++ b/src/com/cyanogenmod/eleven/utils/SortUtils.java
@@ -1,4 +1,19 @@
-package com.cyngn.eleven.utils;
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/com/cyngn/eleven/utils/SrtManager.java b/src/com/cyanogenmod/eleven/utils/SrtManager.java
index fd1080d..ca7e884 100644
--- a/src/com/cyngn/eleven/utils/SrtManager.java
+++ b/src/com/cyanogenmod/eleven/utils/SrtManager.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.utils;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import android.media.MediaPlayer;
 import android.os.Handler;
diff --git a/src/com/cyngn/eleven/utils/SrtParser.java b/src/com/cyanogenmod/eleven/utils/SrtParser.java
index 749f80d..a5d4ccc 100644
--- a/src/com/cyngn/eleven/utils/SrtParser.java
+++ b/src/com/cyanogenmod/eleven/utils/SrtParser.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.utils;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.utils;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/src/com/cyngn/eleven/widgets/AlphaPatternDrawable.java b/src/com/cyanogenmod/eleven/widgets/AlphaPatternDrawable.java
index d078d26..2f188f3 100644
--- a/src/com/cyngn/eleven/widgets/AlphaPatternDrawable.java
+++ b/src/com/cyanogenmod/eleven/widgets/AlphaPatternDrawable.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
diff --git a/src/com/cyngn/eleven/widgets/AlphaTouchInterceptorOverlay.java b/src/com/cyanogenmod/eleven/widgets/AlphaTouchInterceptorOverlay.java
index d3c0a9e..1ea1d73 100644
--- a/src/com/cyngn/eleven/widgets/AlphaTouchInterceptorOverlay.java
+++ b/src/com/cyanogenmod/eleven/widgets/AlphaTouchInterceptorOverlay.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.view.View;
diff --git a/src/com/cyanogenmod/eleven/widgets/AudioActivityButton.java b/src/com/cyanogenmod/eleven/widgets/AudioActivityButton.java
new file mode 100644
index 0000000..bbc3345
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/widgets/AudioActivityButton.java
@@ -0,0 +1,33 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
+import android.content.Context;
+import android.support.v4.app.FragmentActivity;
+import android.util.AttributeSet;
+
+import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+
+public abstract class AudioActivityButton extends AudioButton {
+    protected SlidingPanelActivity mActivity;
+
+    public AudioActivityButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public void setActivity(FragmentActivity activity) {
+        mActivity = (SlidingPanelActivity)activity;
+    }
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/AudioButton.java b/src/com/cyanogenmod/eleven/widgets/AudioButton.java
index 42bf013..1f5f70f 100644
--- a/src/com/cyngn/eleven/widgets/AudioButton.java
+++ b/src/com/cyanogenmod/eleven/widgets/AudioButton.java
@@ -1,4 +1,4 @@
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -8,8 +8,8 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.ImageButton;
 
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.widgets.theme.HoloSelector;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.widgets.theme.HoloSelector;
 
 public abstract class AudioButton extends ImageButton implements OnClickListener, OnLongClickListener {
     public static float ACTIVE_ALPHA = 1.0f;
diff --git a/src/com/cyngn/eleven/widgets/BlurScrimImage.java b/src/com/cyanogenmod/eleven/widgets/BlurScrimImage.java
index 9b370c3..c5cd9aa 100644
--- a/src/com/cyngn/eleven/widgets/BlurScrimImage.java
+++ b/src/com/cyanogenmod/eleven/widgets/BlurScrimImage.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.widgets;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -13,9 +25,9 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageFetcher;
-import com.cyngn.eleven.cache.ImageWorker;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageFetcher;
+import com.cyanogenmod.eleven.cache.ImageWorker;
 
 public class BlurScrimImage extends FrameLayout {
     private ImageView mImageView;
diff --git a/src/com/cyanogenmod/eleven/widgets/BrowseButton.java b/src/com/cyanogenmod/eleven/widgets/BrowseButton.java
new file mode 100644
index 0000000..1bd74d8
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/widgets/BrowseButton.java
@@ -0,0 +1,34 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+
+public class BrowseButton extends AudioActivityButton {
+
+    public BrowseButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void onClick(View view) {
+        mActivity.showPanel(SlidingPanelActivity.Panel.Browse);
+    }
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/ColorPanelView.java b/src/com/cyanogenmod/eleven/widgets/ColorPanelView.java
index c449e4d..0920276 100644
--- a/src/com/cyngn/eleven/widgets/ColorPanelView.java
+++ b/src/com/cyanogenmod/eleven/widgets/ColorPanelView.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/cyngn/eleven/widgets/ColorPickerView.java b/src/com/cyanogenmod/eleven/widgets/ColorPickerView.java
index 107b94c..099cdd8 100644
--- a/src/com/cyngn/eleven/widgets/ColorPickerView.java
+++ b/src/com/cyanogenmod/eleven/widgets/ColorPickerView.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/com/cyngn/eleven/widgets/EqualizerView.java b/src/com/cyanogenmod/eleven/widgets/EqualizerView.java
index 5814692..5b8baa5 100644
--- a/src/com/cyngn/eleven/widgets/EqualizerView.java
+++ b/src/com/cyanogenmod/eleven/widgets/EqualizerView.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.widgets;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -12,9 +24,9 @@ import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.util.Log;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.utils.PreferenceUtils;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.utils.PreferenceUtils;
 import com.pheelicks.visualizer.AudioData;
 import com.pheelicks.visualizer.FFTData;
 import com.pheelicks.visualizer.VisualizerView;
diff --git a/src/com/cyngn/eleven/widgets/FrameLayoutWithOverlay.java b/src/com/cyanogenmod/eleven/widgets/FrameLayoutWithOverlay.java
index 06c3eaf..071bdee 100644
--- a/src/com/cyngn/eleven/widgets/FrameLayoutWithOverlay.java
+++ b/src/com/cyanogenmod/eleven/widgets/FrameLayoutWithOverlay.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/cyanogenmod/eleven/widgets/IPopupMenuCallback.java b/src/com/cyanogenmod/eleven/widgets/IPopupMenuCallback.java
new file mode 100644
index 0000000..2cad85d
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/widgets/IPopupMenuCallback.java
@@ -0,0 +1,26 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
+
+import android.view.View;
+
+public interface IPopupMenuCallback {
+    public static interface IListener {
+        void onPopupMenuClicked(final View v, final int position);
+    };
+
+    public void setPopupMenuClickedListener(final IListener listener);
+}
diff --git a/src/com/cyngn/eleven/widgets/LayoutSuppressingImageView.java b/src/com/cyanogenmod/eleven/widgets/LayoutSuppressingImageView.java
index aad2b9d..5263e13 100644
--- a/src/com/cyngn/eleven/widgets/LayoutSuppressingImageView.java
+++ b/src/com/cyanogenmod/eleven/widgets/LayoutSuppressingImageView.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/cyngn/eleven/widgets/LetterTileDrawable.java b/src/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java
index 139d5e7..24cb8e2 100644
--- a/src/com/cyngn/eleven/widgets/LetterTileDrawable.java
+++ b/src/com/cyanogenmod/eleven/widgets/LetterTileDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -32,9 +32,9 @@ import android.text.TextUtils;
 
 import junit.framework.Assert;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.cache.ImageWorker.ImageType;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * A drawable that encapsulates all the functionality needed to display a letter tile to
diff --git a/src/com/cyngn/eleven/widgets/LoadingEmptyContainer.java b/src/com/cyanogenmod/eleven/widgets/LoadingEmptyContainer.java
index 0522439..e7a002e 100644
--- a/src/com/cyngn/eleven/widgets/LoadingEmptyContainer.java
+++ b/src/com/cyanogenmod/eleven/widgets/LoadingEmptyContainer.java
@@ -1,17 +1,27 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.widgets;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.os.Handler;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /**
  * This class is the default empty state view for most listviews/fragments
diff --git a/src/com/cyngn/eleven/widgets/NoResultsContainer.java b/src/com/cyanogenmod/eleven/widgets/NoResultsContainer.java
index e90e797..8da0d29 100644
--- a/src/com/cyngn/eleven/widgets/NoResultsContainer.java
+++ b/src/com/cyanogenmod/eleven/widgets/NoResultsContainer.java
@@ -1,19 +1,27 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.widgets;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /**
  * This class is the default empty state view for most listviews/fragments
diff --git a/src/com/cyngn/eleven/widgets/PlayPauseButton.java b/src/com/cyanogenmod/eleven/widgets/PlayPauseButton.java
index 157d96e..1b8e988 100644
--- a/src/com/cyngn/eleven/widgets/PlayPauseButton.java
+++ b/src/com/cyanogenmod/eleven/widgets/PlayPauseButton.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -19,10 +21,10 @@ import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 import android.widget.ImageButton;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.theme.HoloSelector;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.theme.HoloSelector;
 
 /**
  * A custom {@link ImageButton} that represents the "play and pause" button.
diff --git a/src/com/cyngn/eleven/widgets/PlayPauseProgressButton.java b/src/com/cyanogenmod/eleven/widgets/PlayPauseProgressButton.java
index 05d57cc..5c086be 100644
--- a/src/com/cyngn/eleven/widgets/PlayPauseProgressButton.java
+++ b/src/com/cyanogenmod/eleven/widgets/PlayPauseProgressButton.java
@@ -1,16 +1,27 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.widgets;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * This class handles the playpause button as well as the circular progress bar
diff --git a/src/com/cyngn/eleven/widgets/PopupMenuButton.java b/src/com/cyanogenmod/eleven/widgets/PopupMenuButton.java
index caf8152..f45bb47 100644
--- a/src/com/cyngn/eleven/widgets/PopupMenuButton.java
+++ b/src/com/cyanogenmod/eleven/widgets/PopupMenuButton.java
@@ -1,8 +1,20 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-
-package com.cyngn.eleven.widgets;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/cyanogenmod/eleven/widgets/QueueButton.java b/src/com/cyanogenmod/eleven/widgets/QueueButton.java
new file mode 100644
index 0000000..a8a1f50
--- /dev/null
+++ b/src/com/cyanogenmod/eleven/widgets/QueueButton.java
@@ -0,0 +1,34 @@
+/*
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+
+public class QueueButton extends AudioActivityButton {
+
+    public QueueButton(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void onClick(View view) {
+        mActivity.showPanel(SlidingPanelActivity.Panel.Queue);
+    }
+}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/RepeatButton.java b/src/com/cyanogenmod/eleven/widgets/RepeatButton.java
index 707523b..7cf3c9b 100644
--- a/src/com/cyngn/eleven/widgets/RepeatButton.java
+++ b/src/com/cyanogenmod/eleven/widgets/RepeatButton.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,16 +11,16 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageButton;
 
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * A custom {@link ImageButton} that represents the "repeat" button.
diff --git a/src/com/cyngn/eleven/widgets/RepeatingImageButton.java b/src/com/cyanogenmod/eleven/widgets/RepeatingImageButton.java
index f5440a5..9fb6758 100644
--- a/src/com/cyngn/eleven/widgets/RepeatingImageButton.java
+++ b/src/com/cyanogenmod/eleven/widgets/RepeatingImageButton.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.os.SystemClock;
@@ -20,10 +20,10 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.ApolloUtils;
-import com.cyngn.eleven.utils.MusicUtils;
-import com.cyngn.eleven.widgets.theme.HoloSelector;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.utils.ApolloUtils;
+import com.cyanogenmod.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.widgets.theme.HoloSelector;
 
 /**
  * A {@link ImageButton} that will repeatedly call a 'listener' method as long
diff --git a/src/com/cyngn/eleven/widgets/SeparatedListAdapter.java b/src/com/cyanogenmod/eleven/widgets/SeparatedListAdapter.java
index 0167941..da29626 100644
--- a/src/com/cyngn/eleven/widgets/SeparatedListAdapter.java
+++ b/src/com/cyanogenmod/eleven/widgets/SeparatedListAdapter.java
@@ -1,5 +1,5 @@
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.view.View;
@@ -8,7 +8,7 @@ import android.widget.Adapter;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com/cyngn/eleven/widgets/ShowHideMasterLayout.java b/src/com/cyanogenmod/eleven/widgets/ShowHideMasterLayout.java
index 953c723..26b6688 100644
--- a/src/com/cyngn/eleven/widgets/ShowHideMasterLayout.java
+++ b/src/com/cyanogenmod/eleven/widgets/ShowHideMasterLayout.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/src/com/cyngn/eleven/widgets/ShuffleButton.java b/src/com/cyanogenmod/eleven/widgets/ShuffleButton.java
index 83a5200..838c2e7 100644
--- a/src/com/cyngn/eleven/widgets/ShuffleButton.java
+++ b/src/com/cyanogenmod/eleven/widgets/ShuffleButton.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,15 +11,15 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyngn.eleven.MusicPlaybackService;
-import com.cyngn.eleven.R;
-import com.cyngn.eleven.utils.MusicUtils;
+import com.cyanogenmod.eleven.MusicPlaybackService;
+import com.cyanogenmod.eleven.R;
+import com.cyanogenmod.eleven.utils.MusicUtils;
 
 /**
  * @author Andrew Neal (andrewdneal@gmail.com)
diff --git a/src/com/cyngn/eleven/widgets/SquareFrame.java b/src/com/cyanogenmod/eleven/widgets/SquareFrame.java
index 8c5a441..85b0acc 100644
--- a/src/com/cyngn/eleven/widgets/SquareFrame.java
+++ b/src/com/cyanogenmod/eleven/widgets/SquareFrame.java
@@ -1,4 +1,4 @@
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/cyngn/eleven/widgets/SquareImageView.java b/src/com/cyanogenmod/eleven/widgets/SquareImageView.java
index 31eeaac..bace9bf 100644
--- a/src/com/cyngn/eleven/widgets/SquareImageView.java
+++ b/src/com/cyanogenmod/eleven/widgets/SquareImageView.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/cyngn/eleven/widgets/SquareView.java b/src/com/cyanogenmod/eleven/widgets/SquareView.java
index 27bfa89..6bb7d6e 100644
--- a/src/com/cyngn/eleven/widgets/SquareView.java
+++ b/src/com/cyanogenmod/eleven/widgets/SquareView.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets;
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/com/cyngn/eleven/widgets/SquareViewPager.java b/src/com/cyanogenmod/eleven/widgets/SquareViewPager.java
index da1d5f5..e24c1e9 100644
--- a/src/com/cyngn/eleven/widgets/SquareViewPager.java
+++ b/src/com/cyanogenmod/eleven/widgets/SquareViewPager.java
@@ -1,7 +1,19 @@
 /*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.widgets;
+* Copyright (C) 2014 The CyanogenMod Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package com.cyanogenmod.eleven.widgets;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
diff --git a/src/com/cyngn/eleven/widgets/theme/HoloSelector.java b/src/com/cyanogenmod/eleven/widgets/theme/HoloSelector.java
index 51326e1..2ec6348 100644
--- a/src/com/cyngn/eleven/widgets/theme/HoloSelector.java
+++ b/src/com/cyanogenmod/eleven/widgets/theme/HoloSelector.java
@@ -1,5 +1,7 @@
 /*
- * Copyright (C) 2012 Andrew Neal Licensed under the Apache License, Version 2.0
+ * Copyright (C) 2012 Andrew Neal
+ * Copyright (C) 2014 The CyanogenMod Project
+ * Licensed under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with the
  * License. You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
@@ -9,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyngn.eleven.widgets.theme;
+package com.cyanogenmod.eleven.widgets.theme;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -17,7 +19,7 @@ import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.StateListDrawable;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/com/cyngn/eleven/MusicStateListener.java b/src/com/cyngn/eleven/MusicStateListener.java
deleted file mode 100644
index 64bae40..0000000
--- a/src/com/cyngn/eleven/MusicStateListener.java
+++ /dev/null
@@ -1,24 +0,0 @@
-
-package com.cyngn.eleven;
-
-/**
- * Listens for playback changes to send the the fragments bound to this activity
- */
-public interface MusicStateListener {
-
-    /**
-     * Called when {@link MusicPlaybackService#REFRESH} is invoked
-     */
-    public void restartLoader();
-
-    /**
-     * Called when {@link MusicPlaybackService#PLAYLIST_CHANGED} is invoked
-     */
-    public void onPlaylistChanged();
-
-    /**
-     * Called when {@link MusicPlaybackService#META_CHANGED} is invoked
-     */
-    public void onMetaChanged();
-
-}
diff --git a/src/com/cyngn/eleven/cache/ICacheListener.java b/src/com/cyngn/eleven/cache/ICacheListener.java
deleted file mode 100644
index f41e539..0000000
--- a/src/com/cyngn/eleven/cache/ICacheListener.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.cache;
-
-public interface ICacheListener {
-    void onCacheUnpaused();
-}
diff --git a/src/com/cyngn/eleven/model/AlbumArtistDetails.java b/src/com/cyngn/eleven/model/AlbumArtistDetails.java
deleted file mode 100644
index ea54cda..0000000
--- a/src/com/cyngn/eleven/model/AlbumArtistDetails.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.model;
-
-/**
- * Simple containing class to query for album art
- */
-public class AlbumArtistDetails {
-    public long mAudioId;
-    public long mAlbumId;
-    public String mAlbumName;
-    public String mArtistName;
-}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/sectionadapter/SectionListContainer.java b/src/com/cyngn/eleven/sectionadapter/SectionListContainer.java
deleted file mode 100644
index a5fe678..0000000
--- a/src/com/cyngn/eleven/sectionadapter/SectionListContainer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.sectionadapter;
-
-import com.cyngn.eleven.utils.SectionCreatorUtils;
-
-import java.util.List;
-import java.util.TreeMap;
-
-/**
- * Simple Container that contains a list of T items as well as the map of section information
- * @param <T> the type of item that the list contains
- */
-public class SectionListContainer<T> {
-    public TreeMap<Integer, SectionCreatorUtils.Section> mSections;
-    public List<T> mListResults;
-
-    public SectionListContainer(final TreeMap<Integer, SectionCreatorUtils.Section> sections,
-                                final List<T> results) {
-        mSections = sections;
-        mListResults = results;
-    }
-}
diff --git a/src/com/cyngn/eleven/service/MusicPlaybackTrack.aidl b/src/com/cyngn/eleven/service/MusicPlaybackTrack.aidl
deleted file mode 100644
index 682a0df..0000000
--- a/src/com/cyngn/eleven/service/MusicPlaybackTrack.aidl
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.cyngn.eleven.service;
-
-parcelable MusicPlaybackTrack;
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/ui/fragments/IChildFragment.java b/src/com/cyngn/eleven/ui/fragments/IChildFragment.java
deleted file mode 100644
index 1e750f2..0000000
--- a/src/com/cyngn/eleven/ui/fragments/IChildFragment.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.ui.fragments;
-
-import com.cyngn.eleven.adapters.PagerAdapter;
-
-public interface IChildFragment {
-    PagerAdapter.MusicFragments getMusicFragmentParent();
-}
diff --git a/src/com/cyngn/eleven/ui/fragments/ISetupActionBar.java b/src/com/cyngn/eleven/ui/fragments/ISetupActionBar.java
deleted file mode 100644
index 6c97253..0000000
--- a/src/com/cyngn/eleven/ui/fragments/ISetupActionBar.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.ui.fragments;
-
-public interface ISetupActionBar {
-    public void setupActionBar();
-}
diff --git a/src/com/cyngn/eleven/widgets/AudioActivityButton.java b/src/com/cyngn/eleven/widgets/AudioActivityButton.java
deleted file mode 100644
index bab45aa..0000000
--- a/src/com/cyngn/eleven/widgets/AudioActivityButton.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.cyngn.eleven.widgets;
-import android.content.Context;
-import android.support.v4.app.FragmentActivity;
-import android.util.AttributeSet;
-
-import com.cyngn.eleven.ui.activities.SlidingPanelActivity;
-
-public abstract class AudioActivityButton extends AudioButton {
-    protected SlidingPanelActivity mActivity;
-
-    public AudioActivityButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public void setActivity(FragmentActivity activity) {
-        mActivity = (SlidingPanelActivity)activity;
-    }
-}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/BrowseButton.java b/src/com/cyngn/eleven/widgets/BrowseButton.java
deleted file mode 100644
index 825f841..0000000
--- a/src/com/cyngn/eleven/widgets/BrowseButton.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.cyngn.eleven.widgets;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.cyngn.eleven.ui.activities.SlidingPanelActivity;
-
-public class BrowseButton extends AudioActivityButton {
-
-    public BrowseButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onClick(View view) {
-        mActivity.showPanel(SlidingPanelActivity.Panel.Browse);
-    }
-}
\ No newline at end of file
diff --git a/src/com/cyngn/eleven/widgets/IPopupMenuCallback.java b/src/com/cyngn/eleven/widgets/IPopupMenuCallback.java
deleted file mode 100644
index 7b73c35..0000000
--- a/src/com/cyngn/eleven/widgets/IPopupMenuCallback.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2014 Cyanogen, Inc.
- */
-package com.cyngn.eleven.widgets;
-
-import android.view.View;
-
-public interface IPopupMenuCallback {
-    public static interface IListener {
-        void onPopupMenuClicked(final View v, final int position);
-    };
-
-    public void setPopupMenuClickedListener(final IListener listener);
-}
diff --git a/src/com/cyngn/eleven/widgets/QueueButton.java b/src/com/cyngn/eleven/widgets/QueueButton.java
deleted file mode 100644
index 43404ce..0000000
--- a/src/com/cyngn/eleven/widgets/QueueButton.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.cyngn.eleven.widgets;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.cyngn.eleven.ui.activities.SlidingPanelActivity;
-
-public class QueueButton extends AudioActivityButton {
-
-    public QueueButton(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onClick(View view) {
-        mActivity.showPanel(SlidingPanelActivity.Panel.Queue);
-    }
-}
\ No newline at end of file
diff --git a/src/com/viewpagerindicator/CirclePageIndicator.java b/src/com/viewpagerindicator/CirclePageIndicator.java
index e7de160..41668f1 100644
--- a/src/com/viewpagerindicator/CirclePageIndicator.java
+++ b/src/com/viewpagerindicator/CirclePageIndicator.java
@@ -37,7 +37,7 @@ import static android.graphics.Paint.ANTI_ALIAS_FLAG;
 import static android.widget.LinearLayout.HORIZONTAL;
 import static android.widget.LinearLayout.VERTICAL;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /**
  * Draws circles (one for each view). The current view position is filled and
diff --git a/src/com/viewpagerindicator/IconPageIndicator.java b/src/com/viewpagerindicator/IconPageIndicator.java
index 44ea4ae..deab171 100644
--- a/src/com/viewpagerindicator/IconPageIndicator.java
+++ b/src/com/viewpagerindicator/IconPageIndicator.java
@@ -29,7 +29,7 @@ import android.widget.ImageView;
 import static android.view.ViewGroup.LayoutParams.FILL_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /**
  * This widget implements the dynamic action bar tab behavior that can change
diff --git a/src/com/viewpagerindicator/LinePageIndicator.java b/src/com/viewpagerindicator/LinePageIndicator.java
index b76d602..17e8158 100644
--- a/src/com/viewpagerindicator/LinePageIndicator.java
+++ b/src/com/viewpagerindicator/LinePageIndicator.java
@@ -32,7 +32,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /**
  * Draws a line for each page. The current page line is colored differently
diff --git a/src/com/viewpagerindicator/TabPageIndicator.java b/src/com/viewpagerindicator/TabPageIndicator.java
index b1c5ef0..07c995d 100644
--- a/src/com/viewpagerindicator/TabPageIndicator.java
+++ b/src/com/viewpagerindicator/TabPageIndicator.java
@@ -30,7 +30,7 @@ import android.widget.TextView;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /**
  * This widget implements the dynamic action bar tab behavior that can change
diff --git a/src/com/viewpagerindicator/TitlePageIndicator.java b/src/com/viewpagerindicator/TitlePageIndicator.java
index 97e1210..4965ad0 100644
--- a/src/com/viewpagerindicator/TitlePageIndicator.java
+++ b/src/com/viewpagerindicator/TitlePageIndicator.java
@@ -36,7 +36,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 import java.util.ArrayList;
 
diff --git a/src/com/viewpagerindicator/UnderlinePageIndicator.java b/src/com/viewpagerindicator/UnderlinePageIndicator.java
index 72657d2..0f799c2 100644
--- a/src/com/viewpagerindicator/UnderlinePageIndicator.java
+++ b/src/com/viewpagerindicator/UnderlinePageIndicator.java
@@ -31,7 +31,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 
-import com.cyngn.eleven.R;
+import com.cyanogenmod.eleven.R;
 
 /**
  * Draws a line for each page. The current page line is colored differently