From 869ef7eef36052a2960751fe4e2b760f060df502 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 22 Jan 2018 21:06:57 +0200
Subject: Eleven: rebrand step 2: update file contents

Change-Id: Ib99317dbf3b1f91222461d6c1fd1b3568268e3af
---
 Android.mk                                         |  2 +-
 AndroidManifest.xml                                | 26 ++++----
 res/layout/activity_base.xml                       | 12 ++--
 res/layout/album_art_fragment.xml                  |  2 +-
 res/layout/album_detail_song.xml                   |  2 +-
 res/layout/artist_detail_album.xml                 |  2 +-
 res/layout/artist_detail_song.xml                  |  2 +-
 res/layout/blur_scrim_image.xml                    |  4 +-
 res/layout/bottom_action_bar.xml                   |  4 +-
 res/layout/fragment_music_browser_phone.xml        |  2 +-
 res/layout/grid_items_normal.xml                   |  2 +-
 res/layout/header_bar.xml                          |  4 +-
 res/layout/list_base.xml                           |  2 +-
 res/layout/list_base_padding.xml                   |  2 +-
 res/layout/list_item_common.xml                    |  2 +-
 res/layout/list_item_queue.xml                     |  2 +-
 res/layout/list_item_search_history.xml            |  2 +-
 res/layout/list_item_simple.xml                    |  2 +-
 res/layout/list_item_top_tracks.xml                |  2 +-
 res/layout/loading_empty_container.xml             |  4 +-
 res/layout/main_album_flow.xml                     |  8 +--
 res/layout/main_playback_controls.xml              |  8 +--
 res/layout/no_results_message.xml                  |  4 +-
 res/layout/play_pause_progress_button.xml          |  6 +-
 res/layout/playlist_detail_header.xml              |  2 +-
 res/layout/square_image_view.xml                   |  6 +-
 src/org/lineageos/eleven/Config.java               |  2 +-
 src/org/lineageos/eleven/ElevenApplication.java    |  4 +-
 src/org/lineageos/eleven/IElevenService.aidl       |  4 +-
 .../eleven/MediaButtonIntentReceiver.java          |  2 +-
 src/org/lineageos/eleven/MusicPlaybackService.java | 78 +++++++++++-----------
 src/org/lineageos/eleven/MusicStateListener.java   |  2 +-
 .../lineageos/eleven/adapters/AlbumAdapter.java    | 16 ++---
 .../eleven/adapters/AlbumArtPagerAdapter.java      | 20 +++---
 .../eleven/adapters/AlbumDetailSongAdapter.java    | 16 ++---
 .../lineageos/eleven/adapters/ArtistAdapter.java   | 20 +++---
 .../eleven/adapters/ArtistDetailAlbumAdapter.java  | 20 +++---
 .../eleven/adapters/ArtistDetailSongAdapter.java   | 12 ++--
 .../eleven/adapters/DetailSongAdapter.java         | 20 +++---
 .../lineageos/eleven/adapters/PagerAdapter.java    | 14 ++--
 .../lineageos/eleven/adapters/PlaylistAdapter.java | 20 +++---
 .../eleven/adapters/ProfileSongAdapter.java        |  8 +--
 src/org/lineageos/eleven/adapters/SongAdapter.java | 30 ++++-----
 .../eleven/adapters/SummarySearchAdapter.java      | 20 +++---
 .../lineageos/eleven/appwidgets/AppWidgetBase.java |  4 +-
 .../eleven/appwidgets/AppWidgetLarge.java          | 10 +--
 .../eleven/appwidgets/AppWidgetLargeAlternate.java | 14 ++--
 .../eleven/appwidgets/AppWidgetSmall.java          | 10 +--
 .../lineageos/eleven/cache/BitmapWorkerTask.java   |  4 +-
 .../eleven/cache/BlurBitmapWorkerTask.java         |  8 +--
 src/org/lineageos/eleven/cache/DiskLruCache.java   |  2 +-
 src/org/lineageos/eleven/cache/ICacheListener.java |  2 +-
 src/org/lineageos/eleven/cache/ImageCache.java     |  4 +-
 src/org/lineageos/eleven/cache/ImageFetcher.java   | 16 ++---
 src/org/lineageos/eleven/cache/ImageWorker.java    | 16 ++---
 src/org/lineageos/eleven/cache/LruCache.java       |  2 +-
 .../lineageos/eleven/cache/PlaylistWorkerTask.java | 14 ++--
 .../eleven/cache/SimpleBitmapWorkerTask.java       |  6 +-
 .../eleven/dragdrop/DragSortController.java        |  2 +-
 .../eleven/dragdrop/DragSortListView.java          |  4 +-
 .../eleven/dragdrop/SimpleFloatViewManager.java    |  2 +-
 src/org/lineageos/eleven/format/Capitalize.java    |  2 +-
 .../lineageos/eleven/format/PrefixHighlighter.java |  4 +-
 src/org/lineageos/eleven/lastfm/Album.java         |  4 +-
 src/org/lineageos/eleven/lastfm/Artist.java        |  4 +-
 src/org/lineageos/eleven/lastfm/Caller.java        |  8 +--
 src/org/lineageos/eleven/lastfm/DomElement.java    |  2 +-
 src/org/lineageos/eleven/lastfm/Image.java         |  2 +-
 src/org/lineageos/eleven/lastfm/ImageHolder.java   |  2 +-
 src/org/lineageos/eleven/lastfm/ImageSize.java     |  2 +-
 src/org/lineageos/eleven/lastfm/ItemFactory.java   |  4 +-
 .../eleven/lastfm/ItemFactoryBuilder.java          |  2 +-
 src/org/lineageos/eleven/lastfm/MapUtilities.java  |  2 +-
 src/org/lineageos/eleven/lastfm/MusicEntry.java    |  2 +-
 .../lineageos/eleven/lastfm/PaginatedResult.java   |  2 +-
 .../lineageos/eleven/lastfm/ResponseBuilder.java   |  2 +-
 src/org/lineageos/eleven/lastfm/Result.java        |  2 +-
 .../lineageos/eleven/lastfm/StringUtilities.java   |  2 +-
 src/org/lineageos/eleven/loaders/AlbumLoader.java  | 18 ++---
 .../lineageos/eleven/loaders/AlbumSongLoader.java  |  8 +--
 src/org/lineageos/eleven/loaders/ArtistLoader.java | 18 ++---
 src/org/lineageos/eleven/loaders/AsyncHandler.java |  2 +-
 .../lineageos/eleven/loaders/LastAddedLoader.java  | 10 +--
 .../lineageos/eleven/loaders/NowPlayingCursor.java |  6 +-
 .../lineageos/eleven/loaders/PlaylistLoader.java   | 10 +--
 .../eleven/loaders/PlaylistSongLoader.java         |  6 +-
 src/org/lineageos/eleven/loaders/QueueLoader.java  |  6 +-
 src/org/lineageos/eleven/loaders/SearchLoader.java |  6 +-
 src/org/lineageos/eleven/loaders/SongLoader.java   | 18 ++---
 src/org/lineageos/eleven/loaders/SortedCursor.java |  2 +-
 .../lineageos/eleven/loaders/TopTracksLoader.java  |  8 +--
 .../eleven/loaders/WrappedAsyncTaskLoader.java     |  2 +-
 src/org/lineageos/eleven/locale/HanziToPinyin.java |  2 +-
 .../eleven/locale/LocaleChangeReceiver.java        |  4 +-
 src/org/lineageos/eleven/locale/LocaleSet.java     |  2 +-
 .../lineageos/eleven/locale/LocaleSetManager.java  |  4 +-
 src/org/lineageos/eleven/locale/LocaleUtils.java   |  4 +-
 .../lineageos/eleven/menu/BasePlaylistDialog.java  |  6 +-
 src/org/lineageos/eleven/menu/ConfirmDialog.java   |  4 +-
 .../lineageos/eleven/menu/CreateNewPlaylist.java   |  8 +--
 src/org/lineageos/eleven/menu/DeleteDialog.java    | 12 ++--
 .../lineageos/eleven/menu/FragmentMenuItems.java   |  2 +-
 .../eleven/menu/PhotoSelectionDialog.java          | 14 ++--
 src/org/lineageos/eleven/menu/RenamePlaylist.java  |  8 +--
 src/org/lineageos/eleven/model/Album.java          |  2 +-
 .../lineageos/eleven/model/AlbumArtistDetails.java |  2 +-
 src/org/lineageos/eleven/model/Artist.java         |  2 +-
 src/org/lineageos/eleven/model/Genre.java          |  2 +-
 src/org/lineageos/eleven/model/Playlist.java       |  2 +-
 src/org/lineageos/eleven/model/SearchResult.java   |  4 +-
 src/org/lineageos/eleven/model/Song.java           |  2 +-
 .../lineageos/eleven/provider/LocalizedStore.java  | 12 ++--
 src/org/lineageos/eleven/provider/MusicDB.java     |  2 +-
 .../eleven/provider/MusicPlaybackState.java        |  8 +--
 .../eleven/provider/PlaylistArtworkStore.java      |  4 +-
 .../lineageos/eleven/provider/PropertiesStore.java |  2 +-
 src/org/lineageos/eleven/provider/RecentStore.java |  2 +-
 .../lineageos/eleven/provider/SearchHistory.java   |  2 +-
 .../lineageos/eleven/provider/SongPlayCount.java   |  2 +-
 .../lineageos/eleven/recycler/RecycleHolder.java   |  6 +-
 .../eleven/sectionadapter/SectionAdapter.java      | 12 ++--
 .../eleven/sectionadapter/SectionCreator.java      |  6 +-
 .../sectionadapter/SectionListContainer.java       |  4 +-
 .../eleven/service/MusicPlaybackTrack.aidl         |  2 +-
 .../eleven/service/MusicPlaybackTrack.java         |  4 +-
 .../slidinguppanel/SlidingUpPanelLayout.java       |  4 +-
 .../eleven/slidinguppanel/ViewDragHelper.java      |  2 +-
 src/org/lineageos/eleven/ui/HeaderBar.java         | 14 ++--
 src/org/lineageos/eleven/ui/MusicHolder.java       |  8 +--
 .../eleven/ui/activities/BaseActivity.java         | 28 ++++----
 .../eleven/ui/activities/HomeActivity.java         | 36 +++++-----
 .../eleven/ui/activities/SearchActivity.java       | 54 +++++++--------
 .../eleven/ui/activities/SettingsActivity.java     | 10 +--
 .../eleven/ui/activities/SlidingPanelActivity.java | 20 +++---
 .../activities/preview/AudioPreviewActivity.java   |  6 +-
 .../eleven/ui/activities/preview/PreviewSong.java  |  2 +-
 .../eleven/ui/activities/preview/util/Logger.java  |  2 +-
 .../eleven/ui/fragments/AlbumDetailFragment.java   | 32 ++++-----
 .../eleven/ui/fragments/AlbumFragment.java         | 38 +++++------
 .../eleven/ui/fragments/ArtistDetailFragment.java  | 36 +++++-----
 .../eleven/ui/fragments/ArtistFragment.java        | 42 ++++++------
 .../eleven/ui/fragments/AudioPlayerFragment.java   | 50 +++++++-------
 .../eleven/ui/fragments/BaseFragment.java          |  8 +--
 .../eleven/ui/fragments/DetailFragment.java        |  6 +-
 .../eleven/ui/fragments/FadingBarFragment.java     |  4 +-
 .../eleven/ui/fragments/IChildFragment.java        |  4 +-
 .../eleven/ui/fragments/ISetupActionBar.java       |  2 +-
 .../ui/fragments/PlaylistDetailFragment.java       | 46 ++++++-------
 .../eleven/ui/fragments/PlaylistFragment.java      | 32 ++++-----
 .../eleven/ui/fragments/QueueFragment.java         | 48 ++++++-------
 .../eleven/ui/fragments/RecentFragment.java        | 28 ++++----
 .../eleven/ui/fragments/SongFragment.java          | 20 +++---
 .../ui/fragments/phone/MusicBrowserFragment.java   |  2 +-
 .../fragments/phone/MusicBrowserPhoneFragment.java | 30 ++++-----
 .../ui/fragments/profile/BasicSongFragment.java    | 34 +++++-----
 .../ui/fragments/profile/LastAddedFragment.java    | 24 +++----
 .../fragments/profile/SmartPlaylistFragment.java   | 24 +++----
 .../ui/fragments/profile/TopTracksFragment.java    | 26 ++++----
 .../eleven/utils/AlbumPopupMenuHelper.java         | 14 ++--
 src/org/lineageos/eleven/utils/ApolloUtils.java    |  6 +-
 .../eleven/utils/ArtistPopupMenuHelper.java        | 12 ++--
 src/org/lineageos/eleven/utils/BitmapUtils.java    |  2 +-
 .../lineageos/eleven/utils/BitmapWithColors.java   |  2 +-
 src/org/lineageos/eleven/utils/GenreFetcher.java   |  2 +-
 src/org/lineageos/eleven/utils/ImageUtils.java     | 10 +--
 src/org/lineageos/eleven/utils/Lists.java          |  2 +-
 src/org/lineageos/eleven/utils/MusicUtils.java     | 42 ++++++------
 src/org/lineageos/eleven/utils/NavUtils.java       | 18 ++---
 .../eleven/utils/PlaylistPopupMenuHelper.java      | 10 +--
 .../lineageos/eleven/utils/PopupMenuHelper.java    | 14 ++--
 .../lineageos/eleven/utils/PreferenceUtils.java    | 14 ++--
 .../eleven/utils/SectionCreatorUtils.java          | 14 ++--
 src/org/lineageos/eleven/utils/ShakeDetector.java  |  2 +-
 .../eleven/utils/SongPopupMenuHelper.java          |  8 +--
 src/org/lineageos/eleven/utils/SortOrder.java      |  2 +-
 src/org/lineageos/eleven/utils/SrtManager.java     |  2 +-
 src/org/lineageos/eleven/utils/SrtParser.java      |  2 +-
 .../eleven/widgets/AlphaPatternDrawable.java       |  2 +-
 .../widgets/AlphaTouchInterceptorOverlay.java      |  2 +-
 .../eleven/widgets/AudioActivityButton.java        |  4 +-
 src/org/lineageos/eleven/widgets/AudioButton.java  |  6 +-
 .../lineageos/eleven/widgets/BlurScrimImage.java   |  8 +--
 src/org/lineageos/eleven/widgets/BrowseButton.java |  4 +-
 .../lineageos/eleven/widgets/ColorPanelView.java   |  2 +-
 .../lineageos/eleven/widgets/ColorPickerView.java  |  2 +-
 .../eleven/widgets/FrameLayoutWithOverlay.java     |  2 +-
 .../eleven/widgets/IPopupMenuCallback.java         |  2 +-
 .../eleven/widgets/LayoutSuppressingImageView.java |  2 +-
 .../eleven/widgets/LetterTileDrawable.java         | 10 +--
 .../eleven/widgets/LoadingEmptyContainer.java      |  4 +-
 .../eleven/widgets/NoResultsContainer.java         |  4 +-
 .../lineageos/eleven/widgets/PlayPauseButton.java  |  8 +--
 .../eleven/widgets/PlayPauseProgressButton.java    |  6 +-
 .../lineageos/eleven/widgets/PopupMenuButton.java  |  4 +-
 src/org/lineageos/eleven/widgets/QueueButton.java  |  4 +-
 src/org/lineageos/eleven/widgets/RepeatButton.java |  8 +--
 .../eleven/widgets/RepeatingImageButton.java       |  8 +--
 .../eleven/widgets/SeparatedListAdapter.java       |  4 +-
 .../eleven/widgets/ShowHideMasterLayout.java       |  2 +-
 .../lineageos/eleven/widgets/ShuffleButton.java    |  8 +--
 src/org/lineageos/eleven/widgets/SquareFrame.java  |  2 +-
 .../lineageos/eleven/widgets/SquareImageView.java  |  2 +-
 src/org/lineageos/eleven/widgets/SquareView.java   |  2 +-
 .../lineageos/eleven/widgets/SquareViewPager.java  |  2 +-
 .../eleven/widgets/ViewPagerTabStrip.java          |  4 +-
 .../lineageos/eleven/widgets/ViewPagerTabs.java    |  4 +-
 .../lineageos/eleven/widgets/VisualizerView.java   |  4 +-
 207 files changed, 946 insertions(+), 946 deletions(-)

