diff --git a/.classpath b/.classpath
index 5b9cd4b..c117472 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="app/src/main/java"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="con" path="org.eclipse.andmore.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.andmore.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.andmore.DEPENDENCIES"/>
-	<classpathentry kind="lib" path="/home/didi/Android/Sdk/tools/lib/guava-20.0.jar"/>
-	<classpathentry kind="output" path="bin/classes"/>
+	<classpathentry kind="lib" path="/home/didi/Android/Sdk/build-tools/28.0.3/renderscript/lib/renderscript-v8.jar"/>
+	<classpathentry kind="lib" path="libs/guava-24.1-jre.jar"/>
+	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/README.md b/README.md
index 4bf7788..b68bb1f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Eleven music player (CyanogenMod/LineageOS) - compatible with Android version >1
 Copied from https://github.com/LineageOS/android_packages_apps_Eleven/archive/cm-14.1.zip (03.08.2017)
 
 Moved to lineage-15.1 branch.
-Merged with upstream project on 06.04.2018
+Merged with upstream project on 31.12.2018
 
 Made compatibility changes for android version >14 using as much material design as possible
 
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..31716a1
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,64 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
+
+    defaultConfig {
+        applicationId "org.lineageos.eleven"
+        targetSdkVersion 28
+        renderscriptTargetApi 28
+        renderscriptSupportModeEnabled true
+        versionCode 3
+        versionName "3.0"
+
+        vectorDrawables.useSupportLibrary = true  
+    }
+
+    signingConfigs {
+        release {
+            storeFile file("/home/didi/eclipse/DevStore")
+            storePassword "test123"
+            keyAlias "TestKey"
+            keyPassword "1234567890"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility "1.8"
+        targetCompatibility "1.8"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+            signingConfig signingConfigs.release
+        }
+    }
+
+    lintOptions {
+        disable 'ExtraTranslation', 'MissingTranslation', 'MissingQuantity'
+        disable 'ProtectedPermissions'
+        disable 'AppLinkUrlError', 'StringFormatInvalid'
+    }
+
+    useLibrary 'android.test.runner'
+
+    useLibrary 'android.test.base'
+    useLibrary 'android.test.mock'
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.palette:palette:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.media:media:1.0.0'
+    implementation 'com.google.guava:guava:24.1-jre'
+}
+
diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 98%
rename from AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
index 5d4c73d..22e151a 100644
--- a/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
 
     <uses-sdk
         android:minSdkVersion="14"
-        android:targetSdkVersion="27" />
+        android:targetSdkVersion="28" />
 
     <original-package android:name="com.cyanogenmod.eleven" />
 
@@ -45,6 +45,8 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <!-- Allows Eleven to modify media files on external storage -->
     <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
+    <!-- For Android Pie -->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <!-- Audio Visualizer Permissions -->
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
diff --git a/src/main/aidl/org/lineageos/eleven/IElevenService.aidl b/app/src/main/aidl/org/lineageos/eleven/IElevenService.aidl
similarity index 100%
rename from src/main/aidl/org/lineageos/eleven/IElevenService.aidl
rename to app/src/main/aidl/org/lineageos/eleven/IElevenService.aidl
diff --git a/src/main/aidl/org/lineageos/eleven/service/MusicPlaybackTrack.aidl b/app/src/main/aidl/org/lineageos/eleven/service/MusicPlaybackTrack.aidl
similarity index 100%
rename from src/main/aidl/org/lineageos/eleven/service/MusicPlaybackTrack.aidl
rename to app/src/main/aidl/org/lineageos/eleven/service/MusicPlaybackTrack.aidl
diff --git a/assets/Roboto-Light.ttf b/app/src/main/assets/Roboto-Light.ttf
similarity index 100%
rename from assets/Roboto-Light.ttf
rename to app/src/main/assets/Roboto-Light.ttf
diff --git a/assets/Roboto-Medium.ttf b/app/src/main/assets/Roboto-Medium.ttf
similarity index 100%
rename from assets/Roboto-Medium.ttf
rename to app/src/main/assets/Roboto-Medium.ttf
diff --git a/assets/Roboto-Regular.ttf b/app/src/main/assets/Roboto-Regular.ttf
similarity index 100%
rename from assets/Roboto-Regular.ttf
rename to app/src/main/assets/Roboto-Regular.ttf
diff --git a/assets/licenses.html b/app/src/main/assets/licenses.html
similarity index 97%
rename from assets/licenses.html
rename to app/src/main/assets/licenses.html
index e238ddc..558e0b3 100644
--- a/assets/licenses.html
+++ b/app/src/main/assets/licenses.html
@@ -67,11 +67,11 @@ <h3>Notices for files:</h3><ul>
 </body></html>
 
 <h3>Notices for file:</h3><ul>
-<li>android-support-v4.jar</li>
+<li>guava-24.1-jre.jar</li>
 </ul>
 <pre>
 /*
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright (C) 2010 The Guava Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/lineageos/eleven/Config.java b/app/src/main/java/org/lineageos/eleven/Config.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/Config.java
rename to app/src/main/java/org/lineageos/eleven/Config.java
diff --git a/src/main/java/org/lineageos/eleven/ElevenApplication.java b/app/src/main/java/org/lineageos/eleven/ElevenApplication.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ElevenApplication.java
rename to app/src/main/java/org/lineageos/eleven/ElevenApplication.java
diff --git a/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java b/app/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java
similarity index 91%
rename from src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java
rename to app/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java
index 2c6a607..432b7fb 100644
--- a/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java
+++ b/app/src/main/java/org/lineageos/eleven/MediaButtonIntentReceiver.java
@@ -14,9 +14,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.media.AudioManager;
-import android.support.v4.content.WakefulBroadcastReceiver;
+import android.os.Build;
 import android.util.Log;
 import android.view.KeyEvent;
+import androidx.core.content.ContextCompat;
+import androidx.legacy.content.WakefulBroadcastReceiver;
 
 public class MediaButtonIntentReceiver extends WakefulBroadcastReceiver {
     private static final boolean DEBUG = false;
@@ -76,6 +78,10 @@ private static void startService(Context context, String command, long timestamp
         i.putExtra(MusicPlaybackService.CMDNAME, command);
         i.putExtra(MusicPlaybackService.FROM_MEDIA_BUTTON, true);
         i.putExtra(MusicPlaybackService.TIMESTAMP, timestamp);
-        startWakefulService(context, i);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            ContextCompat.startForegroundService(context, i);
+        } else {
+            startWakefulService(context, i);
+        }
     }
 }
diff --git a/src/main/java/org/lineageos/eleven/MusicPlaybackService.java b/app/src/main/java/org/lineageos/eleven/MusicPlaybackService.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/MusicPlaybackService.java
rename to app/src/main/java/org/lineageos/eleven/MusicPlaybackService.java
index 04092c4..a7c4972 100644
--- a/src/main/java/org/lineageos/eleven/MusicPlaybackService.java
+++ b/app/src/main/java/org/lineageos/eleven/MusicPlaybackService.java
@@ -17,8 +17,6 @@
 import android.annotation.SuppressLint;
 import android.app.AlarmManager;
 import android.app.Notification;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.media.app.NotificationCompat.MediaStyle;
 import android.app.NotificationManager;
 import android.app.NotificationChannel;
 import android.app.PendingIntent;
@@ -39,13 +37,8 @@
 import android.hardware.SensorManager;
 import android.media.AudioManager;
 import android.media.AudioManager.OnAudioFocusChangeListener;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.media.MediaDescriptionCompat;
-import android.support.v4.media.MediaMetadataCompat;
 import android.media.MediaPlayer;
 import android.media.audiofx.AudioEffect;
-import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -60,10 +53,17 @@
 import android.provider.MediaStore;
 import android.provider.MediaStore.Audio.AlbumColumns;
 import android.provider.MediaStore.Audio.AudioColumns;
+import android.support.v4.media.MediaDescriptionCompat;
+import android.support.v4.media.MediaMetadataCompat;
+import android.support.v4.media.session.MediaSessionCompat;
+import android.support.v4.media.session.PlaybackStateCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.LongSparseArray;
 import android.view.KeyEvent;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
+import androidx.media.app.NotificationCompat.MediaStyle;
 
 import org.lineageos.eleven.Config.IdType;
 import org.lineageos.eleven.appwidgets.AppWidgetLarge;
@@ -100,7 +100,6 @@
 public class MusicPlaybackService extends Service {
     private static final String TAG = "MusicPlaybackService";
     private static final boolean D = false;
-    public static final String CHANNEL_ID = "eleven_channel_01";
 
     /**
      * Indicates that the music has paused or resumed
@@ -342,6 +341,8 @@ public class MusicPlaybackService extends Service {
      */
     public static final int MAX_HISTORY_SIZE = 1000;
 