diff --git a/Android.mk b/Android.mk
index 7624f1f..5ee57e8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_SRC_FILES := src/com/cyanogenmod/eleven/IElevenService.aidl
+LOCAL_SRC_FILES := src/org/lineageos/eleven/IElevenService.aidl
 LOCAL_SRC_FILES += $(call all-java-files-under, src)
 
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res) \
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 35c4328..f9f831b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -15,7 +15,7 @@
      limitations under the License.
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.cyanogenmod.eleven"
+    package="org.lineageos.eleven"
     android:versionCode="3"
     android:versionName="3.0" >
 
@@ -23,6 +23,8 @@
         android:minSdkVersion="24"
         android:targetSdkVersion="24" />
 
+    <original-package android:name="com.cyanogenmod.eleven" />
+
     <!-- Used for caching and creating new playlists -->
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <!-- Used to check for a network connection -->
@@ -52,14 +54,14 @@
     <uses-feature android:name="android.hardware.sensor.accelerometer" />
 
     <application
-        android:name="com.cyanogenmod.eleven.ElevenApplication"
+        android:name="org.lineageos.eleven.ElevenApplication"
         android:allowBackup="true"
         android:allowTaskReparenting="true"
         android:hardwareAccelerated="@bool/config_hardwareAccelerated"
         android:icon="@mipmap/ic_launcher_eleven"
         android:label="@string/app_name"
         android:largeHeap="@bool/config_largeHeap"
-        android:taskAffinity="com.cyanogenmod.eleven.task"
+        android:taskAffinity="org.lineageos.eleven.task"
         android:theme="@style/Eleven.Theme">
 
         <!-- Searchable -->
@@ -68,7 +70,7 @@
             android:value=".ui.activities.SearchActivity" />
         <!-- Main activity -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.HomeActivity"
+            android:name="org.lineageos.eleven.ui.activities.HomeActivity"
             android:windowSoftInputMode="adjustPan"
             android:launchMode="singleTop"
             android:exported="true"
@@ -91,7 +93,7 @@
                 <data android:mimeType="vnd.android.cursor.dir/artists" />
             </intent-filter>
             <intent-filter>
-                <action android:name="com.cyanogenmod.eleven.AUDIO_PLAYER" />
+                <action android:name="org.lineageos.eleven.AUDIO_PLAYER" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
@@ -99,7 +101,7 @@
 
         <!-- Search interface -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.SearchActivity"
+            android:name="org.lineageos.eleven.ui.activities.SearchActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:theme="@style/Eleven.Theme">
@@ -116,7 +118,7 @@
         </activity>
         <!-- Used to set options -->
         <activity
-            android:name="com.cyanogenmod.eleven.ui.activities.SettingsActivity"
+            android:name="org.lineageos.eleven.ui.activities.SettingsActivity"
             android:label="@string/menu_settings"/>
         <!-- Audio Preview -->
         <activity
@@ -162,7 +164,7 @@
         </activity>
         <!-- 4x1 App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetSmall"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetSmall"
             android:exported="false"
             android:label="@string/app_widget_small" >
             <intent-filter>
@@ -175,7 +177,7 @@
         </receiver>
         <!-- 4x2  App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetLarge"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetLarge"
             android:exported="false"
             android:label="@string/app_widget_large" >
             <intent-filter>
@@ -188,7 +190,7 @@
         </receiver>
         <!-- 4x2 alternate App Widget -->
         <receiver
-            android:name="com.cyanogenmod.eleven.appwidgets.AppWidgetLargeAlternate"
+            android:name="org.lineageos.eleven.appwidgets.AppWidgetLargeAlternate"
             android:exported="false"
             android:label="@string/app_widget_large_alt" >
             <intent-filter>
@@ -200,7 +202,7 @@
                 android:resource="@xml/app_widget_large_alternate" />
         </receiver>
         <!-- Media button receiver -->
-        <receiver android:name="com.cyanogenmod.eleven.MediaButtonIntentReceiver" >
+        <receiver android:name="org.lineageos.eleven.MediaButtonIntentReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
                 <action android:name="android.media.AUDIO_BECOMING_NOISY" />
@@ -214,7 +216,7 @@
         </receiver>
         <!-- Music service -->
         <service
-            android:name="com.cyanogenmod.eleven.MusicPlaybackService"
+            android:name="org.lineageos.eleven.MusicPlaybackService"
             android:label="@string/app_name"
             android:process=":main" />
     </application>
diff --git a/res/layout/activity_base.xml b/res/layout/activity_base.xml
index 031223e..9356b8d 100644
--- a/res/layout/activity_base.xml
+++ b/res/layout/activity_base.xml
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+<org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
     android:id="@+id/sliding_layout"
@@ -46,7 +46,7 @@
 
     </FrameLayout>
 
-    <com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout
+    <org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout
         android:id="@+id/sliding_layout2"
         android:background="@color/activity_base_background_color"
         android:layout_width="match_parent"
@@ -77,7 +77,7 @@
 
                 <fragment
                     android:id="@+id/audioPlayerFragment"
-                    class="com.cyanogenmod.eleven.ui.fragments.AudioPlayerFragment"
+                    class="org.lineageos.eleven.ui.fragments.AudioPlayerFragment"
                     android:layout_width="match_parent"
                     android:layout_height="0dip"
                     android:layout_weight="1" />
@@ -109,10 +109,10 @@
 
             <fragment
                 android:id="@+id/queueFragment"
-                class="com.cyanogenmod.eleven.ui.fragments.QueueFragment"
+                class="org.lineageos.eleven.ui.fragments.QueueFragment"
                 android:layout_width="match_parent"
                 android:layout_height="0dip"
                 android:layout_weight="1" />
         </LinearLayout>
-    </com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
-</com.cyanogenmod.eleven.slidinguppanel.SlidingUpPanelLayout>
+    </org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>
+</org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout>
diff --git a/res/layout/album_art_fragment.xml b/res/layout/album_art_fragment.xml
index 423c62c..b8e44f8 100644
--- a/res/layout/album_art_fragment.xml
+++ b/res/layout/album_art_fragment.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/audio_player_album_art"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index 917759f..f4273a0 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -18,7 +18,7 @@
             android:src="@drawable/now_playing_icon"
             android:visibility="gone" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 4433f9e..e6c8f8b 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -39,7 +39,7 @@
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="match_parent"
diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index f3dfc1b..01557d7 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -29,7 +29,7 @@
             android:src="@drawable/now_playing_icon"
             android:visibility="gone" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/blur_scrim_image.xml b/res/layout/blur_scrim_image.xml
index 14ff186..0afbd7e 100644
--- a/res/layout/blur_scrim_image.xml
+++ b/res/layout/blur_scrim_image.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.BlurScrimImage
+<org.lineageos.eleven.widgets.BlurScrimImage
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/blurScrimImage"
     android:layout_width="match_parent"
@@ -31,4 +31,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"/>
-</com.cyanogenmod.eleven.widgets.BlurScrimImage>
+</org.lineageos.eleven.widgets.BlurScrimImage>
diff --git a/res/layout/bottom_action_bar.xml b/res/layout/bottom_action_bar.xml
index 8ce90fd..c7689b2 100644
--- a/res/layout/bottom_action_bar.xml
+++ b/res/layout/bottom_action_bar.xml
@@ -17,7 +17,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res/com.cyanogenmod.eleven"
+    xmlns:app="http://schemas.android.com/apk/res/org.lineageos.eleven"
     android:id="@+id/bottom_action_bar"
     android:layout_width="match_parent"
     android:layout_height="@dimen/bottom_action_bar_height"
@@ -28,7 +28,7 @@
     android:background="@android:color/transparent"
     tools:ignore="ContentDescription" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/bottom_action_bar_album_art"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/fragment_music_browser_phone.xml b/res/layout/fragment_music_browser_phone.xml
index ccb1b99..9f69b23 100644
--- a/res/layout/fragment_music_browser_phone.xml
+++ b/res/layout/fragment_music_browser_phone.xml
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <com.cyanogenmod.eleven.widgets.ViewPagerTabs
+        <org.lineageos.eleven.widgets.ViewPagerTabs
             android:id="@+id/fragment_home_phone_pager_titles"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tpi_height"
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index 3c1b0dd..b69f5e2 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -61,7 +61,7 @@
 
             </LinearLayout>
 
-            <com.cyanogenmod.eleven.widgets.PopupMenuButton
+            <org.lineageos.eleven.widgets.PopupMenuButton
                 android:id="@+id/popup_menu_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
diff --git a/res/layout/header_bar.xml b/res/layout/header_bar.xml
index 97731fe..e46f91d 100644
--- a/res/layout/header_bar.xml
+++ b/res/layout/header_bar.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<com.cyanogenmod.eleven.ui.HeaderBar xmlns:android="http://schemas.android.com/apk/res/android"
+<org.lineageos.eleven.ui.HeaderBar xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="@dimen/header_bar_height"
     android:enabled="false"
@@ -67,4 +67,4 @@
         android:background="@drawable/selectable_background"
         android:src="@drawable/menu_button_light"/>
 
-</com.cyanogenmod.eleven.ui.HeaderBar>
+</org.lineageos.eleven.ui.HeaderBar>
diff --git a/res/layout/list_base.xml b/res/layout/list_base.xml
index 42b85a4..6737ecc 100644
--- a/res/layout/list_base.xml
+++ b/res/layout/list_base.xml
@@ -23,7 +23,7 @@
     <include
         layout="@layout/loading_empty_container" />
 
-    <com.cyanogenmod.eleven.dragdrop.DragSortListView
+    <org.lineageos.eleven.dragdrop.DragSortListView
         android:id="@+id/list_base"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/list_base_padding.xml b/res/layout/list_base_padding.xml
index a2e36ab..f0e6c08 100644
--- a/res/layout/list_base_padding.xml
+++ b/res/layout/list_base_padding.xml
@@ -24,7 +24,7 @@
     <include
         layout="@layout/loading_empty_container" />
 
-    <com.cyanogenmod.eleven.dragdrop.DragSortListView
+    <org.lineageos.eleven.dragdrop.DragSortListView
         android:id="@+id/list_base"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index b0f45bd..ecdf782 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -52,7 +52,7 @@
             android:src="@drawable/now_playing_icon"
             android:visibility="gone" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@+id/popup_menu_button"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index 9b699ec..657ea70 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -66,7 +66,7 @@
             layout="@layout/play_pause_progress_button"/>
     </FrameLayout>
 
-    <com.cyanogenmod.eleven.widgets.PopupMenuButton
+    <org.lineageos.eleven.widgets.PopupMenuButton
         android:id="@id/popup_menu_button"
         android:layout_width="@dimen/overflow_width"
         android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/list_item_search_history.xml b/res/layout/list_item_search_history.xml
index a9ed615..6bddba0 100644
--- a/res/layout/list_item_search_history.xml
+++ b/res/layout/list_item_search_history.xml
@@ -29,7 +29,7 @@
         android:paddingLeft="@dimen/list_preferred_item_padding"
         android:paddingRight="@dimen/list_preferred_item_padding">
 
-        <com.cyanogenmod.eleven.widgets.SquareImageView
+        <org.lineageos.eleven.widgets.SquareImageView
             android:id="@+id/image"
             android:layout_width="@dimen/list_item_image_width"
             android:layout_height="@dimen/list_item_image_height"
diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml
index 6fa8228..6828376 100644
--- a/res/layout/list_item_simple.xml
+++ b/res/layout/list_item_simple.xml
@@ -59,7 +59,7 @@
             android:layout_toLeftOf="@+id/popup_menu_button"
             android:layout_centerVertical="true" />
 
-        <com.cyanogenmod.eleven.widgets.PopupMenuButton
+        <org.lineageos.eleven.widgets.PopupMenuButton
             android:id="@id/popup_menu_button"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index 1f74e46..9bb464f 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -91,7 +91,7 @@
                 android:src="@drawable/now_playing_icon"
                 android:visibility="gone" />
 
-            <com.cyanogenmod.eleven.widgets.PopupMenuButton
+            <org.lineageos.eleven.widgets.PopupMenuButton
                 android:id="@+id/popup_menu_button"
                 android:layout_width="@dimen/overflow_width"
                 android:layout_height="@dimen/overflow_height"
diff --git a/res/layout/loading_empty_container.xml b/res/layout/loading_empty_container.xml
index a2d5355..146793b 100644
--- a/res/layout/loading_empty_container.xml
+++ b/res/layout/loading_empty_container.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<com.cyanogenmod.eleven.widgets.LoadingEmptyContainer
+<org.lineageos.eleven.widgets.LoadingEmptyContainer
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/loading_empty_container"
     android:gravity="center"
@@ -32,4 +32,4 @@
 
     <include
         layout="@layout/no_results_message" />
-</com.cyanogenmod.eleven.widgets.LoadingEmptyContainer>
+</org.lineageos.eleven.widgets.LoadingEmptyContainer>
diff --git a/res/layout/main_album_flow.xml b/res/layout/main_album_flow.xml
index d2e7cde..1807540 100644
--- a/res/layout/main_album_flow.xml
+++ b/res/layout/main_album_flow.xml
@@ -15,17 +15,17 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.SquareFrame
+<org.lineageos.eleven.widgets.SquareFrame
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <com.cyanogenmod.eleven.widgets.SquareViewPager
+    <org.lineageos.eleven.widgets.SquareViewPager
         android:id="@+id/audio_player_album_art_viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
     <include layout="@layout/loading_empty_container" />
 
-    <com.cyanogenmod.eleven.widgets.VisualizerView
+    <org.lineageos.eleven.widgets.VisualizerView
         android:id="@+id/visualizerView"
         android:gravity="bottom"
         android:layout_gravity="bottom"
@@ -48,4 +48,4 @@
         android:textColor="@color/audio_player_lyrics_text_color"
         android:textSize="@dimen/text_size_small"
         android:alpha="0.0"/>
-</com.cyanogenmod.eleven.widgets.SquareFrame>
\ No newline at end of file
+</org.lineageos.eleven.widgets.SquareFrame>
\ No newline at end of file
diff --git a/res/layout/main_playback_controls.xml b/res/layout/main_playback_controls.xml
index 09f934a..61f4ec4 100644
--- a/res/layout/main_playback_controls.xml
+++ b/res/layout/main_playback_controls.xml
@@ -58,7 +58,7 @@
                 android:textSize="@dimen/audio_player_time_text_size"
                 android:textStyle="bold"/>
 
-            <com.cyanogenmod.eleven.widgets.RepeatingImageButton
+            <org.lineageos.eleven.widgets.RepeatingImageButton
                 android:id="@+id/action_button_previous"
                 android:layout_width="@dimen/audio_player_controls_end_button_width"
                 android:layout_height="@dimen/audio_player_controls_end_button_height"
@@ -77,7 +77,7 @@
                 android:layout_below="@id/audio_player_current_time"
                 android:background="@color/now_playing_divider" />
 
-            <com.cyanogenmod.eleven.widgets.ShuffleButton
+            <org.lineageos.eleven.widgets.ShuffleButton
                 android:id="@+id/action_button_shuffle"
                 android:layout_width="@dimen/audio_player_controls_end_button_width"
                 android:layout_height="@dimen/audio_player_controls_end_button_height"
@@ -108,7 +108,7 @@
                 android:textSize="@dimen/audio_player_time_text_size"
                 android:textStyle="bold"/>
 
-            <com.cyanogenmod.eleven.widgets.RepeatingImageButton
+            <org.lineageos.eleven.widgets.RepeatingImageButton
                 android:id="@+id/action_button_next"
                 android:layout_width="@dimen/audio_player_controls_end_button_width"
                 android:layout_height="@dimen/audio_player_controls_end_button_height"
@@ -126,7 +126,7 @@
                 android:layout_alignParentLeft="true"
                 android:layout_below="@id/audio_player_total_time" />
 
-            <com.cyanogenmod.eleven.widgets.RepeatButton
+            <org.lineageos.eleven.widgets.RepeatButton
                 android:id="@+id/action_button_repeat"
                 android:layout_width="@dimen/audio_player_controls_end_button_width"
                 android:layout_height="@dimen/audio_player_controls_end_button_height"
diff --git a/res/layout/no_results_message.xml b/res/layout/no_results_message.xml
index 07dfe91..cf78c5b 100644
--- a/res/layout/no_results_message.xml
+++ b/res/layout/no_results_message.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<com.cyanogenmod.eleven.widgets.NoResultsContainer
+<org.lineageos.eleven.widgets.NoResultsContainer
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/no_results_container"
     android:gravity="center_horizontal"
@@ -75,4 +75,4 @@
         android:textColor="@color/no_results"
         android:textSize="@dimen/no_results_text_secondary"
         android:text="@string/empty_generic_secondary" />
-</com.cyanogenmod.eleven.widgets.NoResultsContainer>
+</org.lineageos.eleven.widgets.NoResultsContainer>
diff --git a/res/layout/play_pause_progress_button.xml b/res/layout/play_pause_progress_button.xml
index dabd750..628763b 100644
--- a/res/layout/play_pause_progress_button.xml
+++ b/res/layout/play_pause_progress_button.xml
@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.PlayPauseProgressButton
+<org.lineageos.eleven.widgets.PlayPauseProgressButton
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/playPauseProgressButton"
     android:layout_width="match_parent"
@@ -22,7 +22,7 @@
     android:visibility="gone">
 
     <!-- TODO: Figure out why scaleType: centerInside isn't properly scaling up -->
-    <com.cyanogenmod.eleven.widgets.PlayPauseButton
+    <org.lineageos.eleven.widgets.PlayPauseButton
         android:id="@+id/action_button_play"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
@@ -54,4 +54,4 @@
         android:max="1000"
         android:progressDrawable="@drawable/circular_drawable" />
 
-</com.cyanogenmod.eleven.widgets.PlayPauseProgressButton>
+</org.lineageos.eleven.widgets.PlayPauseProgressButton>
diff --git a/res/layout/playlist_detail_header.xml b/res/layout/playlist_detail_header.xml
index 8456cac..fa38cdf 100644
--- a/res/layout/playlist_detail_header.xml
+++ b/res/layout/playlist_detail_header.xml
@@ -17,7 +17,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/playlist_detail_header_height">
 
-    <com.cyanogenmod.eleven.widgets.LayoutSuppressingImageView
+    <org.lineageos.eleven.widgets.LayoutSuppressingImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/square_image_view.xml b/res/layout/square_image_view.xml
index a8e09b2..0627f33 100644
--- a/res/layout/square_image_view.xml
+++ b/res/layout/square_image_view.xml
@@ -15,15 +15,15 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<com.cyanogenmod.eleven.widgets.SquareView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.lineageos.eleven.widgets.SquareView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/square_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <com.cyanogenmod.eleven.widgets.SquareImageView
+    <org.lineageos.eleven.widgets.SquareImageView
         android:id="@+id/image"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop" />
 
-</com.cyanogenmod.eleven.widgets.SquareView>
\ No newline at end of file
+</org.lineageos.eleven.widgets.SquareView>
\ No newline at end of file
diff --git a/src/org/lineageos/eleven/Config.java b/src/org/lineageos/eleven/Config.java
index 3ebdac8..3a3096f 100644
--- a/src/org/lineageos/eleven/Config.java
+++ b/src/org/lineageos/eleven/Config.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 /**
  * App-wide constants.
diff --git a/src/org/lineageos/eleven/ElevenApplication.java b/src/org/lineageos/eleven/ElevenApplication.java
index 9e0fc3b..6ab80b8 100644
--- a/src/org/lineageos/eleven/ElevenApplication.java
+++ b/src/org/lineageos/eleven/ElevenApplication.java
@@ -11,12 +11,12 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 import android.app.Application;
 import android.os.StrictMode;
 
-import com.cyanogenmod.eleven.cache.ImageCache;
+import org.lineageos.eleven.cache.ImageCache;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/src/org/lineageos/eleven/IElevenService.aidl b/src/org/lineageos/eleven/IElevenService.aidl
index e3b0acf..b53a874 100644
--- a/src/org/lineageos/eleven/IElevenService.aidl
+++ b/src/org/lineageos/eleven/IElevenService.aidl
@@ -1,6 +1,6 @@
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
 
 interface IElevenService
 {
diff --git a/src/org/lineageos/eleven/MediaButtonIntentReceiver.java b/src/org/lineageos/eleven/MediaButtonIntentReceiver.java
index b7982e7..4933825 100644
--- a/src/org/lineageos/eleven/MediaButtonIntentReceiver.java
+++ b/src/org/lineageos/eleven/MediaButtonIntentReceiver.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/org/lineageos/eleven/MusicPlaybackService.java b/src/org/lineageos/eleven/MusicPlaybackService.java
index eedf555..91859fa 100644
--- a/src/org/lineageos/eleven/MusicPlaybackService.java
+++ b/src/org/lineageos/eleven/MusicPlaybackService.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 import android.Manifest.permission;
 import android.annotation.NonNull;
@@ -61,21 +61,21 @@ import android.util.Log;
 import android.util.LongSparseArray;
 import android.view.KeyEvent;
 
-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.BitmapWithColors;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
-import com.cyanogenmod.eleven.utils.ShakeDetector;
-import com.cyanogenmod.eleven.utils.SrtManager;
+import org.lineageos.eleven.Config.IdType;
+import org.lineageos.eleven.appwidgets.AppWidgetLarge;
+import org.lineageos.eleven.appwidgets.AppWidgetLargeAlternate;
+import org.lineageos.eleven.appwidgets.AppWidgetSmall;
+import org.lineageos.eleven.cache.ImageCache;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.provider.MusicPlaybackState;
+import org.lineageos.eleven.provider.RecentStore;
+import org.lineageos.eleven.provider.SongPlayCount;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.utils.BitmapWithColors;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.ShakeDetector;
+import org.lineageos.eleven.utils.SrtManager;
 
 import java.io.File;
 import java.io.IOException;
@@ -100,96 +100,96 @@ public class MusicPlaybackService extends Service {
     /**
      * Indicates that the music has paused or resumed
      */
-    public static final String PLAYSTATE_CHANGED = "com.cyanogenmod.eleven.playstatechanged";
+    public static final String PLAYSTATE_CHANGED = "org.lineageos.eleven.playstatechanged";
 
     /**
      * Indicates that music playback position within
      * a title was changed
      */
-    public static final String POSITION_CHANGED = "com.cyanogenmod.eleven.positionchanged";
+    public static final String POSITION_CHANGED = "org.lineageos.eleven.positionchanged";
 
     /**
      * Indicates the meta data has changed in some way, like a track change
      */
-    public static final String META_CHANGED = "com.cyanogenmod.eleven.metachanged";
+    public static final String META_CHANGED = "org.lineageos.eleven.metachanged";
 
     /**
      * Indicates the queue has been updated
      */
-    public static final String QUEUE_CHANGED = "com.cyanogenmod.eleven.queuechanged";
+    public static final String QUEUE_CHANGED = "org.lineageos.eleven.queuechanged";
 
     /**
      * Indicates the queue has been updated
      */
-    public static final String PLAYLIST_CHANGED = "com.cyanogenmod.eleven.playlistchanged";
+    public static final String PLAYLIST_CHANGED = "org.lineageos.eleven.playlistchanged";
 
     /**
      * Indicates the repeat mode changed
      */
-    public static final String REPEATMODE_CHANGED = "com.cyanogenmod.eleven.repeatmodechanged";
+    public static final String REPEATMODE_CHANGED = "org.lineageos.eleven.repeatmodechanged";
 
     /**
      * Indicates the shuffle mode changed
      */
-    public static final String SHUFFLEMODE_CHANGED = "com.cyanogenmod.eleven.shufflemodechanged";
+    public static final String SHUFFLEMODE_CHANGED = "org.lineageos.eleven.shufflemodechanged";
 
     /**
      * Indicates the track fails to play
      */
-    public static final String TRACK_ERROR = "com.cyanogenmod.eleven.trackerror";
+    public static final String TRACK_ERROR = "org.lineageos.eleven.trackerror";
 
     /**
      * For backwards compatibility reasons, also provide sticky
      * broadcasts under the music package
      */
-    public static final String ELEVEN_PACKAGE_NAME = "com.cyanogenmod.eleven";
+    public static final String ELEVEN_PACKAGE_NAME = "org.lineageos.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.cyanogenmod.eleven.musicservicecommand";
+    public static final String SERVICECMD = "org.lineageos.eleven.musicservicecommand";
 
     /**
      * Called to go toggle between pausing and playing the music
      */
-    public static final String TOGGLEPAUSE_ACTION = "com.cyanogenmod.eleven.togglepause";
+    public static final String TOGGLEPAUSE_ACTION = "org.lineageos.eleven.togglepause";
 
     /**
      * Called to go to pause the playback
      */
-    public static final String PAUSE_ACTION = "com.cyanogenmod.eleven.pause";
+    public static final String PAUSE_ACTION = "org.lineageos.eleven.pause";
 
     /**
      * Called to go to stop the playback
      */
-    public static final String STOP_ACTION = "com.cyanogenmod.eleven.stop";
+    public static final String STOP_ACTION = "org.lineageos.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.cyanogenmod.eleven.previous";
+    public static final String PREVIOUS_ACTION = "org.lineageos.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.cyanogenmod.eleven.previous.force";
+    public static final String PREVIOUS_FORCE_ACTION = "org.lineageos.eleven.previous.force";
 
     /**
      * Called to go to the next track
      */
-    public static final String NEXT_ACTION = "com.cyanogenmod.eleven.next";
+    public static final String NEXT_ACTION = "org.lineageos.eleven.next";
 
     /**
      * Called to change the repeat mode
      */
-    public static final String REPEAT_ACTION = "com.cyanogenmod.eleven.repeat";
+    public static final String REPEAT_ACTION = "org.lineageos.eleven.repeat";
 
     /**
      * Called to change the shuffle mode
      */
-    public static final String SHUFFLE_ACTION = "com.cyanogenmod.eleven.shuffle";
+    public static final String SHUFFLE_ACTION = "org.lineageos.eleven.shuffle";
 
     public static final String FROM_MEDIA_BUTTON = "frommediabutton";
 
@@ -199,22 +199,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.cyanogenmod.eleven.refresh";
+    public static final String REFRESH = "org.lineageos.eleven.refresh";
 
     /**
      * Used by the alarm intent to shutdown the service after being idle
      */
-    private static final String SHUTDOWN = "com.cyanogenmod.eleven.shutdown";
+    private static final String SHUTDOWN = "org.lineageos.eleven.shutdown";
 
     /**
      * Called to notify of a timed text
      */
-    public static final String NEW_LYRICS = "com.cyanogenmod.eleven.lyrics";
+    public static final String NEW_LYRICS = "org.lineageos.eleven.lyrics";
 
     /**
      * Called to update the remote control client
      */
-    public static final String UPDATE_LOCKSCREEN = "com.cyanogenmod.eleven.updatelockscreen";
+    public static final String UPDATE_LOCKSCREEN = "org.lineageos.eleven.updatelockscreen";
 
     public static final String CMDNAME = "command";
 