+    private static final String CHANNEL_NAME = "eleven_playback";
+
     public interface TrackErrorExtra {
         /**
          * Name of the track that was unable to play
@@ -628,13 +629,6 @@ public void onCreate() {
 
         mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            CharSequence channelName = "Eleven";
-            // Create channel to show notifications.
-            mNotificationManager.createNotificationChannel(new NotificationChannel(CHANNEL_ID,
-                    channelName, NotificationManager.IMPORTANCE_LOW));
-        }
-
         // Initialize the favorites and recents databases
         mRecentsCache = RecentStore.getInstance(this);
 
@@ -916,7 +910,7 @@ private void handleHeadsetHookClick(long timestamp) {
         if (mHeadsetHookWakeLock == null) {
             PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
             mHeadsetHookWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
-                    "Eleven headset button");
+                    "Eleven:headset button");
             mHeadsetHookWakeLock.setReferenceCounted(false);
         }
         // Make sure we don't indefinitely hold the wake lock under any circumstances
@@ -1659,7 +1653,7 @@ private Notification buildNotification() {
             mNotificationPostTime = System.currentTimeMillis();
         }
 
-        android.support.v4.app.NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_ID)
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(this, CHANNEL_NAME)
                     .setSmallIcon(R.drawable.ic_notification)
                     .setLargeIcon(artwork.getBitmap())
                     .setContentIntent(clickIntent)
@@ -1680,6 +1674,25 @@ private Notification buildNotification() {
 
         builder.setColor(artwork.getVibrantDarkColor());
 
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = mNotificationManager
+                    .getNotificationChannel(CHANNEL_NAME);
+
+            if (channel == null) {
+                String name = getString(R.string.channel_music);
+
+                channel = new NotificationChannel(CHANNEL_NAME, name,
+                        mNotificationManager.IMPORTANCE_DEFAULT);
+                channel.setShowBadge(false);
+                channel.enableVibration(false);
+                channel.setSound(null, null);
+                mNotificationManager.createNotificationChannel(channel);
+            }
+
+            builder.setChannelId(channel.getId());
+        }
+
         return builder.build();
     }
 
diff --git a/src/main/java/org/lineageos/eleven/MusicStateListener.java b/app/src/main/java/org/lineageos/eleven/MusicStateListener.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/MusicStateListener.java
rename to app/src/main/java/org/lineageos/eleven/MusicStateListener.java
diff --git a/src/main/java/org/lineageos/eleven/adapters/AlbumAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/AlbumAdapter.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/adapters/AlbumAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/AlbumAdapter.java
diff --git a/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
index 50d513c..604429a 100644
--- a/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
+++ b/app/src/main/java/org/lineageos/eleven/adapters/AlbumArtPagerAdapter.java
@@ -19,13 +19,13 @@
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
@@ -40,7 +40,7 @@
 import java.util.LinkedList;
 
 /**
- * A {@link android.support.v4.app.FragmentStatePagerAdapter} class for swiping between album art
+ * A {@link androidx.fragment.app.FragmentStatePagerAdapter} class for swiping between album art
  */
 public class AlbumArtPagerAdapter extends FragmentStatePagerAdapter {
     private static boolean DEBUG = false;
diff --git a/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
index 8f6fc34..529df6f 100644
--- a/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
+++ b/app/src/main/java/org/lineageos/eleven/adapters/AlbumDetailSongAdapter.java
@@ -18,9 +18,9 @@
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.TextView;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java
index 59e07b7..66623a3 100644
--- a/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java
+++ b/app/src/main/java/org/lineageos/eleven/adapters/ArtistAdapter.java
@@ -15,11 +15,11 @@
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
diff --git a/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
index 66fec09..c138eb3 100644
--- a/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
+++ b/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailAlbumAdapter.java
@@ -17,14 +17,14 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.RecyclerView;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
index c55025b..90c8273 100644
--- a/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
+++ b/app/src/main/java/org/lineageos/eleven/adapters/ArtistDetailSongAdapter.java
@@ -18,10 +18,10 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java
index 697a9dd..e6b3d64 100644
--- a/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java
+++ b/app/src/main/java/org/lineageos/eleven/adapters/DetailSongAdapter.java
@@ -1,8 +1,6 @@
 package org.lineageos.eleven.adapters;
 
 import android.app.Activity;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +9,8 @@
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java
index b7eea13..1f76e3f 100644
--- a/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java
+++ b/app/src/main/java/org/lineageos/eleven/adapters/PagerAdapter.java
@@ -15,11 +15,11 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
 import android.util.SparseArray;
 import android.view.ViewGroup;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.fragments.AlbumFragment;
diff --git a/src/main/java/org/lineageos/eleven/adapters/PlaylistAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/PlaylistAdapter.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/adapters/PlaylistAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/PlaylistAdapter.java
diff --git a/src/main/java/org/lineageos/eleven/adapters/ProfileSongAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/ProfileSongAdapter.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/adapters/ProfileSongAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/ProfileSongAdapter.java
diff --git a/src/main/java/org/lineageos/eleven/adapters/SongAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/SongAdapter.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/adapters/SongAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/SongAdapter.java
diff --git a/src/main/java/org/lineageos/eleven/adapters/SummarySearchAdapter.java b/app/src/main/java/org/lineageos/eleven/adapters/SummarySearchAdapter.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/adapters/SummarySearchAdapter.java
rename to app/src/main/java/org/lineageos/eleven/adapters/SummarySearchAdapter.java
diff --git a/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetBase.java b/app/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetBase.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/appwidgets/AppWidgetBase.java
rename to app/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetBase.java
diff --git a/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLarge.java b/app/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
rename to app/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLarge.java
diff --git a/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java b/app/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
rename to app/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetLargeAlternate.java
diff --git a/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetSmall.java b/app/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
rename to app/src/main/java/org/lineageos/eleven/appwidgets/AppWidgetSmall.java
diff --git a/src/main/java/org/lineageos/eleven/cache/BitmapWorkerTask.java b/app/src/main/java/org/lineageos/eleven/cache/BitmapWorkerTask.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/cache/BitmapWorkerTask.java
rename to app/src/main/java/org/lineageos/eleven/cache/BitmapWorkerTask.java
diff --git a/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java b/app/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
similarity index 82%
rename from src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
rename to app/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
index ecae723..351db41 100644
--- a/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
+++ b/app/src/main/java/org/lineageos/eleven/cache/BlurBitmapWorkerTask.java
@@ -19,11 +19,18 @@
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
+import android.util.Log;
+import android.widget.ImageView;
+// Because of androidx.renderscript issue https://issuetracker.google.com/u/0/issues/119582492
+// Using android.support.v8.Renderscript-Libraries instead of androidx.renderscript
 import android.support.v8.renderscript.Allocation;
+//import androidx.renderscript.Allocation;
 import android.support.v8.renderscript.Element;
+//import androidx.renderscript.Element;
 import android.support.v8.renderscript.RenderScript;
+//import androidx.renderscript.RenderScript;
 import android.support.v8.renderscript.ScriptIntrinsicBlur;
-import android.widget.ImageView;
+//import androidx.renderscript.ScriptIntrinsicBlur;
 
 import org.lineageos.eleven.cache.ImageWorker.ImageType;
 import org.lineageos.eleven.widgets.BlurScrimImage;
@@ -35,6 +42,9 @@
  * BlurScrimImage
  */
 public class BlurBitmapWorkerTask extends BitmapWorkerTask<String, Void, BlurBitmapWorkerTask.ResultContainer> {
+
+    private static final String TAG = BlurBitmapWorkerTask.class.getSimpleName();
+
     // if the image is too small, the blur will look bad post scale up so we use the min size
     // to scale up before bluring
     private static final int MIN_BITMAP_SIZE = 500;
@@ -114,19 +124,24 @@ protected ResultContainer doInBackground(final String... params) {
 
             // run the blur multiple times
             for (int i = 0; i < NUM_BLUR_RUNS; i++) {
-                final Allocation inputAlloc = Allocation.createFromBitmap(mRenderScript, input);
-                final Allocation outputAlloc = Allocation.createTyped(mRenderScript,
-                        inputAlloc.getType());
-                final ScriptIntrinsicBlur script = ScriptIntrinsicBlur.create(mRenderScript,
-                        Element.U8_4(mRenderScript));
-
-                script.setRadius(BLUR_RADIUS);
-                script.setInput(inputAlloc);
-                script.forEach(outputAlloc);
-                outputAlloc.copyTo(output);
-
-                // if we run more than 1 blur, the new input should be the old output
-                input = output;
+                try {
+                    final Allocation inputAlloc = Allocation.createFromBitmap(mRenderScript, input);
+                    final Allocation outputAlloc = Allocation.createTyped(mRenderScript,
+                            inputAlloc.getType());
+                    final ScriptIntrinsicBlur script = ScriptIntrinsicBlur.create(mRenderScript,
+                            Element.U8_4(mRenderScript));
+
+                    script.setRadius(BLUR_RADIUS);
+                    script.setInput(inputAlloc);
+                    script.forEach(outputAlloc);
+                    outputAlloc.copyTo(output);
+
+                    // if we run more than 1 blur, the new input should be the old output
+                    input = output;
+                } catch (RuntimeException e) {
+                    Log.w(TAG, "Cannot blur image. " + e.getMessage());
+                    break;
+                }
             }
 
             // Set the scrim color to be 50% gray
diff --git a/src/main/java/org/lineageos/eleven/cache/DiskLruCache.java b/app/src/main/java/org/lineageos/eleven/cache/DiskLruCache.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/cache/DiskLruCache.java
rename to app/src/main/java/org/lineageos/eleven/cache/DiskLruCache.java
diff --git a/src/main/java/org/lineageos/eleven/cache/ICacheListener.java b/app/src/main/java/org/lineageos/eleven/cache/ICacheListener.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/cache/ICacheListener.java
rename to app/src/main/java/org/lineageos/eleven/cache/ICacheListener.java
diff --git a/src/main/java/org/lineageos/eleven/cache/ImageCache.java b/app/src/main/java/org/lineageos/eleven/cache/ImageCache.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/cache/ImageCache.java
rename to app/src/main/java/org/lineageos/eleven/cache/ImageCache.java
diff --git a/src/main/java/org/lineageos/eleven/cache/ImageFetcher.java b/app/src/main/java/org/lineageos/eleven/cache/ImageFetcher.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/cache/ImageFetcher.java
rename to app/src/main/java/org/lineageos/eleven/cache/ImageFetcher.java
diff --git a/src/main/java/org/lineageos/eleven/cache/ImageWorker.java b/app/src/main/java/org/lineageos/eleven/cache/ImageWorker.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/cache/ImageWorker.java
rename to app/src/main/java/org/lineageos/eleven/cache/ImageWorker.java
index 980fd82..8d7fd1b 100644
--- a/src/main/java/org/lineageos/eleven/cache/ImageWorker.java
+++ b/app/src/main/java/org/lineageos/eleven/cache/ImageWorker.java
@@ -21,10 +21,13 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.TransitionDrawable;
-import android.support.v8.renderscript.RenderScript;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
+// Because of androidx.renderscript issue https://issuetracker.google.com/u/0/issues/119582492
+// Using android.support.v8.Renderscript-Libraries instead of androidx.renderscript
+import android.support.v8.renderscript.RenderScript;
+//import androidx.renderscript.RenderScript;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.provider.PlaylistArtworkStore;
diff --git a/src/main/java/org/lineageos/eleven/cache/LruCache.java b/app/src/main/java/org/lineageos/eleven/cache/LruCache.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/cache/LruCache.java
rename to app/src/main/java/org/lineageos/eleven/cache/LruCache.java
diff --git a/src/main/java/org/lineageos/eleven/cache/PlaylistWorkerTask.java b/app/src/main/java/org/lineageos/eleven/cache/PlaylistWorkerTask.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/cache/PlaylistWorkerTask.java
rename to app/src/main/java/org/lineageos/eleven/cache/PlaylistWorkerTask.java
diff --git a/src/main/java/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java b/app/src/main/java/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
rename to app/src/main/java/org/lineageos/eleven/cache/SimpleBitmapWorkerTask.java
diff --git a/src/main/java/org/lineageos/eleven/dragdrop/DragSortController.java b/app/src/main/java/org/lineageos/eleven/dragdrop/DragSortController.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/dragdrop/DragSortController.java
rename to app/src/main/java/org/lineageos/eleven/dragdrop/DragSortController.java
diff --git a/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java b/app/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java
rename to app/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java
index 5839006..ea862fc 100644
--- a/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java
+++ b/app/src/main/java/org/lineageos/eleven/dragdrop/DragSortListView.java
@@ -18,7 +18,6 @@
 import android.graphics.Point;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
-import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
@@ -30,6 +29,7 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 
diff --git a/src/main/java/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java b/app/src/main/java/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
rename to app/src/main/java/org/lineageos/eleven/dragdrop/SimpleFloatViewManager.java
diff --git a/src/main/java/org/lineageos/eleven/format/Capitalize.java b/app/src/main/java/org/lineageos/eleven/format/Capitalize.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/format/Capitalize.java
rename to app/src/main/java/org/lineageos/eleven/format/Capitalize.java
diff --git a/src/main/java/org/lineageos/eleven/format/PrefixHighlighter.java b/app/src/main/java/org/lineageos/eleven/format/PrefixHighlighter.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/format/PrefixHighlighter.java
rename to app/src/main/java/org/lineageos/eleven/format/PrefixHighlighter.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/Album.java b/app/src/main/java/org/lineageos/eleven/lastfm/Album.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/Album.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/Album.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/Artist.java b/app/src/main/java/org/lineageos/eleven/lastfm/Artist.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/Artist.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/Artist.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/Caller.java b/app/src/main/java/org/lineageos/eleven/lastfm/Caller.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/lastfm/Caller.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/Caller.java
index c312f88..c096b53 100644
--- a/src/main/java/org/lineageos/eleven/lastfm/Caller.java
+++ b/app/src/main/java/org/lineageos/eleven/lastfm/Caller.java
@@ -76,7 +76,7 @@ public class Caller {
 
     private final String apiRootUrl = DEFAULT_API_ROOT;
 
-    private final String userAgent = "Apollo";
+    private final String userAgent = "Eleven";
 
     private Result lastResult;
 
diff --git a/src/main/java/org/lineageos/eleven/lastfm/DomElement.java b/app/src/main/java/org/lineageos/eleven/lastfm/DomElement.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/DomElement.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/DomElement.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/Image.java b/app/src/main/java/org/lineageos/eleven/lastfm/Image.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/Image.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/Image.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/ImageHolder.java b/app/src/main/java/org/lineageos/eleven/lastfm/ImageHolder.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/ImageHolder.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/ImageHolder.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/ImageSize.java b/app/src/main/java/org/lineageos/eleven/lastfm/ImageSize.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/ImageSize.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/ImageSize.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/ItemFactory.java b/app/src/main/java/org/lineageos/eleven/lastfm/ItemFactory.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/ItemFactory.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/ItemFactory.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java b/app/src/main/java/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/ItemFactoryBuilder.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/MapUtilities.java b/app/src/main/java/org/lineageos/eleven/lastfm/MapUtilities.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/MapUtilities.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/MapUtilities.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/MusicEntry.java b/app/src/main/java/org/lineageos/eleven/lastfm/MusicEntry.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/MusicEntry.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/MusicEntry.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/PaginatedResult.java b/app/src/main/java/org/lineageos/eleven/lastfm/PaginatedResult.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/PaginatedResult.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/PaginatedResult.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/ResponseBuilder.java b/app/src/main/java/org/lineageos/eleven/lastfm/ResponseBuilder.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/ResponseBuilder.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/ResponseBuilder.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/Result.java b/app/src/main/java/org/lineageos/eleven/lastfm/Result.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/Result.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/Result.java
diff --git a/src/main/java/org/lineageos/eleven/lastfm/StringUtilities.java b/app/src/main/java/org/lineageos/eleven/lastfm/StringUtilities.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/lastfm/StringUtilities.java
rename to app/src/main/java/org/lineageos/eleven/lastfm/StringUtilities.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/AlbumLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/AlbumLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/AlbumLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/AlbumLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/AlbumSongLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/AlbumSongLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/AlbumSongLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/AlbumSongLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/ArtistLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/ArtistLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/ArtistLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/ArtistLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/AsyncHandler.java b/app/src/main/java/org/lineageos/eleven/loaders/AsyncHandler.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/AsyncHandler.java
rename to app/src/main/java/org/lineageos/eleven/loaders/AsyncHandler.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/LastAddedLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/LastAddedLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/LastAddedLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/LastAddedLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/NowPlayingCursor.java b/app/src/main/java/org/lineageos/eleven/loaders/NowPlayingCursor.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/NowPlayingCursor.java
rename to app/src/main/java/org/lineageos/eleven/loaders/NowPlayingCursor.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/PlaylistLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/PlaylistLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/PlaylistLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/PlaylistLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/PlaylistSongLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/PlaylistSongLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/PlaylistSongLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/PlaylistSongLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/QueueLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/QueueLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/QueueLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/QueueLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/SearchLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/SearchLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/SearchLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/SearchLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/SongLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/SongLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/SongLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/SongLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/SortedCursor.java b/app/src/main/java/org/lineageos/eleven/loaders/SortedCursor.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/SortedCursor.java
rename to app/src/main/java/org/lineageos/eleven/loaders/SortedCursor.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/TopTracksLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/TopTracksLoader.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/loaders/TopTracksLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/TopTracksLoader.java
diff --git a/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java b/app/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
similarity index 96%
rename from src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
rename to app/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
index de4271e..250fb98 100644
--- a/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
+++ b/app/src/main/java/org/lineageos/eleven/loaders/WrappedAsyncTaskLoader.java
@@ -2,7 +2,7 @@
 package org.lineageos.eleven.loaders;
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 /**
  * <a href="http://code.google.com/p/android/issues/detail?id=14944">Issue
diff --git a/src/main/java/org/lineageos/eleven/locale/AlphabeticIndexCompat.java b/app/src/main/java/org/lineageos/eleven/locale/AlphabeticIndexCompat.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/locale/AlphabeticIndexCompat.java
rename to app/src/main/java/org/lineageos/eleven/locale/AlphabeticIndexCompat.java
diff --git a/src/main/java/org/lineageos/eleven/locale/HanziToPinyin.java b/app/src/main/java/org/lineageos/eleven/locale/HanziToPinyin.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/locale/HanziToPinyin.java
rename to app/src/main/java/org/lineageos/eleven/locale/HanziToPinyin.java
diff --git a/src/main/java/org/lineageos/eleven/locale/LocaleChangeReceiver.java b/app/src/main/java/org/lineageos/eleven/locale/LocaleChangeReceiver.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/locale/LocaleChangeReceiver.java
rename to app/src/main/java/org/lineageos/eleven/locale/LocaleChangeReceiver.java
diff --git a/src/main/java/org/lineageos/eleven/locale/LocaleSet.java b/app/src/main/java/org/lineageos/eleven/locale/LocaleSet.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/locale/LocaleSet.java
rename to app/src/main/java/org/lineageos/eleven/locale/LocaleSet.java
diff --git a/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java b/app/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java
rename to app/src/main/java/org/lineageos/eleven/locale/LocaleSetManager.java
diff --git a/src/main/java/org/lineageos/eleven/locale/LocaleUtility.java b/app/src/main/java/org/lineageos/eleven/locale/LocaleUtility.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/locale/LocaleUtility.java
rename to app/src/main/java/org/lineageos/eleven/locale/LocaleUtility.java
diff --git a/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java b/app/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/locale/LocaleUtils.java
rename to app/src/main/java/org/lineageos/eleven/locale/LocaleUtils.java
diff --git a/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java b/app/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java
rename to app/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java
index 1c63ebf..3c4def1 100644
--- a/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java
+++ b/app/src/main/java/org/lineageos/eleven/menu/BasePlaylistDialog.java
@@ -13,12 +13,10 @@
 
 package org.lineageos.eleven.menu;
 
-import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
@@ -26,6 +24,8 @@
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.EditText;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.utils.MusicUtils;
diff --git a/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java b/app/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java
similarity index 95%
rename from src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java
rename to app/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java
index 3f05081..44f7262 100644
--- a/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java
+++ b/app/src/main/java/org/lineageos/eleven/menu/ConfirmDialog.java
@@ -16,14 +16,14 @@
 
 package org.lineageos.eleven.menu;
 
-import android.support.v7.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.view.ViewGroup;
-import android.support.v4.app.Fragment;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
+import androidx.fragment.app.Fragment;
 
 import org.lineageos.eleven.R;
 
diff --git a/src/main/java/org/lineageos/eleven/menu/CreateNewPlaylist.java b/app/src/main/java/org/lineageos/eleven/menu/CreateNewPlaylist.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/menu/CreateNewPlaylist.java
rename to app/src/main/java/org/lineageos/eleven/menu/CreateNewPlaylist.java
diff --git a/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java b/app/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/menu/DeleteDialog.java
rename to app/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java
index f8b3a9b..3587cb3 100644
--- a/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java
+++ b/app/src/main/java/org/lineageos/eleven/menu/DeleteDialog.java
@@ -13,13 +13,13 @@
 
 package org.lineageos.eleven.menu;
 
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.view.ViewGroup;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.Bundle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/menu/FragmentMenuItems.java b/app/src/main/java/org/lineageos/eleven/menu/FragmentMenuItems.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/menu/FragmentMenuItems.java
rename to app/src/main/java/org/lineageos/eleven/menu/FragmentMenuItems.java
diff --git a/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java b/app/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java
similarity index 96%
rename from src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java
rename to app/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java
index 616c132..9fc89c9 100644
--- a/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java
+++ b/app/src/main/java/org/lineageos/eleven/menu/PhotoSelectionDialog.java
@@ -13,14 +13,14 @@
 
 package org.lineageos.eleven.menu;
 
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatDialogFragment;
 import android.view.ViewGroup;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatDialogFragment;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
@@ -124,7 +124,7 @@ private void setArtistChoices() {
         // Select a photo from the gallery
         mChoices.add(NEW_PHOTO, getString(R.string.new_photo));
         /* Disable fetching image until we find a last.fm replacement
-        if (ApolloUtils.isOnline(getActivity())) {
+        if (ElevenUtils.isOnline(getActivity())) {
             // Option to fetch the old artist image
             mChoices.add(OLD_PHOTO, getString(R.string.context_menu_fetch_artist_image));
         }*/
@@ -138,7 +138,7 @@ private void setAlbumChoices() {
         mChoices.add(NEW_PHOTO, getString(R.string.new_photo));
         /* Disable fetching image until we find a last.fm replacement
         // Option to fetch the old album image
-        if (ApolloUtils.isOnline(getActivity())) {
+        if (ElevenUtils.isOnline(getActivity())) {
             // Option to fetch the old artist image
             mChoices.add(OLD_PHOTO, getString(R.string.context_menu_fetch_album_art));
         }*/
diff --git a/src/main/java/org/lineageos/eleven/menu/RenamePlaylist.java b/app/src/main/java/org/lineageos/eleven/menu/RenamePlaylist.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/menu/RenamePlaylist.java
rename to app/src/main/java/org/lineageos/eleven/menu/RenamePlaylist.java
diff --git a/src/main/java/org/lineageos/eleven/model/Album.java b/app/src/main/java/org/lineageos/eleven/model/Album.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/model/Album.java
rename to app/src/main/java/org/lineageos/eleven/model/Album.java
diff --git a/src/main/java/org/lineageos/eleven/model/AlbumArtistDetails.java b/app/src/main/java/org/lineageos/eleven/model/AlbumArtistDetails.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/model/AlbumArtistDetails.java
rename to app/src/main/java/org/lineageos/eleven/model/AlbumArtistDetails.java
diff --git a/src/main/java/org/lineageos/eleven/model/Artist.java b/app/src/main/java/org/lineageos/eleven/model/Artist.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/model/Artist.java
rename to app/src/main/java/org/lineageos/eleven/model/Artist.java
diff --git a/src/main/java/org/lineageos/eleven/model/Genre.java b/app/src/main/java/org/lineageos/eleven/model/Genre.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/model/Genre.java
rename to app/src/main/java/org/lineageos/eleven/model/Genre.java
diff --git a/src/main/java/org/lineageos/eleven/model/Playlist.java b/app/src/main/java/org/lineageos/eleven/model/Playlist.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/model/Playlist.java
rename to app/src/main/java/org/lineageos/eleven/model/Playlist.java
diff --git a/src/main/java/org/lineageos/eleven/model/SearchResult.java b/app/src/main/java/org/lineageos/eleven/model/SearchResult.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/model/SearchResult.java
rename to app/src/main/java/org/lineageos/eleven/model/SearchResult.java
diff --git a/src/main/java/org/lineageos/eleven/model/Song.java b/app/src/main/java/org/lineageos/eleven/model/Song.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/model/Song.java
rename to app/src/main/java/org/lineageos/eleven/model/Song.java
diff --git a/src/main/java/org/lineageos/eleven/provider/LocalizedStore.java b/app/src/main/java/org/lineageos/eleven/provider/LocalizedStore.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/provider/LocalizedStore.java
rename to app/src/main/java/org/lineageos/eleven/provider/LocalizedStore.java
diff --git a/src/main/java/org/lineageos/eleven/provider/MusicDB.java b/app/src/main/java/org/lineageos/eleven/provider/MusicDB.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/provider/MusicDB.java
rename to app/src/main/java/org/lineageos/eleven/provider/MusicDB.java
diff --git a/src/main/java/org/lineageos/eleven/provider/MusicPlaybackState.java b/app/src/main/java/org/lineageos/eleven/provider/MusicPlaybackState.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/provider/MusicPlaybackState.java
rename to app/src/main/java/org/lineageos/eleven/provider/MusicPlaybackState.java
diff --git a/src/main/java/org/lineageos/eleven/provider/PlaylistArtworkStore.java b/app/src/main/java/org/lineageos/eleven/provider/PlaylistArtworkStore.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/provider/PlaylistArtworkStore.java
rename to app/src/main/java/org/lineageos/eleven/provider/PlaylistArtworkStore.java
diff --git a/src/main/java/org/lineageos/eleven/provider/PropertiesStore.java b/app/src/main/java/org/lineageos/eleven/provider/PropertiesStore.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/provider/PropertiesStore.java
rename to app/src/main/java/org/lineageos/eleven/provider/PropertiesStore.java
diff --git a/src/main/java/org/lineageos/eleven/provider/RecentStore.java b/app/src/main/java/org/lineageos/eleven/provider/RecentStore.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/provider/RecentStore.java
rename to app/src/main/java/org/lineageos/eleven/provider/RecentStore.java
diff --git a/src/main/java/org/lineageos/eleven/provider/SearchHistory.java b/app/src/main/java/org/lineageos/eleven/provider/SearchHistory.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/provider/SearchHistory.java
rename to app/src/main/java/org/lineageos/eleven/provider/SearchHistory.java
diff --git a/src/main/java/org/lineageos/eleven/provider/SongPlayCount.java b/app/src/main/java/org/lineageos/eleven/provider/SongPlayCount.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/provider/SongPlayCount.java
rename to app/src/main/java/org/lineageos/eleven/provider/SongPlayCount.java
diff --git a/src/main/java/org/lineageos/eleven/recycler/RecycleHolder.java b/app/src/main/java/org/lineageos/eleven/recycler/RecycleHolder.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/recycler/RecycleHolder.java
rename to app/src/main/java/org/lineageos/eleven/recycler/RecycleHolder.java
diff --git a/src/main/java/org/lineageos/eleven/sectionadapter/SectionAdapter.java b/app/src/main/java/org/lineageos/eleven/sectionadapter/SectionAdapter.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/sectionadapter/SectionAdapter.java
rename to app/src/main/java/org/lineageos/eleven/sectionadapter/SectionAdapter.java
diff --git a/src/main/java/org/lineageos/eleven/sectionadapter/SectionCreator.java b/app/src/main/java/org/lineageos/eleven/sectionadapter/SectionCreator.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/sectionadapter/SectionCreator.java
rename to app/src/main/java/org/lineageos/eleven/sectionadapter/SectionCreator.java
diff --git a/src/main/java/org/lineageos/eleven/sectionadapter/SectionListContainer.java b/app/src/main/java/org/lineageos/eleven/sectionadapter/SectionListContainer.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/sectionadapter/SectionListContainer.java
rename to app/src/main/java/org/lineageos/eleven/sectionadapter/SectionListContainer.java
diff --git a/src/main/java/org/lineageos/eleven/service/MusicPlaybackTrack.java b/app/src/main/java/org/lineageos/eleven/service/MusicPlaybackTrack.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/service/MusicPlaybackTrack.java
rename to app/src/main/java/org/lineageos/eleven/service/MusicPlaybackTrack.java
diff --git a/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java b/app/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
rename to app/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
index afd4027..4f9b94b 100644
--- a/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
+++ b/app/src/main/java/org/lineageos/eleven/slidinguppanel/SlidingUpPanelLayout.java
@@ -10,15 +10,15 @@
 import android.graphics.drawable.Drawable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.ViewCompat;
 import org.lineageos.eleven.R;
 
 public class SlidingUpPanelLayout extends ViewGroup {
@@ -1044,7 +1044,7 @@ private void onPanelDragged(int newTop) {
     @Override
     protected boolean drawChild(Canvas canvas, View child, long drawingTime) {
         boolean result;
-        final int save = canvas.save(Canvas.ALL_SAVE_FLAG);
+        final int save = canvas.save();
 
         if (isSlidingEnabled() && mMainView == child) {
             // Clip against the slider; no sense drawing what will immediately be covered,
diff --git a/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java b/app/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
rename to app/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
index 5627151..7182a7b 100644
--- a/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/slidinguppanel/ViewDragHelper.java
@@ -20,16 +20,16 @@
 import java.util.Arrays;
 
 import android.content.Context;
-import android.support.v4.view.MotionEventCompat;
-import android.support.v4.view.VelocityTrackerCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.ScrollerCompat;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.ViewGroup;
 import android.view.animation.Interpolator;
+import androidx.core.view.MotionEventCompat;
+import androidx.core.view.VelocityTrackerCompat;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.ScrollerCompat;
 
 /**
  * ViewDragHelper is a utility class for writing custom ViewGroups. It offers a number
diff --git a/src/main/java/org/lineageos/eleven/ui/HeaderBar.java b/app/src/main/java/org/lineageos/eleven/ui/HeaderBar.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/ui/HeaderBar.java
rename to app/src/main/java/org/lineageos/eleven/ui/HeaderBar.java
index 7dbf192..6ff250d 100644
--- a/src/main/java/org/lineageos/eleven/ui/HeaderBar.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/HeaderBar.java
@@ -16,7 +16,6 @@
 package org.lineageos.eleven.ui;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
 import android.util.AttributeSet;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -26,6 +25,7 @@
 import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import androidx.fragment.app.Fragment;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.loaders.NowPlayingCursor;
diff --git a/src/main/java/org/lineageos/eleven/ui/MusicHolder.java b/app/src/main/java/org/lineageos/eleven/ui/MusicHolder.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/MusicHolder.java
rename to app/src/main/java/org/lineageos/eleven/ui/MusicHolder.java
diff --git a/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java
rename to app/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java
index 7bf5dfa..3267951 100644
--- a/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/activities/BaseActivity.java
@@ -15,8 +15,6 @@
 
 import static org.lineageos.eleven.utils.MusicUtils.mService;
 
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -29,8 +27,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
 import android.util.TypedValue;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -38,7 +34,10 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.IElevenService;
 import org.lineageos.eleven.MusicPlaybackService;
diff --git a/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java
rename to app/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java
index f40f8ed..62a2cd9 100644
--- a/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/activities/HomeActivity.java
@@ -28,15 +28,15 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatDelegate;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.Window;
+import androidx.appcompat.app.AppCompatDelegate;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java
rename to app/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java
index 2db8933..0872dbe 100644
--- a/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/activities/SearchActivity.java
@@ -13,7 +13,6 @@
 
 package org.lineageos.eleven.ui.activities;
 
-import android.support.v7.app.ActionBar;
 import android.app.SearchManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -28,11 +27,6 @@
 import android.os.PowerManager;
 import android.provider.BaseColumns;
 import android.provider.MediaStore;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.Loader;
-import android.support.v4.view.MenuItemCompat;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -47,8 +41,14 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.SearchView.OnQueryTextListener;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.SearchView.OnQueryTextListener;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.IElevenService;
diff --git a/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java
similarity index 94%
rename from src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java
rename to app/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java
index 8043ea4..eff559e 100644
--- a/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/activities/SettingsActivity.java
@@ -19,11 +19,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.TypedValue;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.fragments.PreferenceFragment;
@@ -113,7 +113,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 PreferenceUtils.requestRecordAudio(this);    		   
             }
-        } if (key.equals(PreferenceUtils.SHAKE_TO_PLAY)) {
+        } else if (key.equals(PreferenceUtils.SHAKE_TO_PLAY)) {
             MusicUtils.setShakeToPlayEnabled(sharedPreferences.getBoolean(key, false));
         } else if (key.equals(PreferenceUtils.SHOW_ALBUM_ART_ON_LOCKSCREEN)) {
             MusicUtils.setShowAlbumArtOnLockscreen(sharedPreferences.getBoolean(key, true));
diff --git a/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
rename to app/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
index c681974..1d5f725 100644
--- a/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/activities/SlidingPanelActivity.java
@@ -15,10 +15,10 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.LinearLayout;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.slidinguppanel.SlidingUpPanelLayout;
diff --git a/src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java b/app/src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
rename to app/src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
index aff4b8b..4002f6b 100644
--- a/src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/activities/preview/AudioPreviewActivity.java
@@ -17,7 +17,6 @@
 package org.lineageos.eleven.ui.activities.preview;
 
 import android.app.Activity;
-import android.support.v7.app.AppCompatActivity;
 import android.content.AsyncQueryHandler;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -48,6 +47,7 @@
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.activities.preview.util.Logger;
 
diff --git a/src/main/java/org/lineageos/eleven/ui/activities/preview/PreviewSong.java b/app/src/main/java/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
rename to app/src/main/java/org/lineageos/eleven/ui/activities/preview/PreviewSong.java
diff --git a/src/main/java/org/lineageos/eleven/ui/activities/preview/util/Logger.java b/app/src/main/java/org/lineageos/eleven/ui/activities/preview/util/Logger.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/activities/preview/util/Logger.java
rename to app/src/main/java/org/lineageos/eleven/ui/activities/preview/util/Logger.java
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
index 826fbf0..94fb735 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumDetailFragment.java
@@ -16,11 +16,11 @@
 package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
+import androidx.loader.app.LoaderManager;
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.AlbumDetailSongAdapter;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java
index 7d81c66..2743775 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/AlbumFragment.java
@@ -15,8 +15,6 @@
 
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -25,6 +23,8 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.GridView;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
index 373e50c..0425a94 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistDetailFragment.java
@@ -17,15 +17,15 @@
 
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.ListView;
+import androidx.loader.app.LoaderManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.ArtistDetailAlbumAdapter;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java
index 2a421bc..1c9ad8d 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/ArtistFragment.java
@@ -16,9 +16,6 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +24,9 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
index 7016d64..74a1ef8 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/AudioPlayerFragment.java
@@ -30,9 +30,6 @@
 import android.os.IBinder;
 import android.os.Message;
 import android.os.PowerManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewPager;
 import android.text.Html;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -47,6 +44,9 @@
 import android.widget.ImageView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
 
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
@@ -160,7 +160,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
         // Control the media volume
         getActivity().setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
-        // Bind Apollo's service
+        // Bind Eleven's service
         mToken = MusicUtils.bindToService(getActivity(), this);
 
         // Initialize the image fetcher/cache
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java
index 969541f..6925b20 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/BaseFragment.java
@@ -16,12 +16,12 @@
 package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
 
 import org.lineageos.eleven.MusicStateListener;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/DetailFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/DetailFragment.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/fragments/DetailFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/DetailFragment.java
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/FadingBarFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/FadingBarFragment.java
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/IChildFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/IChildFragment.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/fragments/IChildFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/IChildFragment.java
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/ISetupActionBar.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/ISetupActionBar.java
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
index 2043444..986c9e2 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistDetailFragment.java
@@ -19,15 +19,15 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.PagerAdapter;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
index cbe3c2c..f09ba88 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/PlaylistFragment.java
@@ -14,15 +14,15 @@
 package org.lineageos.eleven.ui.fragments;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config.SmartPlaylistType;
 import org.lineageos.eleven.MusicStateListener;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java
similarity index 93%
rename from src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java
index dfb07af..c77d48b 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/PreferenceFragment.java
@@ -7,10 +7,10 @@
 
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
 import android.view.ViewGroup;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
 
 public class PreferenceFragment extends PreferenceFragmentCompat {
 
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java
index 9795a2b..e4ed00c 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/QueueFragment.java
@@ -24,15 +24,15 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.MediaStore;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.MusicPlaybackService;
@@ -251,7 +251,7 @@ public void onActivityCreated(final Bundle savedInstanceState) {
         // Initialize the broadcast receiver
         mQueueUpdateListener = new QueueUpdateListener(this);
 
-        // Bind Apollo's service
+        // Bind Eleven's service
         mToken = MusicUtils.bindToService(getActivity(), this);
     }
 
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java
index 3e7c751..a777075 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/RecentFragment.java
@@ -15,10 +15,10 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.Config.SmartPlaylistType;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java
index ccf8ead..856f0d9 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/SongFragment.java
@@ -15,8 +15,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.adapters.PagerAdapter;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/ViewOutlineProviderCompat.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/ViewOutlineProviderCompat.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/fragments/ViewOutlineProviderCompat.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/ViewOutlineProviderCompat.java
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
similarity index 91%
rename from src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
index caa2fc5..6985e35 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserFragment.java
@@ -16,9 +16,9 @@
 package org.lineageos.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
 
 /**
  * This class is used for fragments under the {@link MusicBrowserFragment}
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
index d5a92bb..5026b4f 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/phone/MusicBrowserPhoneFragment.java
@@ -14,11 +14,11 @@
 package org.lineageos.eleven.ui.fragments.phone;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.adapters.PagerAdapter;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
index aa7297c..2df0b75 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/BasicSongFragment.java
@@ -15,11 +15,6 @@
 
 import android.os.Bundle;
 import android.os.SystemClock;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -27,6 +22,11 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.MusicStateListener;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
index 8e96489..8748a65 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/LastAddedFragment.java
@@ -14,10 +14,10 @@
 package org.lineageos.eleven.ui.fragments.profile;
 
 import android.os.Bundle;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.Config.SmartPlaylistType;
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/profile/SmartPlaylistFragment.java
diff --git a/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
rename to app/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
index f6adc10..36ea5d2 100644
--- a/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
+++ b/app/src/main/java/org/lineageos/eleven/ui/fragments/profile/TopTracksFragment.java
@@ -15,11 +15,11 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import androidx.loader.content.Loader;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.Config.SmartPlaylistType;
diff --git a/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
rename to app/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
index d565b50..70cff8e 100644
--- a/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/AlbumPopupMenuHelper.java
@@ -17,9 +17,8 @@
 
 import android.app.Activity;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentManager;
-
 import android.view.MenuItem;
+import androidx.fragment.app.FragmentManager;
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.cache.ImageFetcher;
 import org.lineageos.eleven.menu.DeleteDialog;
diff --git a/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
rename to app/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
index 301acff..7c0e542 100644
--- a/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/ArtistPopupMenuHelper.java
@@ -16,9 +16,8 @@
 package org.lineageos.eleven.utils;
 
 import android.app.Activity;
-import android.support.v4.app.FragmentManager;
-
 import android.view.MenuItem;
+import androidx.fragment.app.FragmentManager;
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.menu.DeleteDialog;
 import org.lineageos.eleven.menu.FragmentMenuItems;
diff --git a/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java b/app/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/utils/BitmapUtils.java
rename to app/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java
index 12cd4aa..5b44de3 100644
--- a/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/BitmapUtils.java
@@ -18,11 +18,8 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.DrawableRes;
-import android.support.v7.view.menu.ListMenuPresenter;
-import android.support.v7.view.menu.MenuBuilder;
-import android.support.v7.view.menu.MenuPresenter;
-import android.support.v7.widget.AppCompatDrawableManager;
+import androidx.annotation.DrawableRes;
+import androidx.appcompat.widget.AppCompatDrawableManager;
 
 import java.lang.reflect.Method;
 
diff --git a/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java b/app/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java
rename to app/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java
index c493f3c..efbb9f8 100644
--- a/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/BitmapWithColors.java
@@ -18,9 +18,8 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Looper;
-import android.support.v7.graphics.Palette;
-import android.support.v7.graphics.Target;
 import android.util.LruCache;
+import androidx.palette.graphics.Palette;
 
 public class BitmapWithColors {
     private static final class BitmapColors {
diff --git a/src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java b/app/src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java
rename to app/src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java
index 3315fb3..6d6ef20 100644
--- a/src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/ContextMenuBuilder.java
@@ -29,8 +29,8 @@
 import android.view.SubMenu;
 import android.view.View;
 
-import android.support.v7.view.menu.MenuBuilder;
-import android.support.v7.view.menu.MenuItemImpl;
+import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.appcompat.view.menu.MenuItemImpl;
 
 
 /**
diff --git a/src/main/java/org/lineageos/eleven/utils/CustomTypefaceSpan.java b/app/src/main/java/org/lineageos/eleven/utils/CustomTypefaceSpan.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/CustomTypefaceSpan.java
rename to app/src/main/java/org/lineageos/eleven/utils/CustomTypefaceSpan.java
diff --git a/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java b/app/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/ElevenUtils.java
rename to app/src/main/java/org/lineageos/eleven/utils/ElevenUtils.java
diff --git a/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java b/app/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java
similarity index 87%
rename from src/main/java/org/lineageos/eleven/utils/GenreFetcher.java
rename to app/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java
index 4a52440..9162870 100644
--- a/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/GenreFetcher.java
@@ -4,13 +4,13 @@
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.CursorLoader;
-import android.support.v4.content.Loader;
 import android.view.View;
 import android.widget.TextView;
+import androidx.fragment.app.FragmentActivity;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.CursorLoader;
+import androidx.loader.content.Loader;
 
 public class GenreFetcher implements LoaderCallbacks<Cursor> {
     private static final String[] GENRE_PROJECTION = new String[] { MediaStore.Audio.Genres.NAME };
diff --git a/src/main/java/org/lineageos/eleven/utils/ImageUtils.java b/app/src/main/java/org/lineageos/eleven/utils/ImageUtils.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/ImageUtils.java
rename to app/src/main/java/org/lineageos/eleven/utils/ImageUtils.java
diff --git a/src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java b/app/src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java
similarity index 94%
rename from src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java
rename to app/src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java
index a42fad7..54b7eb0 100644
--- a/src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/ListMenuPresenterHelper.java
@@ -7,13 +7,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.support.v7.view.menu.MenuPresenter;
-import android.support.v7.view.menu.ListMenuPresenter;
-import android.support.v7.view.menu.MenuBuilder;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListAdapter;
+import androidx.appcompat.view.menu.ListMenuPresenter;
+import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.appcompat.view.menu.MenuPresenter;
 
 public class ListMenuPresenterHelper {
 
diff --git a/src/main/java/org/lineageos/eleven/utils/Lists.java b/app/src/main/java/org/lineageos/eleven/utils/Lists.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/Lists.java
rename to app/src/main/java/org/lineageos/eleven/utils/Lists.java
diff --git a/src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java b/app/src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java
rename to app/src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java
index e597aa5..cbf65bc 100644
--- a/src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/MenuBuilderHelper.java
@@ -8,13 +8,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.support.v7.view.menu.MenuBuilder;
-import android.support.v7.view.menu.MenuItemImpl;
-import android.support.v7.view.menu.MenuPresenter;
 import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.SubMenu;
 import android.view.View;
+import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.appcompat.view.menu.MenuItemImpl;
+import androidx.appcompat.view.menu.MenuPresenter;
 
 public class MenuBuilderHelper {
 
diff --git a/src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java b/app/src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java
similarity index 95%
rename from src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java
rename to app/src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java
index 5a876d7..49e9537 100644
--- a/src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/MenuDialogHelper.java
@@ -19,15 +19,15 @@
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.IBinder;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.view.menu.ListMenuPresenter;
-import android.support.v7.view.menu.MenuBuilder;
-import android.support.v7.view.menu.MenuItemImpl;
-import android.support.v7.view.menu.MenuPresenter;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.appcompat.view.menu.MenuItemImpl;
+import androidx.appcompat.view.menu.ListMenuPresenter;
+import androidx.appcompat.view.menu.MenuPresenter;
 
 import org.lineageos.eleven.R;
 
diff --git a/src/main/java/org/lineageos/eleven/utils/MusicUtils.java b/app/src/main/java/org/lineageos/eleven/utils/MusicUtils.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/MusicUtils.java
rename to app/src/main/java/org/lineageos/eleven/utils/MusicUtils.java
diff --git a/src/main/java/org/lineageos/eleven/utils/NavUtils.java b/app/src/main/java/org/lineageos/eleven/utils/NavUtils.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/NavUtils.java
rename to app/src/main/java/org/lineageos/eleven/utils/NavUtils.java
diff --git a/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
rename to app/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
index 6526c53..bb37545 100644
--- a/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/PlaylistPopupMenuHelper.java
@@ -16,14 +16,14 @@
 package org.lineageos.eleven.utils;
 
 import android.app.Activity;
-import android.support.v7.app.AlertDialog;
 import android.view.ViewGroup;
 import android.content.ContentUris;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentManager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.Config.SmartPlaylistType;
diff --git a/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java
rename to app/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java
index bc28971..d4fd10d 100644
--- a/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/PopupMenuHelper.java
@@ -18,14 +18,14 @@
 import android.app.Activity;
 import android.graphics.Typeface;
 import android.os.Build;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.view.menu.MenuBuilder;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.support.v7.widget.PopupMenu;
 import android.text.Spannable;
 import android.text.SpannableString;
+import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.fragment.app.FragmentManager;
 
 import org.lineageos.eleven.Config;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java b/app/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java
rename to app/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java
index 30689e1..8dce302 100644
--- a/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/PreferenceUtils.java
@@ -22,8 +22,8 @@
 import android.os.Build;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.fragments.AlbumFragment;
diff --git a/src/main/java/org/lineageos/eleven/utils/SectionCreatorUtils.java b/app/src/main/java/org/lineageos/eleven/utils/SectionCreatorUtils.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/SectionCreatorUtils.java
rename to app/src/main/java/org/lineageos/eleven/utils/SectionCreatorUtils.java
diff --git a/src/main/java/org/lineageos/eleven/utils/ShakeDetector.java b/app/src/main/java/org/lineageos/eleven/utils/ShakeDetector.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/ShakeDetector.java
rename to app/src/main/java/org/lineageos/eleven/utils/ShakeDetector.java
diff --git a/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java b/app/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java
rename to app/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java
index 54f1e5a..cd3f9af 100644
--- a/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java
+++ b/app/src/main/java/org/lineageos/eleven/utils/SongPopupMenuHelper.java
@@ -15,10 +15,9 @@
 */
 package org.lineageos.eleven.utils;
 
-
 import android.app.Activity;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
 
 import org.lineageos.eleven.menu.DeleteDialog;
 import org.lineageos.eleven.menu.FragmentMenuItems;
diff --git a/src/main/java/org/lineageos/eleven/utils/SortOrder.java b/app/src/main/java/org/lineageos/eleven/utils/SortOrder.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/SortOrder.java
rename to app/src/main/java/org/lineageos/eleven/utils/SortOrder.java
diff --git a/src/main/java/org/lineageos/eleven/utils/SrtManager.java b/app/src/main/java/org/lineageos/eleven/utils/SrtManager.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/SrtManager.java
rename to app/src/main/java/org/lineageos/eleven/utils/SrtManager.java
diff --git a/src/main/java/org/lineageos/eleven/utils/SrtParser.java b/app/src/main/java/org/lineageos/eleven/utils/SrtParser.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/utils/SrtParser.java
rename to app/src/main/java/org/lineageos/eleven/utils/SrtParser.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/AlphaPatternDrawable.java b/app/src/main/java/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
rename to app/src/main/java/org/lineageos/eleven/widgets/AlphaPatternDrawable.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java b/app/src/main/java/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
rename to app/src/main/java/org/lineageos/eleven/widgets/AlphaTouchInterceptorOverlay.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java b/app/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java
similarity index 95%
rename from src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java
index 483dbe8..e2ebd95 100644
--- a/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/AudioActivityButton.java
@@ -15,8 +15,8 @@
 */
 package org.lineageos.eleven.widgets;
 import android.content.Context;
-import android.support.v4.app.FragmentActivity;
 import android.util.AttributeSet;
+import androidx.fragment.app.FragmentActivity;
 
 import org.lineageos.eleven.ui.activities.SlidingPanelActivity;
 
diff --git a/src/main/java/org/lineageos/eleven/widgets/AudioButton.java b/app/src/main/java/org/lineageos/eleven/widgets/AudioButton.java
similarity index 93%
rename from src/main/java/org/lineageos/eleven/widgets/AudioButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/AudioButton.java
index 2f75e6c..e929efc 100644
--- a/src/main/java/org/lineageos/eleven/widgets/AudioButton.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/AudioButton.java
@@ -1,14 +1,14 @@
 package org.lineageos.eleven.widgets;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
 import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.utils.ElevenUtils;
diff --git a/src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java b/app/src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java
rename to app/src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java
index dfa32a3..e8c43bf 100644
--- a/src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/BlurScrimImage.java
@@ -21,11 +21,11 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.TransitionDrawable;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.cache.ImageFetcher;
diff --git a/src/main/java/org/lineageos/eleven/widgets/BrowseButton.java b/app/src/main/java/org/lineageos/eleven/widgets/BrowseButton.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/BrowseButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/BrowseButton.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/ColorPanelView.java b/app/src/main/java/org/lineageos/eleven/widgets/ColorPanelView.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/ColorPanelView.java
rename to app/src/main/java/org/lineageos/eleven/widgets/ColorPanelView.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/ColorPickerView.java b/app/src/main/java/org/lineageos/eleven/widgets/ColorPickerView.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/ColorPickerView.java
rename to app/src/main/java/org/lineageos/eleven/widgets/ColorPickerView.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java b/app/src/main/java/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
rename to app/src/main/java/org/lineageos/eleven/widgets/FrameLayoutWithOverlay.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/IPopupMenuCallback.java b/app/src/main/java/org/lineageos/eleven/widgets/IPopupMenuCallback.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/IPopupMenuCallback.java
rename to app/src/main/java/org/lineageos/eleven/widgets/IPopupMenuCallback.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java b/app/src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
similarity index 88%
rename from src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
rename to app/src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
index 511aefb..905be1a 100644
--- a/src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/LayoutSuppressingImageView.java
@@ -13,11 +13,10 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.widget.ImageView;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 
 /**
- * A custom {@link ImageView} that improves the performance by not passing
+ * A custom {@link AppCompatImageView} that improves the performance by not passing
  * requestLayout() to its parent, taking advantage of knowing that image size
  * won't change once set.
  */
diff --git a/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java b/app/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java
rename to app/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java
index 9f39a05..8f9243c 100644
--- a/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/LetterTileDrawable.java
@@ -28,8 +28,8 @@
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
+import androidx.core.content.ContextCompat;
 
 import junit.framework.Assert;
 
diff --git a/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java b/app/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
rename to app/src/main/java/org/lineageos/eleven/widgets/LoadingEmptyContainer.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/NoResultsContainer.java b/app/src/main/java/org/lineageos/eleven/widgets/NoResultsContainer.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/NoResultsContainer.java
rename to app/src/main/java/org/lineageos/eleven/widgets/NoResultsContainer.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java b/app/src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java
index 6b1b43e..b278f29 100644
--- a/src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/PlayPauseButton.java
@@ -16,14 +16,14 @@
 import android.animation.Animator;
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.utils.ElevenUtils;
diff --git a/src/main/java/org/lineageos/eleven/widgets/PlayPauseProgressButton.java b/app/src/main/java/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/PlayPauseProgressButton.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java b/app/src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java
similarity index 94%
rename from src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java
index 2b63d76..61c3f7d 100644
--- a/src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/PopupMenuButton.java
@@ -18,10 +18,10 @@
 
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 
diff --git a/src/main/java/org/lineageos/eleven/widgets/QueueButton.java b/app/src/main/java/org/lineageos/eleven/widgets/QueueButton.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/QueueButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/QueueButton.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/RepeatButton.java b/app/src/main/java/org/lineageos/eleven/widgets/RepeatButton.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/widgets/RepeatButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/RepeatButton.java
index 82c1252..c357a86 100644
--- a/src/main/java/org/lineageos/eleven/widgets/RepeatButton.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/RepeatButton.java
@@ -14,10 +14,10 @@
 package org.lineageos.eleven.widgets;
 
 import android.content.Context;
-import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageButton;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.MusicPlaybackService;
 import org.lineageos.eleven.R;
diff --git a/src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java b/app/src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java
index 90eae97..72d0aa6 100644
--- a/src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/RepeatingImageButton.java
@@ -14,13 +14,13 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.appcompat.widget.AppCompatImageButton;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.utils.ElevenUtils;
diff --git a/src/main/java/org/lineageos/eleven/widgets/Roboto.java b/app/src/main/java/org/lineageos/eleven/widgets/Roboto.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/Roboto.java
rename to app/src/main/java/org/lineageos/eleven/widgets/Roboto.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java b/app/src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java
similarity index 96%
rename from src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java
rename to app/src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java
index d24fb10..00b6cd4 100644
--- a/src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/RobotoTextView.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.appcompat.widget.AppCompatTextView;
 
 import org.lineageos.eleven.R;
 
diff --git a/src/main/java/org/lineageos/eleven/widgets/SeparatedListAdapter.java b/app/src/main/java/org/lineageos/eleven/widgets/SeparatedListAdapter.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/SeparatedListAdapter.java
rename to app/src/main/java/org/lineageos/eleven/widgets/SeparatedListAdapter.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/ShowHideMasterLayout.java b/app/src/main/java/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
rename to app/src/main/java/org/lineageos/eleven/widgets/ShowHideMasterLayout.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/ShuffleButton.java b/app/src/main/java/org/lineageos/eleven/widgets/ShuffleButton.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/ShuffleButton.java
rename to app/src/main/java/org/lineageos/eleven/widgets/ShuffleButton.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/SquareFrame.java b/app/src/main/java/org/lineageos/eleven/widgets/SquareFrame.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/SquareFrame.java
rename to app/src/main/java/org/lineageos/eleven/widgets/SquareFrame.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/SquareImageView.java b/app/src/main/java/org/lineageos/eleven/widgets/SquareImageView.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/SquareImageView.java
rename to app/src/main/java/org/lineageos/eleven/widgets/SquareImageView.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/SquareView.java b/app/src/main/java/org/lineageos/eleven/widgets/SquareView.java
similarity index 100%
rename from src/main/java/org/lineageos/eleven/widgets/SquareView.java
rename to app/src/main/java/org/lineageos/eleven/widgets/SquareView.java
diff --git a/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java b/app/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java
rename to app/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java
index a9900f6..65b8e77 100644
--- a/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/SquareViewPager.java
@@ -16,8 +16,8 @@
 package org.lineageos.eleven.widgets;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
+import androidx.viewpager.widget.ViewPager;
 
 /**
  * A custom {@link ViewPager} that is sized to be a perfect square, otherwise
diff --git a/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java b/app/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
similarity index 97%
rename from src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
rename to app/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
index 887dcf7..bc3be35 100644
--- a/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabStrip.java
@@ -20,11 +20,11 @@
 import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
 
 import org.lineageos.eleven.R;
 
diff --git a/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java b/app/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java
similarity index 98%
rename from src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java
rename to app/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java
index c761840..9526caa 100644
--- a/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/ViewPagerTabs.java
@@ -20,9 +20,6 @@
 import android.content.res.TypedArray;
 import android.graphics.Outline;
 import android.os.Build;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -32,6 +29,9 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.core.view.ViewCompat;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 
 import org.lineageos.eleven.R;
 import org.lineageos.eleven.ui.fragments.ViewOutlineProviderCompat;
diff --git a/src/main/java/org/lineageos/eleven/widgets/VisualizerView.java b/app/src/main/java/org/lineageos/eleven/widgets/VisualizerView.java
similarity index 99%
rename from src/main/java/org/lineageos/eleven/widgets/VisualizerView.java
rename to app/src/main/java/org/lineageos/eleven/widgets/VisualizerView.java
index 94dec51..6b5d495 100644
--- a/src/main/java/org/lineageos/eleven/widgets/VisualizerView.java
+++ b/app/src/main/java/org/lineageos/eleven/widgets/VisualizerView.java
@@ -25,9 +25,9 @@
 import android.media.audiofx.Visualizer;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
+import androidx.core.content.ContextCompat;
 
 import org.lineageos.eleven.R;
 
diff --git a/res/color/tab_text_color.xml b/app/src/main/res/color/tab_text_color.xml
similarity index 100%
rename from res/color/tab_text_color.xml
rename to app/src/main/res/color/tab_text_color.xml
diff --git a/res/drawable-hdpi/btn_playback_next_compat.png b/app/src/main/res/drawable-hdpi/btn_playback_next_compat.png
similarity index 100%
rename from res/drawable-hdpi/btn_playback_next_compat.png
rename to app/src/main/res/drawable-hdpi/btn_playback_next_compat.png
diff --git a/res/drawable-hdpi/btn_playback_pause_compat.png b/app/src/main/res/drawable-hdpi/btn_playback_pause_compat.png
similarity index 100%
rename from res/drawable-hdpi/btn_playback_pause_compat.png
rename to app/src/main/res/drawable-hdpi/btn_playback_pause_compat.png
diff --git a/res/drawable-hdpi/btn_playback_play_compat.png b/app/src/main/res/drawable-hdpi/btn_playback_play_compat.png
similarity index 100%
rename from res/drawable-hdpi/btn_playback_play_compat.png
rename to app/src/main/res/drawable-hdpi/btn_playback_play_compat.png
diff --git a/res/drawable-hdpi/btn_playback_previous_compat.png b/app/src/main/res/drawable-hdpi/btn_playback_previous_compat.png
similarity index 100%
rename from res/drawable-hdpi/btn_playback_previous_compat.png
rename to app/src/main/res/drawable-hdpi/btn_playback_previous_compat.png
diff --git a/res/drawable-hdpi/btn_playback_repeat_all_compat.png b/app/src/main/res/drawable-hdpi/btn_playback_repeat_all_compat.png
similarity index 100%
rename from res/drawable-hdpi/btn_playback_repeat_all_compat.png
rename to app/src/main/res/drawable-hdpi/btn_playback_repeat_all_compat.png
diff --git a/res/drawable-hdpi/btn_playback_repeat_one_compat.png b/app/src/main/res/drawable-hdpi/btn_playback_repeat_one_compat.png
similarity index 100%
rename from res/drawable-hdpi/btn_playback_repeat_one_compat.png
rename to app/src/main/res/drawable-hdpi/btn_playback_repeat_one_compat.png
diff --git a/res/drawable-hdpi/btn_playback_shuffle_all_compat.png b/app/src/main/res/drawable-hdpi/btn_playback_shuffle_all_compat.png
similarity index 100%
rename from res/drawable-hdpi/btn_playback_shuffle_all_compat.png
rename to app/src/main/res/drawable-hdpi/btn_playback_shuffle_all_compat.png
diff --git a/res/drawable-hdpi/default_artwork.png b/app/src/main/res/drawable-hdpi/default_artwork.png
similarity index 100%
rename from res/drawable-hdpi/default_artwork.png
rename to app/src/main/res/drawable-hdpi/default_artwork.png
diff --git a/res/drawable-hdpi/default_artwork_blur.png b/app/src/main/res/drawable-hdpi/default_artwork_blur.png
similarity index 100%
rename from res/drawable-hdpi/default_artwork_blur.png
rename to app/src/main/res/drawable-hdpi/default_artwork_blur.png
diff --git a/res/drawable-hdpi/ic_album.png b/app/src/main/res/drawable-hdpi/ic_album.png
similarity index 100%
rename from res/drawable-hdpi/ic_album.png
rename to app/src/main/res/drawable-hdpi/ic_album.png
diff --git a/res/drawable-hdpi/ic_album_lg.png b/app/src/main/res/drawable-hdpi/ic_album_lg.png
similarity index 100%
rename from res/drawable-hdpi/ic_album_lg.png
rename to app/src/main/res/drawable-hdpi/ic_album_lg.png
diff --git a/res/drawable-hdpi/ic_artist.png b/app/src/main/res/drawable-hdpi/ic_artist.png
similarity index 100%
rename from res/drawable-hdpi/ic_artist.png
rename to app/src/main/res/drawable-hdpi/ic_artist.png
diff --git a/res/drawable-hdpi/ic_artist_lg.png b/app/src/main/res/drawable-hdpi/ic_artist_lg.png
similarity index 100%
rename from res/drawable-hdpi/ic_artist_lg.png
rename to app/src/main/res/drawable-hdpi/ic_artist_lg.png
diff --git a/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png
similarity index 100%
rename from res/drawable-hdpi/ic_notification.png
rename to app/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/res/drawable-hdpi/ic_playlist.png b/app/src/main/res/drawable-hdpi/ic_playlist.png
similarity index 100%
rename from res/drawable-hdpi/ic_playlist.png
rename to app/src/main/res/drawable-hdpi/ic_playlist.png
diff --git a/res/drawable-hdpi/ic_playlist_lg.png b/app/src/main/res/drawable-hdpi/ic_playlist_lg.png
similarity index 100%
rename from res/drawable-hdpi/ic_playlist_lg.png
rename to app/src/main/res/drawable-hdpi/ic_playlist_lg.png
diff --git a/res/drawable-mdpi/btn_playback_next_compat.png b/app/src/main/res/drawable-mdpi/btn_playback_next_compat.png
similarity index 100%
rename from res/drawable-mdpi/btn_playback_next_compat.png
rename to app/src/main/res/drawable-mdpi/btn_playback_next_compat.png
diff --git a/res/drawable-mdpi/btn_playback_pause_compat.png b/app/src/main/res/drawable-mdpi/btn_playback_pause_compat.png
similarity index 100%
rename from res/drawable-mdpi/btn_playback_pause_compat.png
rename to app/src/main/res/drawable-mdpi/btn_playback_pause_compat.png
diff --git a/res/drawable-mdpi/btn_playback_play_compat.png b/app/src/main/res/drawable-mdpi/btn_playback_play_compat.png
similarity index 100%
rename from res/drawable-mdpi/btn_playback_play_compat.png
rename to app/src/main/res/drawable-mdpi/btn_playback_play_compat.png
diff --git a/res/drawable-mdpi/btn_playback_previous_compat.png b/app/src/main/res/drawable-mdpi/btn_playback_previous_compat.png
similarity index 100%
rename from res/drawable-mdpi/btn_playback_previous_compat.png
rename to app/src/main/res/drawable-mdpi/btn_playback_previous_compat.png
diff --git a/res/drawable-mdpi/btn_playback_repeat_all_compat.png b/app/src/main/res/drawable-mdpi/btn_playback_repeat_all_compat.png
similarity index 100%
rename from res/drawable-mdpi/btn_playback_repeat_all_compat.png
rename to app/src/main/res/drawable-mdpi/btn_playback_repeat_all_compat.png
diff --git a/res/drawable-mdpi/btn_playback_repeat_one_compat.png b/app/src/main/res/drawable-mdpi/btn_playback_repeat_one_compat.png
similarity index 100%
rename from res/drawable-mdpi/btn_playback_repeat_one_compat.png
rename to app/src/main/res/drawable-mdpi/btn_playback_repeat_one_compat.png
diff --git a/res/drawable-mdpi/btn_playback_shuffle_all_compat.png b/app/src/main/res/drawable-mdpi/btn_playback_shuffle_all_compat.png
similarity index 100%
rename from res/drawable-mdpi/btn_playback_shuffle_all_compat.png
rename to app/src/main/res/drawable-mdpi/btn_playback_shuffle_all_compat.png
diff --git a/res/drawable-mdpi/default_artwork.png b/app/src/main/res/drawable-mdpi/default_artwork.png
similarity index 100%
rename from res/drawable-mdpi/default_artwork.png
rename to app/src/main/res/drawable-mdpi/default_artwork.png
diff --git a/res/drawable-mdpi/default_artwork_blur.png b/app/src/main/res/drawable-mdpi/default_artwork_blur.png
similarity index 100%
rename from res/drawable-mdpi/default_artwork_blur.png
rename to app/src/main/res/drawable-mdpi/default_artwork_blur.png
diff --git a/res/drawable-mdpi/ic_album.png b/app/src/main/res/drawable-mdpi/ic_album.png
similarity index 100%
rename from res/drawable-mdpi/ic_album.png
rename to app/src/main/res/drawable-mdpi/ic_album.png
diff --git a/res/drawable-mdpi/ic_album_lg.png b/app/src/main/res/drawable-mdpi/ic_album_lg.png
similarity index 100%
rename from res/drawable-mdpi/ic_album_lg.png
rename to app/src/main/res/drawable-mdpi/ic_album_lg.png
diff --git a/res/drawable-mdpi/ic_artist.png b/app/src/main/res/drawable-mdpi/ic_artist.png
similarity index 100%
rename from res/drawable-mdpi/ic_artist.png
rename to app/src/main/res/drawable-mdpi/ic_artist.png
diff --git a/res/drawable-mdpi/ic_artist_lg.png b/app/src/main/res/drawable-mdpi/ic_artist_lg.png
similarity index 100%
rename from res/drawable-mdpi/ic_artist_lg.png
rename to app/src/main/res/drawable-mdpi/ic_artist_lg.png
diff --git a/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png
similarity index 100%
rename from res/drawable-mdpi/ic_notification.png
rename to app/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/res/drawable-mdpi/ic_playlist.png b/app/src/main/res/drawable-mdpi/ic_playlist.png
similarity index 100%
rename from res/drawable-mdpi/ic_playlist.png
rename to app/src/main/res/drawable-mdpi/ic_playlist.png
diff --git a/res/drawable-mdpi/ic_playlist_lg.png b/app/src/main/res/drawable-mdpi/ic_playlist_lg.png
similarity index 100%
rename from res/drawable-mdpi/ic_playlist_lg.png
rename to app/src/main/res/drawable-mdpi/ic_playlist_lg.png
diff --git a/res/drawable-v21/floating_action_button.xml b/app/src/main/res/drawable-v21/floating_action_button.xml
similarity index 100%
rename from res/drawable-v21/floating_action_button.xml
rename to app/src/main/res/drawable-v21/floating_action_button.xml
diff --git a/res/drawable-v21/selectable_background.xml b/app/src/main/res/drawable-v21/selectable_background.xml
similarity index 100%
rename from res/drawable-v21/selectable_background.xml
rename to app/src/main/res/drawable-v21/selectable_background.xml
diff --git a/res/drawable-v21/selectable_background_light.xml b/app/src/main/res/drawable-v21/selectable_background_light.xml
similarity index 100%
rename from res/drawable-v21/selectable_background_light.xml
rename to app/src/main/res/drawable-v21/selectable_background_light.xml
diff --git a/res/drawable-v21/view_pager_tab_background.xml b/app/src/main/res/drawable-v21/view_pager_tab_background.xml
similarity index 100%
rename from res/drawable-v21/view_pager_tab_background.xml
rename to app/src/main/res/drawable-v21/view_pager_tab_background.xml
diff --git a/res/drawable-xhdpi/btn_playback_next_compat.png b/app/src/main/res/drawable-xhdpi/btn_playback_next_compat.png
similarity index 100%
rename from res/drawable-xhdpi/btn_playback_next_compat.png
rename to app/src/main/res/drawable-xhdpi/btn_playback_next_compat.png
diff --git a/res/drawable-xhdpi/btn_playback_pause_compat.png b/app/src/main/res/drawable-xhdpi/btn_playback_pause_compat.png
similarity index 100%
rename from res/drawable-xhdpi/btn_playback_pause_compat.png
rename to app/src/main/res/drawable-xhdpi/btn_playback_pause_compat.png
diff --git a/res/drawable-xhdpi/btn_playback_play_compat.png b/app/src/main/res/drawable-xhdpi/btn_playback_play_compat.png
similarity index 100%
rename from res/drawable-xhdpi/btn_playback_play_compat.png
rename to app/src/main/res/drawable-xhdpi/btn_playback_play_compat.png
diff --git a/res/drawable-xhdpi/btn_playback_previous_compat.png b/app/src/main/res/drawable-xhdpi/btn_playback_previous_compat.png
similarity index 100%
rename from res/drawable-xhdpi/btn_playback_previous_compat.png
rename to app/src/main/res/drawable-xhdpi/btn_playback_previous_compat.png
diff --git a/res/drawable-xhdpi/btn_playback_repeat_all_compat.png b/app/src/main/res/drawable-xhdpi/btn_playback_repeat_all_compat.png
similarity index 100%
rename from res/drawable-xhdpi/btn_playback_repeat_all_compat.png
rename to app/src/main/res/drawable-xhdpi/btn_playback_repeat_all_compat.png
diff --git a/res/drawable-xhdpi/btn_playback_repeat_one_compat.png b/app/src/main/res/drawable-xhdpi/btn_playback_repeat_one_compat.png
similarity index 100%
rename from res/drawable-xhdpi/btn_playback_repeat_one_compat.png
rename to app/src/main/res/drawable-xhdpi/btn_playback_repeat_one_compat.png
diff --git a/res/drawable-xhdpi/btn_playback_shuffle_all_compat.png b/app/src/main/res/drawable-xhdpi/btn_playback_shuffle_all_compat.png
similarity index 100%
rename from res/drawable-xhdpi/btn_playback_shuffle_all_compat.png
rename to app/src/main/res/drawable-xhdpi/btn_playback_shuffle_all_compat.png
diff --git a/res/drawable-xhdpi/default_artwork.png b/app/src/main/res/drawable-xhdpi/default_artwork.png
similarity index 100%
rename from res/drawable-xhdpi/default_artwork.png
rename to app/src/main/res/drawable-xhdpi/default_artwork.png
diff --git a/res/drawable-xhdpi/default_artwork_blur.png b/app/src/main/res/drawable-xhdpi/default_artwork_blur.png
similarity index 100%
rename from res/drawable-xhdpi/default_artwork_blur.png
rename to app/src/main/res/drawable-xhdpi/default_artwork_blur.png
diff --git a/res/drawable-xhdpi/ic_album.png b/app/src/main/res/drawable-xhdpi/ic_album.png
similarity index 100%
rename from res/drawable-xhdpi/ic_album.png
rename to app/src/main/res/drawable-xhdpi/ic_album.png
diff --git a/res/drawable-xhdpi/ic_album_lg.png b/app/src/main/res/drawable-xhdpi/ic_album_lg.png
similarity index 100%
rename from res/drawable-xhdpi/ic_album_lg.png
rename to app/src/main/res/drawable-xhdpi/ic_album_lg.png
diff --git a/res/drawable-xhdpi/ic_artist.png b/app/src/main/res/drawable-xhdpi/ic_artist.png
similarity index 100%
rename from res/drawable-xhdpi/ic_artist.png
rename to app/src/main/res/drawable-xhdpi/ic_artist.png
diff --git a/res/drawable-xhdpi/ic_artist_lg.png b/app/src/main/res/drawable-xhdpi/ic_artist_lg.png
similarity index 100%
rename from res/drawable-xhdpi/ic_artist_lg.png
rename to app/src/main/res/drawable-xhdpi/ic_artist_lg.png
diff --git a/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png
similarity index 100%
rename from res/drawable-xhdpi/ic_notification.png
rename to app/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/res/drawable-xhdpi/ic_playlist.png b/app/src/main/res/drawable-xhdpi/ic_playlist.png
similarity index 100%
rename from res/drawable-xhdpi/ic_playlist.png
rename to app/src/main/res/drawable-xhdpi/ic_playlist.png
diff --git a/res/drawable-xhdpi/ic_playlist_lg.png b/app/src/main/res/drawable-xhdpi/ic_playlist_lg.png
similarity index 100%
rename from res/drawable-xhdpi/ic_playlist_lg.png
rename to app/src/main/res/drawable-xhdpi/ic_playlist_lg.png
diff --git a/res/drawable-xxhdpi/btn_playback_next_compat.png b/app/src/main/res/drawable-xxhdpi/btn_playback_next_compat.png
similarity index 100%
rename from res/drawable-xxhdpi/btn_playback_next_compat.png
rename to app/src/main/res/drawable-xxhdpi/btn_playback_next_compat.png
diff --git a/res/drawable-xxhdpi/btn_playback_pause_compat.png b/app/src/main/res/drawable-xxhdpi/btn_playback_pause_compat.png
similarity index 100%
rename from res/drawable-xxhdpi/btn_playback_pause_compat.png
rename to app/src/main/res/drawable-xxhdpi/btn_playback_pause_compat.png
diff --git a/res/drawable-xxhdpi/btn_playback_play_compat.png b/app/src/main/res/drawable-xxhdpi/btn_playback_play_compat.png
similarity index 100%
rename from res/drawable-xxhdpi/btn_playback_play_compat.png
rename to app/src/main/res/drawable-xxhdpi/btn_playback_play_compat.png
diff --git a/res/drawable-xxhdpi/btn_playback_previous_compat.png b/app/src/main/res/drawable-xxhdpi/btn_playback_previous_compat.png
similarity index 100%
rename from res/drawable-xxhdpi/btn_playback_previous_compat.png
rename to app/src/main/res/drawable-xxhdpi/btn_playback_previous_compat.png
diff --git a/res/drawable-xxhdpi/btn_playback_repeat_all_compat.png b/app/src/main/res/drawable-xxhdpi/btn_playback_repeat_all_compat.png
similarity index 100%
rename from res/drawable-xxhdpi/btn_playback_repeat_all_compat.png
rename to app/src/main/res/drawable-xxhdpi/btn_playback_repeat_all_compat.png
diff --git a/res/drawable-xxhdpi/btn_playback_repeat_one_compat.png b/app/src/main/res/drawable-xxhdpi/btn_playback_repeat_one_compat.png
similarity index 100%
rename from res/drawable-xxhdpi/btn_playback_repeat_one_compat.png
rename to app/src/main/res/drawable-xxhdpi/btn_playback_repeat_one_compat.png
diff --git a/res/drawable-xxhdpi/btn_playback_shuffle_all_compat.png b/app/src/main/res/drawable-xxhdpi/btn_playback_shuffle_all_compat.png
similarity index 100%
rename from res/drawable-xxhdpi/btn_playback_shuffle_all_compat.png
rename to app/src/main/res/drawable-xxhdpi/btn_playback_shuffle_all_compat.png
diff --git a/res/drawable-xxhdpi/default_artwork.png b/app/src/main/res/drawable-xxhdpi/default_artwork.png
similarity index 100%
rename from res/drawable-xxhdpi/default_artwork.png
rename to app/src/main/res/drawable-xxhdpi/default_artwork.png
diff --git a/res/drawable-xxhdpi/default_artwork_blur.png b/app/src/main/res/drawable-xxhdpi/default_artwork_blur.png
similarity index 100%
rename from res/drawable-xxhdpi/default_artwork_blur.png
rename to app/src/main/res/drawable-xxhdpi/default_artwork_blur.png
diff --git a/res/drawable-xxhdpi/ic_album.png b/app/src/main/res/drawable-xxhdpi/ic_album.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_album.png
rename to app/src/main/res/drawable-xxhdpi/ic_album.png
diff --git a/res/drawable-xxhdpi/ic_album_lg.png b/app/src/main/res/drawable-xxhdpi/ic_album_lg.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_album_lg.png
rename to app/src/main/res/drawable-xxhdpi/ic_album_lg.png
diff --git a/res/drawable-xxhdpi/ic_artist.png b/app/src/main/res/drawable-xxhdpi/ic_artist.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_artist.png
rename to app/src/main/res/drawable-xxhdpi/ic_artist.png
diff --git a/res/drawable-xxhdpi/ic_artist_lg.png b/app/src/main/res/drawable-xxhdpi/ic_artist_lg.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_artist_lg.png
rename to app/src/main/res/drawable-xxhdpi/ic_artist_lg.png
diff --git a/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_notification.png
rename to app/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/res/drawable-xxhdpi/ic_playlist.png b/app/src/main/res/drawable-xxhdpi/ic_playlist.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_playlist.png
rename to app/src/main/res/drawable-xxhdpi/ic_playlist.png
diff --git a/res/drawable-xxhdpi/ic_playlist_lg.png b/app/src/main/res/drawable-xxhdpi/ic_playlist_lg.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_playlist_lg.png
rename to app/src/main/res/drawable-xxhdpi/ic_playlist_lg.png
diff --git a/res/drawable/above_shadow.xml b/app/src/main/res/drawable/above_shadow.xml
similarity index 100%
rename from res/drawable/above_shadow.xml
rename to app/src/main/res/drawable/above_shadow.xml
diff --git a/res/drawable/below_shadow.xml b/app/src/main/res/drawable/below_shadow.xml
similarity index 100%
rename from res/drawable/below_shadow.xml
rename to app/src/main/res/drawable/below_shadow.xml
diff --git a/res/drawable/bottom_shadow.xml b/app/src/main/res/drawable/bottom_shadow.xml
similarity index 100%
rename from res/drawable/bottom_shadow.xml
rename to app/src/main/res/drawable/bottom_shadow.xml
diff --git a/res/drawable/btn_add_to_playlist.xml b/app/src/main/res/drawable/btn_add_to_playlist.xml
similarity index 100%
rename from res/drawable/btn_add_to_playlist.xml
rename to app/src/main/res/drawable/btn_add_to_playlist.xml
diff --git a/res/drawable/btn_header_collapse.xml b/app/src/main/res/drawable/btn_header_collapse.xml
similarity index 100%
rename from res/drawable/btn_header_collapse.xml
rename to app/src/main/res/drawable/btn_header_collapse.xml
diff --git a/res/drawable/btn_notification_collapse.xml b/app/src/main/res/drawable/btn_notification_collapse.xml
similarity index 100%
rename from res/drawable/btn_notification_collapse.xml
rename to app/src/main/res/drawable/btn_notification_collapse.xml
diff --git a/res/drawable/btn_playback_browse.xml b/app/src/main/res/drawable/btn_playback_browse.xml
similarity index 100%
rename from res/drawable/btn_playback_browse.xml
rename to app/src/main/res/drawable/btn_playback_browse.xml
diff --git a/res/drawable/btn_playback_icon.xml b/app/src/main/res/drawable/btn_playback_icon.xml
similarity index 100%
rename from res/drawable/btn_playback_icon.xml
rename to app/src/main/res/drawable/btn_playback_icon.xml
diff --git a/res/drawable/btn_playback_next.xml b/app/src/main/res/drawable/btn_playback_next.xml
similarity index 100%
rename from res/drawable/btn_playback_next.xml
rename to app/src/main/res/drawable/btn_playback_next.xml
diff --git a/res/drawable/btn_playback_pause.xml b/app/src/main/res/drawable/btn_playback_pause.xml
similarity index 100%
rename from res/drawable/btn_playback_pause.xml
rename to app/src/main/res/drawable/btn_playback_pause.xml
diff --git a/res/drawable/btn_playback_play.xml b/app/src/main/res/drawable/btn_playback_play.xml
similarity index 100%
rename from res/drawable/btn_playback_play.xml
rename to app/src/main/res/drawable/btn_playback_play.xml
diff --git a/res/drawable/btn_playback_previous.xml b/app/src/main/res/drawable/btn_playback_previous.xml
similarity index 100%
rename from res/drawable/btn_playback_previous.xml
rename to app/src/main/res/drawable/btn_playback_previous.xml
diff --git a/res/drawable/btn_playback_repeat_all.xml b/app/src/main/res/drawable/btn_playback_repeat_all.xml
similarity index 100%
rename from res/drawable/btn_playback_repeat_all.xml
rename to app/src/main/res/drawable/btn_playback_repeat_all.xml
diff --git a/res/drawable/btn_playback_repeat_one.xml b/app/src/main/res/drawable/btn_playback_repeat_one.xml
similarity index 100%
rename from res/drawable/btn_playback_repeat_one.xml
rename to app/src/main/res/drawable/btn_playback_repeat_one.xml
diff --git a/res/drawable/btn_playback_shuffle_all.xml b/app/src/main/res/drawable/btn_playback_shuffle_all.xml
similarity index 100%
rename from res/drawable/btn_playback_shuffle_all.xml
rename to app/src/main/res/drawable/btn_playback_shuffle_all.xml
diff --git a/res/drawable/btn_queue_icon.xml b/app/src/main/res/drawable/btn_queue_icon.xml
similarity index 100%
rename from res/drawable/btn_queue_icon.xml
rename to app/src/main/res/drawable/btn_queue_icon.xml
diff --git a/res/drawable/circular_drawable.xml b/app/src/main/res/drawable/circular_drawable.xml
similarity index 100%
rename from res/drawable/circular_drawable.xml
rename to app/src/main/res/drawable/circular_drawable.xml
diff --git a/res/drawable/circular_drawable_background.xml b/app/src/main/res/drawable/circular_drawable_background.xml
similarity index 100%
rename from res/drawable/circular_drawable_background.xml
rename to app/src/main/res/drawable/circular_drawable_background.xml
diff --git a/res/drawable/dnd_list_divider.xml b/app/src/main/res/drawable/dnd_list_divider.xml
similarity index 100%
rename from res/drawable/dnd_list_divider.xml
rename to app/src/main/res/drawable/dnd_list_divider.xml
diff --git a/res/drawable/dnd_list_divider_light.xml b/app/src/main/res/drawable/dnd_list_divider_light.xml
similarity index 100%
rename from res/drawable/dnd_list_divider_light.xml
rename to app/src/main/res/drawable/dnd_list_divider_light.xml
diff --git a/res/drawable/drag_indicator.xml b/app/src/main/res/drawable/drag_indicator.xml
similarity index 100%
rename from res/drawable/drag_indicator.xml
rename to app/src/main/res/drawable/drag_indicator.xml
diff --git a/res/drawable/fab_accent.xml b/app/src/main/res/drawable/fab_accent.xml
similarity index 100%
rename from res/drawable/fab_accent.xml
rename to app/src/main/res/drawable/fab_accent.xml
diff --git a/res/drawable/floating_action_button.xml b/app/src/main/res/drawable/floating_action_button.xml
similarity index 100%
rename from res/drawable/floating_action_button.xml
rename to app/src/main/res/drawable/floating_action_button.xml
diff --git a/res/drawable/gray_circle.xml b/app/src/main/res/drawable/gray_circle.xml
similarity index 100%
rename from res/drawable/gray_circle.xml
rename to app/src/main/res/drawable/gray_circle.xml
diff --git a/res/drawable/gripper.xml b/app/src/main/res/drawable/gripper.xml
similarity index 100%
rename from res/drawable/gripper.xml
rename to app/src/main/res/drawable/gripper.xml
diff --git a/res/drawable/gripper_light.xml b/app/src/main/res/drawable/gripper_light.xml
similarity index 100%
rename from res/drawable/gripper_light.xml
rename to app/src/main/res/drawable/gripper_light.xml
diff --git a/res/drawable/history_icon.xml b/app/src/main/res/drawable/history_icon.xml
similarity index 100%
rename from res/drawable/history_icon.xml
rename to app/src/main/res/drawable/history_icon.xml
diff --git a/res/drawable/ic_action_search.xml b/app/src/main/res/drawable/ic_action_search.xml
similarity index 100%
rename from res/drawable/ic_action_search.xml
rename to app/src/main/res/drawable/ic_action_search.xml
diff --git a/res/drawable/inset_list_divider.xml b/app/src/main/res/drawable/inset_list_divider.xml
similarity index 100%
rename from res/drawable/inset_list_divider.xml
rename to app/src/main/res/drawable/inset_list_divider.xml
diff --git a/res/drawable/inset_list_divider_no_padding.xml b/app/src/main/res/drawable/inset_list_divider_no_padding.xml
similarity index 100%
rename from res/drawable/inset_list_divider_no_padding.xml
rename to app/src/main/res/drawable/inset_list_divider_no_padding.xml
diff --git a/res/drawable/menu_button.xml b/app/src/main/res/drawable/menu_button.xml
similarity index 100%
rename from res/drawable/menu_button.xml
rename to app/src/main/res/drawable/menu_button.xml
diff --git a/res/drawable/menu_button_light.xml b/app/src/main/res/drawable/menu_button_light.xml
similarity index 100%
rename from res/drawable/menu_button_light.xml
rename to app/src/main/res/drawable/menu_button_light.xml
diff --git a/res/drawable/no_results.xml b/app/src/main/res/drawable/no_results.xml
similarity index 100%
rename from res/drawable/no_results.xml
rename to app/src/main/res/drawable/no_results.xml
diff --git a/res/drawable/now_playing_icon.xml b/app/src/main/res/drawable/now_playing_icon.xml
similarity index 100%
rename from res/drawable/now_playing_icon.xml
rename to app/src/main/res/drawable/now_playing_icon.xml
diff --git a/res/drawable/now_playing_progress.xml b/app/src/main/res/drawable/now_playing_progress.xml
similarity index 100%
rename from res/drawable/now_playing_progress.xml
rename to app/src/main/res/drawable/now_playing_progress.xml
diff --git a/res/drawable/now_playing_progress_background.xml b/app/src/main/res/drawable/now_playing_progress_background.xml
similarity index 100%
rename from res/drawable/now_playing_progress_background.xml
rename to app/src/main/res/drawable/now_playing_progress_background.xml
diff --git a/res/drawable/playlist_icon.xml b/app/src/main/res/drawable/playlist_icon.xml
similarity index 100%
rename from res/drawable/playlist_icon.xml
rename to app/src/main/res/drawable/playlist_icon.xml
diff --git a/res/drawable/recent_icon.xml b/app/src/main/res/drawable/recent_icon.xml
similarity index 100%
rename from res/drawable/recent_icon.xml
rename to app/src/main/res/drawable/recent_icon.xml
diff --git a/res/drawable/recently_added.xml b/app/src/main/res/drawable/recently_added.xml
similarity index 100%
rename from res/drawable/recently_added.xml
rename to app/src/main/res/drawable/recently_added.xml
diff --git a/res/drawable/right_shadow.xml b/app/src/main/res/drawable/right_shadow.xml
similarity index 100%
rename from res/drawable/right_shadow.xml
rename to app/src/main/res/drawable/right_shadow.xml
diff --git a/res/drawable/selectable_background.xml b/app/src/main/res/drawable/selectable_background.xml
similarity index 100%
rename from res/drawable/selectable_background.xml
rename to app/src/main/res/drawable/selectable_background.xml
diff --git a/res/drawable/selectable_background_light.xml b/app/src/main/res/drawable/selectable_background_light.xml
similarity index 100%
rename from res/drawable/selectable_background_light.xml
rename to app/src/main/res/drawable/selectable_background_light.xml
diff --git a/res/drawable/stopwatch_icon_small_grey.xml b/app/src/main/res/drawable/stopwatch_icon_small_grey.xml
similarity index 100%
rename from res/drawable/stopwatch_icon_small_grey.xml
rename to app/src/main/res/drawable/stopwatch_icon_small_grey.xml
diff --git a/res/drawable/stopwatch_icon_white.xml b/app/src/main/res/drawable/stopwatch_icon_white.xml
similarity index 100%
rename from res/drawable/stopwatch_icon_white.xml
rename to app/src/main/res/drawable/stopwatch_icon_white.xml
diff --git a/res/drawable/top_tracks_icon.xml b/app/src/main/res/drawable/top_tracks_icon.xml
similarity index 100%
rename from res/drawable/top_tracks_icon.xml
rename to app/src/main/res/drawable/top_tracks_icon.xml
diff --git a/res/drawable/view_pager_tab_background.xml b/app/src/main/res/drawable/view_pager_tab_background.xml
similarity index 100%
rename from res/drawable/view_pager_tab_background.xml
rename to app/src/main/res/drawable/view_pager_tab_background.xml
diff --git a/res/layout-land/activity_player_fragment.xml b/app/src/main/res/layout-land/activity_player_fragment.xml
similarity index 100%
rename from res/layout-land/activity_player_fragment.xml
rename to app/src/main/res/layout-land/activity_player_fragment.xml
diff --git a/res/layout-v16/app_widget_large.xml b/app/src/main/res/layout-v16/app_widget_large.xml
similarity index 100%
rename from res/layout-v16/app_widget_large.xml
rename to app/src/main/res/layout-v16/app_widget_large.xml
diff --git a/res/layout-v16/app_widget_large_alternate.xml b/app/src/main/res/layout-v16/app_widget_large_alternate.xml
similarity index 100%
rename from res/layout-v16/app_widget_large_alternate.xml
rename to app/src/main/res/layout-v16/app_widget_large_alternate.xml
diff --git a/res/layout-v16/app_widget_small.xml b/app/src/main/res/layout-v16/app_widget_small.xml
similarity index 100%
rename from res/layout-v16/app_widget_small.xml
rename to app/src/main/res/layout-v16/app_widget_small.xml
diff --git a/res/layout-v21/activity_album_detail.xml b/app/src/main/res/layout-v21/activity_album_detail.xml
similarity index 100%
rename from res/layout-v21/activity_album_detail.xml
rename to app/src/main/res/layout-v21/activity_album_detail.xml
diff --git a/res/layout-v21/activity_base.xml b/app/src/main/res/layout-v21/activity_base.xml
similarity index 99%
rename from res/layout-v21/activity_base.xml
rename to app/src/main/res/layout-v21/activity_base.xml
index 8d2fbad..a4eaa22 100644
--- a/res/layout-v21/activity_base.xml
+++ b/app/src/main/res/layout-v21/activity_base.xml
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             xmlns:sothree="http://schemas.android.com/apk/res-auto"
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
diff --git a/res/layout-v21/app_widget_large.xml b/app/src/main/res/layout-v21/app_widget_large.xml
similarity index 100%
rename from res/layout-v21/app_widget_large.xml
rename to app/src/main/res/layout-v21/app_widget_large.xml
diff --git a/res/layout-v21/app_widget_large_alternate.xml b/app/src/main/res/layout-v21/app_widget_large_alternate.xml
similarity index 100%
rename from res/layout-v21/app_widget_large_alternate.xml
rename to app/src/main/res/layout-v21/app_widget_large_alternate.xml
diff --git a/res/layout-v21/app_widget_small.xml b/app/src/main/res/layout-v21/app_widget_small.xml
similarity index 100%
rename from res/layout-v21/app_widget_small.xml
rename to app/src/main/res/layout-v21/app_widget_small.xml
diff --git a/res/layout/artist_detail_album.xml b/app/src/main/res/layout-v21/artist_detail_album.xml
similarity index 97%
rename from res/layout/artist_detail_album.xml
rename to app/src/main/res/layout-v21/artist_detail_album.xml
index 226cd07..4bca871 100644
--- a/res/layout/artist_detail_album.xml
+++ b/app/src/main/res/layout-v21/artist_detail_album.xml
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="156dp"
@@ -78,4 +78,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout-v21/audio_player_header_bar.xml b/app/src/main/res/layout-v21/audio_player_header_bar.xml
similarity index 100%
rename from res/layout-v21/audio_player_header_bar.xml
rename to app/src/main/res/layout-v21/audio_player_header_bar.xml
diff --git a/res/layout-v21/bottom_action_bar.xml b/app/src/main/res/layout-v21/bottom_action_bar.xml
similarity index 100%
rename from res/layout-v21/bottom_action_bar.xml
rename to app/src/main/res/layout-v21/bottom_action_bar.xml
diff --git a/res/layout/fragment_music_browser_phone.xml b/app/src/main/res/layout-v21/fragment_music_browser_phone.xml
similarity index 97%
rename from res/layout/fragment_music_browser_phone.xml
rename to app/src/main/res/layout-v21/fragment_music_browser_phone.xml
index 9f69b23..a508c8b 100644
--- a/res/layout/fragment_music_browser_phone.xml
+++ b/app/src/main/res/layout-v21/fragment_music_browser_phone.xml
@@ -31,7 +31,7 @@
             android:elevation="@dimen/action_bar_elevation"
             style="@style/HeaderTabTextStyle" />
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/fragment_home_phone_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/grid_items_normal.xml b/app/src/main/res/layout-v21/grid_items_normal.xml
similarity index 97%
rename from res/layout/grid_items_normal.xml
rename to app/src/main/res/layout-v21/grid_items_normal.xml
index efba753..6f35307 100644
--- a/res/layout/grid_items_normal.xml
+++ b/app/src/main/res/layout-v21/grid_items_normal.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -74,4 +74,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout-v21/header_bar.xml b/app/src/main/res/layout-v21/header_bar.xml
similarity index 100%
rename from res/layout-v21/header_bar.xml
rename to app/src/main/res/layout-v21/header_bar.xml
diff --git a/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
similarity index 100%
rename from res/layout/activity_album_detail.xml
rename to app/src/main/res/layout/activity_album_detail.xml
diff --git a/res/layout/activity_artist_detail.xml b/app/src/main/res/layout/activity_artist_detail.xml
similarity index 100%
rename from res/layout/activity_artist_detail.xml
rename to app/src/main/res/layout/activity_artist_detail.xml
diff --git a/res/layout/activity_audio_preview.xml b/app/src/main/res/layout/activity_audio_preview.xml
similarity index 100%
rename from res/layout/activity_audio_preview.xml
rename to app/src/main/res/layout/activity_audio_preview.xml
diff --git a/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
similarity index 99%
rename from res/layout/activity_base.xml
rename to app/src/main/res/layout/activity_base.xml
index 8d2fbad..a4eaa22 100644
--- a/res/layout/activity_base.xml
+++ b/app/src/main/res/layout/activity_base.xml
@@ -36,7 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             xmlns:sothree="http://schemas.android.com/apk/res-auto"
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
diff --git a/res/layout/activity_player_fragment.xml b/app/src/main/res/layout/activity_player_fragment.xml
similarity index 100%
rename from res/layout/activity_player_fragment.xml
rename to app/src/main/res/layout/activity_player_fragment.xml
diff --git a/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
similarity index 100%
rename from res/layout/activity_search.xml
rename to app/src/main/res/layout/activity_search.xml
diff --git a/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
similarity index 97%
rename from res/layout/activity_settings.xml
rename to app/src/main/res/layout/activity_settings.xml
index 85697f1..29e626e 100644
--- a/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
        
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         xmlns:sothree="http://schemas.android.com/apk/res-auto"
         android:id="@+id/prefToolbar"
         android:layout_width="match_parent"
diff --git a/res/layout/album_art_fragment.xml b/app/src/main/res/layout/album_art_fragment.xml
similarity index 100%
rename from res/layout/album_art_fragment.xml
rename to app/src/main/res/layout/album_art_fragment.xml
diff --git a/res/layout/album_detail_song.xml b/app/src/main/res/layout/album_detail_song.xml
similarity index 100%
rename from res/layout/album_detail_song.xml
rename to app/src/main/res/layout/album_detail_song.xml
diff --git a/res/layout/app_msg.xml b/app/src/main/res/layout/app_msg.xml
similarity index 100%
rename from res/layout/app_msg.xml
rename to app/src/main/res/layout/app_msg.xml
diff --git a/res/layout/app_widget_large.xml b/app/src/main/res/layout/app_widget_large.xml
similarity index 100%
rename from res/layout/app_widget_large.xml
rename to app/src/main/res/layout/app_widget_large.xml
diff --git a/res/layout/app_widget_large_alternate.xml b/app/src/main/res/layout/app_widget_large_alternate.xml
similarity index 100%
rename from res/layout/app_widget_large_alternate.xml
rename to app/src/main/res/layout/app_widget_large_alternate.xml
diff --git a/res/layout/app_widget_small.xml b/app/src/main/res/layout/app_widget_small.xml
similarity index 100%
rename from res/layout/app_widget_small.xml
rename to app/src/main/res/layout/app_widget_small.xml
diff --git a/res/layout-v21/artist_detail_album.xml b/app/src/main/res/layout/artist_detail_album.xml
similarity index 97%
rename from res/layout-v21/artist_detail_album.xml
rename to app/src/main/res/layout/artist_detail_album.xml
index 226cd07..4bca871 100644
--- a/res/layout-v21/artist_detail_album.xml
+++ b/app/src/main/res/layout/artist_detail_album.xml
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="156dp"
@@ -78,4 +78,4 @@
 
     </RelativeLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout/artist_detail_header.xml b/app/src/main/res/layout/artist_detail_header.xml
similarity index 97%
rename from res/layout/artist_detail_header.xml
rename to app/src/main/res/layout/artist_detail_header.xml
index 3bdff8d..bba20ca 100644
--- a/res/layout/artist_detail_header.xml
+++ b/app/src/main/res/layout/artist_detail_header.xml
@@ -21,7 +21,7 @@
         android:textSize="@dimen/text_size_medium"
         android:text="@string/header_albums" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/albums"
         android:scrollbars="none"
         android:layout_width="match_parent"
diff --git a/res/layout/artist_detail_song.xml b/app/src/main/res/layout/artist_detail_song.xml
similarity index 100%
rename from res/layout/artist_detail_song.xml
rename to app/src/main/res/layout/artist_detail_song.xml
diff --git a/res/layout/audio_player_header_bar.xml b/app/src/main/res/layout/audio_player_header_bar.xml
similarity index 100%
rename from res/layout/audio_player_header_bar.xml
rename to app/src/main/res/layout/audio_player_header_bar.xml
diff --git a/res/layout/blur_scrim_image.xml b/app/src/main/res/layout/blur_scrim_image.xml
similarity index 100%
rename from res/layout/blur_scrim_image.xml
rename to app/src/main/res/layout/blur_scrim_image.xml
diff --git a/res/layout/bottom_action_bar.xml b/app/src/main/res/layout/bottom_action_bar.xml
similarity index 100%
rename from res/layout/bottom_action_bar.xml
rename to app/src/main/res/layout/bottom_action_bar.xml
diff --git a/res/layout/colorstrip.xml b/app/src/main/res/layout/colorstrip.xml
similarity index 100%
rename from res/layout/colorstrip.xml
rename to app/src/main/res/layout/colorstrip.xml
diff --git a/res/layout/edit_queue_list_item.xml b/app/src/main/res/layout/edit_queue_list_item.xml
similarity index 100%
rename from res/layout/edit_queue_list_item.xml
rename to app/src/main/res/layout/edit_queue_list_item.xml
diff --git a/res/layout/edit_track_list_item.xml b/app/src/main/res/layout/edit_track_list_item.xml
similarity index 100%
rename from res/layout/edit_track_list_item.xml
rename to app/src/main/res/layout/edit_track_list_item.xml
diff --git a/res/layout/faux_playlist_header.xml b/app/src/main/res/layout/faux_playlist_header.xml
similarity index 100%
rename from res/layout/faux_playlist_header.xml
rename to app/src/main/res/layout/faux_playlist_header.xml
diff --git a/res/layout-v21/fragment_music_browser_phone.xml b/app/src/main/res/layout/fragment_music_browser_phone.xml
similarity index 97%
rename from res/layout-v21/fragment_music_browser_phone.xml
rename to app/src/main/res/layout/fragment_music_browser_phone.xml
index 9f69b23..a508c8b 100644
--- a/res/layout-v21/fragment_music_browser_phone.xml
+++ b/app/src/main/res/layout/fragment_music_browser_phone.xml
@@ -31,7 +31,7 @@
             android:elevation="@dimen/action_bar_elevation"
             style="@style/HeaderTabTextStyle" />
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
             android:id="@+id/fragment_home_phone_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/grid_base.xml b/app/src/main/res/layout/grid_base.xml
similarity index 100%
rename from res/layout/grid_base.xml
rename to app/src/main/res/layout/grid_base.xml
diff --git a/res/layout/grid_header.xml b/app/src/main/res/layout/grid_header.xml
similarity index 100%
rename from res/layout/grid_header.xml
rename to app/src/main/res/layout/grid_header.xml
diff --git a/res/layout-v21/grid_items_normal.xml b/app/src/main/res/layout/grid_items_normal.xml
similarity index 97%
rename from res/layout-v21/grid_items_normal.xml
rename to app/src/main/res/layout/grid_items_normal.xml
index efba753..6f35307 100644
--- a/res/layout-v21/grid_items_normal.xml
+++ b/app/src/main/res/layout/grid_items_normal.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -74,4 +74,4 @@
 
     </LinearLayout>
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout/header_bar.xml b/app/src/main/res/layout/header_bar.xml
similarity index 100%
rename from res/layout/header_bar.xml
rename to app/src/main/res/layout/header_bar.xml
diff --git a/res/layout/list_base.xml b/app/src/main/res/layout/list_base.xml
similarity index 100%
rename from res/layout/list_base.xml
rename to app/src/main/res/layout/list_base.xml
diff --git a/res/layout/list_base_padding.xml b/app/src/main/res/layout/list_base_padding.xml
similarity index 100%
rename from res/layout/list_base_padding.xml
rename to app/src/main/res/layout/list_base_padding.xml
diff --git a/res/layout/list_header.xml b/app/src/main/res/layout/list_header.xml
similarity index 100%
rename from res/layout/list_header.xml
rename to app/src/main/res/layout/list_header.xml
diff --git a/res/layout/list_item_common.xml b/app/src/main/res/layout/list_item_common.xml
similarity index 100%
rename from res/layout/list_item_common.xml
rename to app/src/main/res/layout/list_item_common.xml
diff --git a/res/layout/list_item_normal.xml b/app/src/main/res/layout/list_item_normal.xml
similarity index 100%
rename from res/layout/list_item_normal.xml
rename to app/src/main/res/layout/list_item_normal.xml
diff --git a/res/layout/list_item_queue.xml b/app/src/main/res/layout/list_item_queue.xml
similarity index 100%
rename from res/layout/list_item_queue.xml
rename to app/src/main/res/layout/list_item_queue.xml
diff --git a/res/layout/list_item_search_history.xml b/app/src/main/res/layout/list_item_search_history.xml
similarity index 100%
rename from res/layout/list_item_search_history.xml
rename to app/src/main/res/layout/list_item_search_history.xml
diff --git a/res/layout/list_item_simple.xml b/app/src/main/res/layout/list_item_simple.xml
similarity index 100%
rename from res/layout/list_item_simple.xml
rename to app/src/main/res/layout/list_item_simple.xml
diff --git a/res/layout/list_item_smart_playlist.xml b/app/src/main/res/layout/list_item_smart_playlist.xml
similarity index 100%
rename from res/layout/list_item_smart_playlist.xml
rename to app/src/main/res/layout/list_item_smart_playlist.xml
diff --git a/res/layout/list_item_top_tracks.xml b/app/src/main/res/layout/list_item_top_tracks.xml
similarity index 100%
rename from res/layout/list_item_top_tracks.xml
rename to app/src/main/res/layout/list_item_top_tracks.xml
diff --git a/res/layout/list_search_footer.xml b/app/src/main/res/layout/list_search_footer.xml
similarity index 100%
rename from res/layout/list_search_footer.xml
rename to app/src/main/res/layout/list_search_footer.xml
diff --git a/res/layout/list_search_header.xml b/app/src/main/res/layout/list_search_header.xml
similarity index 100%
rename from res/layout/list_search_header.xml
rename to app/src/main/res/layout/list_search_header.xml
diff --git a/res/layout/loading_empty_container.xml b/app/src/main/res/layout/loading_empty_container.xml
similarity index 100%
rename from res/layout/loading_empty_container.xml
rename to app/src/main/res/layout/loading_empty_container.xml
diff --git a/res/layout/main_album_flow.xml b/app/src/main/res/layout/main_album_flow.xml
similarity index 100%
rename from res/layout/main_album_flow.xml
rename to app/src/main/res/layout/main_album_flow.xml
diff --git a/res/layout/main_playback_controls.xml b/app/src/main/res/layout/main_playback_controls.xml
similarity index 99%
rename from res/layout/main_playback_controls.xml
rename to app/src/main/res/layout/main_playback_controls.xml
index 2674972..d9b6f57 100644
--- a/res/layout/main_playback_controls.xml
+++ b/app/src/main/res/layout/main_playback_controls.xml
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<android.support.v7.widget.CardView
+<androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
@@ -141,4 +141,4 @@
         </RelativeLayout>
 
     </RelativeLayout>
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/res/layout/no_results_message.xml b/app/src/main/res/layout/no_results_message.xml
similarity index 100%
rename from res/layout/no_results_message.xml
rename to app/src/main/res/layout/no_results_message.xml
diff --git a/res/layout/play_pause_progress_button.xml b/app/src/main/res/layout/play_pause_progress_button.xml
similarity index 100%
rename from res/layout/play_pause_progress_button.xml
rename to app/src/main/res/layout/play_pause_progress_button.xml
diff --git a/res/layout/playlist_detail.xml b/app/src/main/res/layout/playlist_detail.xml
similarity index 100%
rename from res/layout/playlist_detail.xml
rename to app/src/main/res/layout/playlist_detail.xml
diff --git a/res/layout/playlist_detail_header.xml b/app/src/main/res/layout/playlist_detail_header.xml
similarity index 100%
rename from res/layout/playlist_detail_header.xml
rename to app/src/main/res/layout/playlist_detail_header.xml
diff --git a/res/layout/square_image_view.xml b/app/src/main/res/layout/square_image_view.xml
similarity index 100%
rename from res/layout/square_image_view.xml
rename to app/src/main/res/layout/square_image_view.xml
diff --git a/res/menu/activity_base.xml b/app/src/main/res/menu/activity_base.xml
similarity index 100%
rename from res/menu/activity_base.xml
rename to app/src/main/res/menu/activity_base.xml
diff --git a/res/menu/album_sort_by.xml b/app/src/main/res/menu/album_sort_by.xml
similarity index 100%
rename from res/menu/album_sort_by.xml
rename to app/src/main/res/menu/album_sort_by.xml
diff --git a/res/menu/artist_album_sort_by.xml b/app/src/main/res/menu/artist_album_sort_by.xml
similarity index 100%
rename from res/menu/artist_album_sort_by.xml
rename to app/src/main/res/menu/artist_album_sort_by.xml
diff --git a/res/menu/artist_song_sort_by.xml b/app/src/main/res/menu/artist_song_sort_by.xml
similarity index 100%
rename from res/menu/artist_song_sort_by.xml
rename to app/src/main/res/menu/artist_song_sort_by.xml
diff --git a/res/menu/artist_sort_by.xml b/app/src/main/res/menu/artist_sort_by.xml
similarity index 100%
rename from res/menu/artist_sort_by.xml
rename to app/src/main/res/menu/artist_sort_by.xml
diff --git a/res/menu/audio_player.xml b/app/src/main/res/menu/audio_player.xml
similarity index 100%
rename from res/menu/audio_player.xml
rename to app/src/main/res/menu/audio_player.xml
diff --git a/res/menu/clear_list.xml b/app/src/main/res/menu/clear_list.xml
similarity index 100%
rename from res/menu/clear_list.xml
rename to app/src/main/res/menu/clear_list.xml
diff --git a/res/menu/new_playlist.xml b/app/src/main/res/menu/new_playlist.xml
similarity index 100%
rename from res/menu/new_playlist.xml
rename to app/src/main/res/menu/new_playlist.xml
diff --git a/res/menu/queue.xml b/app/src/main/res/menu/queue.xml
similarity index 100%
rename from res/menu/queue.xml
rename to app/src/main/res/menu/queue.xml
diff --git a/res/menu/search.xml b/app/src/main/res/menu/search.xml
similarity index 94%
rename from res/menu/search.xml
rename to app/src/main/res/menu/search.xml
index e6472e1..d29df67 100644
--- a/res/menu/search.xml
+++ b/app/src/main/res/menu/search.xml
@@ -19,7 +19,7 @@
 
     <item
         android:id="@+id/menu_search"
-        sothree:actionViewClass="android.support.v7.widget.SearchView"
+        sothree:actionViewClass="androidx.appcompat.widget.SearchView"
         android:icon="@drawable/ic_action_search"
         android:orderInCategory="1"
         sothree:showAsAction="ifRoom|collapseActionView"
diff --git a/res/menu/search_btn.xml b/app/src/main/res/menu/search_btn.xml
similarity index 100%
rename from res/menu/search_btn.xml
rename to app/src/main/res/menu/search_btn.xml
diff --git a/res/menu/shuffle_all.xml b/app/src/main/res/menu/shuffle_all.xml
similarity index 100%
rename from res/menu/shuffle_all.xml
rename to app/src/main/res/menu/shuffle_all.xml
diff --git a/res/menu/shuffle_item.xml b/app/src/main/res/menu/shuffle_item.xml
similarity index 100%
rename from res/menu/shuffle_item.xml
rename to app/src/main/res/menu/shuffle_item.xml
diff --git a/res/menu/song_sort_by.xml b/app/src/main/res/menu/song_sort_by.xml
similarity index 100%
rename from res/menu/song_sort_by.xml
rename to app/src/main/res/menu/song_sort_by.xml
diff --git a/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from res/mipmap-anydpi-v26/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/res/mipmap-hdpi-v26/ic_background.png b/app/src/main/res/mipmap-hdpi-v26/ic_background.png
similarity index 100%
rename from res/mipmap-hdpi-v26/ic_background.png
rename to app/src/main/res/mipmap-hdpi-v26/ic_background.png
diff --git a/res/mipmap-hdpi-v26/ic_foreground.png b/app/src/main/res/mipmap-hdpi-v26/ic_foreground.png
similarity index 100%
rename from res/mipmap-hdpi-v26/ic_foreground.png
rename to app/src/main/res/mipmap-hdpi-v26/ic_foreground.png
diff --git a/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/res/mipmap-mdpi-v26/ic_background.png b/app/src/main/res/mipmap-mdpi-v26/ic_background.png
similarity index 100%
rename from res/mipmap-mdpi-v26/ic_background.png
rename to app/src/main/res/mipmap-mdpi-v26/ic_background.png
diff --git a/res/mipmap-mdpi-v26/ic_foreground.png b/app/src/main/res/mipmap-mdpi-v26/ic_foreground.png
similarity index 100%
rename from res/mipmap-mdpi-v26/ic_foreground.png
rename to app/src/main/res/mipmap-mdpi-v26/ic_foreground.png
diff --git a/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-mdpi/ic_launcher.png
rename to app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/res/mipmap-xhdpi-v26/ic_background.png b/app/src/main/res/mipmap-xhdpi-v26/ic_background.png
similarity index 100%
rename from res/mipmap-xhdpi-v26/ic_background.png
rename to app/src/main/res/mipmap-xhdpi-v26/ic_background.png
diff --git a/res/mipmap-xhdpi-v26/ic_foreground.png b/app/src/main/res/mipmap-xhdpi-v26/ic_foreground.png
similarity index 100%
rename from res/mipmap-xhdpi-v26/ic_foreground.png
rename to app/src/main/res/mipmap-xhdpi-v26/ic_foreground.png
diff --git a/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-xhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/res/mipmap-xxhdpi-v26/ic_background.png b/app/src/main/res/mipmap-xxhdpi-v26/ic_background.png
similarity index 100%
rename from res/mipmap-xxhdpi-v26/ic_background.png
rename to app/src/main/res/mipmap-xxhdpi-v26/ic_background.png
diff --git a/res/mipmap-xxhdpi-v26/ic_foreground.png b/app/src/main/res/mipmap-xxhdpi-v26/ic_foreground.png
similarity index 100%
rename from res/mipmap-xxhdpi-v26/ic_foreground.png
rename to app/src/main/res/mipmap-xxhdpi-v26/ic_foreground.png
diff --git a/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/res/mipmap-xxxhdpi-v26/ic_background.png b/app/src/main/res/mipmap-xxxhdpi-v26/ic_background.png
similarity index 100%
rename from res/mipmap-xxxhdpi-v26/ic_background.png
rename to app/src/main/res/mipmap-xxxhdpi-v26/ic_background.png
diff --git a/res/mipmap-xxxhdpi-v26/ic_foreground.png b/app/src/main/res/mipmap-xxxhdpi-v26/ic_foreground.png
similarity index 100%
rename from res/mipmap-xxxhdpi-v26/ic_foreground.png
rename to app/src/main/res/mipmap-xxxhdpi-v26/ic_foreground.png
diff --git a/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from res/mipmap-xxxhdpi/ic_launcher.png
rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/res/transition/explode.xml b/app/src/main/res/transition/explode.xml
similarity index 100%
rename from res/transition/explode.xml
rename to app/src/main/res/transition/explode.xml
diff --git a/res/values-af/plurals.xml b/app/src/main/res/values-af/plurals.xml
similarity index 100%
rename from res/values-af/plurals.xml
rename to app/src/main/res/values-af/plurals.xml
diff --git a/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
similarity index 100%
rename from res/values-af/strings.xml
rename to app/src/main/res/values-af/strings.xml
diff --git a/res/values-am/plurals.xml b/app/src/main/res/values-am/plurals.xml
similarity index 100%
rename from res/values-am/plurals.xml
rename to app/src/main/res/values-am/plurals.xml
diff --git a/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
similarity index 100%
rename from res/values-am/strings.xml
rename to app/src/main/res/values-am/strings.xml
diff --git a/res/values-ar/plurals.xml b/app/src/main/res/values-ar/plurals.xml
similarity index 100%
rename from res/values-ar/plurals.xml
rename to app/src/main/res/values-ar/plurals.xml
diff --git a/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
similarity index 100%
rename from res/values-ar/strings.xml
rename to app/src/main/res/values-ar/strings.xml
diff --git a/res/values-as-rIN/plurals.xml b/app/src/main/res/values-as-rIN/plurals.xml
similarity index 100%
rename from res/values-as-rIN/plurals.xml
rename to app/src/main/res/values-as-rIN/plurals.xml
diff --git a/res/values-as-rIN/strings.xml b/app/src/main/res/values-as-rIN/strings.xml
similarity index 100%
rename from res/values-as-rIN/strings.xml
rename to app/src/main/res/values-as-rIN/strings.xml
diff --git a/res/values-ast-rES/plurals.xml b/app/src/main/res/values-ast-rES/plurals.xml
similarity index 100%
rename from res/values-ast-rES/plurals.xml
rename to app/src/main/res/values-ast-rES/plurals.xml
diff --git a/res/values-ast-rES/strings.xml b/app/src/main/res/values-ast-rES/strings.xml
similarity index 100%
rename from res/values-ast-rES/strings.xml
rename to app/src/main/res/values-ast-rES/strings.xml
diff --git a/res/values-az/plurals.xml b/app/src/main/res/values-az/plurals.xml
similarity index 100%
rename from res/values-az/plurals.xml
rename to app/src/main/res/values-az/plurals.xml
diff --git a/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
similarity index 100%
rename from res/values-az/strings.xml
rename to app/src/main/res/values-az/strings.xml
diff --git a/res/values-b+sr+Latn/plurals.xml b/app/src/main/res/values-b+sr+Latn/plurals.xml
similarity index 100%
rename from res/values-b+sr+Latn/plurals.xml
rename to app/src/main/res/values-b+sr+Latn/plurals.xml
diff --git a/res/values-b+sr+Latn/strings.xml b/app/src/main/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from res/values-b+sr+Latn/strings.xml
rename to app/src/main/res/values-b+sr+Latn/strings.xml
diff --git a/res/values-be/plurals.xml b/app/src/main/res/values-be/plurals.xml
similarity index 100%
rename from res/values-be/plurals.xml
rename to app/src/main/res/values-be/plurals.xml
diff --git a/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
similarity index 100%
rename from res/values-be/strings.xml
rename to app/src/main/res/values-be/strings.xml
diff --git a/res/values-bg/plurals.xml b/app/src/main/res/values-bg/plurals.xml
similarity index 100%
rename from res/values-bg/plurals.xml
rename to app/src/main/res/values-bg/plurals.xml
diff --git a/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
similarity index 99%
rename from res/values-bg/strings.xml
rename to app/src/main/res/values-bg/strings.xml
index a31461f..bcda9fa 100644
--- a/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Всички песни на \"%s\"</string>
   <string name="search_title_playlists">Всички списъци за изпълнение \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s </xliff:g> <xliff:g id="minutes">%2$s </xliff:g></string>
+  <string name="channel_music">Възпроизвеждане на музика</string>
 </resources>
diff --git a/res/values-bn/plurals.xml b/app/src/main/res/values-bn/plurals.xml
similarity index 100%
rename from res/values-bn/plurals.xml
rename to app/src/main/res/values-bn/plurals.xml
diff --git a/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
similarity index 100%
rename from res/values-bn/strings.xml
rename to app/src/main/res/values-bn/strings.xml
diff --git a/res/values-br-rFR/plurals.xml b/app/src/main/res/values-br-rFR/plurals.xml
similarity index 100%
rename from res/values-br-rFR/plurals.xml
rename to app/src/main/res/values-br-rFR/plurals.xml
diff --git a/res/values-br-rFR/strings.xml b/app/src/main/res/values-br-rFR/strings.xml
similarity index 100%
rename from res/values-br-rFR/strings.xml
rename to app/src/main/res/values-br-rFR/strings.xml
diff --git a/res/values-bs/plurals.xml b/app/src/main/res/values-bs/plurals.xml
similarity index 100%
rename from res/values-bs/plurals.xml
rename to app/src/main/res/values-bs/plurals.xml
diff --git a/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
similarity index 100%
rename from res/values-bs/strings.xml
rename to app/src/main/res/values-bs/strings.xml
diff --git a/res/values-ca/plurals.xml b/app/src/main/res/values-ca/plurals.xml
similarity index 100%
rename from res/values-ca/plurals.xml
rename to app/src/main/res/values-ca/plurals.xml
diff --git a/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
similarity index 99%
rename from res/values-ca/strings.xml
rename to app/src/main/res/values-ca/strings.xml
index 5537d5b..3b8c356 100644
--- a/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Totes les cançons de \"%s\"</string>
   <string name="search_title_playlists">Totes les llistes de reproducció de \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Reproducció de música</string>
 </resources>
diff --git a/res/values-cs/plurals.xml b/app/src/main/res/values-cs/plurals.xml
similarity index 100%
rename from res/values-cs/plurals.xml
rename to app/src/main/res/values-cs/plurals.xml
diff --git a/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
similarity index 100%
rename from res/values-cs/strings.xml
rename to app/src/main/res/values-cs/strings.xml
diff --git a/res/values-csb/plurals.xml b/app/src/main/res/values-csb/plurals.xml
similarity index 100%
rename from res/values-csb/plurals.xml
rename to app/src/main/res/values-csb/plurals.xml
diff --git a/res/values-csb/strings.xml b/app/src/main/res/values-csb/strings.xml
similarity index 100%
rename from res/values-csb/strings.xml
rename to app/src/main/res/values-csb/strings.xml
diff --git a/res/values-cy/plurals.xml b/app/src/main/res/values-cy/plurals.xml
similarity index 100%
rename from res/values-cy/plurals.xml
rename to app/src/main/res/values-cy/plurals.xml
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
new file mode 100644
index 0000000..e02852d
--- /dev/null
+++ b/app/src/main/res/values-cy/strings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Page titles -->
+    <string name="page_albums">Casgliadau</string>
+    <!-- Section Headers -->
+    <string name="header_albums">Casgliadau</string>
+    <!-- Option menu items -->
+    <!-- Playlist items -->
+    <!-- Sort orders -->
+    <string name="sort_order_entry_za">Y i A</string>
+    <string name="sort_order_entry_year">Blwyddyn</string>
+    <string name="sort_order_entry_number_of_albums">Nifer o gasgliadau</string>
+    <!-- Default playlist names -->
+    <!-- AlertDialog items -->
+    <string name="cancel">Diddymu</string>
+    <string name="cannot_be_undone">Nid yw\'n bosib dadwneud hyn.</string>
+    <string name="old_photo">Defnyddio hen lun</string>
+    <!-- Context menu items -->
+    <string name="context_menu_use_as_ringtone">Defnyddio fel tôn canu</string>
+    <!-- Content descriptions -->
+    <!-- Toast messages -->
+    <!-- Settings -->
+    <!-- App widget -->
+    <!-- Empty list / error messages -->
+    <string name="empty_music">I gopïo cerddoriaeth o dy gyfrifiadur i dy ddyfais, defnyddia gebl USB.</string>
+    <string name="empty_playlist_secondary">I ychwanegu traciau at y rhestr chwarae hon, tara dewislen opsiynau trac, casgliad neu artist a dewis \"Ychwanegu i\'r rhestr chwarae\".</string>
+    <string name="empty_top_tracks_secondary">Caiff y traciau wyt yn eu chwarae amlaf eu hychwanegu i\'r rhestr hon.</string>
+    <string name="empty_generic_secondary">I gopïo cerddoriaeth o dy gyfrifiadur i dy ddyfais, defnyddia gebl USB.</string>
+    <string name="error_playing_track">Methu â chwarae trac %1$s</string>
+    <!-- Section Headers -->
+    <string name="header_unknown_year">Blwyddyn anhysbys</string>
+    <string name="header_1_to_2_minutes">1 - 2 munud</string>
+    <string name="header_10_to_30_minutes">10 - 30 munud</string>
+    <string name="header_1_song">1 cân</string>
+    <string name="header_5_plus_albums">5+ casgliad</string>
+    <string name="footer_search_albums">Dangos pob casgliad</string>
+    <string name="search_title_albums">Pob \"%s\" casgliad</string>
+</resources>
diff --git a/res/values-da/plurals.xml b/app/src/main/res/values-da/plurals.xml
similarity index 100%
rename from res/values-da/plurals.xml
rename to app/src/main/res/values-da/plurals.xml
diff --git a/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
similarity index 100%
rename from res/values-da/strings.xml
rename to app/src/main/res/values-da/strings.xml
diff --git a/res/values-de/plurals.xml b/app/src/main/res/values-de/plurals.xml
similarity index 100%
rename from res/values-de/plurals.xml
rename to app/src/main/res/values-de/plurals.xml
diff --git a/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
similarity index 99%
rename from res/values-de/strings.xml
rename to app/src/main/res/values-de/strings.xml
index c384b31..2346575 100644
--- a/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Alle \"%s\" Titel</string>
   <string name="search_title_playlists">Alle \"%s\" Wiedergabelisten</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Musikwiedergabe</string>
 </resources>
diff --git a/res/values-el/plurals.xml b/app/src/main/res/values-el/plurals.xml
similarity index 100%
rename from res/values-el/plurals.xml
rename to app/src/main/res/values-el/plurals.xml
diff --git a/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
similarity index 99%
rename from res/values-el/strings.xml
rename to app/src/main/res/values-el/strings.xml
index bb56add..f884d3a 100644
--- a/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Όλα τα τραγούδια \"%s\"</string>
   <string name="search_title_playlists">Όλες οι λίστες αναπαραγωγής \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Αναπαραγωγή μουσικής</string>
 </resources>
diff --git a/res/values-en-rAU/plurals.xml b/app/src/main/res/values-en-rAU/plurals.xml
similarity index 100%
rename from res/values-en-rAU/plurals.xml
rename to app/src/main/res/values-en-rAU/plurals.xml
diff --git a/res/values-en-rAU/strings.xml b/app/src/main/res/values-en-rAU/strings.xml
similarity index 99%
rename from res/values-en-rAU/strings.xml
rename to app/src/main/res/values-en-rAU/strings.xml
index 86d62d2..c205ce6 100644
--- a/res/values-en-rAU/strings.xml
+++ b/app/src/main/res/values-en-rAU/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">All \"%s\" songs</string>
   <string name="search_title_playlists">All \"%s\" playlists</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Music playback</string>
 </resources>
diff --git a/res/values-en-rCA/plurals.xml b/app/src/main/res/values-en-rCA/plurals.xml
similarity index 100%
rename from res/values-en-rCA/plurals.xml
rename to app/src/main/res/values-en-rCA/plurals.xml
diff --git a/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
similarity index 100%
rename from res/values-en-rCA/strings.xml
rename to app/src/main/res/values-en-rCA/strings.xml
diff --git a/res/values-en-rGB/plurals.xml b/app/src/main/res/values-en-rGB/plurals.xml
similarity index 100%
rename from res/values-en-rGB/plurals.xml
rename to app/src/main/res/values-en-rGB/plurals.xml
diff --git a/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
similarity index 100%
rename from res/values-en-rGB/strings.xml
rename to app/src/main/res/values-en-rGB/strings.xml
diff --git a/res/values-en-rIN/plurals.xml b/app/src/main/res/values-en-rIN/plurals.xml
similarity index 100%
rename from res/values-en-rIN/plurals.xml
rename to app/src/main/res/values-en-rIN/plurals.xml
diff --git a/res/values-en-rIN/strings.xml b/app/src/main/res/values-en-rIN/strings.xml
similarity index 99%
rename from res/values-en-rIN/strings.xml
rename to app/src/main/res/values-en-rIN/strings.xml
index 751c0c5..e44d9d1 100644
--- a/res/values-en-rIN/strings.xml
+++ b/app/src/main/res/values-en-rIN/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">All \"%s\" songs</string>
   <string name="search_title_playlists">All \"%s\" playlists</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Music playback</string>
 </resources>
diff --git a/res/values-en-rPT/plurals.xml b/app/src/main/res/values-en-rPT/plurals.xml
similarity index 100%
rename from res/values-en-rPT/plurals.xml
rename to app/src/main/res/values-en-rPT/plurals.xml
diff --git a/res/values-en-rPT/strings.xml b/app/src/main/res/values-en-rPT/strings.xml
similarity index 100%
rename from res/values-en-rPT/strings.xml
rename to app/src/main/res/values-en-rPT/strings.xml
diff --git a/res/values-eo/plurals.xml b/app/src/main/res/values-eo/plurals.xml
similarity index 100%
rename from res/values-eo/plurals.xml
rename to app/src/main/res/values-eo/plurals.xml
diff --git a/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
similarity index 100%
rename from res/values-eo/strings.xml
rename to app/src/main/res/values-eo/strings.xml
diff --git a/res/values-es-rCO/plurals.xml b/app/src/main/res/values-es-rCO/plurals.xml
similarity index 100%
rename from res/values-es-rCO/plurals.xml
rename to app/src/main/res/values-es-rCO/plurals.xml
diff --git a/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml
similarity index 100%
rename from res/values-es-rCO/strings.xml
rename to app/src/main/res/values-es-rCO/strings.xml
diff --git a/res/values-es-rMX/plurals.xml b/app/src/main/res/values-es-rMX/plurals.xml
similarity index 100%
rename from res/values-es-rMX/plurals.xml
rename to app/src/main/res/values-es-rMX/plurals.xml
diff --git a/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
similarity index 100%
rename from res/values-es-rMX/strings.xml
rename to app/src/main/res/values-es-rMX/strings.xml
diff --git a/res/values-es-rUS/plurals.xml b/app/src/main/res/values-es-rUS/plurals.xml
similarity index 100%
rename from res/values-es-rUS/plurals.xml
rename to app/src/main/res/values-es-rUS/plurals.xml
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..1dfd379
--- /dev/null
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Música</string>
+    <!-- Page titles -->
+    <string name="page_recent">Reciente</string>
+    <string name="page_artists">Artistas</string>
+    <string name="page_albums">Álbumes</string>
+    <string name="page_songs">Canciones</string>
+    <string name="page_playlists">Listas de reproducción</string>
+    <string name="page_genres">Géneros</string>
+    <string name="page_now_playing">Reproduciendo ahora</string>
+    <string name="page_play_queue">Cola de reproducción</string>
+    <!-- Section Headers -->
+    <string name="header_albums">Álbumes</string>
+    <string name="header_top_songs">Canciones más escuchadas</string>
+    <string name="header_all_songs">Todas las canciones</string>
+    <!-- Option menu items -->
+    <string name="menu_settings">Ajustes</string>
+    <string name="menu_search">Buscar</string>
+    <string name="menu_shuffle_item">Orden aleatorio</string>
+    <string name="menu_shuffle_all">Reproducción aleatoria</string>
+    <string name="menu_shuffle_playlist">Lista de reproducción aleatoria</string>
+    <string name="menu_shuffle_album">Reproducir álbum aleatoriamente</string>
+    <string name="menu_shuffle_artist">Reproducir artista aleatoriamente</string>
+    <string name="menu_shuffle_top_tracks">Reproducir las más escuchadas aleatoriamente</string>
+    <string name="menu_shuffle_recent">Seleccionar las reproducidas recientemente</string>
+    <string name="menu_shuffle_last_added">Seleccionar las últimas añadidas</string>
+    <string name="menu_play_all">Reproducir todo</string>
+    <string name="menu_sort_by">Ordenar por</string>
+    <string name="menu_clear_list">Borrar lista</string>
+    <string name="menu_clear_recents">Borrar recientes</string>
+    <string name="menu_clear_queue">Borrar cola</string>
+    <string name="menu_save_queue">Guardar cola en la lista de reproducción</string>
+    <string name="menu_equalizer">Ecualizador</string>
+    <!-- Playlist items -->
+    <string name="add_to_playlist">Añadir a la lista</string>
+    <string name="add_to_queue">Añadir a la cola</string>
+    <string name="remove_from_recent">Quitar de recientes</string>
+    <string name="remove_from_queue">Quitar de la cola</string>
+    <!-- Sort orders -->
+    <string name="sort_order_entry_az">A-Z</string>
+    <string name="sort_order_entry_za">Z-A</string>
+    <string name="sort_order_entry_artist">Artista</string>
+    <string name="sort_order_entry_album">Álbum</string>
+    <string name="sort_order_entry_year">Año</string>
+    <string name="sort_order_entry_duration">Duración</string>
+    <string name="sort_order_entry_date_added">Fecha</string>
+    <string name="sort_order_entry_track_list">Número de pista</string>
+    <string name="sort_order_entry_number_of_songs">Número de canciones</string>
+    <string name="sort_order_entry_number_of_albums">Número de álbumes</string>
+    <string name="sort_order_entry_filename">Nombre de archivo</string>
+    <!-- Default playlist names -->
+    <string name="playlist_last_added">Recientes</string>
+    <string name="playlist_recently_played">Reproducido recientemente</string>
+    <string name="playlist_top_tracks">Mis canciones más escuchadas</string>
+    <!-- AlertDialog items -->
+    <string name="new_playlist">Nueva lista</string>
+    <string name="save">Guardar</string>
+    <string name="cancel">Cancelar</string>
+    <string name="overwrite">Sobrescribir</string>
+    <string name="clear">Borrar</string>
+    <string name="new_playlist_name_template">Lista de reproducción <xliff:g id="number">%d </xliff:g></string>
+    <string name="create_playlist_prompt">Nombre de lista</string>
+    <string name="delete_dialog_title">¿Borrar <xliff:g id="item" example="album">%s</xliff:g>?</string>
+    <string name="clear_top_tracks_title">¿Borrar las canciones más reproducidas?</string>
+    <string name="clear_recent_title">¿Borrar reproducidas recientemente?</string>
+    <string name="clear_last_added">¿Borrar últimos añadidos?</string>
+    <string name="cannot_be_undone">Esta operación no se puede deshacer</string>
+    <string name="delete_warning">Esta operación borrará todas las imágenes almacenadas en caché</string>
+    <string name="new_photo">Elegir imagen de la galería</string>
+    <string name="google_search">Buscar en Google</string>
+    <string name="use_default">Usar imagen predefinida</string>
+    <string name="old_photo">Usar imagen previa</string>
+    <!-- Context menu items -->
+    <string name="context_menu_play_selection">Reproducir</string>
+    <string name="context_menu_play_next">Siguiente</string>
+    <string name="context_menu_play_album">Reproducir álbum</string>
+    <string name="context_menu_more_by_artist">Más del artista</string>
+    <string name="context_menu_rename_playlist">Renombrar</string>
+    <string name="context_menu_delete">Borrar</string>
+    <string name="context_menu_fetch_album_art">Obtener carátula del álbum</string>
+    <string name="context_menu_fetch_artist_image">Obtener foto del artista</string>
+    <string name="context_menu_remove_from_recent">Quitar de recientes</string>
+    <string name="context_menu_use_as_ringtone">Usar como tono</string>
+    <string name="context_menu_remove_from_playlist">Quitar de la lista</string>
+    <string name="context_menu_change_image">Cambiar imagen</string>
+    <!-- Content descriptions -->
+    <string name="accessibility_play">Reproducir</string>
+    <string name="accessibility_pause">Pausar</string>
+    <string name="accessibility_next">Siguiente</string>
+    <string name="accessibility_prev">Anterior</string>
+    <string name="accessibility_shuffle">Aleatorio</string>
+    <string name="accessibility_shuffle_all">Reproducción aleatoria</string>
+    <string name="accessibility_repeat">Repetir</string>
+    <string name="accessibility_repeat_all">Repetir todas</string>
+    <string name="accessibility_repeat_one">Repetir una</string>
+    <string name="accessibility_queue">Abrir cola</string>
+    <string name="accessibility_browse">Buscar música</string>
+    <!-- Toast messages -->
+    <string name="set_as_ringtone">Se estableció «<xliff:g id="name" example="Alarm Bell">%s </xliff:g>» como tono de llamada</string>
+    <string name="playlist_renamed">Lista renombrada</string>
+    <!-- Settings -->
+    <string name="settings_ui_category">Interfaz</string>
+    <string name="settings_storage_category">Almacenamiento</string>
+    <string name="settings_data_category">Datos</string>
+    <string name="settings_delete_cache_title">Borrar caché</string>
+    <string name="settings_delete_cache_summary">Quitar todas las imágenes almacenadas</string>
+    <string name="settings_download_only_on_wifi_title">Sólo descargar vía Wi-Fi</string>
+    <string name="settings_download_only_on_wifi_summary">Para reducir los cargos del proveedor no descargar a través de redes móviles</string>
+    <string name="settings_download_missing_artwork_title">Descargar carátulas faltantes</string>
+    <string name="settings_download_artist_images_title">Obtener fotos faltantes de artistas</string>
+    <string name="settings_general_category">General</string>
+    <string name="settings_show_music_visualization_title">Mostrar la visualización de música</string>
+    <string name="settings_show_lyrics_title">Mostrar las letras de las canciones</string>
+    <string name="settings_show_lyrics_summary">Para canciones que tienen un archivo srt</string>
+    <string name="settings_shake_to_play">Agitar para reproducir</string>
+    <string name="settings_shake_to_play_summary">Agita tu dispositivo para reproducir la siguiente canción</string>
+    <string name="settings_lockscreen_album_art">Carátula del álbum en pantalla bloqueada</string>
+    <string name="settings_lockscreen_album_art_summary">Reemplazar la pantalla bloqueada con la carátula del álbum</string>
+    <!-- App widget -->
+    <string name="app_widget_small">Música: 4 \u00d7 1</string>
+    <string name="app_widget_large">Música: 4 \u00d7 2</string>
+    <string name="app_widget_large_alt">Música: 4 \u00d7 2 (alternativo)</string>
+    <string name="app_widget_recent">Música: Escuchada recientemente</string>
+    <!-- Empty list / error messages -->
+    <string name="no_effects_for_you">No se pudo abrir el ecualizador.</string>
+    <string name="empty_music">Para copiar música del ordenador al dispositivo, utiliza un cable USB.</string>
+    <string name="empty_search">Sin resultados que mostrar</string>
+    <string name="empty_search_check">Comprueba que lo has escrito correctamente o intenta una palabra clave diferente.</string>
+    <string name="empty_favorite">Las canciones marcadas como favoritas aparecerán aquí.</string>
+    <string name="empty_recent_main">Sin canciones recientes</string>
+    <string name="empty_recent">Las canciones que hayas escuchado recientemente aparecerán aquí.</string>
+    <string name="empty_playlist_main">Sin canciones en la lista de reproducción</string>
+    <string name="empty_playlist_secondary">Para añadir canciones a esta lista de reproducción, pulsa en el menú de opciones de una canción, álbum o artista y selecciona «Añadir a la lista».</string>
+    <string name="empty_top_tracks_main">Sin canciones más escuchadas</string>
+    <string name="empty_top_tracks_secondary">Las canciones que más escuches se añadirán a esta lista.</string>
+    <string name="empty_last_added_main">No se añadieron canciones recientemente</string>
+    <string name="empty_last_added">Las canciones que añadiste en el último mes aparecerán aquí.</string>
+    <string name="empty_generic_main">No se encontró música</string>
+    <string name="empty_generic_secondary">Para copiar música del ordenador al dispositivo utiliza un cable USB.</string>
+    <string name="empty_queue_main">Sin canciones en la cola</string>
+    <string name="empty_queue_secondary">Para añadir canciones a la cola, pulsa en el menú de opciones de una canción, álbum o artista y selecciona «Añadir a la cola».</string>
+    <string name="error_playing_track">No se pudo reproducir la pista %1$s</string>
+    <!-- Section Headers -->
+    <string name="header_unknown_year">Año desconocido</string>
+    <string name="header_less_than_30s">Menos de 30 segundos</string>
+    <string name="header_30_to_60_seconds">30 - 60 segundos</string>
+    <string name="header_1_to_2_minutes">1 - 2 minutos</string>
+    <string name="header_2_to_3_minutes">2 - 3 minutos</string>
+    <string name="header_3_to_4_minutes">3 - 4 minutos</string>
+    <string name="header_4_to_5_minutes">4 - 5 minutos</string>
+    <string name="header_5_to_10_minutes">5 - 10 minutos</string>
+    <string name="header_10_to_30_minutes">10 - 30 minutos</string>
+    <string name="header_30_to_60_minutes">30 - 60 minutos</string>
+    <string name="header_greater_than_60_minutes">Más de 60 minutos</string>
+    <string name="header_1_song">1 canción</string>
+    <string name="header_2_to_4_songs">2 - 4 canciones</string>
+    <string name="header_5_to_9_songs">5 - 9 canciones</string>
+    <string name="header_10_plus_songs">Más de 10 canciones</string>
+    <string name="header_5_plus_albums">Más de 5 álbumes</string>
+    <string name="header_other">"Otros"</string>
+    <string name="footer_search_artists">Mostrar todos los artistas</string>
+    <string name="footer_search_albums">Mostrar todos los álbumes</string>
+    <string name="footer_search_songs">Mostrar todas las canciones</string>
+    <string name="footer_search_playlists">Mostrar todas las listas de reproducción</string>
+    <string name="searchHint">Buscar música</string>
+    <string name="search_title_artists">Todos los artistas «%s»</string>
+    <string name="search_title_albums">Todos los álbumes «%s»</string>
+    <string name="search_title_songs">Todas las canciones «%s»</string>
+    <string name="search_title_playlists">Todas las listas de reproducción «%s»</string>
+    <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+    <string name="channel_music">Reproducción de música</string>
+</resources>
diff --git a/res/values-es/plurals.xml b/app/src/main/res/values-es/plurals.xml
similarity index 100%
rename from res/values-es/plurals.xml
rename to app/src/main/res/values-es/plurals.xml
diff --git a/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
similarity index 100%
rename from res/values-es/strings.xml
rename to app/src/main/res/values-es/strings.xml
diff --git a/res/values-et/plurals.xml b/app/src/main/res/values-et/plurals.xml
similarity index 100%
rename from res/values-et/plurals.xml
rename to app/src/main/res/values-et/plurals.xml
diff --git a/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
similarity index 100%
rename from res/values-et/strings.xml
rename to app/src/main/res/values-et/strings.xml
diff --git a/res/values-eu/plurals.xml b/app/src/main/res/values-eu/plurals.xml
similarity index 100%
rename from res/values-eu/plurals.xml
rename to app/src/main/res/values-eu/plurals.xml
diff --git a/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
similarity index 99%
rename from res/values-eu/strings.xml
rename to app/src/main/res/values-eu/strings.xml
index f9da9fe..e1fe5d5 100644
--- a/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">\"%s\" abesti guztiak</string>
   <string name="search_title_playlists">\"%s\" erreprodukzio-zerrenda guztiak</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Musika erreprodukzioa</string>
 </resources>
diff --git a/res/values-fa/plurals.xml b/app/src/main/res/values-fa/plurals.xml
similarity index 100%
rename from res/values-fa/plurals.xml
rename to app/src/main/res/values-fa/plurals.xml
diff --git a/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
similarity index 100%
rename from res/values-fa/strings.xml
rename to app/src/main/res/values-fa/strings.xml
diff --git a/res/values-fi/plurals.xml b/app/src/main/res/values-fi/plurals.xml
similarity index 100%
rename from res/values-fi/plurals.xml
rename to app/src/main/res/values-fi/plurals.xml
diff --git a/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
similarity index 99%
rename from res/values-fi/strings.xml
rename to app/src/main/res/values-fi/strings.xml
index 3c29af6..f633556 100644
--- a/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Kaikki \"%s\" kappaletta</string>
   <string name="search_title_playlists">Kaikki \"%s\" soittolistaa</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Musiikin toisto</string>
 </resources>
diff --git a/res/values-fil/plurals.xml b/app/src/main/res/values-fil/plurals.xml
similarity index 100%
rename from res/values-fil/plurals.xml
rename to app/src/main/res/values-fil/plurals.xml
diff --git a/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
similarity index 100%
rename from res/values-fil/strings.xml
rename to app/src/main/res/values-fil/strings.xml
diff --git a/res/values-fr-rCA/plurals.xml b/app/src/main/res/values-fr-rCA/plurals.xml
similarity index 100%
rename from res/values-fr-rCA/plurals.xml
rename to app/src/main/res/values-fr-rCA/plurals.xml
diff --git a/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
similarity index 100%
rename from res/values-fr-rCA/strings.xml
rename to app/src/main/res/values-fr-rCA/strings.xml
diff --git a/res/values-fr/plurals.xml b/app/src/main/res/values-fr/plurals.xml
similarity index 100%
rename from res/values-fr/plurals.xml
rename to app/src/main/res/values-fr/plurals.xml
diff --git a/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 99%
rename from res/values-fr/strings.xml
rename to app/src/main/res/values-fr/strings.xml
index 88d1380..61ad348 100644
--- a/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Tous les titres \"%s\"</string>
   <string name="search_title_playlists">Toutes les listes de lecture \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Lecture de musique</string>
 </resources>
diff --git a/res/values-frp/plurals.xml b/app/src/main/res/values-frp/plurals.xml
similarity index 100%
rename from res/values-frp/plurals.xml
rename to app/src/main/res/values-frp/plurals.xml
diff --git a/res/values-frp/strings.xml b/app/src/main/res/values-frp/strings.xml
similarity index 100%
rename from res/values-frp/strings.xml
rename to app/src/main/res/values-frp/strings.xml
diff --git a/res/values-fy-rNL/plurals.xml b/app/src/main/res/values-fy-rNL/plurals.xml
similarity index 100%
rename from res/values-fy-rNL/plurals.xml
rename to app/src/main/res/values-fy-rNL/plurals.xml
diff --git a/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
similarity index 100%
rename from res/values-fy-rNL/strings.xml
rename to app/src/main/res/values-fy-rNL/strings.xml
diff --git a/res/values-ga-rIE/plurals.xml b/app/src/main/res/values-ga-rIE/plurals.xml
similarity index 100%
rename from res/values-ga-rIE/plurals.xml
rename to app/src/main/res/values-ga-rIE/plurals.xml
diff --git a/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
similarity index 100%
rename from res/values-ga-rIE/strings.xml
rename to app/src/main/res/values-ga-rIE/strings.xml
diff --git a/app/src/main/res/values-gd/plurals.xml b/app/src/main/res/values-gd/plurals.xml
new file mode 100644
index 0000000..2ec326c
--- /dev/null
+++ b/app/src/main/res/values-gd/plurals.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- Used to indicate the number of artists -->
+    <plurals name="Nartists">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> neach-ciùil</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> neach-ciùil</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> luchd-ciùil</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> neach-ciùil</item>
+    </plurals>
+    <!-- Used to indicate the number of albums for an artist -->
+    <plurals name="Nalbums">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> albam</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> albam</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> albaman</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> albam</item>
+    </plurals>
+    <!-- Used to indicate the number of songs for an album -->
+    <plurals name="Nsongs">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> òran</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> òran</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> òrain</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> òran</item>
+    </plurals>
+    <!-- Used to indicate the number of genres -->
+    <plurals name="Ngenres">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> ghnè</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> ghnè</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> gnèithean</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> gnè</item>
+    </plurals>
+    <!-- Used to show a shortened version of hours-->
+    <plurals name="Nhours">
+        <item quantity="one"><xliff:g id="hours">%d</xliff:g>u</item>
+        <item quantity="two"><xliff:g id="hours">%d</xliff:g>u</item>
+        <item quantity="few"><xliff:g id="hours">%d</xliff:g>u</item>
+        <item quantity="other"><xliff:g id="hours">%d</xliff:g>u</item>
+    </plurals>
+    <!-- Used to show a shortened version of minutes -->
+    <plurals name="Nminutes">
+        <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
+        <item quantity="two"><xliff:g id="minutes">%d</xliff:g>m</item>
+        <item quantity="few"><xliff:g id="minutes">%d</xliff:g>m</item>
+        <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
+    </plurals>
+    <!-- Toasts after adding song(s) to playlists -->
+    <plurals name="NNNtrackstoplaylist">
+        <item quantity="one">Chaidh <xliff:g id="number" example="1">%d</xliff:g> òran a chur ris an liosta-chluich.</item>
+        <item quantity="two">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òran a chur ris an liosta-chluich.</item>
+        <item quantity="few">Chaidh <xliff:g id="number" example="1">%d</xliff:g> òrain a chur ris an liosta-chluich.</item>
+        <item quantity="other">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òran a chur ris an liosta-chluich.</item>
+    </plurals>
+    <!-- Toasts after removing song(s) from playlists -->
+    <plurals name="NNNtracksfromplaylist">
+        <item quantity="one">Chaidh <xliff:g id="number" example="1">%d</xliff:g> òran a thoirt air falbh on liosta-chluich.</item>
+        <item quantity="two">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òran a thoirt air falbh on liosta-chluich.</item>
+        <item quantity="few">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òrain a thoirt air falbh on liosta-chluich.</item>
+        <item quantity="other">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òran a thoirt air falbh on liosta-chluich.</item>
+    </plurals>
+    <!-- Toasts after adding song(s) to queue -->
+    <plurals name="NNNtrackstoqueue">
+        <item quantity="one">Chaidh <xliff:g id="number" example="1">%d</xliff:g> òran a chur ris a’ chiutha.</item>
+        <item quantity="two">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òran a chur ris a’ chiutha.</item>
+        <item quantity="few">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òrain a chur ris a’ chiutha.</item>
+        <item quantity="other">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òran a chur ris a’ chiutha.</item>
+    </plurals>
+    <!-- Toasts after adding song(s) to the favorites list -->
+    <plurals name="NNNtrackstofavorites">
+        <item quantity="one">Chaidh <xliff:g id="number" example="1">%d</xliff:g> òran a chur ris na h-annsachdan.</item>
+        <item quantity="two">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òran a chur ris na h-annsachdan.</item>
+        <item quantity="few">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òrain a chur ris na h-annsachdan.</item>
+        <item quantity="other">Chaidh <xliff:g id="number" example="27">%d</xliff:g> òran a chur ris na h-annsachdan.</item>
+    </plurals>
+    <!-- Toast confirming that song(s) was/were deleted. -->
+    <plurals name="NNNtracksdeleted">
+        <item quantity="one">Chaidh <xliff:g id="songs_to_delete" example="1">%d</xliff:g> òran a sguabadh às.</item>
+        <item quantity="two">Chaidh <xliff:g id="songs_to_delete">%d</xliff:g> òran a sguabadh às.</item>
+        <item quantity="few">Chaidh <xliff:g id="songs_to_delete">%d</xliff:g> òrain a sguabadh às.</item>
+        <item quantity="other">Chaidh <xliff:g id="songs_to_delete">%d</xliff:g> òran a sguabadh às.</item>
+    </plurals>
+</resources>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
new file mode 100644
index 0000000..a892b4b
--- /dev/null
+++ b/app/src/main/res/values-gd/strings.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Ceòl</string>
+    <!-- Page titles -->
+    <string name="page_recent">O chionn goirid</string>
+    <string name="page_artists">Luchd-ciùil</string>
+    <string name="page_albums">Albaman</string>
+    <string name="page_songs">Òrain</string>
+    <string name="page_playlists">Liostaichean-cluich</string>
+    <string name="page_genres">Gnèithean</string>
+    <string name="page_now_playing">’Ga chluich an-dràsta</string>
+    <string name="page_play_queue">Cluich an ciutha</string>
+    <!-- Section Headers -->
+    <string name="header_albums">Albaman</string>
+    <string name="header_top_songs">Brod nan òran</string>
+    <string name="header_all_songs">A h-uile òran</string>
+    <!-- Option menu items -->
+    <string name="menu_settings">Roghainnean</string>
+    <string name="menu_search">Lorg</string>
+    <string name="menu_shuffle_item">Air thuaiream</string>
+    <string name="menu_shuffle_all">Na h-uile air thuaiream</string>
+    <string name="menu_shuffle_playlist">Cuir an liosta-chluich air thuaiream</string>
+    <string name="menu_shuffle_album">Cuir an t-albam air thuaiream</string>
+    <string name="menu_shuffle_artist">Cuir an neach-ciùil air thuaiream</string>
+    <string name="menu_shuffle_top_tracks">Cuir brod nan òran air thuaiream</string>
+    <string name="menu_shuffle_recent">Cuir na chaidh a chluich o chionn goirid air thuaiream</string>
+    <string name="menu_shuffle_last_added">Cuir an fheadhainn a chuir thu ris o chionn goirid air thuaiream</string>
+    <string name="menu_play_all">Cluich na h-uile</string>
+    <string name="menu_sort_by">Seòrsaich a-rèir</string>
+    <string name="menu_clear_list">Falamhaich an liosta</string>
+    <string name="menu_clear_recents">Falamhaich na chluich thu o chionn goirid</string>
+    <string name="menu_clear_queue">Falamhaich an ciutha</string>
+    <string name="menu_save_queue">Sàbhail an ciutha san liosta-chluich</string>
+    <string name="menu_equalizer">Cothromaiche</string>
+    <!-- Playlist items -->
+    <string name="add_to_playlist">Cuir ris an liosta-chluich</string>
+    <string name="add_to_queue">Cuir ris a\' chiutha</string>
+    <string name="remove_from_recent">Thoir air falbh o na chluich thu o chionn goirid</string>
+    <string name="remove_from_queue">Thoir air falbh on chiutha</string>
+    <!-- Sort orders -->
+    <string name="sort_order_entry_az">A-Z</string>
+    <string name="sort_order_entry_za">Z-A</string>
+    <string name="sort_order_entry_artist">Neach-ciùil</string>
+    <string name="sort_order_entry_album">Albam</string>
+    <string name="sort_order_entry_year">Bliadhna</string>
+    <string name="sort_order_entry_duration">Faid</string>
+    <string name="sort_order_entry_date_added">Cuin a chaidh a chur ris</string>
+    <string name="sort_order_entry_track_list">Liosta nan traca</string>
+    <string name="sort_order_entry_number_of_songs">Co mheud òran</string>
+    <string name="sort_order_entry_number_of_albums">Co mheud albam</string>
+    <string name="sort_order_entry_filename">Ainm an fhaidhle</string>
+    <!-- Default playlist names -->
+    <string name="playlist_last_added">Fear mu dheireadh a chuir thu ris</string>
+    <string name="playlist_recently_played">Air a chluich o chionn goirid</string>
+    <string name="playlist_top_tracks">Brod nan traca agam</string>
+    <!-- AlertDialog items -->
+    <string name="new_playlist">Liosta-chluich ùr</string>
+    <string name="save">Sàbhail</string>
+    <string name="cancel">Sguir dheth</string>
+    <string name="overwrite">Sgrìobh thairis air</string>
+    <string name="clear">Falamhaich</string>
+    <string name="new_playlist_name_template">Liosta-chluich <xliff:g id="number">%d</xliff:g></string>
+    <string name="create_playlist_prompt">Ainm na liosta-chluich</string>
+    <string name="delete_dialog_title">A bheil thu airson <xliff:g id="item" example="album">%s</xliff:g> a sguabadh às?</string>
+    <string name="clear_top_tracks_title">A bheil thu airson brod nan traca fhalamhachadh?</string>
+    <string name="clear_recent_title">A bheil thu airson na chluich thu o chionn goirid a sguabadh às?</string>
+    <string name="clear_last_added">A bheil thu airson am fear mu dheireadh a chuir thu ris a thoirt air falbh?</string>
+    <string name="cannot_be_undone">Chan urrainn dhut seo a neo-dhèanamh</string>
+    <string name="delete_warning">Sguabaidh seo às na dealbhan gu buan a chaidh a chur san tasgadan</string>
+    <string name="new_photo">Tagh dealbh on ghailearaidh</string>
+    <string name="google_search">Lorg Google</string>
+    <string name="use_default">Cleachd dealbh bunaiteach</string>
+    <string name="old_photo">Cleachd seann-dealbh</string>
+    <!-- Context menu items -->
+    <string name="context_menu_play_selection">Cluich</string>
+    <string name="context_menu_play_next">Cluich an ath-fhear</string>
+    <string name="context_menu_play_album">Cluich an t-albam</string>
+    <string name="context_menu_more_by_artist">Barrachd leis an neach-chiùil seo</string>
+    <string name="context_menu_rename_playlist">Thoir ainm ùr air</string>
+    <string name="context_menu_delete">Sguab às</string>
+    <string name="context_menu_fetch_album_art">Faigh obair-ealain an albaim</string>
+    <string name="context_menu_fetch_artist_image">Faigh dealbh an neach-chiùil</string>
+    <string name="context_menu_remove_from_recent">Thoir air falbh on fheadhainn a bha agam o chionn goirid</string>
+    <string name="context_menu_use_as_ringtone">Cleachd mar sheirm</string>
+    <string name="context_menu_remove_from_playlist">Thoir air falbh on liosta-chluich</string>
+    <string name="context_menu_change_image">Atharraich an dealbh</string>
+    <!-- Content descriptions -->
+    <string name="accessibility_play">Cluich</string>
+    <string name="accessibility_pause">Cuir ’na stad</string>
+    <string name="accessibility_next">Air adhart</string>
+    <string name="accessibility_prev">Air ais</string>
+    <string name="accessibility_shuffle">Air thuaiream</string>
+    <string name="accessibility_shuffle_all">Cuir na h-uile air thuaiream</string>
+    <string name="accessibility_repeat">Ath-chluich</string>
+    <string name="accessibility_repeat_all">Ath-chluich na h-uile</string>
+    <string name="accessibility_repeat_one">Ath-chluich aonan</string>
+    <string name="accessibility_queue">Fosgail an ciutha</string>
+    <string name="accessibility_browse">Rùraich an ceòl</string>
+    <!-- Toast messages -->
+    <string name="set_as_ringtone">Suidhich “<xliff:g id="name" example="Alarm Bell">%s</xliff:g>” mar sheirm</string>
+    <string name="playlist_renamed">Chaidh ainm ùr a thoirt air an liosta-chluich</string>
+    <!-- Settings -->
+    <string name="settings_ui_category">Eadar-aghaidh</string>
+    <string name="settings_storage_category">Stòras</string>
+    <string name="settings_data_category">Dàta</string>
+    <string name="settings_delete_cache_title">Sguab an tasgadan às</string>
+    <string name="settings_delete_cache_summary">Thoir air falbh gach dealbh san tasgadan</string>
+    <string name="settings_download_only_on_wifi_title">Na luchdaich a-nuas ach air WiFi</string>
+    <string name="settings_download_only_on_wifi_summary">Airson cosgaisean a sheachnadh, na luchdaich a-nuas air lìonra mobile</string>
+    <string name="settings_download_missing_artwork_title">Luchdaich a-nuas obair-ealain an albaim a tha a dhìth</string>
+    <string name="settings_download_artist_images_title">Luchdaich a-nuas dealbhan an luchd-chiùil a tha a dhìth</string>
+    <string name="settings_general_category">Coitcheann</string>
+    <string name="settings_show_music_visualization_title">Seall fir-chlis a’ chiùil</string>
+    <string name="settings_show_lyrics_title">Seall faclan nan òran</string>
+    <string name="settings_show_lyrics_summary">Airson òrain aig a bheil faidhle srt</string>
+    <string name="settings_shake_to_play">Crath airson cluich</string>
+    <string name="settings_shake_to_play_summary">Crath an t-uidheam agad airson an ath-òran a chluich</string>
+    <string name="settings_lockscreen_album_art">Obair-ealain albaman air an sgrìn-ghlasaidh</string>
+    <string name="settings_lockscreen_album_art_summary">Cuir obair-ealain an albaim an àite cùlaibh na sgrìn-ghlasaidh</string>
+    <!-- App widget -->
+    <string name="app_widget_small">Ceòl: 4 \u00d7 1</string>
+    <string name="app_widget_large">Ceòl: 4 \u00d7 2</string>
+    <string name="app_widget_large_alt">Ceòl: 4 \u00d7 2 (roghainn eile)</string>
+    <string name="app_widget_recent">Ceòl: Air èisteachd o chionn goirid</string>
+    <!-- Empty list / error messages -->
+    <string name="no_effects_for_you">Cha b’ urrainn dhuinn an cothromaiche fhosgladh.</string>
+    <string name="empty_music">Cleachd càball USB airson lethbhreac dhen cheòl air a’ choimpiutair agad a chur air an uidheam agad.</string>
+    <string name="empty_search">Cha deach toradh luirg a lorg</string>
+    <string name="empty_search_check">Dèan cinnteach gu bheil e air a litreachadh gun mhearachd no feuch facal-luirg eile.</string>
+    <string name="empty_favorite">Nochdaidh òrain a chomharraich thu mar annsachdan an-seo.</string>
+    <string name="empty_recent_main">Cha do chluich thu òran o chionn goirid</string>
+    <string name="empty_recent">Nochdaidh òrain ris an do dh’èist thu o chionn goirid an-seo.</string>
+    <string name="empty_playlist_main">Chan eil òran sam bith air an liosta-chluich</string>
+    <string name="empty_playlist_secondary">Airson òrain a chur ris an liosta-chluich, thoir gnogag air clàr-taice nan roghainnean aig òran, albam no neach-ciùil agus tagh “Cuir ris an liosta-chluich”.</string>
+    <string name="empty_top_tracks_main">Chan eil brod traca agad</string>
+    <string name="empty_top_tracks_secondary">Thèid na h-òrain ris an èist thu gu tric a chur ris an liosta seo.</string>
+    <string name="empty_last_added_main">Cha deach òran sam bith a chur ris o chionn goirid</string>
+    <string name="empty_last_added">Nochdaidh òrain a chur thu ris thairis air a’ mhìos seo chaidh an-seo.</string>
+    <string name="empty_generic_main">Cha deach ceòl a lorg</string>
+    <string name="empty_generic_secondary">Cleachd càball USB airson lethbhreac dhen cheòl air a’ choimpiutair agad a chur air an uidheam agad.</string>
+    <string name="empty_queue_main">Chan eil òran sam bith sa chiutha</string>
+    <string name="empty_queue_secondary">Airson òrain a chur ris a’ chiutha chluich, thoir gnogag air clàr-taice nan roghainnean aig òran, albam no neach-ciùil agus tagh “Cuir ris a’ chiutha chluich”.</string>
+    <string name="error_playing_track">Cha ghabh an traca %1$s a chluich</string>
+    <!-- Section Headers -->
+    <string name="header_unknown_year">Bliadhna neo-aithnichte</string>
+    <string name="header_less_than_30s">Nas lugha na 30 diog</string>
+    <string name="header_30_to_60_seconds">Eadar 30 is 60 diog</string>
+    <string name="header_1_to_2_minutes">Eadar mionaid is 2 mhionaid</string>
+    <string name="header_2_to_3_minutes">Eadar 2 is 3 mionaidean</string>
+    <string name="header_3_to_4_minutes">Eadar 3 is 4 mionaidean</string>
+    <string name="header_4_to_5_minutes">Eadar 4 is 5 mionaidean</string>
+    <string name="header_5_to_10_minutes">Eadar 5 is 10 mionaidean</string>
+    <string name="header_10_to_30_minutes">Eadar 10 mionaidean is leth-uair a thìde</string>
+    <string name="header_30_to_60_minutes">Eadar leth-uair is uair a thìde</string>
+    <string name="header_greater_than_60_minutes">Barrachd air uair a thìde</string>
+    <string name="header_1_song">Òran</string>
+    <string name="header_2_to_4_songs">Eadar 2 is 4 òrain</string>
+    <string name="header_5_to_9_songs">Eadar 5 is 9 òrain</string>
+    <string name="header_10_plus_songs">Barrachd air 10 òrain</string>
+    <string name="header_5_plus_albums">Barrachd air 5 albaman</string>
+    <string name="header_other">"Eile"</string>
+    <string name="footer_search_artists">Seall a h-uile neach-ciùil</string>
+    <string name="footer_search_albums">Seall a h-uile albam</string>
+    <string name="footer_search_songs">Seall a h-uile òran</string>
+    <string name="footer_search_playlists">Seall a h-uile liosta-chluich</string>
+    <string name="searchHint">Lorg ceòl</string>
+    <string name="search_title_artists">A h-uile neach-ciùil “%s”</string>
+    <string name="search_title_albums">A h-uile albam “%s”</string>
+    <string name="search_title_songs">A h-uile òran “%s”</string>
+    <string name="search_title_playlists">A h-uile liosta-chluich “%s”</string>
+    <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+</resources>
diff --git a/res/values-gl/plurals.xml b/app/src/main/res/values-gl/plurals.xml
similarity index 100%
rename from res/values-gl/plurals.xml
rename to app/src/main/res/values-gl/plurals.xml
diff --git a/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
similarity index 99%
rename from res/values-gl/strings.xml
rename to app/src/main/res/values-gl/strings.xml
index aa67995..bd49d4b 100644
--- a/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Todas as cancións \"%s\"</string>
   <string name="search_title_playlists">Todas as listas de reprodución \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Reproducir música</string>
 </resources>
diff --git a/res/values-gu/plurals.xml b/app/src/main/res/values-gu/plurals.xml
similarity index 100%
rename from res/values-gu/plurals.xml
rename to app/src/main/res/values-gu/plurals.xml
diff --git a/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
similarity index 100%
rename from res/values-gu/strings.xml
rename to app/src/main/res/values-gu/strings.xml
diff --git a/res/values-hi/plurals.xml b/app/src/main/res/values-hi/plurals.xml
similarity index 100%
rename from res/values-hi/plurals.xml
rename to app/src/main/res/values-hi/plurals.xml
diff --git a/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
similarity index 100%
rename from res/values-hi/strings.xml
rename to app/src/main/res/values-hi/strings.xml
diff --git a/res/values-hr/plurals.xml b/app/src/main/res/values-hr/plurals.xml
similarity index 100%
rename from res/values-hr/plurals.xml
rename to app/src/main/res/values-hr/plurals.xml
diff --git a/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
similarity index 100%
rename from res/values-hr/strings.xml
rename to app/src/main/res/values-hr/strings.xml
diff --git a/res/values-hu/plurals.xml b/app/src/main/res/values-hu/plurals.xml
similarity index 100%
rename from res/values-hu/plurals.xml
rename to app/src/main/res/values-hu/plurals.xml
diff --git a/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
similarity index 100%
rename from res/values-hu/strings.xml
rename to app/src/main/res/values-hu/strings.xml
diff --git a/res/values-gd/plurals.xml b/app/src/main/res/values-hy/plurals.xml
similarity index 100%
rename from res/values-gd/plurals.xml
rename to app/src/main/res/values-hy/plurals.xml
diff --git a/res/values-gd/strings.xml b/app/src/main/res/values-hy/strings.xml
similarity index 100%
rename from res/values-gd/strings.xml
rename to app/src/main/res/values-hy/strings.xml
diff --git a/res/values-in/plurals.xml b/app/src/main/res/values-in/plurals.xml
similarity index 100%
rename from res/values-in/plurals.xml
rename to app/src/main/res/values-in/plurals.xml
diff --git a/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
similarity index 99%
rename from res/values-in/strings.xml
rename to app/src/main/res/values-in/strings.xml
index 9408446..57444a9 100644
--- a/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Semua \"%s\" lagu</string>
   <string name="search_title_playlists">Semua \"%s\" daftar putar</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Pemutaran musik</string>
 </resources>
diff --git a/res/values-hy/plurals.xml b/app/src/main/res/values-is/plurals.xml
similarity index 100%
rename from res/values-hy/plurals.xml
rename to app/src/main/res/values-is/plurals.xml
diff --git a/res/values-hy/strings.xml b/app/src/main/res/values-is/strings.xml
similarity index 100%
rename from res/values-hy/strings.xml
rename to app/src/main/res/values-is/strings.xml
diff --git a/res/values-it/plurals.xml b/app/src/main/res/values-it/plurals.xml
similarity index 100%
rename from res/values-it/plurals.xml
rename to app/src/main/res/values-it/plurals.xml
diff --git a/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 99%
rename from res/values-it/strings.xml
rename to app/src/main/res/values-it/strings.xml
index 20b8aee..882cd4a 100644
--- a/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Tutte le canzoni \"%s\"</string>
   <string name="search_title_playlists">Tutte le playlist \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Riproduzione musicale</string>
 </resources>
diff --git a/res/values-iw/plurals.xml b/app/src/main/res/values-iw/plurals.xml
similarity index 100%
rename from res/values-iw/plurals.xml
rename to app/src/main/res/values-iw/plurals.xml
diff --git a/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
similarity index 100%
rename from res/values-iw/strings.xml
rename to app/src/main/res/values-iw/strings.xml
diff --git a/res/values-ja/plurals.xml b/app/src/main/res/values-ja/plurals.xml
similarity index 100%
rename from res/values-ja/plurals.xml
rename to app/src/main/res/values-ja/plurals.xml
diff --git a/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
similarity index 99%
rename from res/values-ja/strings.xml
rename to app/src/main/res/values-ja/strings.xml
index 91bc19d..15f1aaa 100644
--- a/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">[%s]を含むすべての曲</string>
   <string name="search_title_playlists">[%s]を含むすべてのプレイリスト</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g><xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">音楽の再生</string>
 </resources>
diff --git a/res/values-is/plurals.xml b/app/src/main/res/values-ka/plurals.xml
similarity index 100%
rename from res/values-is/plurals.xml
rename to app/src/main/res/values-ka/plurals.xml
diff --git a/res/values-is/strings.xml b/app/src/main/res/values-ka/strings.xml
similarity index 100%
rename from res/values-is/strings.xml
rename to app/src/main/res/values-ka/strings.xml
diff --git a/res/values-ka/plurals.xml b/app/src/main/res/values-kab-rDZ/plurals.xml
similarity index 100%
rename from res/values-ka/plurals.xml
rename to app/src/main/res/values-kab-rDZ/plurals.xml
diff --git a/res/values-ka/strings.xml b/app/src/main/res/values-kab-rDZ/strings.xml
similarity index 100%
rename from res/values-ka/strings.xml
rename to app/src/main/res/values-kab-rDZ/strings.xml
diff --git a/res/values-kab-rDZ/plurals.xml b/app/src/main/res/values-kk/plurals.xml
similarity index 100%
rename from res/values-kab-rDZ/plurals.xml
rename to app/src/main/res/values-kk/plurals.xml
diff --git a/res/values-kab-rDZ/strings.xml b/app/src/main/res/values-kk/strings.xml
similarity index 100%
rename from res/values-kab-rDZ/strings.xml
rename to app/src/main/res/values-kk/strings.xml
diff --git a/res/values-kk/plurals.xml b/app/src/main/res/values-km/plurals.xml
similarity index 100%
rename from res/values-kk/plurals.xml
rename to app/src/main/res/values-km/plurals.xml
diff --git a/res/values-kk/strings.xml b/app/src/main/res/values-km/strings.xml
similarity index 100%
rename from res/values-kk/strings.xml
rename to app/src/main/res/values-km/strings.xml
diff --git a/res/values-kn/plurals.xml b/app/src/main/res/values-kn/plurals.xml
similarity index 100%
rename from res/values-kn/plurals.xml
rename to app/src/main/res/values-kn/plurals.xml
diff --git a/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
similarity index 100%
rename from res/values-kn/strings.xml
rename to app/src/main/res/values-kn/strings.xml
diff --git a/res/values-ko/plurals.xml b/app/src/main/res/values-ko/plurals.xml
similarity index 100%
rename from res/values-ko/plurals.xml
rename to app/src/main/res/values-ko/plurals.xml
diff --git a/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
similarity index 99%
rename from res/values-ko/strings.xml
rename to app/src/main/res/values-ko/strings.xml
index fa13bcf..775a37d 100644
--- a/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">모든 \"%s\" 음악</string>
   <string name="search_title_playlists">모든 \"%s\" 재생목록</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">음악 재생</string>
 </resources>
diff --git a/res/values-km/plurals.xml b/app/src/main/res/values-ku/plurals.xml
similarity index 100%
rename from res/values-km/plurals.xml
rename to app/src/main/res/values-ku/plurals.xml
diff --git a/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
similarity index 100%
rename from res/values-ku/strings.xml
rename to app/src/main/res/values-ku/strings.xml
diff --git a/res/values-ku/plurals.xml b/app/src/main/res/values-ky/plurals.xml
similarity index 100%
rename from res/values-ku/plurals.xml
rename to app/src/main/res/values-ky/plurals.xml
diff --git a/res/values-km/strings.xml b/app/src/main/res/values-ky/strings.xml
similarity index 100%
rename from res/values-km/strings.xml
rename to app/src/main/res/values-ky/strings.xml
diff --git a/res/values-lb/plurals.xml b/app/src/main/res/values-lb/plurals.xml
similarity index 100%
rename from res/values-lb/plurals.xml
rename to app/src/main/res/values-lb/plurals.xml
diff --git a/res/values-lb/strings.xml b/app/src/main/res/values-lb/strings.xml
similarity index 100%
rename from res/values-lb/strings.xml
rename to app/src/main/res/values-lb/strings.xml
diff --git a/res/values-ky/plurals.xml b/app/src/main/res/values-lo/plurals.xml
similarity index 100%
rename from res/values-ky/plurals.xml
rename to app/src/main/res/values-lo/plurals.xml
diff --git a/res/values-ky/strings.xml b/app/src/main/res/values-lo/strings.xml
similarity index 100%
rename from res/values-ky/strings.xml
rename to app/src/main/res/values-lo/strings.xml
diff --git a/res/values-lo/plurals.xml b/app/src/main/res/values-lt/plurals.xml
similarity index 100%
rename from res/values-lo/plurals.xml
rename to app/src/main/res/values-lt/plurals.xml
diff --git a/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
similarity index 100%
rename from res/values-lt/strings.xml
rename to app/src/main/res/values-lt/strings.xml
diff --git a/res/values-lv/plurals.xml b/app/src/main/res/values-lv/plurals.xml
similarity index 100%
rename from res/values-lv/plurals.xml
rename to app/src/main/res/values-lv/plurals.xml
diff --git a/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
similarity index 100%
rename from res/values-lv/strings.xml
rename to app/src/main/res/values-lv/strings.xml
diff --git a/res/values-lt/plurals.xml b/app/src/main/res/values-mk/plurals.xml
similarity index 100%
rename from res/values-lt/plurals.xml
rename to app/src/main/res/values-mk/plurals.xml
diff --git a/res/values-lo/strings.xml b/app/src/main/res/values-mk/strings.xml
similarity index 100%
rename from res/values-lo/strings.xml
rename to app/src/main/res/values-mk/strings.xml
diff --git a/res/values-ml/plurals.xml b/app/src/main/res/values-ml/plurals.xml
similarity index 100%
rename from res/values-ml/plurals.xml
rename to app/src/main/res/values-ml/plurals.xml
diff --git a/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
similarity index 100%
rename from res/values-ml/strings.xml
rename to app/src/main/res/values-ml/strings.xml
diff --git a/res/values-mk/plurals.xml b/app/src/main/res/values-mn/plurals.xml
similarity index 100%
rename from res/values-mk/plurals.xml
rename to app/src/main/res/values-mn/plurals.xml
diff --git a/res/values-mk/strings.xml b/app/src/main/res/values-mn/strings.xml
similarity index 100%
rename from res/values-mk/strings.xml
rename to app/src/main/res/values-mn/strings.xml
diff --git a/res/values-mr/plurals.xml b/app/src/main/res/values-mr/plurals.xml
similarity index 100%
rename from res/values-mr/plurals.xml
rename to app/src/main/res/values-mr/plurals.xml
diff --git a/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
similarity index 100%
rename from res/values-mr/strings.xml
rename to app/src/main/res/values-mr/strings.xml
diff --git a/res/values-mn/plurals.xml b/app/src/main/res/values-ms/plurals.xml
similarity index 100%
rename from res/values-mn/plurals.xml
rename to app/src/main/res/values-ms/plurals.xml
diff --git a/res/values-mn/strings.xml b/app/src/main/res/values-ms/strings.xml
similarity index 100%
rename from res/values-mn/strings.xml
rename to app/src/main/res/values-ms/strings.xml
diff --git a/res/values-ms/plurals.xml b/app/src/main/res/values-my/plurals.xml
similarity index 100%
rename from res/values-ms/plurals.xml
rename to app/src/main/res/values-my/plurals.xml
diff --git a/res/values-ms/strings.xml b/app/src/main/res/values-my/strings.xml
similarity index 100%
rename from res/values-ms/strings.xml
rename to app/src/main/res/values-my/strings.xml
diff --git a/res/values-nb/plurals.xml b/app/src/main/res/values-nb/plurals.xml
similarity index 100%
rename from res/values-nb/plurals.xml
rename to app/src/main/res/values-nb/plurals.xml
diff --git a/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
similarity index 100%
rename from res/values-nb/strings.xml
rename to app/src/main/res/values-nb/strings.xml
diff --git a/res/values-my/plurals.xml b/app/src/main/res/values-ne/plurals.xml
similarity index 100%
rename from res/values-my/plurals.xml
rename to app/src/main/res/values-ne/plurals.xml
diff --git a/res/values-my/strings.xml b/app/src/main/res/values-ne/strings.xml
similarity index 100%
rename from res/values-my/strings.xml
rename to app/src/main/res/values-ne/strings.xml
diff --git a/res/values-nl/plurals.xml b/app/src/main/res/values-nl/plurals.xml
similarity index 100%
rename from res/values-nl/plurals.xml
rename to app/src/main/res/values-nl/plurals.xml
diff --git a/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
similarity index 100%
rename from res/values-nl/strings.xml
rename to app/src/main/res/values-nl/strings.xml
diff --git a/res/values-ne/plurals.xml b/app/src/main/res/values-oc/plurals.xml
similarity index 100%
rename from res/values-ne/plurals.xml
rename to app/src/main/res/values-oc/plurals.xml
diff --git a/res/values-ne/strings.xml b/app/src/main/res/values-oc/strings.xml
similarity index 100%
rename from res/values-ne/strings.xml
rename to app/src/main/res/values-oc/strings.xml
diff --git a/res/values-or-rIN/plurals.xml b/app/src/main/res/values-or-rIN/plurals.xml
similarity index 100%
rename from res/values-or-rIN/plurals.xml
rename to app/src/main/res/values-or-rIN/plurals.xml
diff --git a/res/values-or-rIN/strings.xml b/app/src/main/res/values-or-rIN/strings.xml
similarity index 100%
rename from res/values-or-rIN/strings.xml
rename to app/src/main/res/values-or-rIN/strings.xml
diff --git a/res/values-oc/plurals.xml b/app/src/main/res/values-pa/plurals.xml
similarity index 100%
rename from res/values-oc/plurals.xml
rename to app/src/main/res/values-pa/plurals.xml
diff --git a/res/values-oc/strings.xml b/app/src/main/res/values-pa/strings.xml
similarity index 100%
rename from res/values-oc/strings.xml
rename to app/src/main/res/values-pa/strings.xml
diff --git a/res/values-pa/plurals.xml b/app/src/main/res/values-pl/plurals.xml
similarity index 100%
rename from res/values-pa/plurals.xml
rename to app/src/main/res/values-pl/plurals.xml
diff --git a/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
similarity index 99%
rename from res/values-pl/strings.xml
rename to app/src/main/res/values-pl/strings.xml
index 0e3df0d..01ad86a 100644
--- a/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Wszystkie piosenki \"%s\"</string>
   <string name="search_title_playlists">Wszystkie playlisty \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Odtwarzanie muzyki</string>
 </resources>
diff --git a/res/values-pt-rBR/plurals.xml b/app/src/main/res/values-pt-rBR/plurals.xml
similarity index 100%
rename from res/values-pt-rBR/plurals.xml
rename to app/src/main/res/values-pt-rBR/plurals.xml
diff --git a/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
similarity index 99%
rename from res/values-pt-rBR/strings.xml
rename to app/src/main/res/values-pt-rBR/strings.xml
index e199478..b1e98e0 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Todas as músicas com \"%s\"</string>
   <string name="search_title_playlists">Todas as listas de reprodução com \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Reprodução de música</string>
 </resources>
diff --git a/res/values-pt-rPT/plurals.xml b/app/src/main/res/values-pt-rPT/plurals.xml
similarity index 100%
rename from res/values-pt-rPT/plurals.xml
rename to app/src/main/res/values-pt-rPT/plurals.xml
diff --git a/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
similarity index 99%
rename from res/values-pt-rPT/strings.xml
rename to app/src/main/res/values-pt-rPT/strings.xml
index 8d3dc02..871bdb5 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Todas as músicas \"%s\"</string>
   <string name="search_title_playlists">Todas as listas de reprodução \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Reproduzir música</string>
 </resources>
diff --git a/res/values-pl/plurals.xml b/app/src/main/res/values-rm/plurals.xml
similarity index 100%
rename from res/values-pl/plurals.xml
rename to app/src/main/res/values-rm/plurals.xml
diff --git a/res/values-pa/strings.xml b/app/src/main/res/values-rm/strings.xml
similarity index 100%
rename from res/values-pa/strings.xml
rename to app/src/main/res/values-rm/strings.xml
diff --git a/res/values-ro/plurals.xml b/app/src/main/res/values-ro/plurals.xml
similarity index 100%
rename from res/values-ro/plurals.xml
rename to app/src/main/res/values-ro/plurals.xml
diff --git a/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
similarity index 99%
rename from res/values-ro/strings.xml
rename to app/src/main/res/values-ro/strings.xml
index 76ff6aa..c7e6fd3 100644
--- a/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Toate \"%s\" melodiile</string>
   <string name="search_title_playlists">Toate \"%s\" listele de redare</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Redare muzică</string>
 </resources>
diff --git a/res/values-ru/plurals.xml b/app/src/main/res/values-ru/plurals.xml
similarity index 99%
rename from res/values-ru/plurals.xml
rename to app/src/main/res/values-ru/plurals.xml
index 45e87bd..5c3fdec 100644
--- a/res/values-ru/plurals.xml
+++ b/app/src/main/res/values-ru/plurals.xml
@@ -68,7 +68,7 @@
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек удалён из плейлиста.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек удален из плейлиста.</item>
     <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> трека удалены из плейлиста.</item>
     <item quantity="many"><xliff:g id="number" example="1">%d</xliff:g> треков удалены из плейлиста.</item>
     <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> треков удалены из плейлиста.</item>
diff --git a/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
similarity index 98%
rename from res/values-ru/strings.xml
rename to app/src/main/res/values-ru/strings.xml
index 9221495..15f7f0e 100644
--- a/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -40,7 +40,7 @@
   <string name="menu_shuffle_album">Перемешать альбом</string>
   <string name="menu_shuffle_artist">Перемешать исполнителя</string>
   <string name="menu_shuffle_top_tracks">Перемешать топ-треки</string>
-  <string name="menu_shuffle_recent">Перемешать недавно воспроизведённые</string>
+  <string name="menu_shuffle_recent">Перемешать недавно воспроизведенные</string>
   <string name="menu_shuffle_last_added">Перемешать последние добавленные</string>
   <string name="menu_play_all">Воспроизвести все</string>
   <string name="menu_sort_by">Сортировать по</string>
@@ -68,7 +68,7 @@
   <string name="sort_order_entry_filename">Имени файла</string>
   <!-- Default playlist names -->
   <string name="playlist_last_added">Недавно добавленные</string>
-  <string name="playlist_recently_played">Недавно воспроизведённые</string>
+  <string name="playlist_recently_played">Недавно воспроизведенные</string>
   <string name="playlist_top_tracks">Мои топ-треки</string>
   <!-- AlertDialog items -->
   <string name="new_playlist">Новый плейлист</string>
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Все треки «%s»</string>
   <string name="search_title_playlists">Все плейлисты «%s»</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Воспроизведение музыки</string>
 </resources>
diff --git a/res/values-rm/plurals.xml b/app/src/main/res/values-sc-rIT/plurals.xml
similarity index 100%
rename from res/values-rm/plurals.xml
rename to app/src/main/res/values-sc-rIT/plurals.xml
diff --git a/app/src/main/res/values-sc-rIT/strings.xml b/app/src/main/res/values-sc-rIT/strings.xml
new file mode 100644
index 0000000..cc3851c
--- /dev/null
+++ b/app/src/main/res/values-sc-rIT/strings.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
+     Copyright (C) 2012-2014 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="app_name">Mùsica</string>
+  <!-- Page titles -->
+  <!-- Section Headers -->
+  <!-- Option menu items -->
+  <string name="menu_settings">Cunfiguratziones</string>
+  <string name="menu_search">Chirca</string>
+  <!-- Playlist items -->
+  <!-- Sort orders -->
+  <string name="sort_order_entry_artist">Artista</string>
+  <string name="sort_order_entry_year">Annu</string>
+  <string name="sort_order_entry_duration">Longària</string>
+  <!-- Default playlist names -->
+  <!-- AlertDialog items -->
+  <string name="save">Sarva</string>
+  <string name="cancel">Annulla</string>
+  <string name="overwrite">Subraiscrie</string>
+  <string name="clear">Isbòida</string>
+  <!-- Context menu items -->
+  <string name="context_menu_delete">Iscantzella</string>
+  <!-- Content descriptions -->
+  <!-- Toast messages -->
+  <!-- Settings -->
+  <string name="settings_data_category">Datos</string>
+  <string name="settings_general_category">Generale</string>
+  <!-- App widget -->
+  <!-- Empty list / error messages -->
+  <!-- Section Headers -->
+  <string name="header_less_than_30s">Prus pagu de 30 segundos</string>
+  <string name="header_30_to_60_seconds">30 - 60 segundos</string>
+  <string name="header_1_to_2_minutes">1 - 2 minutos</string>
+  <string name="header_2_to_3_minutes">2 - 3 minutos</string>
+  <string name="header_3_to_4_minutes">3 - 4 minutos</string>
+  <string name="header_4_to_5_minutes">4 - 5 minutos</string>
+  <string name="header_5_to_10_minutes">5 - 10 minutos</string>
+  <string name="header_10_to_30_minutes">10 - 30 minutos</string>
+  <string name="header_30_to_60_minutes">30 - 60 minutos</string>
+  <string name="header_greater_than_60_minutes">Prus de 60 minutos</string>
+  <string name="header_other">"Àteru"</string>
+</resources>
diff --git a/res/values-sc-rIT/plurals.xml b/app/src/main/res/values-si/plurals.xml
similarity index 100%
rename from res/values-sc-rIT/plurals.xml
rename to app/src/main/res/values-si/plurals.xml
diff --git a/res/values-rm/strings.xml b/app/src/main/res/values-si/strings.xml
similarity index 100%
rename from res/values-rm/strings.xml
rename to app/src/main/res/values-si/strings.xml
diff --git a/res/values-sk/plurals.xml b/app/src/main/res/values-sk/plurals.xml
similarity index 100%
rename from res/values-sk/plurals.xml
rename to app/src/main/res/values-sk/plurals.xml
diff --git a/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
similarity index 99%
rename from res/values-sk/strings.xml
rename to app/src/main/res/values-sk/strings.xml
index 2e2508a..67036a4 100644
--- a/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Všetky skladby \"%s\"</string>
   <string name="search_title_playlists">Všetky v zozname skladieb \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Prehrávanie zvuku</string>
 </resources>
diff --git a/res/values-sl/plurals.xml b/app/src/main/res/values-sl/plurals.xml
similarity index 100%
rename from res/values-sl/plurals.xml
rename to app/src/main/res/values-sl/plurals.xml
diff --git a/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
similarity index 99%
rename from res/values-sl/strings.xml
rename to app/src/main/res/values-sl/strings.xml
index a0cfc2f..c407054 100644
--- a/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Vseh \"%s\" skladb</string>
   <string name="search_title_playlists">Vseh \"%s\" seznamov predvajanja</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Predvajanje glasbe</string>
 </resources>
diff --git a/res/values-sq/plurals.xml b/app/src/main/res/values-sq/plurals.xml
similarity index 100%
rename from res/values-sq/plurals.xml
rename to app/src/main/res/values-sq/plurals.xml
diff --git a/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq/strings.xml
rename to app/src/main/res/values-sq/strings.xml
diff --git a/res/values-sr/plurals.xml b/app/src/main/res/values-sr/plurals.xml
similarity index 100%
rename from res/values-sr/plurals.xml
rename to app/src/main/res/values-sr/plurals.xml
diff --git a/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
similarity index 100%
rename from res/values-sr/strings.xml
rename to app/src/main/res/values-sr/strings.xml
diff --git a/res/values-sv/plurals.xml b/app/src/main/res/values-sv/plurals.xml
similarity index 100%
rename from res/values-sv/plurals.xml
rename to app/src/main/res/values-sv/plurals.xml
diff --git a/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
similarity index 100%
rename from res/values-sv/strings.xml
rename to app/src/main/res/values-sv/strings.xml
diff --git a/res/values-si/plurals.xml b/app/src/main/res/values-sw/plurals.xml
similarity index 100%
rename from res/values-si/plurals.xml
rename to app/src/main/res/values-sw/plurals.xml
diff --git a/res/values-sc-rIT/strings.xml b/app/src/main/res/values-sw/strings.xml
similarity index 100%
rename from res/values-sc-rIT/strings.xml
rename to app/src/main/res/values-sw/strings.xml
diff --git a/app/src/main/res/values-sw360dp-v13/values-preference.xml b/app/src/main/res/values-sw360dp-v13/values-preference.xml
new file mode 100644
index 0000000..9915362
--- /dev/null
+++ b/app/src/main/res/values-sw360dp-v13/values-preference.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <bool name="config_materialPreferenceIconSpaceReserved" tools:ignore="MissingDefaultResource,PrivateResource">false</bool>
+    <dimen name="preference_category_padding_start" tools:ignore="MissingDefaultResource,PrivateResource">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
similarity index 100%
rename from res/values-sw600dp/dimens.xml
rename to app/src/main/res/values-sw600dp/dimens.xml
diff --git a/res/values-ta/plurals.xml b/app/src/main/res/values-ta/plurals.xml
similarity index 100%
rename from res/values-ta/plurals.xml
rename to app/src/main/res/values-ta/plurals.xml
diff --git a/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
similarity index 100%
rename from res/values-ta/strings.xml
rename to app/src/main/res/values-ta/strings.xml
diff --git a/res/values-te/plurals.xml b/app/src/main/res/values-te/plurals.xml
similarity index 100%
rename from res/values-te/plurals.xml
rename to app/src/main/res/values-te/plurals.xml
diff --git a/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
similarity index 100%
rename from res/values-te/strings.xml
rename to app/src/main/res/values-te/strings.xml
diff --git a/res/values-th/plurals.xml b/app/src/main/res/values-th/plurals.xml
similarity index 100%
rename from res/values-th/plurals.xml
rename to app/src/main/res/values-th/plurals.xml
diff --git a/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
similarity index 100%
rename from res/values-th/strings.xml
rename to app/src/main/res/values-th/strings.xml
diff --git a/res/values-sw/plurals.xml b/app/src/main/res/values-tl/plurals.xml
similarity index 100%
rename from res/values-sw/plurals.xml
rename to app/src/main/res/values-tl/plurals.xml
diff --git a/res/values-si/strings.xml b/app/src/main/res/values-tl/strings.xml
similarity index 100%
rename from res/values-si/strings.xml
rename to app/src/main/res/values-tl/strings.xml
diff --git a/res/values-tr/plurals.xml b/app/src/main/res/values-tr/plurals.xml
similarity index 100%
rename from res/values-tr/plurals.xml
rename to app/src/main/res/values-tr/plurals.xml
diff --git a/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
similarity index 99%
rename from res/values-tr/strings.xml
rename to app/src/main/res/values-tr/strings.xml
index 4468853..2f62c05 100644
--- a/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Tüm \"%s\" şarkıları</string>
   <string name="search_title_playlists">Tüm \"%s\" çalma listeleri</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Müzik çalma</string>
 </resources>
diff --git a/res/values-tl/plurals.xml b/app/src/main/res/values-ug/plurals.xml
similarity index 100%
rename from res/values-tl/plurals.xml
rename to app/src/main/res/values-ug/plurals.xml
diff --git a/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
similarity index 100%
rename from res/values-ug/strings.xml
rename to app/src/main/res/values-ug/strings.xml
diff --git a/res/values-ug/plurals.xml b/app/src/main/res/values-uk/plurals.xml
similarity index 100%
rename from res/values-ug/plurals.xml
rename to app/src/main/res/values-uk/plurals.xml
diff --git a/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
similarity index 100%
rename from res/values-uk/strings.xml
rename to app/src/main/res/values-uk/strings.xml
diff --git a/res/values-uk/plurals.xml b/app/src/main/res/values-ur/plurals.xml
similarity index 100%
rename from res/values-uk/plurals.xml
rename to app/src/main/res/values-ur/plurals.xml
diff --git a/res/values-sw/strings.xml b/app/src/main/res/values-ur/strings.xml
similarity index 100%
rename from res/values-sw/strings.xml
rename to app/src/main/res/values-ur/strings.xml
diff --git a/res/values-ur/plurals.xml b/app/src/main/res/values-uz/plurals.xml
similarity index 100%
rename from res/values-ur/plurals.xml
rename to app/src/main/res/values-uz/plurals.xml
diff --git a/res/values-tl/strings.xml b/app/src/main/res/values-uz/strings.xml
similarity index 100%
rename from res/values-tl/strings.xml
rename to app/src/main/res/values-uz/strings.xml
diff --git a/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
similarity index 100%
rename from res/values-v21/styles.xml
rename to app/src/main/res/values-v21/styles.xml
diff --git a/res/values-uz/plurals.xml b/app/src/main/res/values-vec/plurals.xml
similarity index 100%
rename from res/values-uz/plurals.xml
rename to app/src/main/res/values-vec/plurals.xml
diff --git a/res/values-ur/strings.xml b/app/src/main/res/values-vec/strings.xml
similarity index 100%
rename from res/values-ur/strings.xml
rename to app/src/main/res/values-vec/strings.xml
diff --git a/res/values-vi/plurals.xml b/app/src/main/res/values-vi/plurals.xml
similarity index 100%
rename from res/values-vi/plurals.xml
rename to app/src/main/res/values-vi/plurals.xml
diff --git a/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
similarity index 99%
rename from res/values-vi/strings.xml
rename to app/src/main/res/values-vi/strings.xml
index b6659d5..01eeffd 100644
--- a/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">Tất cả về bài hát \"%s\"</string>
   <string name="search_title_playlists">Tất cả về danh sách phát \"%s\"</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">Điều khiển nhạc</string>
 </resources>
diff --git a/res/values-zh-rCN/plurals.xml b/app/src/main/res/values-zh-rCN/plurals.xml
similarity index 100%
rename from res/values-zh-rCN/plurals.xml
rename to app/src/main/res/values-zh-rCN/plurals.xml
diff --git a/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
similarity index 99%
rename from res/values-zh-rCN/strings.xml
rename to app/src/main/res/values-zh-rCN/strings.xml
index 3b6e47e..94aee1d 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">所有的 \"%s\" 歌曲</string>
   <string name="search_title_playlists">所有的 \"%s\" 播放列表</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">音乐播放</string>
 </resources>
diff --git a/res/values-zh-rHK/plurals.xml b/app/src/main/res/values-zh-rHK/plurals.xml
similarity index 100%
rename from res/values-zh-rHK/plurals.xml
rename to app/src/main/res/values-zh-rHK/plurals.xml
diff --git a/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
similarity index 100%
rename from res/values-zh-rHK/strings.xml
rename to app/src/main/res/values-zh-rHK/strings.xml
diff --git a/res/values-zh-rTW/plurals.xml b/app/src/main/res/values-zh-rTW/plurals.xml
similarity index 100%
rename from res/values-zh-rTW/plurals.xml
rename to app/src/main/res/values-zh-rTW/plurals.xml
diff --git a/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
similarity index 99%
rename from res/values-zh-rTW/strings.xml
rename to app/src/main/res/values-zh-rTW/strings.xml
index 945dd12..ae4db2b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -186,4 +186,5 @@
   <string name="search_title_songs">所有含 「%s」的樂曲</string>
   <string name="search_title_playlists">所有含「%s」的播放清單</string>
   <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+  <string name="channel_music">音樂播放</string>
 </resources>
diff --git a/res/values-vec/plurals.xml b/app/src/main/res/values-zu/plurals.xml
similarity index 100%
rename from res/values-vec/plurals.xml
rename to app/src/main/res/values-zu/plurals.xml
diff --git a/res/values-uz/strings.xml b/app/src/main/res/values-zu/strings.xml
similarity index 100%
rename from res/values-uz/strings.xml
rename to app/src/main/res/values-zu/strings.xml
diff --git a/res/values/appmsg_colors.xml b/app/src/main/res/values/appmsg_colors.xml
similarity index 100%
rename from res/values/appmsg_colors.xml
rename to app/src/main/res/values/appmsg_colors.xml
diff --git a/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
similarity index 100%
rename from res/values/arrays.xml
rename to app/src/main/res/values/arrays.xml
diff --git a/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
similarity index 100%
rename from res/values/attrs.xml
rename to app/src/main/res/values/attrs.xml
diff --git a/res/values/cm_colors.xml b/app/src/main/res/values/cm_colors.xml
similarity index 100%
rename from res/values/cm_colors.xml
rename to app/src/main/res/values/cm_colors.xml
diff --git a/res/values/colors.xml b/app/src/main/res/values/colors.xml
similarity index 100%
rename from res/values/colors.xml
rename to app/src/main/res/values/colors.xml
diff --git a/res/values/config.xml b/app/src/main/res/values/config.xml
similarity index 100%
rename from res/values/config.xml
rename to app/src/main/res/values/config.xml
diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
similarity index 100%
rename from res/values/donottranslate.xml
rename to app/src/main/res/values/donottranslate.xml
diff --git a/res/values/fractions.xml b/app/src/main/res/values/fractions.xml
similarity index 100%
rename from res/values/fractions.xml
rename to app/src/main/res/values/fractions.xml
diff --git a/res/values/plurals.xml b/app/src/main/res/values/plurals.xml
similarity index 100%
rename from res/values/plurals.xml
rename to app/src/main/res/values/plurals.xml
diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 99%
rename from res/values/strings.xml
rename to app/src/main/res/values/strings.xml
index 7e96954..605dd8e 100644
--- a/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -207,4 +207,6 @@
     <string name="search_title_playlists">All \"%s\" playlists</string>
 
     <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
+
+    <string name="channel_music">Music playback</string>
 </resources>
diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/res/values/values.xml b/app/src/main/res/values/values.xml
similarity index 100%
rename from res/values/values.xml
rename to app/src/main/res/values/values.xml
diff --git a/res/xml/app_widget_large.xml b/app/src/main/res/xml/app_widget_large.xml
similarity index 100%
rename from res/xml/app_widget_large.xml
rename to app/src/main/res/xml/app_widget_large.xml
diff --git a/res/xml/app_widget_large_alternate.xml b/app/src/main/res/xml/app_widget_large_alternate.xml
similarity index 100%
rename from res/xml/app_widget_large_alternate.xml
rename to app/src/main/res/xml/app_widget_large_alternate.xml
diff --git a/res/xml/app_widget_small.xml b/app/src/main/res/xml/app_widget_small.xml
similarity index 100%
rename from res/xml/app_widget_small.xml
rename to app/src/main/res/xml/app_widget_small.xml
diff --git a/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
similarity index 100%
rename from res/xml/searchable.xml
rename to app/src/main/res/xml/searchable.xml
diff --git a/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
similarity index 100%
rename from res/xml/settings.xml
rename to app/src/main/res/xml/settings.xml
diff --git a/build.gradle b/build.gradle
index 591938a..e006ab4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,98 +1,20 @@
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
-apply plugin: 'com.android.application'
-
-repositories {
-    jcenter()
-    google()
-}
-
-android {
-    compileSdkVersion 27
-    buildToolsVersion "27.0.3"
-
-    defaultConfig {
-        applicationId "org.lineageos.eleven"
-        targetSdkVersion 27
-        renderscriptTargetApi 27
-        renderscriptSupportModeEnabled true
-        versionCode 3
-        versionName "3.0"
-
-        vectorDrawables.useSupportLibrary = true  
-    }
-
-    signingConfigs {
-        release {
-            storeFile file("/home/didi/eclipse/DevStore")
-            storePassword "test123"
-            keyAlias "TestKey"
-            keyPassword "1234567890"
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility "1.8"
-        targetCompatibility "1.8"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
-            signingConfig signingConfigs.release
-        }
-    }
-
-    lintOptions {
-        // Android Support Libraries has different Versions because of use of RenderScript
-        disable 'GradleCompatible'
-        disable 'ExtraTranslation', 'MissingTranslation', 'MissingQuantity'
-        disable 'ProtectedPermissions'
-        disable 'AppLinkUrlError', 'StringFormatInvalid'
-    }
-
-    sourceSets {
-        main {
-            manifest {
-                srcFile 'AndroidManifest.xml'
-            }
-            java {
-                srcDir 'src'
-            }
-            res {
-                srcDir 'res'
-            }
-            assets {
-                srcDir 'assets'
-            }
-            resources {
-                srcDir 'src'
-            }
-            aidl {
-                srcDir 'src'
-            }
-        }
+allprojects {
+    repositories {
+        google()
+        jcenter()
     }
+}
 
-    dependencies {
-        implementation "com.android.support:appcompat-v7:27.1.0"
-        implementation "com.android.support:palette-v7:27.1.0"
-        implementation "com.android.support:recyclerview-v7:27.1.0"
-        implementation "com.android.support:support-v4:27.1.0"
-        implementation "com.android.support:cardview-v7:27.1.0"
-        implementation "com.android.support:preference-v7:27.1.0"
-        implementation "com.android.support:gridlayout-v7:27.1.0"
-        implementation "com.android.support:support-vector-drawable:27.1.0"
-        implementation "com.google.guava:guava:20.0"
-        implementation fileTree(include: ['*.jar'], dir: 'libs')
-    }
+task clean(type: Delete) {
+    delete rootProject.buildDir
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1b2e111..0000775 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 03 10:03:20 PDT 2017
+#Sun Oct 21 20:30:35 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/libs/guava-24.1-jre.jar b/libs/guava-24.1-jre.jar
new file mode 100644
index 0000000..5f2c693
Binary files /dev/null and b/libs/guava-24.1-jre.jar differ
diff --git a/proguard-project.txt b/proguard-project.txt
index ad2bfe1..e9344eb 100644
--- a/proguard-project.txt
+++ b/proguard-project.txt
@@ -38,7 +38,7 @@
 #keep all classes that might be used in XML layouts
 -keep public class * extends android.view.View
 -keep public class * extends android.app.Fragment
--keep public class * extends android.support.v4.Fragment
+-keep public class * extends androidx.fragment.app.Fragment
 
 #keep all classes
 -keep public class *{
@@ -74,4 +74,4 @@
 -dontwarn **CompatHoneycomb
 -dontwarn org.htmlcleaner.*
 -dontwarn org.jaudiotagger.**
-#-keep class android.support.v4.** { *; }
\ No newline at end of file
+#-keep class androidx.fragment.app.Fragment.** { *; }
diff --git a/project.properties b/project.properties
index 3946ad0..0633243 100644
--- a/project.properties
+++ b/project.properties
@@ -11,15 +11,18 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-27
+target=android-28
 
-renderscript.target=27
+renderscript.target=28
 renderscript.support.mode=true
-sdk.buildtools=27.0.3
+sdk.buildtools=28.0.3
+
+android.library.reference.1=../androidx-appcompat-1.0.0
+android.library.reference.2=../androidx-palette-1.0.0
+android.library.reference.3=../androidx-recyclerview-1.0.0
+android.library.reference.4=../androidx-legacy-support-v4-1.0.0
+android.library.reference.5=../androidx-cardview-1.0.0
+android.library.reference.6=../androidx-preference-1.0.0
+android.library.reference.7=../androidx-viewpager-1.0.0
+android.library.reference.8=../androidx-loader-1.0.0
 
-android.library.reference.1=../android-support-v7-appcompat-27.1.0
-android.library.reference.2=../android-support-v7-palette-27.1.0
-android.library.reference.3=../android-support-v7-recyclerview-27.1.0
-android.library.reference.4=../android-support-v4-27.1.0
-android.library.reference.5=../android-support-v7-cardview-27.1.0
-android.library.reference.6=../android-support-v7-preference-27.1.0
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
deleted file mode 100644
index a27447f..0000000
--- a/res/values-cy/strings.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2013 Andrew Neal
-     Copyright (C) 2012-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Page titles -->
-  <!-- Section Headers -->
-  <!-- Option menu items -->
-  <!-- Playlist items -->
-  <!-- Sort orders -->
-  <!-- Default playlist names -->
-  <!-- AlertDialog items -->
-  <!-- Context menu items -->
-  <!-- Content descriptions -->
-  <!-- Toast messages -->
-  <!-- Settings -->
-  <!-- App widget -->
-  <!-- Empty list / error messages -->
-  <!-- Section Headers -->
-  <string name="header_1_to_2_minutes">1 - 2 munud</string>
-  <string name="header_10_to_30_minutes">10 - 30 munud</string>
-  <string name="header_1_song">1 cân</string>
-</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
deleted file mode 100644
index 82516fe..0000000
--- a/res/values-es-rUS/strings.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2013 Andrew Neal
-     Copyright (C) 2012-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="app_name">Música</string>
-  <!-- Page titles -->
-  <string name="page_recent">Reciente</string>
-  <string name="page_artists">Artistas</string>
-  <string name="page_albums">Álbumes</string>
-  <string name="page_songs">Canciones</string>
-  <string name="page_playlists">Listas de reproducción</string>
-  <string name="page_genres">Géneros</string>
-  <string name="page_now_playing">Reproduciendo ahora</string>
-  <string name="page_play_queue">Cola de reproducción</string>
-  <!-- Section Headers -->
-  <string name="header_albums">Álbumes</string>
-  <string name="header_top_songs">Canciones más escuchadas</string>
-  <string name="header_all_songs">Todas las canciones</string>
-  <!-- Option menu items -->
-  <string name="menu_settings">Ajustes</string>
-  <string name="menu_search">Buscar</string>
-  <string name="menu_shuffle_item">Orden aleatorio</string>
-  <string name="menu_shuffle_all">Reproducción aleatoria</string>
-  <string name="menu_shuffle_playlist">Lista de reproducción aleatoria</string>
-  <string name="menu_shuffle_album">Reproducir álbum aleatoriamente</string>
-  <string name="menu_shuffle_artist">Reproducir artista aleatoriamente</string>
-  <string name="menu_shuffle_top_tracks">Reproducir las más escuchadas aleatoriamente</string>
-  <string name="menu_shuffle_recent">Seleccionar las reproducidas recientemente</string>
-  <string name="menu_shuffle_last_added">Seleccionar las últimas añadidas</string>
-  <string name="menu_play_all">Reproducir todo</string>
-  <string name="menu_sort_by">Ordenar por</string>
-  <string name="menu_clear_list">Borrar lista</string>
-  <string name="menu_clear_recents">Borrar recientes</string>
-  <string name="menu_clear_queue">Borrar cola</string>
-  <string name="menu_save_queue">Guardar cola en la lista de reproducción</string>
-  <string name="menu_equalizer">Ecualizador</string>
-  <!-- Playlist items -->
-  <string name="add_to_playlist">Añadir a la lista</string>
-  <string name="add_to_queue">Añadir a la cola</string>
-  <string name="remove_from_recent">Quitar de recientes</string>
-  <string name="remove_from_queue">Quitar de la cola</string>
-  <!-- Sort orders -->
-  <string name="sort_order_entry_az">A-Z</string>
-  <string name="sort_order_entry_za">Z-A</string>
-  <string name="sort_order_entry_artist">Artista</string>
-  <string name="sort_order_entry_album">Álbum</string>
-  <string name="sort_order_entry_year">Año</string>
-  <string name="sort_order_entry_duration">Duración</string>
-  <string name="sort_order_entry_date_added">Fecha</string>
-  <string name="sort_order_entry_track_list">Número de pista</string>
-  <string name="sort_order_entry_number_of_songs">Número de canciones</string>
-  <string name="sort_order_entry_number_of_albums">Número de álbumes</string>
-  <string name="sort_order_entry_filename">Nombre de archivo</string>
-  <!-- Default playlist names -->
-  <string name="playlist_last_added">Recientes</string>
-  <string name="playlist_recently_played">Reproducido recientemente</string>
-  <string name="playlist_top_tracks">Mis canciones más escuchadas</string>
-  <!-- AlertDialog items -->
-  <string name="new_playlist">Nueva lista</string>
-  <string name="save">Guardar</string>
-  <string name="cancel">Cancelar</string>
-  <string name="overwrite">Sobrescribir</string>
-  <string name="clear">Borrar</string>
-  <string name="new_playlist_name_template">Lista de reproducción <xliff:g id="number">%d </xliff:g></string>
-  <string name="create_playlist_prompt">Nombre de lista</string>
-  <string name="delete_dialog_title">¿Borrar <xliff:g id="item" example="album">%s</xliff:g>?</string>
-  <string name="clear_top_tracks_title">¿Borrar las canciones más reproducidas?</string>
-  <string name="clear_recent_title">¿Borrar reproducidas recientemente?</string>
-  <string name="clear_last_added">¿Borrar últimos añadidos?</string>
-  <string name="cannot_be_undone">Esta operación no se puede deshacer</string>
-  <string name="delete_warning">Esta operación borrará todas las imágenes almacenadas en caché</string>
-  <string name="new_photo">Elegir imagen de la galería</string>
-  <string name="google_search">Buscar en Google</string>
-  <string name="use_default">Usar imagen predefinida</string>
-  <string name="old_photo">Usar imagen previa</string>
-  <!-- Context menu items -->
-  <string name="context_menu_play_selection">Reproducir</string>
-  <string name="context_menu_play_next">Siguiente</string>
-  <string name="context_menu_play_album">Reproducir álbum</string>
-  <string name="context_menu_more_by_artist">Más del artista</string>
-  <string name="context_menu_rename_playlist">Renombrar</string>
-  <string name="context_menu_delete">Borrar</string>
-  <string name="context_menu_fetch_album_art">Obtener carátula del álbum</string>
-  <string name="context_menu_fetch_artist_image">Obtener foto del artista</string>
-  <string name="context_menu_remove_from_recent">Quitar de recientes</string>
-  <string name="context_menu_use_as_ringtone">Usar como tono</string>
-  <string name="context_menu_remove_from_playlist">Quitar de la lista</string>
-  <string name="context_menu_change_image">Cambiar imagen</string>
-  <!-- Content descriptions -->
-  <string name="accessibility_play">Reproducir</string>
-  <string name="accessibility_pause">Pausar</string>
-  <string name="accessibility_next">Siguiente</string>
-  <string name="accessibility_prev">Anterior</string>
-  <string name="accessibility_shuffle">Aleatorio</string>
-  <string name="accessibility_shuffle_all">Reproducción aleatoria</string>
-  <string name="accessibility_repeat">Repetir</string>
-  <string name="accessibility_repeat_all">Repetir todas</string>
-  <string name="accessibility_repeat_one">Repetir una</string>
-  <string name="accessibility_queue">Abrir cola</string>
-  <string name="accessibility_browse">Buscar música</string>
-  <!-- Toast messages -->
-  <string name="set_as_ringtone">Se estableció «<xliff:g id="name" example="Alarm Bell">%s </xliff:g>» como tono de llamada</string>
-  <string name="playlist_renamed">Lista renombrada</string>
-  <!-- Settings -->
-  <string name="settings_ui_category">Interfaz</string>
-  <string name="settings_storage_category">Almacenamiento</string>
-  <string name="settings_data_category">Datos</string>
-  <string name="settings_delete_cache_title">Borrar caché</string>
-  <string name="settings_delete_cache_summary">Quitar todas las imágenes almacenadas</string>
-  <string name="settings_download_only_on_wifi_title">Sólo descargar vía Wi-Fi</string>
-  <string name="settings_download_only_on_wifi_summary">Para reducir los cargos del proveedor no descargar a través de redes móviles</string>
-  <string name="settings_download_missing_artwork_title">Descargar carátulas faltantes</string>
-  <string name="settings_download_artist_images_title">Obtener fotos faltantes de artistas</string>
-  <string name="settings_general_category">General</string>
-  <string name="settings_show_music_visualization_title">Mostrar la visualización de música</string>
-  <string name="settings_show_lyrics_title">Mostrar las letras de las canciones</string>
-  <string name="settings_show_lyrics_summary">Para canciones que tienen un archivo srt</string>
-  <string name="settings_shake_to_play">Agitar para reproducir</string>
-  <string name="settings_shake_to_play_summary">Agita tu dispositivo para reproducir la siguiente canción</string>
-  <string name="settings_lockscreen_album_art">Carátula del álbum en pantalla bloqueada</string>
-  <string name="settings_lockscreen_album_art_summary">Reemplazar la pantalla bloqueada con la carátula del álbum</string>
-  <!-- App widget -->
-  <string name="app_widget_small">Música: 4 \u00d7 1</string>
-  <string name="app_widget_large">Música: 4 \u00d7 2</string>
-  <string name="app_widget_large_alt">Música: 4 \u00d7 2 (alternativo)</string>
-  <string name="app_widget_recent">Música: Escuchada recientemente</string>
-  <!-- Empty list / error messages -->
-  <string name="no_effects_for_you">No se pudo abrir el ecualizador.</string>
-  <string name="empty_music">Para copiar música del ordenador al dispositivo, utiliza un cable USB.</string>
-  <string name="empty_search">Sin resultados que mostrar</string>
-  <string name="empty_search_check">Comprueba que lo has escrito correctamente o intenta una palabra clave diferente.</string>
-  <string name="empty_favorite">Las canciones marcadas como favoritas aparecerán aquí.</string>
-  <string name="empty_recent_main">Sin canciones recientes</string>
-  <string name="empty_recent">Las canciones que hayas escuchado recientemente aparecerán aquí.</string>
-  <string name="empty_playlist_main">Sin canciones en la lista de reproducción</string>
-  <string name="empty_playlist_secondary">Para añadir canciones a esta lista de reproducción, pulsa en el menú de opciones de una canción, álbum o artista y selecciona «Añadir a la lista».</string>
-  <string name="empty_top_tracks_main">Sin canciones más escuchadas</string>
-  <string name="empty_top_tracks_secondary">Las canciones que más escuches se añadirán a esta lista.</string>
-  <string name="empty_last_added_main">No se añadieron canciones recientemente</string>
-  <string name="empty_last_added">Las canciones que añadiste en el último mes aparecerán aquí.</string>
-  <string name="empty_generic_main">No se encontró música</string>
-  <string name="empty_generic_secondary">Para copiar música del ordenador al dispositivo utiliza un cable USB.</string>
-  <string name="empty_queue_main">Sin canciones en la cola</string>
-  <string name="empty_queue_secondary">Para añadir canciones a la cola, pulsa en el menú de opciones de una canción, álbum o artista y selecciona «Añadir a la cola».</string>
-  <string name="error_playing_track">No se pudo reproducir la pista %1$s</string>
-  <!-- Section Headers -->
-  <string name="header_unknown_year">Año desconocido</string>
-  <string name="header_less_than_30s">Menos de 30 segundos</string>
-  <string name="header_30_to_60_seconds">30 - 60 segundos</string>
-  <string name="header_1_to_2_minutes">1 - 2 minutos</string>
-  <string name="header_2_to_3_minutes">2 - 3 minutos</string>
-  <string name="header_3_to_4_minutes">3 - 4 minutos</string>
-  <string name="header_4_to_5_minutes">4 - 5 minutos</string>
-  <string name="header_5_to_10_minutes">5 - 10 minutos</string>
-  <string name="header_10_to_30_minutes">10 - 30 minutos</string>
-  <string name="header_30_to_60_minutes">30 - 60 minutos</string>
-  <string name="header_greater_than_60_minutes">Más de 60 minutos</string>
-  <string name="header_1_song">1 canción</string>
-  <string name="header_2_to_4_songs">2 - 4 canciones</string>
-  <string name="header_5_to_9_songs">5 - 9 canciones</string>
-  <string name="header_10_plus_songs">Más de 10 canciones</string>
-  <string name="header_5_plus_albums">Más de 5 álbumes</string>
-  <string name="header_other">"Otros"</string>
-  <string name="footer_search_artists">Mostrar todos los artistas</string>
-  <string name="footer_search_albums">Mostrar todos los álbumes</string>
-  <string name="footer_search_songs">Mostrar todas las canciones</string>
-  <string name="footer_search_playlists">Mostrar todas las listas de reproducción</string>
-  <string name="searchHint">Buscar música</string>
-  <string name="search_title_artists">Todos los artistas «%s»</string>
-  <string name="search_title_albums">Todos los álbumes «%s»</string>
-  <string name="search_title_songs">Todas las canciones «%s»</string>
-  <string name="search_title_playlists">Todas las listas de reproducción «%s»</string>
-  <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
-</resources>
diff --git a/res/values-vec/strings.xml b/res/values-vec/strings.xml
deleted file mode 100644
index ac715c0..0000000
--- a/res/values-vec/strings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2013 Andrew Neal
-     Copyright (C) 2012-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Page titles -->
-  <!-- Section Headers -->
-  <!-- Option menu items -->
-  <!-- Playlist items -->
-  <!-- Sort orders -->
-  <!-- Default playlist names -->
-  <!-- AlertDialog items -->
-  <!-- Context menu items -->
-  <!-- Content descriptions -->
-  <!-- Toast messages -->
-  <!-- Settings -->
-  <!-- App widget -->
-  <!-- Empty list / error messages -->
-  <!-- Section Headers -->
-</resources>
diff --git a/res/values-zu/plurals.xml b/res/values-zu/plurals.xml
deleted file mode 100644
index 9827780..0000000
--- a/res/values-zu/plurals.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2013 Andrew Neal
-     Copyright (C) 2012-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Used to indicate the number of artists -->
-  <!-- Used to indicate the number of albums for an artist -->
-  <!-- Used to indicate the number of songs for an album -->
-  <!-- Used to indicate the number of genres -->
-  <!-- Used to show a shortened version of hours-->
-  <!-- Used to show a shortened version of minutes -->
-  <!-- Toasts after adding song(s) to playlists -->
-  <!-- Toasts after removing song(s) from playlists -->
-  <!-- Toasts after adding song(s) to queue -->
-  <!-- Toasts after adding song(s) to the favorites list -->
-  <!-- Toast confirming that song(s) was/were deleted. -->
-</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
deleted file mode 100644
index ac715c0..0000000
--- a/res/values-zu/strings.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2013 Andrew Neal
-     Copyright (C) 2012-2014 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Page titles -->
-  <!-- Section Headers -->
-  <!-- Option menu items -->
-  <!-- Playlist items -->
-  <!-- Sort orders -->
-  <!-- Default playlist names -->
-  <!-- AlertDialog items -->
-  <!-- Context menu items -->
-  <!-- Content descriptions -->
-  <!-- Toast messages -->
-  <!-- Settings -->
-  <!-- App widget -->
-  <!-- Empty list / error messages -->
-  <!-- Section Headers -->
-</resources>
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app'