@@ -1642,7 +1642,7 @@ public class MusicPlaybackService extends Service {
                 .setMediaSession(mSession.getSessionToken())
                 .setShowActionsInCompactView(0, 1, 2);
 
-        Intent nowPlayingIntent = new Intent("com.cyanogenmod.eleven.AUDIO_PLAYER")
+        Intent nowPlayingIntent = new Intent("org.lineageos.eleven.AUDIO_PLAYER")
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         PendingIntent clickIntent = PendingIntent.getActivity(this, 0, nowPlayingIntent, 0);
         BitmapWithColors artwork = getAlbumArt(false);
diff --git a/src/org/lineageos/eleven/MusicStateListener.java b/src/org/lineageos/eleven/MusicStateListener.java
index 84bd99d..0ffa975 100644
--- a/src/org/lineageos/eleven/MusicStateListener.java
+++ b/src/org/lineageos/eleven/MusicStateListener.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven;
+package org.lineageos.eleven;
 
 /**
  * Listens for playback changes to send the the fragments bound to this activity
diff --git a/src/org/lineageos/eleven/adapters/AlbumAdapter.java b/src/org/lineageos/eleven/adapters/AlbumAdapter.java
index 928f549..e8a3c8e 100644
--- a/src/org/lineageos/eleven/adapters/AlbumAdapter.java
+++ b/src/org/lineageos/eleven/adapters/AlbumAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -21,13 +21,13 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 
-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 org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.ui.MusicHolder.DataHolder;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java b/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
index 111350d..1e1eb9c 100644
--- a/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
+++ b/src/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.content.Context;
 import android.os.AsyncTask;
@@ -27,14 +27,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-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 org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ICacheListener;
+import org.lineageos.eleven.cache.ImageCache;
+import org.lineageos.eleven.model.AlbumArtistDetails;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.SquareImageView;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -152,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.cyanogenmod.eleven.adapters.AlbumArtPagerAdapter.AlbumArtFragment.ID";
+        private static final String ID = "org.lineageos.eleven.adapters.AlbumArtPagerAdapter.AlbumArtFragment.ID";
 
         private View mRootView;
         private AlbumArtistLoader mTask;
diff --git a/src/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java b/src/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
index 063b468..8f6fc34 100644
--- a/src/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -22,13 +22,13 @@ import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.TextView;
 
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.AlbumSongLoader;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.ui.fragments.AlbumDetailFragment;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.List;
 
diff --git a/src/org/lineageos/eleven/adapters/ArtistAdapter.java b/src/org/lineageos/eleven/adapters/ArtistAdapter.java
index 2c83ccf..1b71d29 100644
--- a/src/org/lineageos/eleven/adapters/ArtistAdapter.java
+++ b/src/org/lineageos/eleven/adapters/ArtistAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -20,15 +20,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-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;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.sectionadapter.SectionAdapter.BasicAdapter;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.ui.MusicHolder.DataHolder;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the artists on a user's
diff --git a/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java b/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
index 4670e0d..d1a101e 100644
--- a/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
+++ b/src/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -26,15 +26,15 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.loaders.AlbumLoader;
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.AlbumLoader;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.PopupMenuButton;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java b/src/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
index 1da8464..c55025b 100644
--- a/src/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -23,11 +23,11 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.loaders.SongLoader;
-import com.cyanogenmod.eleven.model.Song;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.SongLoader;
+import org.lineageos.eleven.model.Song;
 
 import java.util.List;
 
diff --git a/src/org/lineageos/eleven/adapters/DetailSongAdapter.java b/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
index 49157af..88ccf26 100644
--- a/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/DetailSongAdapter.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.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.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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.PopupMenuButton;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/adapters/PagerAdapter.java b/src/org/lineageos/eleven/adapters/PagerAdapter.java
index d0d107f..b7eea13 100644
--- a/src/org/lineageos/eleven/adapters/PagerAdapter.java
+++ b/src/org/lineageos/eleven/adapters/PagerAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -21,12 +21,12 @@ import android.support.v4.app.FragmentPagerAdapter;
 import android.util.SparseArray;
 import android.view.ViewGroup;
 
-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 org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.fragments.AlbumFragment;
+import org.lineageos.eleven.ui.fragments.ArtistFragment;
+import org.lineageos.eleven.ui.fragments.PlaylistFragment;
+import org.lineageos.eleven.ui.fragments.SongFragment;
+import org.lineageos.eleven.utils.Lists;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/adapters/PlaylistAdapter.java b/src/org/lineageos/eleven/adapters/PlaylistAdapter.java
index 023f9f6..364c3e7 100644
--- a/src/org/lineageos/eleven/adapters/PlaylistAdapter.java
+++ b/src/org/lineageos/eleven/adapters/PlaylistAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -19,15 +19,15 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-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;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.ui.MusicHolder.DataHolder;
+import org.lineageos.eleven.ui.fragments.PlaylistFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the playlists on a user's
diff --git a/src/org/lineageos/eleven/adapters/ProfileSongAdapter.java b/src/org/lineageos/eleven/adapters/ProfileSongAdapter.java
index 2dcf932..086b664 100644
--- a/src/org/lineageos/eleven/adapters/ProfileSongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/ProfileSongAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.view.LayoutInflater;
@@ -19,14 +19,14 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.model.Song;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.model.Song;
 
 import java.util.Collection;
 
 /**
  * This {@link ArrayAdapter} is used to display the songs for a particular playlist
- * {@link com.cyanogenmod.eleven.ui.fragments.PlaylistDetailFragment}
+ * {@link org.lineageos.eleven.ui.fragments.PlaylistDetailFragment}
  *
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
diff --git a/src/org/lineageos/eleven/adapters/SongAdapter.java b/src/org/lineageos/eleven/adapters/SongAdapter.java
index 21b4e6b..64e7e20 100644
--- a/src/org/lineageos/eleven/adapters/SongAdapter.java
+++ b/src/org/lineageos/eleven/adapters/SongAdapter.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.content.Context;
@@ -20,20 +20,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 
-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;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.ui.MusicHolder.DataHolder;
+import org.lineageos.eleven.ui.fragments.QueueFragment;
+import org.lineageos.eleven.ui.fragments.SongFragment;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
 
 /**
  * This {@link ArrayAdapter} is used to display all of the songs on a user's
diff --git a/src/org/lineageos/eleven/adapters/SummarySearchAdapter.java b/src/org/lineageos/eleven/adapters/SummarySearchAdapter.java
index 6e61b96..27dc823 100644
--- a/src/org/lineageos/eleven/adapters/SummarySearchAdapter.java
+++ b/src/org/lineageos/eleven/adapters/SummarySearchAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.adapters;
+package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
 import android.text.TextUtils;
@@ -23,15 +23,15 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-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 org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.format.PrefixHighlighter;
+import org.lineageos.eleven.model.SearchResult;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 import java.util.Locale;
 
diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetBase.java b/src/org/lineageos/eleven/appwidgets/AppWidgetBase.java
index 24e5cfd..6f07f38 100644
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetBase.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetBase.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.appwidgets;
+package org.lineageos.eleven.appwidgets;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetProvider;
@@ -19,7 +19,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
+import org.lineageos.eleven.MusicPlaybackService;
 
 public abstract class AppWidgetBase extends AppWidgetProvider {
 
diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java b/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
index 1ede430..d2be599 100644
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.appwidgets;
+package org.lineageos.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -22,10 +22,10 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.widget.RemoteViews;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ApolloUtils;
 
 /**
  * 4x2 App-Widget
diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java b/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
index d40e536..c6eae88 100644
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.appwidgets;
+package org.lineageos.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -22,12 +22,12 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.widget.RemoteViews;
 
-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;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.widgets.RepeatButton;
+import org.lineageos.eleven.widgets.ShuffleButton;
 
 /**
  * 4x2 App-Widget
diff --git a/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java b/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
index 107cc7a..f76ac9a 100644
--- a/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
+++ b/src/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.appwidgets;
+package org.lineageos.eleven.appwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.PendingIntent;
@@ -24,10 +24,10 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.RemoteViews;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ApolloUtils;
 
 /**
  * 4x1 App-Widget
diff --git a/src/org/lineageos/eleven/cache/BitmapWorkerTask.java b/src/org/lineageos/eleven/cache/BitmapWorkerTask.java
index c7ab842..177e772 100644
--- a/src/org/lineageos/eleven/cache/BitmapWorkerTask.java
+++ b/src/org/lineageos/eleven/cache/BitmapWorkerTask.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -23,7 +23,7 @@ import android.graphics.drawable.TransitionDrawable;
 import android.os.AsyncTask;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java b/src/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
index 2fe88ea..20d9978 100644
--- a/src/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
+++ b/src/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -25,8 +25,8 @@ import android.support.v8.renderscript.RenderScript;
 import android.support.v8.renderscript.ScriptIntrinsicBlur;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
-import com.cyanogenmod.eleven.widgets.BlurScrimImage;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.widgets.BlurScrimImage;
 
 import java.lang.ref.WeakReference;
 
@@ -50,7 +50,7 @@ public class BlurBitmapWorkerTask extends BitmapWorkerTask<String, Void, BlurBit
     }
 
     /**
-     * The {@link com.cyanogenmod.eleven.widgets.BlurScrimImage} used to set the result
+     * The {@link org.lineageos.eleven.widgets.BlurScrimImage} used to set the result
      */
     private final WeakReference<BlurScrimImage> mBlurScrimImage;
 
diff --git a/src/org/lineageos/eleven/cache/DiskLruCache.java b/src/org/lineageos/eleven/cache/DiskLruCache.java
index 0e33afb..7c904ac 100644
--- a/src/org/lineageos/eleven/cache/DiskLruCache.java
+++ b/src/org/lineageos/eleven/cache/DiskLruCache.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedWriter;
diff --git a/src/org/lineageos/eleven/cache/ICacheListener.java b/src/org/lineageos/eleven/cache/ICacheListener.java
index 89b88ac..fcc9de6 100644
--- a/src/org/lineageos/eleven/cache/ICacheListener.java
+++ b/src/org/lineageos/eleven/cache/ICacheListener.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 public interface ICacheListener {
     void onCacheUnpaused();
diff --git a/src/org/lineageos/eleven/cache/ImageCache.java b/src/org/lineageos/eleven/cache/ImageCache.java
index 7bee4a8..dd23174 100644
--- a/src/org/lineageos/eleven/cache/ImageCache.java
+++ b/src/org/lineageos/eleven/cache/ImageCache.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -33,7 +33,7 @@ import android.os.Looper;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ApolloUtils;
 
 import java.io.File;
 import java.io.FileDescriptor;
diff --git a/src/org/lineageos/eleven/cache/ImageFetcher.java b/src/org/lineageos/eleven/cache/ImageFetcher.java
index 42480f4..a689ae2 100644
--- a/src/org/lineageos/eleven/cache/ImageFetcher.java
+++ b/src/org/lineageos/eleven/cache/ImageFetcher.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -19,13 +19,13 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
 import android.widget.ImageView;
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
-import com.cyanogenmod.eleven.utils.BitmapWithColors;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.widgets.BlurScrimImage;
-import com.cyanogenmod.eleven.widgets.LetterTileDrawable;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
+import org.lineageos.eleven.utils.BitmapWithColors;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.BlurScrimImage;
+import org.lineageos.eleven.widgets.LetterTileDrawable;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/src/org/lineageos/eleven/cache/ImageWorker.java b/src/org/lineageos/eleven/cache/ImageWorker.java
index e8ea9d8..325533e 100644
--- a/src/org/lineageos/eleven/cache/ImageWorker.java
+++ b/src/org/lineageos/eleven/cache/ImageWorker.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -26,13 +26,13 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
-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 org.lineageos.eleven.R;
+import org.lineageos.eleven.provider.PlaylistArtworkStore;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.ImageUtils;
+import org.lineageos.eleven.widgets.BlurScrimImage;
+import org.lineageos.eleven.cache.PlaylistWorkerTask.PlaylistWorkerType;
+import org.lineageos.eleven.widgets.LetterTileDrawable;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
diff --git a/src/org/lineageos/eleven/cache/LruCache.java b/src/org/lineageos/eleven/cache/LruCache.java
index 8d40b1a..62f9385 100644
--- a/src/org/lineageos/eleven/cache/LruCache.java
+++ b/src/org/lineageos/eleven/cache/LruCache.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 // NOTE: upstream of this class is android.util.LruCache, changes below
 // expose trimToSize() to be called externally.
diff --git a/src/org/lineageos/eleven/cache/PlaylistWorkerTask.java b/src/org/lineageos/eleven/cache/PlaylistWorkerTask.java
index ab87b3f..7abedb3 100644
--- a/src/org/lineageos/eleven/cache/PlaylistWorkerTask.java
+++ b/src/org/lineageos/eleven/cache/PlaylistWorkerTask.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.eleven.cache;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -25,12 +25,12 @@ import android.graphics.drawable.TransitionDrawable;
 import android.provider.MediaStore;
 import android.widget.ImageView;
 
-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 org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.loaders.PlaylistSongLoader;
+import org.lineageos.eleven.loaders.SortedCursor;
+import org.lineageos.eleven.provider.PlaylistArtworkStore;
+import org.lineageos.eleven.provider.SongPlayCount;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java b/src/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
index 027eb7f..9481ab1 100644
--- a/src/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
+++ b/src/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
@@ -13,15 +13,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.cache;
+package org.lineageos.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.cyanogenmod.eleven.cache.ImageWorker.ImageType;
-import com.cyanogenmod.eleven.utils.ImageUtils;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.utils.ImageUtils;
 
 /**
  * The actual {@link android.os.AsyncTask} that will process the image.
diff --git a/src/org/lineageos/eleven/dragdrop/DragSortController.java b/src/org/lineageos/eleven/dragdrop/DragSortController.java
index e433ec0..b4aebd1 100644
--- a/src/org/lineageos/eleven/dragdrop/DragSortController.java
+++ b/src/org/lineageos/eleven/dragdrop/DragSortController.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.dragdrop;
+package org.lineageos.eleven.dragdrop;
 
 import android.graphics.Point;
 import android.view.GestureDetector;
diff --git a/src/org/lineageos/eleven/dragdrop/DragSortListView.java b/src/org/lineageos/eleven/dragdrop/DragSortListView.java
index 64a32c6..3647643 100644
--- a/src/org/lineageos/eleven/dragdrop/DragSortListView.java
+++ b/src/org/lineageos/eleven/dragdrop/DragSortListView.java
@@ -10,7 +10,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.dragdrop;
+package org.lineageos.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.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java b/src/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
index f7be4f2..ce5cb60 100644
--- a/src/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
+++ b/src/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.dragdrop;
+package org.lineageos.eleven.dragdrop;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/src/org/lineageos/eleven/format/Capitalize.java b/src/org/lineageos/eleven/format/Capitalize.java
index d23683c..36ba269 100644
--- a/src/org/lineageos/eleven/format/Capitalize.java
+++ b/src/org/lineageos/eleven/format/Capitalize.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.format;
+package org.lineageos.eleven.format;
 
 import android.text.TextUtils;
 
diff --git a/src/org/lineageos/eleven/format/PrefixHighlighter.java b/src/org/lineageos/eleven/format/PrefixHighlighter.java
index 83f69a7..6761898 100644
--- a/src/org/lineageos/eleven/format/PrefixHighlighter.java
+++ b/src/org/lineageos/eleven/format/PrefixHighlighter.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.format;
+package org.lineageos.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.cyanogenmod.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
 
 /**
  * Highlights the text in a text field.
diff --git a/src/org/lineageos/eleven/lastfm/Album.java b/src/org/lineageos/eleven/lastfm/Album.java
index b5ff603..6adbdd3 100644
--- a/src/org/lineageos/eleven/lastfm/Album.java
+++ b/src/org/lineageos/eleven/lastfm/Album.java
@@ -19,11 +19,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import android.content.Context;
 
-import com.cyanogenmod.eleven.Config;
+import org.lineageos.eleven.Config;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/lineageos/eleven/lastfm/Artist.java b/src/org/lineageos/eleven/lastfm/Artist.java
index 5401a74..25ea60c 100644
--- a/src/org/lineageos/eleven/lastfm/Artist.java
+++ b/src/org/lineageos/eleven/lastfm/Artist.java
@@ -19,11 +19,11 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import android.content.Context;
 
-import com.cyanogenmod.eleven.Config;
+import org.lineageos.eleven.Config;
 
 import java.util.Locale;
 import java.util.Map;
diff --git a/src/org/lineageos/eleven/lastfm/Caller.java b/src/org/lineageos/eleven/lastfm/Caller.java
index 1449ca2..c312f88 100644
--- a/src/org/lineageos/eleven/lastfm/Caller.java
+++ b/src/org/lineageos/eleven/lastfm/Caller.java
@@ -19,15 +19,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
-import static com.cyanogenmod.eleven.lastfm.StringUtilities.encode;
-import static com.cyanogenmod.eleven.lastfm.StringUtilities.map;
+import static org.lineageos.eleven.lastfm.StringUtilities.encode;
+import static org.lineageos.eleven.lastfm.StringUtilities.map;
 
 import android.content.Context;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.lastfm.Result.Status;
+import org.lineageos.eleven.lastfm.Result.Status;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
diff --git a/src/org/lineageos/eleven/lastfm/DomElement.java b/src/org/lineageos/eleven/lastfm/DomElement.java
index 9802444..ee908d6 100644
--- a/src/org/lineageos/eleven/lastfm/DomElement.java
+++ b/src/org/lineageos/eleven/lastfm/DomElement.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
diff --git a/src/org/lineageos/eleven/lastfm/Image.java b/src/org/lineageos/eleven/lastfm/Image.java
index f79f178..1c9032c 100644
--- a/src/org/lineageos/eleven/lastfm/Image.java
+++ b/src/org/lineageos/eleven/lastfm/Image.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 /**
  * An <code>Image</code> contains metadata and URLs for an artist's image.
diff --git a/src/org/lineageos/eleven/lastfm/ImageHolder.java b/src/org/lineageos/eleven/lastfm/ImageHolder.java
index 10e042d..25fabac 100644
--- a/src/org/lineageos/eleven/lastfm/ImageHolder.java
+++ b/src/org/lineageos/eleven/lastfm/ImageHolder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/src/org/lineageos/eleven/lastfm/ImageSize.java b/src/org/lineageos/eleven/lastfm/ImageSize.java
index ec2f6ac..615ef96 100644
--- a/src/org/lineageos/eleven/lastfm/ImageSize.java
+++ b/src/org/lineageos/eleven/lastfm/ImageSize.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 /**
  * @author Janni Kovacs
diff --git a/src/org/lineageos/eleven/lastfm/ItemFactory.java b/src/org/lineageos/eleven/lastfm/ItemFactory.java
index f440fa4..ad8c2df 100644
--- a/src/org/lineageos/eleven/lastfm/ItemFactory.java
+++ b/src/org/lineageos/eleven/lastfm/ItemFactory.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 /**
  * An <code>ItemFactory</code> can be used to instantiate a value object - such
@@ -27,7 +27,7 @@ package com.cyanogenmod.eleven.lastfm;
  * {@link ItemFactoryBuilder} to obtain item factories for a specific type.
  *
  * @author Janni Kovacs
- * @see com.cyanogenmod.eleven.lastfm.api.ItemFactoryBuilder
+ * @see org.lineageos.eleven.lastfm.api.ItemFactoryBuilder
  * @see ResponseBuilder
  */
 interface ItemFactory<T> {
diff --git a/src/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java b/src/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
index 9691028..d496d80 100644
--- a/src/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
+++ b/src/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/lineageos/eleven/lastfm/MapUtilities.java b/src/org/lineageos/eleven/lastfm/MapUtilities.java
index a8d61e2..9ba4dd3 100644
--- a/src/org/lineageos/eleven/lastfm/MapUtilities.java
+++ b/src/org/lineageos/eleven/lastfm/MapUtilities.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.Map;
 
diff --git a/src/org/lineageos/eleven/lastfm/MusicEntry.java b/src/org/lineageos/eleven/lastfm/MusicEntry.java
index eaba7e6..bbb9499 100644
--- a/src/org/lineageos/eleven/lastfm/MusicEntry.java
+++ b/src/org/lineageos/eleven/lastfm/MusicEntry.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 /**
  * <code>MusicEntry</code> is the abstract superclass for {@link Track},
diff --git a/src/org/lineageos/eleven/lastfm/PaginatedResult.java b/src/org/lineageos/eleven/lastfm/PaginatedResult.java
index 34b81e5..5a3a27e 100644
--- a/src/org/lineageos/eleven/lastfm/PaginatedResult.java
+++ b/src/org/lineageos/eleven/lastfm/PaginatedResult.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/org/lineageos/eleven/lastfm/ResponseBuilder.java b/src/org/lineageos/eleven/lastfm/ResponseBuilder.java
index 26394c9..f9a9808 100644
--- a/src/org/lineageos/eleven/lastfm/ResponseBuilder.java
+++ b/src/org/lineageos/eleven/lastfm/ResponseBuilder.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/org/lineageos/eleven/lastfm/Result.java b/src/org/lineageos/eleven/lastfm/Result.java
index a40a401..afa4213 100644
--- a/src/org/lineageos/eleven/lastfm/Result.java
+++ b/src/org/lineageos/eleven/lastfm/Result.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import org.w3c.dom.Document;
 
diff --git a/src/org/lineageos/eleven/lastfm/StringUtilities.java b/src/org/lineageos/eleven/lastfm/StringUtilities.java
index 623e449..d35217b 100644
--- a/src/org/lineageos/eleven/lastfm/StringUtilities.java
+++ b/src/org/lineageos/eleven/lastfm/StringUtilities.java
@@ -19,7 +19,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.cyanogenmod.eleven.lastfm;
+package org.lineageos.eleven.lastfm;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
diff --git a/src/org/lineageos/eleven/loaders/AlbumLoader.java b/src/org/lineageos/eleven/loaders/AlbumLoader.java
index cc4f611..181d347 100644
--- a/src/org/lineageos/eleven/loaders/AlbumLoader.java
+++ b/src/org/lineageos/eleven/loaders/AlbumLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -20,14 +20,14 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AlbumColumns;
 
-import com.cyanogenmod.eleven.model.Album;
-import com.cyanogenmod.eleven.provider.LocalizedStore;
-import com.cyanogenmod.eleven.provider.LocalizedStore.SortParameter;
-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 org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.provider.LocalizedStore;
+import org.lineageos.eleven.provider.LocalizedStore.SortParameter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.SortOrder;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/AlbumSongLoader.java b/src/org/lineageos/eleven/loaders/AlbumSongLoader.java
index 726bde5..81596e0 100644
--- a/src/org/lineageos/eleven/loaders/AlbumSongLoader.java
+++ b/src/org/lineageos/eleven/loaders/AlbumSongLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -19,9 +19,9 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.Lists;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/ArtistLoader.java b/src/org/lineageos/eleven/loaders/ArtistLoader.java
index 4b04030..9a22ca1 100644
--- a/src/org/lineageos/eleven/loaders/ArtistLoader.java
+++ b/src/org/lineageos/eleven/loaders/ArtistLoader.java
@@ -11,21 +11,21 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.Artists;
 
-import com.cyanogenmod.eleven.model.Artist;
-import com.cyanogenmod.eleven.provider.LocalizedStore;
-import com.cyanogenmod.eleven.provider.LocalizedStore.SortParameter;
-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 org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.provider.LocalizedStore;
+import org.lineageos.eleven.provider.LocalizedStore.SortParameter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.SortOrder;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/AsyncHandler.java b/src/org/lineageos/eleven/loaders/AsyncHandler.java
index 1710abb..94126c5 100644
--- a/src/org/lineageos/eleven/loaders/AsyncHandler.java
+++ b/src/org/lineageos/eleven/loaders/AsyncHandler.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.os.Handler;
 import android.os.HandlerThread;
diff --git a/src/org/lineageos/eleven/loaders/LastAddedLoader.java b/src/org/lineageos/eleven/loaders/LastAddedLoader.java
index cbc02c2..4e1fe77 100644
--- a/src/org/lineageos/eleven/loaders/LastAddedLoader.java
+++ b/src/org/lineageos/eleven/loaders/LastAddedLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -19,10 +19,10 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-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 org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/NowPlayingCursor.java b/src/org/lineageos/eleven/loaders/NowPlayingCursor.java
index 8d524bc..5061d28 100644
--- a/src/org/lineageos/eleven/loaders/NowPlayingCursor.java
+++ b/src/org/lineageos/eleven/loaders/NowPlayingCursor.java
@@ -1,7 +1,7 @@
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -12,7 +12,7 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AudioColumns;
 
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.Arrays;
 
diff --git a/src/org/lineageos/eleven/loaders/PlaylistLoader.java b/src/org/lineageos/eleven/loaders/PlaylistLoader.java
index 68a1b12..dfcdae8 100644
--- a/src/org/lineageos/eleven/loaders/PlaylistLoader.java
+++ b/src/org/lineageos/eleven/loaders/PlaylistLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -20,10 +20,10 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.PlaylistsColumns;
 
-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 org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/PlaylistSongLoader.java b/src/org/lineageos/eleven/loaders/PlaylistSongLoader.java
index e06890f..0297434 100644
--- a/src/org/lineageos/eleven/loaders/PlaylistSongLoader.java
+++ b/src/org/lineageos/eleven/loaders/PlaylistSongLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.ContentProviderOperation;
 import android.content.Context;
@@ -24,8 +24,8 @@ import android.provider.MediaStore.Audio.AudioColumns;
 import android.provider.MediaStore.Audio.Playlists;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/QueueLoader.java b/src/org/lineageos/eleven/loaders/QueueLoader.java
index f409b56..ccf8f6d 100644
--- a/src/org/lineageos/eleven/loaders/QueueLoader.java
+++ b/src/org/lineageos/eleven/loaders/QueueLoader.java
@@ -11,13 +11,13 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/SearchLoader.java b/src/org/lineageos/eleven/loaders/SearchLoader.java
index a77ff15..09ef519 100644
--- a/src/org/lineageos/eleven/loaders/SearchLoader.java
+++ b/src/org/lineageos/eleven/loaders/SearchLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -20,8 +20,8 @@ import android.provider.BaseColumns;
 import android.provider.MediaStore;
 import android.text.TextUtils;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/SongLoader.java b/src/org/lineageos/eleven/loaders/SongLoader.java
index 9171f3a..c0a16f9 100644
--- a/src/org/lineageos/eleven/loaders/SongLoader.java
+++ b/src/org/lineageos/eleven/loaders/SongLoader.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
@@ -19,14 +19,14 @@ import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
 import android.text.TextUtils;
 
-import com.cyanogenmod.eleven.model.Song;
-import com.cyanogenmod.eleven.provider.LocalizedStore;
-import com.cyanogenmod.eleven.provider.LocalizedStore.SortParameter;
-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 org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.provider.LocalizedStore;
+import org.lineageos.eleven.provider.LocalizedStore.SortParameter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.SortOrder;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/loaders/SortedCursor.java b/src/org/lineageos/eleven/loaders/SortedCursor.java
index 2f8a3c9..78285af 100644
--- a/src/org/lineageos/eleven/loaders/SortedCursor.java
+++ b/src/org/lineageos/eleven/loaders/SortedCursor.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.database.AbstractCursor;
 import android.database.Cursor;
diff --git a/src/org/lineageos/eleven/loaders/TopTracksLoader.java b/src/org/lineageos/eleven/loaders/TopTracksLoader.java
index f1ea033..7daf622 100644
--- a/src/org/lineageos/eleven/loaders/TopTracksLoader.java
+++ b/src/org/lineageos/eleven/loaders/TopTracksLoader.java
@@ -14,15 +14,15 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.provider.BaseColumns;
 
-import com.cyanogenmod.eleven.provider.RecentStore;
-import com.cyanogenmod.eleven.provider.SongPlayCount;
-import com.cyanogenmod.eleven.provider.SongPlayCount.SongPlayCountColumns;
+import org.lineageos.eleven.provider.RecentStore;
+import org.lineageos.eleven.provider.SongPlayCount;
+import org.lineageos.eleven.provider.SongPlayCount.SongPlayCountColumns;
 
 import java.util.ArrayList;
 
diff --git a/src/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java b/src/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
index 9b6caba..de4271e 100644
--- a/src/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
+++ b/src/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.loaders;
+package org.lineageos.eleven.loaders;
 
 import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
diff --git a/src/org/lineageos/eleven/locale/HanziToPinyin.java b/src/org/lineageos/eleven/locale/HanziToPinyin.java
index a528858..e0ed0ab 100644
--- a/src/org/lineageos/eleven/locale/HanziToPinyin.java
+++ b/src/org/lineageos/eleven/locale/HanziToPinyin.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/src/org/lineageos/eleven/locale/LocaleChangeReceiver.java b/src/org/lineageos/eleven/locale/LocaleChangeReceiver.java
index 3d2f99f..7d30523 100644
--- a/src/org/lineageos/eleven/locale/LocaleChangeReceiver.java
+++ b/src/org/lineageos/eleven/locale/LocaleChangeReceiver.java
@@ -14,13 +14,13 @@
  * limitations under the License
  */
 
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.cyanogenmod.eleven.provider.LocalizedStore;
+import org.lineageos.eleven.provider.LocalizedStore;
 
 /**
  * Locale change intent receiver that invokes {@link LocalizedStore} to update
diff --git a/src/org/lineageos/eleven/locale/LocaleSet.java b/src/org/lineageos/eleven/locale/LocaleSet.java
index 25b2ac9..59949ac 100644
--- a/src/org/lineageos/eleven/locale/LocaleSet.java
+++ b/src/org/lineageos/eleven/locale/LocaleSet.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.text.TextUtils;
 import com.google.common.annotations.VisibleForTesting;
diff --git a/src/org/lineageos/eleven/locale/LocaleSetManager.java b/src/org/lineageos/eleven/locale/LocaleSetManager.java
index 8e49349..de245f6 100644
--- a/src/org/lineageos/eleven/locale/LocaleSetManager.java
+++ b/src/org/lineageos/eleven/locale/LocaleSetManager.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.content.Context;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.provider.PropertiesStore;
+import org.lineageos.eleven.provider.PropertiesStore;
 import com.google.common.annotations.VisibleForTesting;
 
 import java.util.Locale;
diff --git a/src/org/lineageos/eleven/locale/LocaleUtils.java b/src/org/lineageos/eleven/locale/LocaleUtils.java
index 51d35ec..40af650 100644
--- a/src/org/lineageos/eleven/locale/LocaleUtils.java
+++ b/src/org/lineageos/eleven/locale/LocaleUtils.java
@@ -14,14 +14,14 @@
  * limitations under the License
  */
 
-package com.cyanogenmod.eleven.locale;
+package org.lineageos.eleven.locale;
 
 import android.provider.ContactsContract.FullNameStyle;
 import android.provider.ContactsContract.PhoneticNameStyle;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.locale.HanziToPinyin.Token;
+import org.lineageos.eleven.locale.HanziToPinyin.Token;
 
 import com.google.common.annotations.VisibleForTesting;
 
diff --git a/src/org/lineageos/eleven/menu/BasePlaylistDialog.java b/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
index a689d95..887abea 100644
--- a/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
+++ b/src/org/lineageos/eleven/menu/BasePlaylistDialog.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -26,8 +26,8 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A simple base class for the playlist dialogs.
diff --git a/src/org/lineageos/eleven/menu/ConfirmDialog.java b/src/org/lineageos/eleven/menu/ConfirmDialog.java
index 908f3fc..293b59a 100644
--- a/src/org/lineageos/eleven/menu/ConfirmDialog.java
+++ b/src/org/lineageos/eleven/menu/ConfirmDialog.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -24,7 +24,7 @@ import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 /** Dialog to confirm a non-reversible action */
 public class ConfirmDialog extends DialogFragment {
diff --git a/src/org/lineageos/eleven/menu/CreateNewPlaylist.java b/src/org/lineageos/eleven/menu/CreateNewPlaylist.java
index 84a72c4..3eaced5 100644
--- a/src/org/lineageos/eleven/menu/CreateNewPlaylist.java
+++ b/src/org/lineageos/eleven/menu/CreateNewPlaylist.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.app.Dialog;
 import android.content.ContentResolver;
@@ -19,9 +19,9 @@ import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.MediaStore;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.format.Capitalize;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.format.Capitalize;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * @author Andrew Neal (andrewdneal@gmail.com) TODO - The playlist names are
diff --git a/src/org/lineageos/eleven/menu/DeleteDialog.java b/src/org/lineageos/eleven/menu/DeleteDialog.java
index 613288c..121148c 100644
--- a/src/org/lineageos/eleven/menu/DeleteDialog.java
+++ b/src/org/lineageos/eleven/menu/DeleteDialog.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -20,11 +20,11 @@ import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 
-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;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * Alert dialog used to delete tracks.
diff --git a/src/org/lineageos/eleven/menu/FragmentMenuItems.java b/src/org/lineageos/eleven/menu/FragmentMenuItems.java
index df34ef4..f32b8c2 100644
--- a/src/org/lineageos/eleven/menu/FragmentMenuItems.java
+++ b/src/org/lineageos/eleven/menu/FragmentMenuItems.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 /**
  * Several of the context menu items used in Apollo are reused. This class helps
diff --git a/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java b/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
index e0286fd..2c14055 100644
--- a/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
+++ b/src/org/lineageos/eleven/menu/PhotoSelectionDialog.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -21,12 +21,12 @@ import android.support.v4.app.DialogFragment;
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.ArrayList;
 
diff --git a/src/org/lineageos/eleven/menu/RenamePlaylist.java b/src/org/lineageos/eleven/menu/RenamePlaylist.java
index 993c1e2..8803607 100644
--- a/src/org/lineageos/eleven/menu/RenamePlaylist.java
+++ b/src/org/lineageos/eleven/menu/RenamePlaylist.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.menu;
+package org.lineageos.eleven.menu;
 
 import android.app.Dialog;
 import android.content.ContentResolver;
@@ -21,9 +21,9 @@ import android.os.Bundle;
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.format.Capitalize;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.format.Capitalize;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * Alert dialog used to rename playlits.
diff --git a/src/org/lineageos/eleven/model/Album.java b/src/org/lineageos/eleven/model/Album.java
index 8745a8f..055df9f 100644
--- a/src/org/lineageos/eleven/model/Album.java
+++ b/src/org/lineageos/eleven/model/Album.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/org/lineageos/eleven/model/AlbumArtistDetails.java b/src/org/lineageos/eleven/model/AlbumArtistDetails.java
index 28dfe0c..59c39b7 100644
--- a/src/org/lineageos/eleven/model/AlbumArtistDetails.java
+++ b/src/org/lineageos/eleven/model/AlbumArtistDetails.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 /**
  * Simple containing class to query for album art
diff --git a/src/org/lineageos/eleven/model/Artist.java b/src/org/lineageos/eleven/model/Artist.java
index 5ae101a..ca6a040 100644
--- a/src/org/lineageos/eleven/model/Artist.java
+++ b/src/org/lineageos/eleven/model/Artist.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/org/lineageos/eleven/model/Genre.java b/src/org/lineageos/eleven/model/Genre.java
index 90c5210..7842e02 100644
--- a/src/org/lineageos/eleven/model/Genre.java
+++ b/src/org/lineageos/eleven/model/Genre.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/org/lineageos/eleven/model/Playlist.java b/src/org/lineageos/eleven/model/Playlist.java
index 57e0825..91d11df 100644
--- a/src/org/lineageos/eleven/model/Playlist.java
+++ b/src/org/lineageos/eleven/model/Playlist.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/org/lineageos/eleven/model/SearchResult.java b/src/org/lineageos/eleven/model/SearchResult.java
index 278705d..692edd2 100644
--- a/src/org/lineageos/eleven/model/SearchResult.java
+++ b/src/org/lineageos/eleven/model/SearchResult.java
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.database.Cursor;
 import android.provider.MediaStore;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.Config;
+import org.lineageos.eleven.Config;
 
 import java.util.Comparator;
 
diff --git a/src/org/lineageos/eleven/model/Song.java b/src/org/lineageos/eleven/model/Song.java
index 785e21e..785c387 100644
--- a/src/org/lineageos/eleven/model/Song.java
+++ b/src/org/lineageos/eleven/model/Song.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.model;
+package org.lineageos.eleven.model;
 
 import android.text.TextUtils;
 
diff --git a/src/org/lineageos/eleven/provider/LocalizedStore.java b/src/org/lineageos/eleven/provider/LocalizedStore.java
index d3a33d1..363ae20 100644
--- a/src/org/lineageos/eleven/provider/LocalizedStore.java
+++ b/src/org/lineageos/eleven/provider/LocalizedStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
@@ -28,11 +28,11 @@ import android.provider.MediaStore.Audio.AudioColumns;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.cyanogenmod.eleven.loaders.SortedCursor;
-import com.cyanogenmod.eleven.locale.LocaleSet;
-import com.cyanogenmod.eleven.locale.LocaleSetManager;
-import com.cyanogenmod.eleven.locale.LocaleUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.loaders.SortedCursor;
+import org.lineageos.eleven.locale.LocaleSet;
+import org.lineageos.eleven.locale.LocaleSetManager;
+import org.lineageos.eleven.locale.LocaleUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/org/lineageos/eleven/provider/MusicDB.java b/src/org/lineageos/eleven/provider/MusicDB.java
index 84c64a0..a1d7575 100644
--- a/src/org/lineageos/eleven/provider/MusicDB.java
+++ b/src/org/lineageos/eleven/provider/MusicDB.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
diff --git a/src/org/lineageos/eleven/provider/MusicPlaybackState.java b/src/org/lineageos/eleven/provider/MusicPlaybackState.java
index fbfca28..e0bb66c 100644
--- a/src/org/lineageos/eleven/provider/MusicPlaybackState.java
+++ b/src/org/lineageos/eleven/provider/MusicPlaybackState.java
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.service.MusicPlaybackTrack;
-import com.cyanogenmod.eleven.utils.Lists;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.utils.Lists;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/src/org/lineageos/eleven/provider/PlaylistArtworkStore.java b/src/org/lineageos/eleven/provider/PlaylistArtworkStore.java
index 48a792e..3fa886c 100644
--- a/src/org/lineageos/eleven/provider/PlaylistArtworkStore.java
+++ b/src/org/lineageos/eleven/provider/PlaylistArtworkStore.java
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * This db stores the details to generate the playlist artwork including when it was
diff --git a/src/org/lineageos/eleven/provider/PropertiesStore.java b/src/org/lineageos/eleven/provider/PropertiesStore.java
index b22de68..9d84c75 100644
--- a/src/org/lineageos/eleven/provider/PropertiesStore.java
+++ b/src/org/lineageos/eleven/provider/PropertiesStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/org/lineageos/eleven/provider/RecentStore.java b/src/org/lineageos/eleven/provider/RecentStore.java
index 0a913db..e03f52b 100644
--- a/src/org/lineageos/eleven/provider/RecentStore.java
+++ b/src/org/lineageos/eleven/provider/RecentStore.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/org/lineageos/eleven/provider/SearchHistory.java b/src/org/lineageos/eleven/provider/SearchHistory.java
index 4ca1b40..18d25cb 100644
--- a/src/org/lineageos/eleven/provider/SearchHistory.java
+++ b/src/org/lineageos/eleven/provider/SearchHistory.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/org/lineageos/eleven/provider/SongPlayCount.java b/src/org/lineageos/eleven/provider/SongPlayCount.java
index 082dfc2..5fcd83f 100644
--- a/src/org/lineageos/eleven/provider/SongPlayCount.java
+++ b/src/org/lineageos/eleven/provider/SongPlayCount.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.provider;
+package org.lineageos.eleven.provider;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/src/org/lineageos/eleven/recycler/RecycleHolder.java b/src/org/lineageos/eleven/recycler/RecycleHolder.java
index ec16a4e..c3d9d08 100644
--- a/src/org/lineageos/eleven/recycler/RecycleHolder.java
+++ b/src/org/lineageos/eleven/recycler/RecycleHolder.java
@@ -11,13 +11,13 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.recycler;
+package org.lineageos.eleven.recycler;
 
 import android.view.View;
 import android.widget.AbsListView.RecyclerListener;
 
-import com.cyanogenmod.eleven.cache.ImageWorker;
-import com.cyanogenmod.eleven.ui.MusicHolder;
+import org.lineageos.eleven.cache.ImageWorker;
+import org.lineageos.eleven.ui.MusicHolder;
 
 /**
  * A @ {@link RecyclerListener} for {@link MusicHolder}'s views.
diff --git a/src/org/lineageos/eleven/sectionadapter/SectionAdapter.java b/src/org/lineageos/eleven/sectionadapter/SectionAdapter.java
index 870382a..f052a6a 100644
--- a/src/org/lineageos/eleven/sectionadapter/SectionAdapter.java
+++ b/src/org/lineageos/eleven/sectionadapter/SectionAdapter.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.sectionadapter;
+package org.lineageos.eleven.sectionadapter;
 
 import android.app.Activity;
 import android.content.Context;
@@ -24,11 +24,11 @@ import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-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 org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.MusicHolder;
+import org.lineageos.eleven.utils.SectionCreatorUtils.Section;
+import org.lineageos.eleven.utils.SectionCreatorUtils.SectionType;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
 
 import java.util.TreeMap;
 
diff --git a/src/org/lineageos/eleven/sectionadapter/SectionCreator.java b/src/org/lineageos/eleven/sectionadapter/SectionCreator.java
index 16e7e09..b731973 100644
--- a/src/org/lineageos/eleven/sectionadapter/SectionCreator.java
+++ b/src/org/lineageos/eleven/sectionadapter/SectionCreator.java
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.sectionadapter;
+package org.lineageos.eleven.sectionadapter;
 
 import android.content.Context;
 
-import com.cyanogenmod.eleven.loaders.WrappedAsyncTaskLoader;
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.loaders.WrappedAsyncTaskLoader;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
 
 import java.util.List;
 import java.util.TreeMap;
diff --git a/src/org/lineageos/eleven/sectionadapter/SectionListContainer.java b/src/org/lineageos/eleven/sectionadapter/SectionListContainer.java
index 486bf84..93bcf7d 100644
--- a/src/org/lineageos/eleven/sectionadapter/SectionListContainer.java
+++ b/src/org/lineageos/eleven/sectionadapter/SectionListContainer.java
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.sectionadapter;
+package org.lineageos.eleven.sectionadapter;
 
-import com.cyanogenmod.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
 
 import java.util.List;
 import java.util.TreeMap;
diff --git a/src/org/lineageos/eleven/service/MusicPlaybackTrack.aidl b/src/org/lineageos/eleven/service/MusicPlaybackTrack.aidl
index 9ad8f16..2613c99 100644
--- a/src/org/lineageos/eleven/service/MusicPlaybackTrack.aidl
+++ b/src/org/lineageos/eleven/service/MusicPlaybackTrack.aidl
@@ -1,3 +1,3 @@
-package com.cyanogenmod.eleven.service;
+package org.lineageos.eleven.service;
 
 parcelable MusicPlaybackTrack;
\ No newline at end of file
diff --git a/src/org/lineageos/eleven/service/MusicPlaybackTrack.java b/src/org/lineageos/eleven/service/MusicPlaybackTrack.java
index 2c9832a..5939cac 100644
--- a/src/org/lineageos/eleven/service/MusicPlaybackTrack.java
+++ b/src/org/lineageos/eleven/service/MusicPlaybackTrack.java
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.service;
+package org.lineageos.eleven.service;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import com.cyanogenmod.eleven.Config;
+import org.lineageos.eleven.Config;
 
 /**
  * This is used by the music playback service to track the music tracks it is playing
diff --git a/src/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java b/src/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
index 55bd4d3..ce23c2a 100644
--- a/src/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
+++ b/src/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.slidinguppanel;
+package org.lineageos.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.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 public class SlidingUpPanelLayout extends ViewGroup {
 
diff --git a/src/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java b/src/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
index 938593d..42724eb 100644
--- a/src/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
+++ b/src/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
@@ -15,7 +15,7 @@
  */
 
 
-package com.cyanogenmod.eleven.slidinguppanel;
+package org.lineageos.eleven.slidinguppanel;
 
 import java.util.Arrays;
 
diff --git a/src/org/lineageos/eleven/ui/HeaderBar.java b/src/org/lineageos/eleven/ui/HeaderBar.java
index afbf13e..c8f3b18 100644
--- a/src/org/lineageos/eleven/ui/HeaderBar.java
+++ b/src/org/lineageos/eleven/ui/HeaderBar.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui;
+package org.lineageos.eleven.ui;
 
 import android.content.Context;
 import android.support.v4.app.Fragment;
@@ -27,12 +27,12 @@ import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-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 org.lineageos.eleven.R;
+import org.lineageos.eleven.loaders.NowPlayingCursor;
+import org.lineageos.eleven.loaders.QueueLoader;
+import org.lineageos.eleven.menu.CreateNewPlaylist;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
 
 /**
  * Simple Header bar wrapper class that also has its own menu bar button.
diff --git a/src/org/lineageos/eleven/ui/MusicHolder.java b/src/org/lineageos/eleven/ui/MusicHolder.java
index d65e8e7..3313ea2 100644
--- a/src/org/lineageos/eleven/ui/MusicHolder.java
+++ b/src/org/lineageos/eleven/ui/MusicHolder.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui;
+package org.lineageos.eleven.ui;
 
 import android.content.Context;
 import android.view.View;
@@ -19,9 +19,9 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.widgets.PlayPauseProgressButton;
-import com.cyanogenmod.eleven.widgets.PopupMenuButton;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
+import org.lineageos.eleven.widgets.PopupMenuButton;
 
 import java.lang.ref.WeakReference;
 
diff --git a/src/org/lineageos/eleven/ui/activities/BaseActivity.java b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
index 4aca569..03ddf26 100644
--- a/src/org/lineageos/eleven/ui/activities/BaseActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -11,9 +11,9 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 import android.app.ActionBar;
 import android.content.BroadcastReceiver;
@@ -37,18 +37,18 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
 
-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 org.lineageos.eleven.IElevenService;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ICacheListener;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.Lists;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.MusicUtils.ServiceToken;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/src/org/lineageos/eleven/ui/activities/HomeActivity.java b/src/org/lineageos/eleven/ui/activities/HomeActivity.java
index 6499a20..e2ab46b 100644
--- a/src/org/lineageos/eleven/ui/activities/HomeActivity.java
+++ b/src/org/lineageos/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.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
 import android.Manifest;
 import android.animation.ArgbEvaluator;
@@ -36,23 +36,23 @@ import android.util.Log;
 import android.view.MenuItem;
 import android.view.Window;
 
-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.AudioPlayerFragment;
-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.BitmapWithColors;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.NavUtils;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.ui.fragments.AlbumDetailFragment;
+import org.lineageos.eleven.ui.fragments.ArtistDetailFragment;
+import org.lineageos.eleven.ui.fragments.AudioPlayerFragment;
+import org.lineageos.eleven.ui.fragments.IChildFragment;
+import org.lineageos.eleven.ui.fragments.ISetupActionBar;
+import org.lineageos.eleven.ui.fragments.PlaylistDetailFragment;
+import org.lineageos.eleven.ui.fragments.RecentFragment;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
+import org.lineageos.eleven.ui.fragments.profile.LastAddedFragment;
+import org.lineageos.eleven.ui.fragments.profile.TopTracksFragment;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.BitmapWithColors;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
 
 import java.util.ArrayList;
 
diff --git a/src/org/lineageos/eleven/ui/activities/SearchActivity.java b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
index 3bfbb6f..5f5bd3b 100644
--- a/src/org/lineageos/eleven/ui/activities/SearchActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SearchActivity.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
 import android.app.ActionBar;
 import android.app.SearchManager;
@@ -46,31 +46,31 @@ import android.widget.ListView;
 import android.widget.SearchView;
 import android.widget.SearchView.OnQueryTextListener;
 
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.IElevenService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SummarySearchAdapter;
+import org.lineageos.eleven.loaders.WrappedAsyncTaskLoader;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.AlbumArtistDetails;
+import org.lineageos.eleven.model.SearchResult;
+import org.lineageos.eleven.model.SearchResult.ResultType;
+import org.lineageos.eleven.provider.SearchHistory;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionCreator.SimpleListLoader;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.MusicUtils.ServiceToken;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.utils.SectionCreatorUtils.IItemCompare;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -78,7 +78,7 @@ import java.util.List;
 import java.util.TreeSet;
 
 import static android.view.View.OnTouchListener;
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 /**
  * Provides the search interface for Apollo.
diff --git a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java
index cf33054..095e64a 100644
--- a/src/org/lineageos/eleven/ui/activities/SettingsActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SettingsActivity.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -25,10 +25,10 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.view.MenuItem;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.utils.MusicUtils;
-import com.cyanogenmod.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
 
 /**
  * Settings.
diff --git a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
index c7b72a3..55dc5c4 100644
--- a/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities;
+package org.lineageos.eleven.ui.activities;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -20,15 +20,15 @@ import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.LinearLayout;
 
-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 org.lineageos.eleven.R;
+import org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout;
+import org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout.SimplePanelSlideListener;
+import org.lineageos.eleven.ui.HeaderBar;
+import org.lineageos.eleven.ui.fragments.AudioPlayerFragment;
+import org.lineageos.eleven.ui.fragments.QueueFragment;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.BlurScrimImage;
 
 /**
  * This class is used to display the {@link ViewPager} used to swipe between the
diff --git a/src/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java b/src/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
index cbc7129..185acee 100644
--- a/src/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
+++ b/src/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.ui.activities.preview;
+package org.lineageos.eleven.ui.activities.preview;
 
 import android.app.Activity;
 import android.content.AsyncQueryHandler;
@@ -47,8 +47,8 @@ import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.preview.util.Logger;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.preview.util.Logger;
 
 import java.io.IOException;
 import java.lang.ref.WeakReference;
diff --git a/src/org/lineageos/eleven/ui/activities/preview/PreviewSong.java b/src/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
index a4d7524..ba2b7af 100644
--- a/src/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
+++ b/src/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.ui.activities.preview;
+package org.lineageos.eleven.ui.activities.preview;
 
 import android.net.Uri;
 
diff --git a/src/org/lineageos/eleven/ui/activities/preview/util/Logger.java b/src/org/lineageos/eleven/ui/activities/preview/util/Logger.java
index ac25453..a2056de 100644
--- a/src/org/lineageos/eleven/ui/activities/preview/util/Logger.java
+++ b/src/org/lineageos/eleven/ui/activities/preview/util/Logger.java
@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.activities.preview.util;
+package org.lineageos.eleven.ui.activities.preview.util;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/src/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
index 5aeb70f..826fbf0 100644
--- a/src/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
@@ -21,21 +21,21 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.AlbumDetailSongAdapter;
+import org.lineageos.eleven.adapters.DetailSongAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.AlbumPopupMenuHelper;
+import org.lineageos.eleven.utils.GenreFetcher;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SongPopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.List;
 
diff --git a/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java b/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
index f645ddd..d40cfb1 100644
--- a/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/AlbumFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -26,24 +26,24 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
 
-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 org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.AlbumAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.loaders.AlbumLoader;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserFragment;
+import org.lineageos.eleven.utils.AlbumPopupMenuHelper;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 /**
  * This class is used to display all of the albums on a user's device.
diff --git a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
index 21bd556..8eaec02 100644
--- a/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -26,23 +26,23 @@ import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.ListView;
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.ArtistDetailAlbumAdapter;
+import org.lineageos.eleven.adapters.ArtistDetailSongAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.utils.AlbumPopupMenuHelper;
+import org.lineageos.eleven.utils.ArtistPopupMenuHelper;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SongPopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/org/lineageos/eleven/ui/fragments/ArtistFragment.java b/src/org/lineageos/eleven/ui/fragments/ArtistFragment.java
index 100c55a..93671f4 100644
--- a/src/org/lineageos/eleven/ui/fragments/ArtistFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/ArtistFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -28,26 +28,26 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-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 org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.ArtistAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.loaders.ArtistLoader;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserFragment;
+import org.lineageos.eleven.utils.ArtistPopupMenuHelper;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
+import org.lineageos.eleven.utils.SectionCreatorUtils.IItemCompare;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 /**
  * This class is used to display all of the artists on a user's device.
diff --git a/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java b/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
index 58cecd0..0221e06 100644
--- a/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -46,33 +46,33 @@ import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-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.HomeActivity;
-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.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.VisualizerView;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.AlbumArtPagerAdapter;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.NowPlayingCursor;
+import org.lineageos.eleven.loaders.QueueLoader;
+import org.lineageos.eleven.menu.CreateNewPlaylist;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.widgets.BrowseButton;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
+import org.lineageos.eleven.widgets.QueueButton;
+import org.lineageos.eleven.widgets.RepeatButton;
+import org.lineageos.eleven.widgets.RepeatingImageButton;
+import org.lineageos.eleven.widgets.ShuffleButton;
+import org.lineageos.eleven.widgets.VisualizerView;
 
 import java.lang.ref.WeakReference;
 
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 public class AudioPlayerFragment extends Fragment implements ServiceConnection {
     private static final String TAG = AudioPlayerFragment.class.getSimpleName();
diff --git a/src/org/lineageos/eleven/ui/fragments/BaseFragment.java b/src/org/lineageos/eleven/ui/fragments/BaseFragment.java
index 5a5885a..e0c90d2 100644
--- a/src/org/lineageos/eleven/ui/fragments/BaseFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/BaseFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -22,9 +22,9 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.cyanogenmod.eleven.MusicStateListener;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
 
 public abstract class BaseFragment extends Fragment implements MusicStateListener,
     ISetupActionBar {
diff --git a/src/org/lineageos/eleven/ui/fragments/DetailFragment.java b/src/org/lineageos/eleven/ui/fragments/DetailFragment.java
index 43e5274..208e8a7 100644
--- a/src/org/lineageos/eleven/ui/fragments/DetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/DetailFragment.java
@@ -13,14 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.PopupMenuHelper;
 
 public abstract class DetailFragment extends BaseFragment {
     protected PopupMenuHelper mActionMenuHelper;
diff --git a/src/org/lineageos/eleven/ui/fragments/FadingBarFragment.java b/src/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
index 81c4009..89d5d3c 100644
--- a/src/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AbsListView.OnScrollListener;
 
-import com.cyanogenmod.eleven.ui.activities.HomeActivity;
+import org.lineageos.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/org/lineageos/eleven/ui/fragments/IChildFragment.java b/src/org/lineageos/eleven/ui/fragments/IChildFragment.java
index f1b5fb7..aec7aa8 100644
--- a/src/org/lineageos/eleven/ui/fragments/IChildFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/IChildFragment.java
@@ -13,9 +13,9 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
-import com.cyanogenmod.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter;
 
 public interface IChildFragment {
     PagerAdapter.MusicFragments getMusicFragmentParent();
diff --git a/src/org/lineageos/eleven/ui/fragments/ISetupActionBar.java b/src/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
index 6ce191b..eb80656 100644
--- a/src/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
+++ b/src/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 public interface ISetupActionBar {
     public void setupActionBar();
diff --git a/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java b/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
index 4461b27..2043444 100644
--- a/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.database.Cursor;
 import android.net.Uri;
@@ -28,28 +28,28 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.adapters.ProfileSongAdapter;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.dragdrop.DragSortListView;
+import org.lineageos.eleven.dragdrop.DragSortListView.DragScrollProfile;
+import org.lineageos.eleven.dragdrop.DragSortListView.DropListener;
+import org.lineageos.eleven.dragdrop.DragSortListView.RemoveListener;
+import org.lineageos.eleven.loaders.PlaylistSongLoader;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PlaylistPopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper.PopupMenuType;
+import org.lineageos.eleven.utils.SongPopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 import java.util.List;
 import java.util.TreeSet;
diff --git a/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java b/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
index aba8dbd..20fdf39 100644
--- a/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -24,21 +24,21 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-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 org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.adapters.PlaylistAdapter;
+import org.lineageos.eleven.loaders.PlaylistLoader;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserFragment;
+import org.lineageos.eleven.utils.NavUtils;
+import org.lineageos.eleven.utils.PlaylistPopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
 
 import java.util.List;
 
diff --git a/src/org/lineageos/eleven/ui/fragments/QueueFragment.java b/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
index 35229bc..5773af0 100644
--- a/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/QueueFragment.java
@@ -11,9 +11,9 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
-import static com.cyanogenmod.eleven.utils.MusicUtils.mService;
+import static org.lineageos.eleven.utils.MusicUtils.mService;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -33,28 +33,28 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SongAdapter;
+import org.lineageos.eleven.dragdrop.DragSortListView;
+import org.lineageos.eleven.dragdrop.DragSortListView.DragScrollProfile;
+import org.lineageos.eleven.dragdrop.DragSortListView.DropListener;
+import org.lineageos.eleven.dragdrop.DragSortListView.RemoveListener;
+import org.lineageos.eleven.loaders.NowPlayingCursor;
+import org.lineageos.eleven.loaders.QueueLoader;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
+import org.lineageos.eleven.widgets.PlayPauseProgressButton;
 
 import java.lang.ref.WeakReference;
 import java.util.List;
diff --git a/src/org/lineageos/eleven/ui/fragments/RecentFragment.java b/src/org/lineageos/eleven/ui/fragments/RecentFragment.java
index 971f8aa..3e7c751 100644
--- a/src/org/lineageos/eleven/ui/fragments/RecentFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/RecentFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -20,19 +20,19 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SongAdapter;
+import org.lineageos.eleven.loaders.TopTracksLoader;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.profile.SmartPlaylistFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/org/lineageos/eleven/ui/fragments/SongFragment.java b/src/org/lineageos/eleven/ui/fragments/SongFragment.java
index 1e57580..ccf8ead 100644
--- a/src/org/lineageos/eleven/ui/fragments/SongFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/SongFragment.java
@@ -11,22 +11,22 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments;
+package org.lineageos.eleven.ui.fragments;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.loaders.SongLoader;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.fragments.profile.BasicSongFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.SectionCreatorUtils;
 
 /**
  * This class is used to display all of the songs on a user's device.
diff --git a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
index 0d01e5f..caa2fc5 100644
--- a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments.phone;
+package org.lineageos.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
diff --git a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
index 376841e..a93a85d 100644
--- a/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments.phone;
+package org.lineageos.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -20,18 +20,18 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
-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.cyanogenmod.eleven.widgets.ViewPagerTabs;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.adapters.PagerAdapter.MusicFragments;
+import org.lineageos.eleven.menu.CreateNewPlaylist;
+import org.lineageos.eleven.ui.fragments.AlbumFragment;
+import org.lineageos.eleven.ui.fragments.ArtistFragment;
+import org.lineageos.eleven.ui.fragments.BaseFragment;
+import org.lineageos.eleven.ui.fragments.SongFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PreferenceUtils;
+import org.lineageos.eleven.utils.SortOrder;
+import org.lineageos.eleven.widgets.ViewPagerTabs;
 
 /**
  * This class is used to hold the {@link ViewPager} used for swiping between the
@@ -40,9 +40,7 @@ import com.cyanogenmod.eleven.widgets.ViewPagerTabs;
  * 
  * @NOTE: The reason the sort orders are taken care of in this fragment rather
  *        than the individual fragments is to keep from showing all of the menu
- *        items on tablet interfaces. That being said, I have a tablet interface
- *        worked out, but I'm going to keep it in the Play Store version of
- *        Apollo for a couple of weeks or so before merging it with CM.
+ *        items on tablet interfaces.
  * @author Andrew Neal (andrewdneal@gmail.com)
  */
 public class MusicBrowserPhoneFragment extends BaseFragment {
diff --git a/src/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java b/src/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
index ba9d815..5f56996 100644
--- a/src/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments.profile;
+package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -27,22 +27,22 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.MusicStateListener;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SongAdapter;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.recycler.RecycleHolder;
+import org.lineageos.eleven.sectionadapter.SectionAdapter;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.SongPopupMenuHelper;
+import org.lineageos.eleven.widgets.IPopupMenuCallback;
+import org.lineageos.eleven.widgets.LoadingEmptyContainer;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 import java.util.TreeSet;
 
diff --git a/src/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java b/src/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
index 87300d9..8e96489 100644
--- a/src/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments.profile;
+package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.support.v4.content.Loader;
@@ -19,17 +19,17 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-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;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.loaders.LastAddedLoader;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.ISetupActionBar;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 /**
  * This class is used to display all of the songs the user put on their device
diff --git a/src/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java b/src/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
index 72b2b41..d2d53b7 100644
--- a/src/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.ui.fragments.profile;
+package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -23,17 +23,17 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 
-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;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.PagerAdapter;
+import org.lineageos.eleven.menu.ConfirmDialog;
+import org.lineageos.eleven.model.Playlist;
+import org.lineageos.eleven.ui.fragments.IChildFragment;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.utils.PlaylistPopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper;
+import org.lineageos.eleven.utils.PopupMenuHelper.PopupMenuType;
 
 public abstract class SmartPlaylistFragment extends BasicSongFragment
         implements ConfirmDialog.ConfirmCallback, IChildFragment {
diff --git a/src/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java b/src/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
index 1d71316..f6adc10 100644
--- a/src/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
+++ b/src/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.ui.fragments.profile;
+package org.lineageos.eleven.ui.fragments.profile;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -21,18 +21,18 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-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;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.adapters.SongAdapter;
+import org.lineageos.eleven.loaders.TopTracksLoader;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.sectionadapter.SectionCreator;
+import org.lineageos.eleven.sectionadapter.SectionListContainer;
+import org.lineageos.eleven.ui.activities.BaseActivity;
+import org.lineageos.eleven.ui.fragments.ISetupActionBar;
+import org.lineageos.eleven.utils.MusicUtils;
+import org.lineageos.eleven.widgets.NoResultsContainer;
 
 /**
  * This class is used to display all of the songs the user put on their device
diff --git a/src/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java b/src/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
index 5d47393..d565b50 100644
--- a/src/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
@@ -13,19 +13,19 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
 import android.view.MenuItem;
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.menu.PhotoSelectionDialog;
+import org.lineageos.eleven.model.Album;
 
 import java.util.TreeSet;
 
diff --git a/src/org/lineageos/eleven/utils/ApolloUtils.java b/src/org/lineageos/eleven/utils/ApolloUtils.java
index 534358c..8226189 100644
--- a/src/org/lineageos/eleven/utils/ApolloUtils.java
+++ b/src/org/lineageos/eleven/utils/ApolloUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -34,8 +34,8 @@ import android.view.View;
 import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.widget.Toast;
 
-import com.cyanogenmod.eleven.cache.ImageCache;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.cache.ImageCache;
+import org.lineageos.eleven.cache.ImageFetcher;
 
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
diff --git a/src/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java b/src/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
index 7e88662..301acff 100644
--- a/src/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.support.v4.app.FragmentManager;
 
 import android.view.MenuItem;
-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;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.menu.PhotoSelectionDialog;
+import org.lineageos.eleven.model.Artist;
 
 public abstract class ArtistPopupMenuHelper extends PopupMenuHelper {
     private Artist mArtist;
diff --git a/src/org/lineageos/eleven/utils/BitmapUtils.java b/src/org/lineageos/eleven/utils/BitmapUtils.java
index 3e02549..704e559 100644
--- a/src/org/lineageos/eleven/utils/BitmapUtils.java
+++ b/src/org/lineageos/eleven/utils/BitmapUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
diff --git a/src/org/lineageos/eleven/utils/BitmapWithColors.java b/src/org/lineageos/eleven/utils/BitmapWithColors.java
index b3a9962..c493f3c 100644
--- a/src/org/lineageos/eleven/utils/BitmapWithColors.java
+++ b/src/org/lineageos/eleven/utils/BitmapWithColors.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
diff --git a/src/org/lineageos/eleven/utils/GenreFetcher.java b/src/org/lineageos/eleven/utils/GenreFetcher.java
index bef40fb..6d8e5df 100644
--- a/src/org/lineageos/eleven/utils/GenreFetcher.java
+++ b/src/org/lineageos/eleven/utils/GenreFetcher.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.content.Context;
 import android.database.Cursor;
diff --git a/src/org/lineageos/eleven/utils/ImageUtils.java b/src/org/lineageos/eleven/utils/ImageUtils.java
index 69e0c0b..5c031e9 100644
--- a/src/org/lineageos/eleven/utils/ImageUtils.java
+++ b/src/org/lineageos/eleven/utils/ImageUtils.java
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.widget.ImageView;
 
-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 org.lineageos.eleven.cache.ImageCache;
+import org.lineageos.eleven.cache.ImageWorker;
+import org.lineageos.eleven.lastfm.ImageSize;
+import org.lineageos.eleven.lastfm.MusicEntry;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/src/org/lineageos/eleven/utils/Lists.java b/src/org/lineageos/eleven/utils/Lists.java
index 46bc773..ceca2a6 100644
--- a/src/org/lineageos/eleven/utils/Lists.java
+++ b/src/org/lineageos/eleven/utils/Lists.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/org/lineageos/eleven/utils/MusicUtils.java b/src/org/lineageos/eleven/utils/MusicUtils.java
index 8ab4c73..908c169 100644
--- a/src/org/lineageos/eleven/utils/MusicUtils.java
+++ b/src/org/lineageos/eleven/utils/MusicUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -41,26 +41,26 @@ import android.util.Log;
 import android.view.Menu;
 import android.widget.Toast;
 
-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.locale.LocaleUtils;
-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 org.lineageos.eleven.Config.IdType;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.IElevenService;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.loaders.LastAddedLoader;
+import org.lineageos.eleven.loaders.PlaylistLoader;
+import org.lineageos.eleven.loaders.PlaylistSongLoader;
+import org.lineageos.eleven.loaders.SongLoader;
+import org.lineageos.eleven.loaders.TopTracksLoader;
+import org.lineageos.eleven.locale.LocaleUtils;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.model.AlbumArtistDetails;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.model.Song;
+import org.lineageos.eleven.provider.RecentStore;
+import org.lineageos.eleven.provider.SongPlayCount;
+import org.lineageos.eleven.service.MusicPlaybackTrack;
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/src/org/lineageos/eleven/utils/NavUtils.java b/src/org/lineageos/eleven/utils/NavUtils.java
index 31fa5b9..45db610 100644
--- a/src/org/lineageos/eleven/utils/NavUtils.java
+++ b/src/org/lineageos/eleven/utils/NavUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.app.SearchManager;
@@ -25,11 +25,11 @@ import android.provider.MediaStore;
 import android.util.Log;
 import android.widget.Toast;
 
-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;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.activities.HomeActivity;
+import org.lineageos.eleven.ui.activities.SearchActivity;
+import org.lineageos.eleven.ui.activities.SettingsActivity;
 
 import java.util.List;
 
@@ -126,7 +126,7 @@ public final class NavUtils {
     }
 
     /**
-     * Opens the sound effects panel or DSP manager in CM
+     * Opens the sound effects panel AudioFX in LineageOS
      *
      * @param context The {@link Activity} to use.
      * @param requestCode The request code passed into startActivityForResult
@@ -161,7 +161,7 @@ public final class NavUtils {
     }
 
     /**
-     * Opens to {@link com.cyanogenmod.eleven.ui.activities.SearchActivity}.
+     * Opens to {@link org.lineageos.eleven.ui.activities.SearchActivity}.
      *
      * @param activity The {@link Activity} to use.
      * @param query The search query.
@@ -175,7 +175,7 @@ public final class NavUtils {
     }
 
     /**
-     * Opens to {@link com.cyanogenmod.eleven.ui.activities.HomeActivity}.
+     * Opens to {@link org.lineageos.eleven.ui.activities.HomeActivity}.
      *
      * @param activity The {@link Activity} to use.
      */
diff --git a/src/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java b/src/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
index a3fd6d0..cfebe91 100644
--- a/src/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -24,10 +24,10 @@ import android.net.Uri;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
-import com.cyanogenmod.eleven.Config;
-import com.cyanogenmod.eleven.Config.SmartPlaylistType;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.model.Playlist;
+import org.lineageos.eleven.Config;
+import org.lineageos.eleven.Config.SmartPlaylistType;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.model.Playlist;
 
 public abstract class PlaylistPopupMenuHelper extends PopupMenuHelper {
     private Playlist mPlaylist;
diff --git a/src/org/lineageos/eleven/utils/PopupMenuHelper.java b/src/org/lineageos/eleven/utils/PopupMenuHelper.java
index dffde73..d70f458 100644
--- a/src/org/lineageos/eleven/utils/PopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/PopupMenuHelper.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.app.Activity;
 import android.support.v4.app.FragmentManager;
@@ -24,12 +24,12 @@ import android.widget.PopupMenu;
 
 import com.android.internal.view.menu.ContextMenuBuilder;
 import com.android.internal.view.menu.MenuBuilder;
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.menu.CreateNewPlaylist;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.menu.RenamePlaylist;
+import org.lineageos.eleven.provider.RecentStore;
 
 import java.util.TreeSet;
 
diff --git a/src/org/lineageos/eleven/utils/PreferenceUtils.java b/src/org/lineageos/eleven/utils/PreferenceUtils.java
index 0f4fabb..d72fd30 100644
--- a/src/org/lineageos/eleven/utils/PreferenceUtils.java
+++ b/src/org/lineageos/eleven/utils/PreferenceUtils.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.Manifest.permission;
 import android.app.Activity;
@@ -22,11 +22,11 @@ import android.os.AsyncTask;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.preference.PreferenceManager;
 
-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;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.ui.fragments.AlbumFragment;
+import org.lineageos.eleven.ui.fragments.ArtistFragment;
+import org.lineageos.eleven.ui.fragments.SongFragment;
+import org.lineageos.eleven.ui.fragments.phone.MusicBrowserPhoneFragment;
 
 /**
  * A collection of helpers designed to get and set various preferences across
@@ -266,7 +266,7 @@ public final class PreferenceUtils {
 
     /**
      * @return The sort order used for the artist album list in
-     *         {@link com.cyanogenmod.eleven.ui.fragments.ArtistDetailFragment}
+     *         {@link org.lineageos.eleven.ui.fragments.ArtistDetailFragment}
      */
     public final String getArtistAlbumSortOrder() {
         return mPreferences.getString(ARTIST_ALBUM_SORT_ORDER,
diff --git a/src/org/lineageos/eleven/utils/SectionCreatorUtils.java b/src/org/lineageos/eleven/utils/SectionCreatorUtils.java
index cc1756f..16e6cf4 100644
--- a/src/org/lineageos/eleven/utils/SectionCreatorUtils.java
+++ b/src/org/lineageos/eleven/utils/SectionCreatorUtils.java
@@ -13,17 +13,17 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.content.Context;
 import android.text.TextUtils;
 
-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 org.lineageos.eleven.Config;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.model.Album;
+import org.lineageos.eleven.model.Artist;
+import org.lineageos.eleven.model.SearchResult;
+import org.lineageos.eleven.model.Song;
 
 import java.util.List;
 import java.util.TreeMap;
diff --git a/src/org/lineageos/eleven/utils/ShakeDetector.java b/src/org/lineageos/eleven/utils/ShakeDetector.java
index d0be70d..3a971f4 100644
--- a/src/org/lineageos/eleven/utils/ShakeDetector.java
+++ b/src/org/lineageos/eleven/utils/ShakeDetector.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 /*
  * Copyright 2012 Square, Inc.
diff --git a/src/org/lineageos/eleven/utils/SongPopupMenuHelper.java b/src/org/lineageos/eleven/utils/SongPopupMenuHelper.java
index 17fc4d5..54f1e5a 100644
--- a/src/org/lineageos/eleven/utils/SongPopupMenuHelper.java
+++ b/src/org/lineageos/eleven/utils/SongPopupMenuHelper.java
@@ -13,16 +13,16 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 
 import android.app.Activity;
 import android.provider.MediaStore;
 import android.support.v4.app.FragmentManager;
 
-import com.cyanogenmod.eleven.menu.DeleteDialog;
-import com.cyanogenmod.eleven.menu.FragmentMenuItems;
-import com.cyanogenmod.eleven.model.Song;
+import org.lineageos.eleven.menu.DeleteDialog;
+import org.lineageos.eleven.menu.FragmentMenuItems;
+import org.lineageos.eleven.model.Song;
 
 import java.util.TreeSet;
 
diff --git a/src/org/lineageos/eleven/utils/SortOrder.java b/src/org/lineageos/eleven/utils/SortOrder.java
index 6352a43..6ffe57f 100644
--- a/src/org/lineageos/eleven/utils/SortOrder.java
+++ b/src/org/lineageos/eleven/utils/SortOrder.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.provider.MediaStore;
 
diff --git a/src/org/lineageos/eleven/utils/SrtManager.java b/src/org/lineageos/eleven/utils/SrtManager.java
index ffa33dd..b9aec40 100644
--- a/src/org/lineageos/eleven/utils/SrtManager.java
+++ b/src/org/lineageos/eleven/utils/SrtManager.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.media.MediaPlayer;
 import android.os.Handler;
diff --git a/src/org/lineageos/eleven/utils/SrtParser.java b/src/org/lineageos/eleven/utils/SrtParser.java
index bace32a..351c7d0 100644
--- a/src/org/lineageos/eleven/utils/SrtParser.java
+++ b/src/org/lineageos/eleven/utils/SrtParser.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.utils;
+package org.lineageos.eleven.utils;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/src/org/lineageos/eleven/widgets/AlphaPatternDrawable.java b/src/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
index 055d08f..040cd12 100644
--- a/src/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
+++ b/src/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.Config;
diff --git a/src/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java b/src/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
index 1ea1d73..18f5118 100644
--- a/src/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
+++ b/src/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.view.View;
diff --git a/src/org/lineageos/eleven/widgets/AudioActivityButton.java b/src/org/lineageos/eleven/widgets/AudioActivityButton.java
index bbc3345..483dbe8 100644
--- a/src/org/lineageos/eleven/widgets/AudioActivityButton.java
+++ b/src/org/lineageos/eleven/widgets/AudioActivityButton.java
@@ -13,12 +13,12 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 import android.content.Context;
 import android.support.v4.app.FragmentActivity;
 import android.util.AttributeSet;
 
-import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
 
 public abstract class AudioActivityButton extends AudioButton {
     protected SlidingPanelActivity mActivity;
diff --git a/src/org/lineageos/eleven/widgets/AudioButton.java b/src/org/lineageos/eleven/widgets/AudioButton.java
index 1e05e81..ff469e4 100644
--- a/src/org/lineageos/eleven/widgets/AudioButton.java
+++ b/src/org/lineageos/eleven/widgets/AudioButton.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.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.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.ApolloUtils;
 
 public abstract class AudioButton extends ImageButton implements OnClickListener, OnLongClickListener {
     public static float ACTIVE_ALPHA = 1.0f;
diff --git a/src/org/lineageos/eleven/widgets/BlurScrimImage.java b/src/org/lineageos/eleven/widgets/BlurScrimImage.java
index c5cd9aa..8a51cc2 100644
--- a/src/org/lineageos/eleven/widgets/BlurScrimImage.java
+++ b/src/org/lineageos/eleven/widgets/BlurScrimImage.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -25,9 +25,9 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageFetcher;
-import com.cyanogenmod.eleven.cache.ImageWorker;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageFetcher;
+import org.lineageos.eleven.cache.ImageWorker;
 
 public class BlurScrimImage extends FrameLayout {
     private ImageView mImageView;
diff --git a/src/org/lineageos/eleven/widgets/BrowseButton.java b/src/org/lineageos/eleven/widgets/BrowseButton.java
index 1bd74d8..1d7dece 100644
--- a/src/org/lineageos/eleven/widgets/BrowseButton.java
+++ b/src/org/lineageos/eleven/widgets/BrowseButton.java
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
 
 public class BrowseButton extends AudioActivityButton {
 
diff --git a/src/org/lineageos/eleven/widgets/ColorPanelView.java b/src/org/lineageos/eleven/widgets/ColorPanelView.java
index 332d187..8e77bb0 100644
--- a/src/org/lineageos/eleven/widgets/ColorPanelView.java
+++ b/src/org/lineageos/eleven/widgets/ColorPanelView.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/org/lineageos/eleven/widgets/ColorPickerView.java b/src/org/lineageos/eleven/widgets/ColorPickerView.java
index dc034eb..1894e63 100644
--- a/src/org/lineageos/eleven/widgets/ColorPickerView.java
+++ b/src/org/lineageos/eleven/widgets/ColorPickerView.java
@@ -9,7 +9,7 @@
  * language governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.graphics.Canvas;
diff --git a/src/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java b/src/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
index 071bdee..3a311f5 100644
--- a/src/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
+++ b/src/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/org/lineageos/eleven/widgets/IPopupMenuCallback.java b/src/org/lineageos/eleven/widgets/IPopupMenuCallback.java
index 2cad85d..a797175 100644
--- a/src/org/lineageos/eleven/widgets/IPopupMenuCallback.java
+++ b/src/org/lineageos/eleven/widgets/IPopupMenuCallback.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.view.View;
 
diff --git a/src/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java b/src/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
index 5263e13..8f6d39a 100644
--- a/src/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
+++ b/src/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/org/lineageos/eleven/widgets/LetterTileDrawable.java b/src/org/lineageos/eleven/widgets/LetterTileDrawable.java
index 69661f9..fdbc8bd 100644
--- a/src/org/lineageos/eleven/widgets/LetterTileDrawable.java
+++ b/src/org/lineageos/eleven/widgets/LetterTileDrawable.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -32,10 +32,10 @@ import android.text.TextUtils;
 
 import junit.framework.Assert;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.cache.ImageWorker.ImageType;
-import com.cyanogenmod.eleven.utils.BitmapWithColors;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.cache.ImageWorker.ImageType;
+import org.lineageos.eleven.utils.BitmapWithColors;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A drawable that encapsulates all the functionality needed to display a letter tile to
diff --git a/src/org/lineageos/eleven/widgets/LoadingEmptyContainer.java b/src/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
index e7a002e..445887f 100644
--- a/src/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
+++ b/src/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.os.Handler;
@@ -21,7 +21,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 /**
  * This class is the default empty state view for most listviews/fragments
diff --git a/src/org/lineageos/eleven/widgets/NoResultsContainer.java b/src/org/lineageos/eleven/widgets/NoResultsContainer.java
index 8da0d29..26b569b 100644
--- a/src/org/lineageos/eleven/widgets/NoResultsContainer.java
+++ b/src/org/lineageos/eleven/widgets/NoResultsContainer.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -21,7 +21,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 /**
  * This class is the default empty state view for most listviews/fragments
diff --git a/src/org/lineageos/eleven/widgets/PlayPauseButton.java b/src/org/lineageos/eleven/widgets/PlayPauseButton.java
index ca74dcf..0292ee4 100644
--- a/src/org/lineageos/eleven/widgets/PlayPauseButton.java
+++ b/src/org/lineageos/eleven/widgets/PlayPauseButton.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.animation.Animator;
 import android.content.Context;
@@ -25,9 +25,9 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageButton;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A custom {@link ImageButton} that represents the "play and pause" button.
diff --git a/src/org/lineageos/eleven/widgets/PlayPauseProgressButton.java b/src/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
index 8b8788f..9f4eb26 100644
--- a/src/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
+++ b/src/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
@@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -24,8 +24,8 @@ import android.view.ViewConfiguration;
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * This class handles the playpause button as well as the circular progress bar
diff --git a/src/org/lineageos/eleven/widgets/PopupMenuButton.java b/src/org/lineageos/eleven/widgets/PopupMenuButton.java
index a7b6f6f..a400bf4 100644
--- a/src/org/lineageos/eleven/widgets/PopupMenuButton.java
+++ b/src/org/lineageos/eleven/widgets/PopupMenuButton.java
@@ -14,14 +14,14 @@
 * limitations under the License.
 */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 public class PopupMenuButton extends ImageView implements IPopupMenuCallback,
         View.OnClickListener {
diff --git a/src/org/lineageos/eleven/widgets/QueueButton.java b/src/org/lineageos/eleven/widgets/QueueButton.java
index a8a1f50..f4aab93 100644
--- a/src/org/lineageos/eleven/widgets/QueueButton.java
+++ b/src/org/lineageos/eleven/widgets/QueueButton.java
@@ -13,13 +13,13 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.eleven.ui.activities.SlidingPanelActivity;
+import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
 
 public class QueueButton extends AudioActivityButton {
 
diff --git a/src/org/lineageos/eleven/widgets/RepeatButton.java b/src/org/lineageos/eleven/widgets/RepeatButton.java
index f07971c..6e9e4df 100644
--- a/src/org/lineageos/eleven/widgets/RepeatButton.java
+++ b/src/org/lineageos/eleven/widgets/RepeatButton.java
@@ -11,16 +11,16 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageButton;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A custom {@link ImageButton} that represents the "repeat" button.
diff --git a/src/org/lineageos/eleven/widgets/RepeatingImageButton.java b/src/org/lineageos/eleven/widgets/RepeatingImageButton.java
index 53d662c..b14c147 100644
--- a/src/org/lineageos/eleven/widgets/RepeatingImageButton.java
+++ b/src/org/lineageos/eleven/widgets/RepeatingImageButton.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.os.SystemClock;
@@ -20,9 +20,9 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
 
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.ApolloUtils;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.ApolloUtils;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * A {@link ImageButton} that will repeatedly call a 'listener' method as long
diff --git a/src/org/lineageos/eleven/widgets/SeparatedListAdapter.java b/src/org/lineageos/eleven/widgets/SeparatedListAdapter.java
index 70f01b3..7af881a 100644
--- a/src/org/lineageos/eleven/widgets/SeparatedListAdapter.java
+++ b/src/org/lineageos/eleven/widgets/SeparatedListAdapter.java
@@ -1,5 +1,5 @@
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.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.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/org/lineageos/eleven/widgets/ShowHideMasterLayout.java b/src/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
index d12956f..8c8eb36 100644
--- a/src/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
+++ b/src/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
@@ -9,7 +9,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.animation.Animator;
 import android.animation.AnimatorSet;
diff --git a/src/org/lineageos/eleven/widgets/ShuffleButton.java b/src/org/lineageos/eleven/widgets/ShuffleButton.java
index 838c2e7..432e392 100644
--- a/src/org/lineageos/eleven/widgets/ShuffleButton.java
+++ b/src/org/lineageos/eleven/widgets/ShuffleButton.java
@@ -11,15 +11,15 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.eleven.MusicPlaybackService;
-import com.cyanogenmod.eleven.R;
-import com.cyanogenmod.eleven.utils.MusicUtils;
+import org.lineageos.eleven.MusicPlaybackService;
+import org.lineageos.eleven.R;
+import org.lineageos.eleven.utils.MusicUtils;
 
 /**
  * @author Andrew Neal (andrewdneal@gmail.com)
diff --git a/src/org/lineageos/eleven/widgets/SquareFrame.java b/src/org/lineageos/eleven/widgets/SquareFrame.java
index 85b0acc..09048e3 100644
--- a/src/org/lineageos/eleven/widgets/SquareFrame.java
+++ b/src/org/lineageos/eleven/widgets/SquareFrame.java
@@ -1,4 +1,4 @@
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/org/lineageos/eleven/widgets/SquareImageView.java b/src/org/lineageos/eleven/widgets/SquareImageView.java
index 3e40c7b..83f6bb7 100644
--- a/src/org/lineageos/eleven/widgets/SquareImageView.java
+++ b/src/org/lineageos/eleven/widgets/SquareImageView.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/org/lineageos/eleven/widgets/SquareView.java b/src/org/lineageos/eleven/widgets/SquareView.java
index 21e64d7..3d5671a 100644
--- a/src/org/lineageos/eleven/widgets/SquareView.java
+++ b/src/org/lineageos/eleven/widgets/SquareView.java
@@ -11,7 +11,7 @@
  * governing permissions and limitations under the License.
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/org/lineageos/eleven/widgets/SquareViewPager.java b/src/org/lineageos/eleven/widgets/SquareViewPager.java
index e24c1e9..a9900f6 100644
--- a/src/org/lineageos/eleven/widgets/SquareViewPager.java
+++ b/src/org/lineageos/eleven/widgets/SquareViewPager.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
diff --git a/src/org/lineageos/eleven/widgets/ViewPagerTabStrip.java b/src/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
index d1ef9c3..0c2cc4a 100644
--- a/src/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
+++ b/src/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -24,7 +24,7 @@ import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 public class ViewPagerTabStrip extends LinearLayout {
     private int mSelectedUnderlineThickness;
diff --git a/src/org/lineageos/eleven/widgets/ViewPagerTabs.java b/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
index 7c91c87..10a7823 100644
--- a/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
+++ b/src/org/lineageos/eleven/widgets/ViewPagerTabs.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -32,7 +32,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 /**
  * Lightweight implementation of ViewPager tabs. This looks similar to traditional actionBar tabs,
diff --git a/src/org/lineageos/eleven/widgets/VisualizerView.java b/src/org/lineageos/eleven/widgets/VisualizerView.java
index 034d229..6b0feb3 100644
--- a/src/org/lineageos/eleven/widgets/VisualizerView.java
+++ b/src/org/lineageos/eleven/widgets/VisualizerView.java
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package com.cyanogenmod.eleven.widgets;
+package org.lineageos.eleven.widgets;
 
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
@@ -26,7 +26,7 @@ import android.os.AsyncTask;
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.cyanogenmod.eleven.R;
+import org.lineageos.eleven.R;
 
 public class VisualizerView extends View {
     private Paint mPaint;
-- 
cgit v1.2.3