diff --git a/Chameleon.Android/Assets/AboutAssets.txt b/Chameleon.Droid/Assets/AboutAssets.txt
similarity index 100%
rename from Chameleon.Android/Assets/AboutAssets.txt
rename to Chameleon.Droid/Assets/AboutAssets.txt
diff --git a/Chameleon.Android/Chameleon.Android.csproj b/Chameleon.Droid/Chameleon.Droid.csproj
similarity index 99%
rename from Chameleon.Android/Chameleon.Android.csproj
rename to Chameleon.Droid/Chameleon.Droid.csproj
index 3cce2930..2ae0288a 100644
--- a/Chameleon.Android/Chameleon.Android.csproj
+++ b/Chameleon.Droid/Chameleon.Droid.csproj
@@ -7,8 +7,8 @@
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TemplateGuid>{c9e5eea5-ca05-42a1-839b-61506e0a37df}</TemplateGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>Chameleon.Android</RootNamespace>
-    <AssemblyName>Chameleon.Android</AssemblyName>
+    <RootNamespace>Chameleon.Droid</RootNamespace>
+    <AssemblyName>Chameleon.Droid</AssemblyName>
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -37,9 +37,7 @@
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
     <AndroidLinkMode>None</AndroidLinkMode>
     <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
     <AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
-    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,8 +56,6 @@
     <AndroidEnableProfiledAot>true</AndroidEnableProfiledAot>
     <AndroidPackageFormat>aab</AndroidPackageFormat>
     <AotAssemblies>false</AotAssemblies>
-    <EnableLLVM>false</EnableLLVM>
-    <BundleAssemblies>false</BundleAssemblies>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Mono.Android" />
@@ -146,7 +142,6 @@
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\layout\Tabbar.axml" />
     <AndroidResource Include="Resources\layout\Toolbar.axml" />
     <AndroidResource Include="Resources\values\styles.xml" />
     <AndroidResource Include="Resources\values\colors.xml" />
@@ -1640,6 +1635,7 @@
       <Generator>
       </Generator>
     </AndroidResource>
+    <AndroidResource Include="Resources\layout\Tabbar.axml" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\xml\file_paths.xml">
diff --git a/Chameleon.Android/CustomRenderers/ColoredTableViewRenderer.cs b/Chameleon.Droid/CustomRenderers/ColoredTableViewRenderer.cs
similarity index 87%
rename from Chameleon.Android/CustomRenderers/ColoredTableViewRenderer.cs
rename to Chameleon.Droid/CustomRenderers/ColoredTableViewRenderer.cs
index 0d53b6ef..b87f9bda 100644
--- a/Chameleon.Android/CustomRenderers/ColoredTableViewRenderer.cs
+++ b/Chameleon.Droid/CustomRenderers/ColoredTableViewRenderer.cs
@@ -1,13 +1,13 @@
 using System.ComponentModel;
 using Android.Content;
 using Android.Graphics.Drawables;
-using Chameleon.Android.CustomRenderers;
+using Chameleon.Droid.CustomRenderers;
 using Chameleon.Core;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 
 [assembly: ExportRenderer(typeof(ColoredTableView), typeof(ColoredTableViewRenderer))]
-namespace Chameleon.Android.CustomRenderers
+namespace Chameleon.Droid.CustomRenderers
 {
     public class ColoredTableViewRenderer : TableViewRenderer
     {
@@ -21,7 +21,7 @@ protected override void OnElementChanged(ElementChangedEventArgs<TableView> e)
             if (Control == null)
                 return;
 
-            var listView = Control as global::Android.Widget.ListView;
+            var listView = Control as Android.Widget.ListView;
             var coloredTableView = (ColoredTableView)Element;
 
             listView.Divider.SetTint(Color.Transparent.GetHashCode());
@@ -35,7 +35,7 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
             base.OnElementPropertyChanged(sender, e);
             if (e.PropertyName == "SeparatorColor")
             {
-                var listView = Control as global::Android.Widget.ListView;
+                var listView = Control as Android.Widget.ListView;
                 var coloredTableView = (ColoredTableView)Element;
 
                 listView.Divider.SetTint(Color.Transparent.GetHashCode());
diff --git a/Chameleon.Android/CustomRenderers/MySearchBarRenderer.cs b/Chameleon.Droid/CustomRenderers/MySearchBarRenderer.cs
similarity index 55%
rename from Chameleon.Android/CustomRenderers/MySearchBarRenderer.cs
rename to Chameleon.Droid/CustomRenderers/MySearchBarRenderer.cs
index eae38b4e..d618e2cb 100644
--- a/Chameleon.Android/CustomRenderers/MySearchBarRenderer.cs
+++ b/Chameleon.Droid/CustomRenderers/MySearchBarRenderer.cs
@@ -1,11 +1,11 @@
 using Android.Content;
 using Android.Widget;
-using Chameleon.Android.CustomRenderers;
+using Chameleon.Droid.CustomRenderers;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 
 [assembly: ExportRenderer(typeof(SearchBar), typeof(MySearchBarRenderer))]
-namespace Chameleon.Android.CustomRenderers
+namespace Chameleon.Droid.CustomRenderers
 {
     public class MySearchBarRenderer : SearchBarRenderer
     {
@@ -17,15 +17,15 @@ protected override void OnElementChanged(ElementChangedEventArgs<SearchBar> e)
         {
             base.OnElementChanged(e);
 
-            SearchView searchView = (base.Control as SearchView);
+            var searchView = Control as SearchView;
 
-            int textViewId = searchView.Context.Resources.GetIdentifier("android:id/search_src_text", null, null);
-            EditText textView = (searchView.FindViewById(textViewId) as EditText);
+            var textViewId = searchView.Context.Resources.GetIdentifier("android:id/search_src_text", null, null);
+            var textView = (searchView.FindViewById(textViewId) as EditText);
             if (textView != null)
             {
-                int searchMagIcon = searchView.Context.Resources.GetIdentifier("android:id/search_mag_icon", null, null);
-                ImageView magIcon = (ImageView)searchView.FindViewById(searchMagIcon);
-                magIcon.SetColorFilter(global::Android.Graphics.Color.Rgb(255, 255, 255));
+                var searchMagIcon = searchView.Context.Resources.GetIdentifier("android:id/search_mag_icon", null, null);
+                var magIcon = (ImageView)searchView.FindViewById(searchMagIcon);
+                magIcon.SetColorFilter(Android.Graphics.Color.Rgb(255, 255, 255));
             }
         }
     }
diff --git a/Chameleon.Android/Effects/AndroidTransparentSelectableEffect.cs b/Chameleon.Droid/Effects/AndroidTransparentSelectableEffect.cs
similarity index 66%
rename from Chameleon.Android/Effects/AndroidTransparentSelectableEffect.cs
rename to Chameleon.Droid/Effects/AndroidTransparentSelectableEffect.cs
index cfdde5f3..9d18f600 100644
--- a/Chameleon.Android/Effects/AndroidTransparentSelectableEffect.cs
+++ b/Chameleon.Droid/Effects/AndroidTransparentSelectableEffect.cs
@@ -1,14 +1,14 @@
 using System;
 using System.Linq;
 using Android.Util;
-using Chameleon.Android.Effects;
+using Chameleon.Droid.Effects;
 using Chameleon.Core.Effects;
 using Xamarin.Forms;
 using Xamarin.Forms.Platform.Android;
 
 [assembly: ResolutionGroupName("Chameleon")]
 [assembly: ExportEffect(typeof(AndroidTransparentSelectableEffect), nameof(TransparentSelectableEffect))]
-namespace Chameleon.Android.Effects
+namespace Chameleon.Droid.Effects
 {
     public class AndroidTransparentSelectableEffect : PlatformEffect
     {
@@ -19,16 +19,15 @@ protected override void OnAttached()
                 var effect = (TransparentSelectableEffect)Element.Effects.FirstOrDefault(e => e is TransparentSelectableEffect);
                 int resid = 0;
                 if (effect != null && effect.Borderless)
-                    resid = global::Android.Resource.Attribute.SelectableItemBackgroundBorderless;
+                    resid = Android.Resource.Attribute.SelectableItemBackgroundBorderless;
                 else
-                    resid = global::Android.Resource.Attribute.SelectableItemBackground;
+                    resid = Android.Resource.Attribute.SelectableItemBackground;
 
                 var value = new TypedValue();
-                global::Android.App.Application.Context.Theme.ResolveAttribute(resid, value, true);
+                Android.App.Application.Context.Theme.ResolveAttribute(resid, value, true);
+
                 if (Control != null)
                     Control.SetBackgroundResource(value.ResourceId);
-                //else if (Container != null)
-                //    Container.Foreground = ContextCompat.GetDrawable(Container.Context, value.ResourceId); // SetBackgroundResource(value.ResourceId);
             }
             catch (Exception ex)
             {
diff --git a/Chameleon.Android/LinkerPleaseInclude.cs b/Chameleon.Droid/LinkerPleaseInclude.cs
similarity index 92%
rename from Chameleon.Android/LinkerPleaseInclude.cs
rename to Chameleon.Droid/LinkerPleaseInclude.cs
index 7e27cdc9..17d57360 100644
--- a/Chameleon.Android/LinkerPleaseInclude.cs
+++ b/Chameleon.Droid/LinkerPleaseInclude.cs
@@ -4,7 +4,9 @@
 using System.Windows.Input;
 using Android.App;
 using Android.Runtime;
+using Android.Support.Design.Internal;
 using Android.Support.Design.Widget;
+using Android.Support.V7.Widget;
 using Android.Views;
 using Android.Widget;
 using MvvmCross.Binding.BindingContext;
@@ -14,7 +16,7 @@
 using MvvmCross.Navigation;
 using MvvmCross.ViewModels;
 
-namespace Chameleon.Android
+namespace Chameleon.Droid
 {
     // This class is never actually executed, but when Xamarin linking is enabled it does how to ensure types and properties
     // are preserved in the deployed app
@@ -140,14 +142,14 @@ public void Include(MvvmCross.Plugin.Json.Plugin plugin)
             plugin.Load();
         }
 
-        public void Include(global::Android.Support.V7.Widget.AlertDialogLayout alertDialog)
+        public void Include(AlertDialogLayout alertDialog)
         {
-            _ = new global::Android.Support.V7.Widget.AlertDialogLayout(Application.Context);
+            _ = new AlertDialogLayout(Application.Context);
         }
 
-        public void Include(global::Android.Support.Design.Internal.BaselineLayout baselineLayout)
+        public void Include(BaselineLayout baselineLayout)
         {
-            _ = new global::Android.Support.Design.Internal.BaselineLayout(Application.Context);
+            _ = new BaselineLayout(Application.Context);
         }
 
         public void IncludeMvvmcross64()
diff --git a/Chameleon.Android/MainActivity.cs b/Chameleon.Droid/MainActivity.cs
similarity index 89%
rename from Chameleon.Android/MainActivity.cs
rename to Chameleon.Droid/MainActivity.cs
index 5aee9d80..c698afcd 100644
--- a/Chameleon.Android/MainActivity.cs
+++ b/Chameleon.Droid/MainActivity.cs
@@ -4,7 +4,6 @@
 using Android.Content.Res;
 using Android.OS;
 using Android.Runtime;
-using Android.Support.V7.App;
 using Chameleon.Core;
 using Chameleon.Core.Helpers;
 using Chameleon.Core.ViewModels;
@@ -14,9 +13,9 @@
 using MvvmCross.Navigation;
 using Plugin.CurrentActivity;
 using Xamarin.Forms;
-using Intent = global::Android.Content.Intent;
+using Intent = Android.Content.Intent;
 
-namespace Chameleon.Android
+namespace Chameleon.Droid
 {
     [Activity(
         Label = "@string/app_name",
@@ -25,15 +24,15 @@ namespace Chameleon.Android
         MainLauncher = true,
         ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode)]
     [IntentFilter(new[] { Intent.ActionSend, Intent.ActionSendMultiple, Intent.ActionView }, Categories = new[] { Intent.CategoryDefault, Intent.CategoryBrowsable, Intent.CategoryAppMusic }, DataMimeTypes = new[] { "video/*", "audio/*" }, Label = "@string/app_name")]
-    public class MainActivity : MvxFormsAppCompatActivity<Setup, Core.App, FormsApp>
+    public class MainActivity : MvxFormsAppCompatActivity<Setup, App, FormsApp>
     {
         protected override void OnCreate(Bundle savedInstanceState)
         {
             Forms.SetFlags("CollectionView_Experimental");
 
-            TabLayoutResource = Android.Resource.Layout.Tabbar;
-            ToolbarResource = Android.Resource.Layout.Toolbar;
-            SetTheme(Android.Resource.Style.MainTheme);
+            TabLayoutResource = Resource.Layout.Tabbar;
+            ToolbarResource = Resource.Layout.Toolbar;
+            SetTheme(Resource.Style.MainTheme);
 
             base.OnCreate(savedInstanceState);
 
@@ -90,7 +89,7 @@ private void UpdateTheme(Configuration newConfig)
             }
         }
 
-        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] global::Android.Content.PM.Permission[] grantResults)
+        public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Permission[] grantResults)
         {
             Plugin.Permissions.PermissionsImplementation.Current.OnRequestPermissionsResult(requestCode, permissions, grantResults);
             Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
diff --git a/Chameleon.Android/Properties/AndroidManifest.xml b/Chameleon.Droid/Properties/AndroidManifest.xml
similarity index 100%
rename from Chameleon.Android/Properties/AndroidManifest.xml
rename to Chameleon.Droid/Properties/AndroidManifest.xml
diff --git a/Chameleon.Android/Properties/AssemblyInfo.cs b/Chameleon.Droid/Properties/AssemblyInfo.cs
similarity index 92%
rename from Chameleon.Android/Properties/AssemblyInfo.cs
rename to Chameleon.Droid/Properties/AssemblyInfo.cs
index bde903da..56ed50ab 100644
--- a/Chameleon.Android/Properties/AssemblyInfo.cs
+++ b/Chameleon.Droid/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Chameleon.Android")]
+[assembly: AssemblyTitle("Chameleon.Droid")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Baseflow B.V.")]
-[assembly: AssemblyProduct("Chameleon.Android")]
+[assembly: AssemblyProduct("Chameleon.Droid")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Chameleon.Android/Resources/AboutResources.txt b/Chameleon.Droid/Resources/AboutResources.txt
similarity index 100%
rename from Chameleon.Android/Resources/AboutResources.txt
rename to Chameleon.Droid/Resources/AboutResources.txt
diff --git a/Chameleon.Android/Resources/drawable-hdpi/chameleon_logo.png b/Chameleon.Droid/Resources/drawable-hdpi/chameleon_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/chameleon_logo.png
rename to Chameleon.Droid/Resources/drawable-hdpi/chameleon_logo.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/chameleon_mediaplaye.png b/Chameleon.Droid/Resources/drawable-hdpi/chameleon_mediaplaye.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/chameleon_mediaplaye.png
rename to Chameleon.Droid/Resources/drawable-hdpi/chameleon_mediaplaye.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/cover_art_placeholder.png b/Chameleon.Droid/Resources/drawable-hdpi/cover_art_placeholder.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/cover_art_placeholder.png
rename to Chameleon.Droid/Resources/drawable-hdpi/cover_art_placeholder.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/disclosure_button.png b/Chameleon.Droid/Resources/drawable-hdpi/disclosure_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/disclosure_button.png
rename to Chameleon.Droid/Resources/drawable-hdpi/disclosure_button.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_back.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_back.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_back.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_back.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_close.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_close.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_close.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_close.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_contextual_delete.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_contextual_delete.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_contextual_delete.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_contextual_delete.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_contextual_removefromqueue.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_contextual_removefromqueue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_contextual_removefromqueue.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_contextual_removefromqueue.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_contextual_rename.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_contextual_rename.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_contextual_rename.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_contextual_rename.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_list_item_edit.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_list_item_edit.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_list_item_edit.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_list_item_edit.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_more.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_more.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_more.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_playback_speed.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_playback_speed.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_playback_speed.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_playback_speed.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_plus.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_plus.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_plus.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_plus.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_plus_big.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_plus_big.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_plus_big.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_plus_big.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/icon_share.png b/Chameleon.Droid/Resources/drawable-hdpi/icon_share.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/icon_share.png
rename to Chameleon.Droid/Resources/drawable-hdpi/icon_share.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_add_to_playlist.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_add_to_playlist.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_add_to_playlist.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_add_to_playlist.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_add_to_queue.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_add_to_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_add_to_queue.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_add_to_queue.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_favorite_off.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_favorite_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_favorite_off.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_favorite_off.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_favorite_on.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_favorite_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_favorite_on.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_favorite_on.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_next.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_next.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_next.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_next.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_pause_button.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_pause_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_pause_button.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_pause_button.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_play_button.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_play_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_play_button.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_play_button.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_previous.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_previous.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_previous.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_previous.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_queue.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_queue.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_queue.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_repeat_off.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_repeat_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_repeat_off.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_repeat_off.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_repeat_on.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_repeat_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_repeat_on.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_repeat_on.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_repeat_once_on.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_repeat_once_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_repeat_once_on.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_repeat_once_on.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_shuffle_off.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_shuffle_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_shuffle_off.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_shuffle_off.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_shuffle_on.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_shuffle_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_shuffle_on.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_shuffle_on.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_skip_backwards.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_skip_backwards.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_skip_backwards.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_skip_backwards.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/playback_controls_skip_forward.png b/Chameleon.Droid/Resources/drawable-hdpi/playback_controls_skip_forward.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/playback_controls_skip_forward.png
rename to Chameleon.Droid/Resources/drawable-hdpi/playback_controls_skip_forward.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/powered_by_baseflow_logo.png b/Chameleon.Droid/Resources/drawable-hdpi/powered_by_baseflow_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/powered_by_baseflow_logo.png
rename to Chameleon.Droid/Resources/drawable-hdpi/powered_by_baseflow_logo.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/radio_button_off.png b/Chameleon.Droid/Resources/drawable-hdpi/radio_button_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/radio_button_off.png
rename to Chameleon.Droid/Resources/drawable-hdpi/radio_button_off.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/radio_button_on.png b/Chameleon.Droid/Resources/drawable-hdpi/radio_button_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/radio_button_on.png
rename to Chameleon.Droid/Resources/drawable-hdpi/radio_button_on.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/splash_bg.jpg b/Chameleon.Droid/Resources/drawable-hdpi/splash_bg.jpg
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/splash_bg.jpg
rename to Chameleon.Droid/Resources/drawable-hdpi/splash_bg.jpg
diff --git a/Chameleon.Android/Resources/drawable-hdpi/tab_bar_browse.png b/Chameleon.Droid/Resources/drawable-hdpi/tab_bar_browse.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/tab_bar_browse.png
rename to Chameleon.Droid/Resources/drawable-hdpi/tab_bar_browse.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/tab_bar_browse_active.png b/Chameleon.Droid/Resources/drawable-hdpi/tab_bar_browse_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/tab_bar_browse_active.png
rename to Chameleon.Droid/Resources/drawable-hdpi/tab_bar_browse_active.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/tab_bar_icon_home.png b/Chameleon.Droid/Resources/drawable-hdpi/tab_bar_icon_home.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/tab_bar_icon_home.png
rename to Chameleon.Droid/Resources/drawable-hdpi/tab_bar_icon_home.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/tab_bar_icon_home_active.png b/Chameleon.Droid/Resources/drawable-hdpi/tab_bar_icon_home_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/tab_bar_icon_home_active.png
rename to Chameleon.Droid/Resources/drawable-hdpi/tab_bar_icon_home_active.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/tab_bar_settings.png b/Chameleon.Droid/Resources/drawable-hdpi/tab_bar_settings.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/tab_bar_settings.png
rename to Chameleon.Droid/Resources/drawable-hdpi/tab_bar_settings.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/tab_bar_settings_active.png b/Chameleon.Droid/Resources/drawable-hdpi/tab_bar_settings_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/tab_bar_settings_active.png
rename to Chameleon.Droid/Resources/drawable-hdpi/tab_bar_settings_active.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/theme_auto.png b/Chameleon.Droid/Resources/drawable-hdpi/theme_auto.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/theme_auto.png
rename to Chameleon.Droid/Resources/drawable-hdpi/theme_auto.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/theme_auto_on.png b/Chameleon.Droid/Resources/drawable-hdpi/theme_auto_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/theme_auto_on.png
rename to Chameleon.Droid/Resources/drawable-hdpi/theme_auto_on.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/theme_dark.png b/Chameleon.Droid/Resources/drawable-hdpi/theme_dark.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/theme_dark.png
rename to Chameleon.Droid/Resources/drawable-hdpi/theme_dark.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/theme_dark_on.png b/Chameleon.Droid/Resources/drawable-hdpi/theme_dark_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/theme_dark_on.png
rename to Chameleon.Droid/Resources/drawable-hdpi/theme_dark_on.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/theme_light.png b/Chameleon.Droid/Resources/drawable-hdpi/theme_light.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/theme_light.png
rename to Chameleon.Droid/Resources/drawable-hdpi/theme_light.png
diff --git a/Chameleon.Android/Resources/drawable-hdpi/theme_light_on.png b/Chameleon.Droid/Resources/drawable-hdpi/theme_light_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-hdpi/theme_light_on.png
rename to Chameleon.Droid/Resources/drawable-hdpi/theme_light_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/chameleon_mediaplaye.png b/Chameleon.Droid/Resources/drawable-night-hdpi/chameleon_mediaplaye.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/chameleon_mediaplaye.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/chameleon_mediaplaye.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/delete.png b/Chameleon.Droid/Resources/drawable-night-hdpi/delete.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/delete.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/delete.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/disclosure_button.png b/Chameleon.Droid/Resources/drawable-night-hdpi/disclosure_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/disclosure_button.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/disclosure_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/icon_close.png b/Chameleon.Droid/Resources/drawable-night-hdpi/icon_close.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/icon_close.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/icon_close.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/icon_contextual_rename.png b/Chameleon.Droid/Resources/drawable-night-hdpi/icon_contextual_rename.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/icon_contextual_rename.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/icon_contextual_rename.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/icon_list_item_edit.png b/Chameleon.Droid/Resources/drawable-night-hdpi/icon_list_item_edit.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/icon_list_item_edit.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/icon_list_item_edit.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/icon_more.png b/Chameleon.Droid/Resources/drawable-night-hdpi/icon_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/icon_more.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/icon_more.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/icon_plus.png b/Chameleon.Droid/Resources/drawable-night-hdpi/icon_plus.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/icon_plus.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/icon_plus.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/icon_share.png b/Chameleon.Droid/Resources/drawable-night-hdpi/icon_share.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/icon_share.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/icon_share.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_add_to_playlist.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_add_to_playlist.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_add_to_playlist.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_add_to_playlist.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_favorite.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_favorite.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_favorite.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_favorite.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_favorite_off.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_favorite_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_favorite_off.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_favorite_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_favorite_on.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_favorite_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_favorite_on.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_favorite_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_more.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_more.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_more.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_next.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_next.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_next.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_next.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_pause_button.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_pause_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_pause_button.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_pause_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_play_button.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_play_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_play_button.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_play_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_previous.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_previous.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_previous.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_previous.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_queue.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_queue.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_queue.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_repeat.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_repeat.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_repeat.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_repeat.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_repeat_off.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_repeat_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_repeat_off.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_repeat_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_repeat_on.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_repeat_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_repeat_on.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_repeat_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_repeat_once_on.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_repeat_once_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_repeat_once_on.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_repeat_once_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_shuffle.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_shuffle.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_shuffle.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_shuffle.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_shuffle_off.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_shuffle_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_shuffle_off.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_shuffle_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_shuffle_on.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_shuffle_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_shuffle_on.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_shuffle_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_skip_backwards.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_skip_backwards.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_skip_backwards.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_skip_backwards.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_skip_forward.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_skip_forward.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_skip_forward.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_skip_forward.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_time_knob.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_time_knob.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_controls_time_knob.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_controls_time_knob.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/playback_speed.png b/Chameleon.Droid/Resources/drawable-night-hdpi/playback_speed.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/playback_speed.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/playback_speed.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/powered_by_baseflow_logo.png b/Chameleon.Droid/Resources/drawable-night-hdpi/powered_by_baseflow_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/powered_by_baseflow_logo.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/powered_by_baseflow_logo.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/remove_from_queue.png b/Chameleon.Droid/Resources/drawable-night-hdpi/remove_from_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/remove_from_queue.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/remove_from_queue.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/splash_bg.jpg b/Chameleon.Droid/Resources/drawable-night-hdpi/splash_bg.jpg
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/splash_bg.jpg
rename to Chameleon.Droid/Resources/drawable-night-hdpi/splash_bg.jpg
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_browse.png b/Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_browse.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_browse.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_browse.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_browse_active.png b/Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_browse_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_browse_active.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_browse_active.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_icon_home.png b/Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_icon_home.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_icon_home.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_icon_home.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_icon_home_active.png b/Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_icon_home_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_icon_home_active.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_icon_home_active.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_settings.png b/Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_settings.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_settings.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_settings.png
diff --git a/Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_settings_active.png b/Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_settings_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-hdpi/tab_bar_settings_active.png
rename to Chameleon.Droid/Resources/drawable-night-hdpi/tab_bar_settings_active.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/chameleon_mediaplaye.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/chameleon_mediaplaye.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/chameleon_mediaplaye.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/chameleon_mediaplaye.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/delete.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/delete.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/delete.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/delete.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/disclosure_button.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/disclosure_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/disclosure_button.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/disclosure_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/icon_close.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/icon_close.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/icon_close.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/icon_close.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/icon_contextual_rename.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/icon_contextual_rename.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/icon_contextual_rename.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/icon_contextual_rename.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/icon_list_item_edit.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/icon_list_item_edit.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/icon_list_item_edit.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/icon_list_item_edit.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/icon_more.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/icon_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/icon_more.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/icon_more.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/icon_plus.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/icon_plus.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/icon_plus.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/icon_plus.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/icon_share.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/icon_share.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/icon_share.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/icon_share.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_add_to_playlist.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_add_to_playlist.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_add_to_playlist.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_add_to_playlist.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_favorite.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_favorite.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_favorite.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_favorite.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_favorite_off.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_favorite_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_favorite_off.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_favorite_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_favorite_on.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_favorite_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_favorite_on.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_favorite_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_more.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_more.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_more.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_next.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_next.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_next.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_next.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_pause_button.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_pause_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_pause_button.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_pause_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_play_button.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_play_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_play_button.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_play_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_previous.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_previous.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_previous.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_previous.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_queue.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_queue.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_queue.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_repeat.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_repeat.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_repeat.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_repeat.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_repeat_off.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_repeat_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_repeat_off.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_repeat_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_repeat_on.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_repeat_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_repeat_on.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_repeat_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_repeat_once_on.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_repeat_once_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_repeat_once_on.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_repeat_once_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_shuffle.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_shuffle.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_shuffle.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_shuffle.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_shuffle_off.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_shuffle_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_shuffle_off.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_shuffle_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_shuffle_on.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_shuffle_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_shuffle_on.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_shuffle_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_skip_backwards.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_skip_backwards.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_skip_backwards.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_skip_backwards.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_skip_forward.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_skip_forward.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_skip_forward.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_skip_forward.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_time_knob.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_time_knob.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_controls_time_knob.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_controls_time_knob.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/playback_speed.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/playback_speed.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/playback_speed.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/playback_speed.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/powered_by_baseflow_logo.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/powered_by_baseflow_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/powered_by_baseflow_logo.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/powered_by_baseflow_logo.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/remove_from_queue.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/remove_from_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/remove_from_queue.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/remove_from_queue.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/share.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/share.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/share.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/share.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/splash_bg.jpg b/Chameleon.Droid/Resources/drawable-night-xhdpi/splash_bg.jpg
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/splash_bg.jpg
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/splash_bg.jpg
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_browse.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_browse.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_browse.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_browse.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_browse_active.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_browse_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_browse_active.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_browse_active.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_icon_home.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_icon_home.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_icon_home.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_icon_home.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_icon_home_active.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_icon_home_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_icon_home_active.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_icon_home_active.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_settings.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_settings.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_settings.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_settings.png
diff --git a/Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_settings_active.png b/Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_settings_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xhdpi/tab_bar_settings_active.png
rename to Chameleon.Droid/Resources/drawable-night-xhdpi/tab_bar_settings_active.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/chameleon_mediaplaye.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/chameleon_mediaplaye.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/chameleon_mediaplaye.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/chameleon_mediaplaye.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/delete.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/delete.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/delete.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/delete.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/disclosure_button.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/disclosure_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/disclosure_button.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/disclosure_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/icon_close.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_close.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/icon_close.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_close.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/icon_contextual_rename.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_contextual_rename.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/icon_contextual_rename.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_contextual_rename.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/icon_more.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/icon_more.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_more.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/icon_plus.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_plus.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/icon_plus.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_plus.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/icon_share.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_share.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/icon_share.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/icon_share.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_add_to_playlist.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_add_to_playlist.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_add_to_playlist.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_add_to_playlist.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_favorite.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_favorite.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_favorite.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_favorite.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_favorite_off.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_favorite_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_favorite_off.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_favorite_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_favorite_on.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_favorite_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_favorite_on.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_favorite_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_more.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_more.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_more.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_next.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_next.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_next.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_next.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_pause_button.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_pause_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_pause_button.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_pause_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_play_button.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_play_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_play_button.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_play_button.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_previous.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_previous.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_previous.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_previous.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_queue.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_queue.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_queue.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_repeat.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_repeat.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_repeat.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_repeat.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_repeat_off.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_repeat_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_repeat_off.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_repeat_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_repeat_on.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_repeat_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_repeat_on.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_repeat_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_repeat_once_on.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_repeat_once_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_repeat_once_on.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_repeat_once_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_shuffle.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_shuffle.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_shuffle.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_shuffle.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_shuffle_off.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_shuffle_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_shuffle_off.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_shuffle_off.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_shuffle_on.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_shuffle_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_shuffle_on.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_shuffle_on.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_skip_backwards.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_skip_backwards.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_skip_backwards.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_skip_backwards.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_skip_forward.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_skip_forward.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_skip_forward.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_skip_forward.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_time_knob.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_time_knob.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_controls_time_knob.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_controls_time_knob.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/playback_speed.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_speed.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/playback_speed.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/playback_speed.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/powered_by_baseflow_logo.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/powered_by_baseflow_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/powered_by_baseflow_logo.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/powered_by_baseflow_logo.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/remove_from_queue.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/remove_from_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/remove_from_queue.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/remove_from_queue.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/share.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/share.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/share.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/share.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/splash_bg.jpg b/Chameleon.Droid/Resources/drawable-night-xxhdpi/splash_bg.jpg
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/splash_bg.jpg
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/splash_bg.jpg
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_browse.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_browse.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_browse.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_browse.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_browse_active.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_browse_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_browse_active.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_browse_active.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_icon_home.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_icon_home.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_icon_home.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_icon_home.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_icon_home_active.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_icon_home_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_icon_home_active.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_icon_home_active.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_settings.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_settings.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_settings.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_settings.png
diff --git a/Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_settings_active.png b/Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_settings_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-night-xxhdpi/tab_bar_settings_active.png
rename to Chameleon.Droid/Resources/drawable-night-xxhdpi/tab_bar_settings_active.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/chameleon_logo.png b/Chameleon.Droid/Resources/drawable-xhdpi/chameleon_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/chameleon_logo.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/chameleon_logo.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/chameleon_mediaplaye.png b/Chameleon.Droid/Resources/drawable-xhdpi/chameleon_mediaplaye.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/chameleon_mediaplaye.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/chameleon_mediaplaye.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/cover_art_placeholder.png b/Chameleon.Droid/Resources/drawable-xhdpi/cover_art_placeholder.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/cover_art_placeholder.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/cover_art_placeholder.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/disclosure_button.png b/Chameleon.Droid/Resources/drawable-xhdpi/disclosure_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/disclosure_button.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/disclosure_button.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_back.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_back.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_back.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_back.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_close.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_close.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_close.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_close.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_contextual_delete.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_contextual_delete.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_contextual_delete.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_contextual_delete.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_contextual_removefromqueue.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_contextual_removefromqueue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_contextual_removefromqueue.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_contextual_removefromqueue.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_contextual_rename.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_contextual_rename.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_contextual_rename.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_contextual_rename.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_list_item_edit.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_list_item_edit.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_list_item_edit.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_list_item_edit.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_more.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_more.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_more.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_playback_speed.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_playback_speed.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_playback_speed.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_playback_speed.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_plus.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_plus.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_plus.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_plus.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_plus_big.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_plus_big.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_plus_big.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_plus_big.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/icon_share.png b/Chameleon.Droid/Resources/drawable-xhdpi/icon_share.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/icon_share.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/icon_share.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_add_to_playlist.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_add_to_playlist.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_add_to_playlist.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_add_to_playlist.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_add_to_queue.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_add_to_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_add_to_queue.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_add_to_queue.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_favorite_off.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_favorite_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_favorite_off.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_favorite_off.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_favorite_on.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_favorite_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_favorite_on.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_favorite_on.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_next.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_next.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_next.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_next.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_pause_button.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_pause_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_pause_button.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_pause_button.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_play_button.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_play_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_play_button.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_play_button.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_previous.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_previous.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_previous.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_previous.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_queue.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_queue.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_queue.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_repeat_off.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_repeat_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_repeat_off.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_repeat_off.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_repeat_on.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_repeat_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_repeat_on.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_repeat_on.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_repeat_once_on.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_repeat_once_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_repeat_once_on.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_repeat_once_on.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_shuffle_off.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_shuffle_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_shuffle_off.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_shuffle_off.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_shuffle_on.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_shuffle_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_shuffle_on.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_shuffle_on.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_skip_backwards.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_skip_backwards.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_skip_backwards.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_skip_backwards.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/playback_controls_skip_forward.png b/Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_skip_forward.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/playback_controls_skip_forward.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/playback_controls_skip_forward.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/powered_by_baseflow_logo.png b/Chameleon.Droid/Resources/drawable-xhdpi/powered_by_baseflow_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/powered_by_baseflow_logo.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/powered_by_baseflow_logo.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/radio_button_off.png b/Chameleon.Droid/Resources/drawable-xhdpi/radio_button_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/radio_button_off.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/radio_button_off.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/radio_button_on.png b/Chameleon.Droid/Resources/drawable-xhdpi/radio_button_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/radio_button_on.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/radio_button_on.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/splash_bg.jpg b/Chameleon.Droid/Resources/drawable-xhdpi/splash_bg.jpg
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/splash_bg.jpg
rename to Chameleon.Droid/Resources/drawable-xhdpi/splash_bg.jpg
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/tab_bar_browse.png b/Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_browse.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/tab_bar_browse.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_browse.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/tab_bar_browse_active.png b/Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_browse_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/tab_bar_browse_active.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_browse_active.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/tab_bar_icon_home.png b/Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_icon_home.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/tab_bar_icon_home.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_icon_home.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/tab_bar_icon_home_active.png b/Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_icon_home_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/tab_bar_icon_home_active.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_icon_home_active.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/tab_bar_settings.png b/Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_settings.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/tab_bar_settings.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_settings.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/tab_bar_settings_active.png b/Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_settings_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/tab_bar_settings_active.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/tab_bar_settings_active.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/theme_auto.png b/Chameleon.Droid/Resources/drawable-xhdpi/theme_auto.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/theme_auto.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/theme_auto.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/theme_auto_on.png b/Chameleon.Droid/Resources/drawable-xhdpi/theme_auto_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/theme_auto_on.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/theme_auto_on.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/theme_dark.png b/Chameleon.Droid/Resources/drawable-xhdpi/theme_dark.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/theme_dark.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/theme_dark.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/theme_dark_on.png b/Chameleon.Droid/Resources/drawable-xhdpi/theme_dark_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/theme_dark_on.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/theme_dark_on.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/theme_light.png b/Chameleon.Droid/Resources/drawable-xhdpi/theme_light.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/theme_light.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/theme_light.png
diff --git a/Chameleon.Android/Resources/drawable-xhdpi/theme_light_on.png b/Chameleon.Droid/Resources/drawable-xhdpi/theme_light_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xhdpi/theme_light_on.png
rename to Chameleon.Droid/Resources/drawable-xhdpi/theme_light_on.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/chameleon_logo.png b/Chameleon.Droid/Resources/drawable-xxhdpi/chameleon_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/chameleon_logo.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/chameleon_logo.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/chameleon_mediaplaye.png b/Chameleon.Droid/Resources/drawable-xxhdpi/chameleon_mediaplaye.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/chameleon_mediaplaye.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/chameleon_mediaplaye.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/cover_art_placeholder.png b/Chameleon.Droid/Resources/drawable-xxhdpi/cover_art_placeholder.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/cover_art_placeholder.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/cover_art_placeholder.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/disclosure_button.png b/Chameleon.Droid/Resources/drawable-xxhdpi/disclosure_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/disclosure_button.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/disclosure_button.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_back.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_back.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_back.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_back.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_close.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_close.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_close.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_close.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_contextual_delete.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_contextual_delete.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_contextual_delete.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_contextual_delete.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_contextual_removefromqueue.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_contextual_removefromqueue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_contextual_removefromqueue.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_contextual_removefromqueue.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_contextual_rename.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_contextual_rename.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_contextual_rename.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_contextual_rename.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_list_item_edit.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_list_item_edit.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_list_item_edit.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_list_item_edit.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_more.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_more.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_more.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_more.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_playback_speed.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_playback_speed.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_playback_speed.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_playback_speed.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_plus.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_plus.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_plus.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_plus.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_plus_big.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_plus_big.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_plus_big.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_plus_big.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/icon_share.png b/Chameleon.Droid/Resources/drawable-xxhdpi/icon_share.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/icon_share.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/icon_share.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_add_to_playlist.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_add_to_playlist.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_add_to_playlist.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_add_to_playlist.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_add_to_queue.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_add_to_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_add_to_queue.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_add_to_queue.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_favorite_off.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_favorite_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_favorite_off.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_favorite_off.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_favorite_on.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_favorite_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_favorite_on.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_favorite_on.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_next.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_next.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_next.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_next.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_pause_button.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_pause_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_pause_button.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_pause_button.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_play_button.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_play_button.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_play_button.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_play_button.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_previous.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_previous.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_previous.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_previous.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_queue.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_queue.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_queue.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_queue.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_repeat_off.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_repeat_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_repeat_off.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_repeat_off.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_repeat_on.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_repeat_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_repeat_on.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_repeat_on.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_repeat_once_on.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_repeat_once_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_repeat_once_on.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_repeat_once_on.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_shuffle_off.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_shuffle_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_shuffle_off.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_shuffle_off.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_shuffle_on.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_shuffle_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_shuffle_on.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_shuffle_on.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_skip_backwards.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_skip_backwards.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_skip_backwards.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_skip_backwards.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_skip_forward.png b/Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_skip_forward.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/playback_controls_skip_forward.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/playback_controls_skip_forward.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/powered_by_baseflow_logo.png b/Chameleon.Droid/Resources/drawable-xxhdpi/powered_by_baseflow_logo.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/powered_by_baseflow_logo.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/powered_by_baseflow_logo.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/radio_button_off.png b/Chameleon.Droid/Resources/drawable-xxhdpi/radio_button_off.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/radio_button_off.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/radio_button_off.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/radio_button_on.png b/Chameleon.Droid/Resources/drawable-xxhdpi/radio_button_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/radio_button_on.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/radio_button_on.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/splash_bg.jpg b/Chameleon.Droid/Resources/drawable-xxhdpi/splash_bg.jpg
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/splash_bg.jpg
rename to Chameleon.Droid/Resources/drawable-xxhdpi/splash_bg.jpg
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_browse.png b/Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_browse.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_browse.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_browse.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_browse_active.png b/Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_browse_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_browse_active.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_browse_active.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_icon_home.png b/Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_icon_home.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_icon_home.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_icon_home.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_icon_home_active.png b/Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_icon_home_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_icon_home_active.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_icon_home_active.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_settings.png b/Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_settings.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_settings.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_settings.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_settings_active.png b/Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_settings_active.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/tab_bar_settings_active.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/tab_bar_settings_active.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/theme_auto.png b/Chameleon.Droid/Resources/drawable-xxhdpi/theme_auto.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/theme_auto.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/theme_auto.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/theme_auto_on.png b/Chameleon.Droid/Resources/drawable-xxhdpi/theme_auto_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/theme_auto_on.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/theme_auto_on.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/theme_dark.png b/Chameleon.Droid/Resources/drawable-xxhdpi/theme_dark.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/theme_dark.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/theme_dark.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/theme_dark_on.png b/Chameleon.Droid/Resources/drawable-xxhdpi/theme_dark_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/theme_dark_on.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/theme_dark_on.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/theme_light.png b/Chameleon.Droid/Resources/drawable-xxhdpi/theme_light.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/theme_light.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/theme_light.png
diff --git a/Chameleon.Android/Resources/drawable-xxhdpi/theme_light_on.png b/Chameleon.Droid/Resources/drawable-xxhdpi/theme_light_on.png
similarity index 100%
rename from Chameleon.Android/Resources/drawable-xxhdpi/theme_light_on.png
rename to Chameleon.Droid/Resources/drawable-xxhdpi/theme_light_on.png
diff --git a/Chameleon.Android/Resources/drawable/launch_screen.xml b/Chameleon.Droid/Resources/drawable/launch_screen.xml
similarity index 100%
rename from Chameleon.Android/Resources/drawable/launch_screen.xml
rename to Chameleon.Droid/Resources/drawable/launch_screen.xml
diff --git a/Chameleon.Android/Resources/layout/Tabbar.axml b/Chameleon.Droid/Resources/layout/Tabbar.axml
similarity index 100%
rename from Chameleon.Android/Resources/layout/Tabbar.axml
rename to Chameleon.Droid/Resources/layout/Tabbar.axml
diff --git a/Chameleon.Android/Resources/layout/Toolbar.axml b/Chameleon.Droid/Resources/layout/Toolbar.axml
similarity index 100%
rename from Chameleon.Android/Resources/layout/Toolbar.axml
rename to Chameleon.Droid/Resources/layout/Toolbar.axml
diff --git a/Chameleon.Android/Resources/mipmap-anydpi-v26/icon.xml b/Chameleon.Droid/Resources/mipmap-anydpi-v26/icon.xml
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-anydpi-v26/icon.xml
rename to Chameleon.Droid/Resources/mipmap-anydpi-v26/icon.xml
diff --git a/Chameleon.Android/Resources/mipmap-anydpi-v26/icon_round.xml b/Chameleon.Droid/Resources/mipmap-anydpi-v26/icon_round.xml
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-anydpi-v26/icon_round.xml
rename to Chameleon.Droid/Resources/mipmap-anydpi-v26/icon_round.xml
diff --git a/Chameleon.Android/Resources/mipmap-hdpi/ic_launcher.png b/Chameleon.Droid/Resources/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-hdpi/ic_launcher.png
rename to Chameleon.Droid/Resources/mipmap-hdpi/ic_launcher.png
diff --git a/Chameleon.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png b/Chameleon.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-hdpi/ic_launcher_foreground.png
rename to Chameleon.Droid/Resources/mipmap-hdpi/ic_launcher_foreground.png
diff --git a/Chameleon.Android/Resources/mipmap-hdpi/ic_launcher_round.png b/Chameleon.Droid/Resources/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-hdpi/ic_launcher_round.png
rename to Chameleon.Droid/Resources/mipmap-hdpi/ic_launcher_round.png
diff --git a/Chameleon.Android/Resources/mipmap-mdpi/ic_launcher.png b/Chameleon.Droid/Resources/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-mdpi/ic_launcher.png
rename to Chameleon.Droid/Resources/mipmap-mdpi/ic_launcher.png
diff --git a/Chameleon.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png b/Chameleon.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-mdpi/ic_launcher_foreground.png
rename to Chameleon.Droid/Resources/mipmap-mdpi/ic_launcher_foreground.png
diff --git a/Chameleon.Android/Resources/mipmap-mdpi/ic_launcher_round.png b/Chameleon.Droid/Resources/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-mdpi/ic_launcher_round.png
rename to Chameleon.Droid/Resources/mipmap-mdpi/ic_launcher_round.png
diff --git a/Chameleon.Android/Resources/mipmap-xhdpi/ic_launcher.png b/Chameleon.Droid/Resources/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xhdpi/ic_launcher.png
rename to Chameleon.Droid/Resources/mipmap-xhdpi/ic_launcher.png
diff --git a/Chameleon.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png b/Chameleon.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xhdpi/ic_launcher_foreground.png
rename to Chameleon.Droid/Resources/mipmap-xhdpi/ic_launcher_foreground.png
diff --git a/Chameleon.Android/Resources/mipmap-xhdpi/ic_launcher_round.png b/Chameleon.Droid/Resources/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xhdpi/ic_launcher_round.png
rename to Chameleon.Droid/Resources/mipmap-xhdpi/ic_launcher_round.png
diff --git a/Chameleon.Android/Resources/mipmap-xxhdpi/ic_launcher.png b/Chameleon.Droid/Resources/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xxhdpi/ic_launcher.png
rename to Chameleon.Droid/Resources/mipmap-xxhdpi/ic_launcher.png
diff --git a/Chameleon.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png b/Chameleon.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
rename to Chameleon.Droid/Resources/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/Chameleon.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png b/Chameleon.Droid/Resources/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xxhdpi/ic_launcher_round.png
rename to Chameleon.Droid/Resources/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/Chameleon.Android/Resources/mipmap-xxxhdpi/ic_launcher.png b/Chameleon.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xxxhdpi/ic_launcher.png
rename to Chameleon.Droid/Resources/mipmap-xxxhdpi/ic_launcher.png
diff --git a/Chameleon.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png b/Chameleon.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
rename to Chameleon.Droid/Resources/mipmap-xxxhdpi/ic_launcher_foreground.png
diff --git a/Chameleon.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png b/Chameleon.Droid/Resources/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from Chameleon.Android/Resources/mipmap-xxxhdpi/ic_launcher_round.png
rename to Chameleon.Droid/Resources/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/Chameleon.Android/Resources/values-night/colors.xml b/Chameleon.Droid/Resources/values-night/colors.xml
similarity index 100%
rename from Chameleon.Android/Resources/values-night/colors.xml
rename to Chameleon.Droid/Resources/values-night/colors.xml
diff --git a/Chameleon.Android/Resources/values-night/styles.xml b/Chameleon.Droid/Resources/values-night/styles.xml
similarity index 100%
rename from Chameleon.Android/Resources/values-night/styles.xml
rename to Chameleon.Droid/Resources/values-night/styles.xml
diff --git a/Chameleon.Android/Resources/values/colors.xml b/Chameleon.Droid/Resources/values/colors.xml
similarity index 100%
rename from Chameleon.Android/Resources/values/colors.xml
rename to Chameleon.Droid/Resources/values/colors.xml
diff --git a/Chameleon.Android/Resources/values/strings.xml b/Chameleon.Droid/Resources/values/strings.xml
similarity index 100%
rename from Chameleon.Android/Resources/values/strings.xml
rename to Chameleon.Droid/Resources/values/strings.xml
diff --git a/Chameleon.Android/Resources/values/styles.xml b/Chameleon.Droid/Resources/values/styles.xml
similarity index 100%
rename from Chameleon.Android/Resources/values/styles.xml
rename to Chameleon.Droid/Resources/values/styles.xml
diff --git a/Chameleon.Android/Resources/xml/file_paths.xml b/Chameleon.Droid/Resources/xml/file_paths.xml
similarity index 100%
rename from Chameleon.Android/Resources/xml/file_paths.xml
rename to Chameleon.Droid/Resources/xml/file_paths.xml
diff --git a/Chameleon.Android/Setup.cs b/Chameleon.Droid/Setup.cs
similarity index 75%
rename from Chameleon.Android/Setup.cs
rename to Chameleon.Droid/Setup.cs
index e071a4bb..514a86e5 100644
--- a/Chameleon.Android/Setup.cs
+++ b/Chameleon.Droid/Setup.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Reflection;
 using Acr.UserDialogs;
+using Android.Support.Design.Widget;
 using Chameleon.Core;
 using Chameleon.Core.Helpers;
 using MvvmCross;
@@ -8,15 +9,15 @@
 using MvvmCross.IoC;
 using MvvmCross.Platforms.Android;
 
-namespace Chameleon.Android
+namespace Chameleon.Droid
 {
-    public class Setup : MvxFormsAndroidSetup<Core.App, FormsApp>
+    public class Setup : MvxFormsAndroidSetup<App, FormsApp>
     {
         protected override void InitializeFirstChance()
         {
             base.InitializeFirstChance();
             UserDialogs.Init(() => Mvx.IoCProvider.Resolve<IMvxAndroidCurrentTopActivity>().Activity);
-            ActionSheetConfig.DefaultAndroidStyleId = Android.Resource.Style.MainTheme_BottomSheet;
+            ActionSheetConfig.DefaultAndroidStyleId = Resource.Style.MainTheme_BottomSheet;
         }
 
         protected override void InitializeLastChance()
@@ -28,7 +29,7 @@ protected override void InitializeLastChance()
         protected override IEnumerable<Assembly> AndroidViewAssemblies =>
             new List<Assembly>(base.AndroidViewAssemblies)
             {
-                typeof(global::Android.Support.Design.Widget.BottomNavigationView).Assembly
+                typeof(BottomNavigationView).Assembly
             };
     }
 }
diff --git a/Chameleon.Android/ThemeService.cs b/Chameleon.Droid/ThemeService.cs
similarity index 98%
rename from Chameleon.Android/ThemeService.cs
rename to Chameleon.Droid/ThemeService.cs
index 90e9c10f..a5a39f9a 100644
--- a/Chameleon.Android/ThemeService.cs
+++ b/Chameleon.Droid/ThemeService.cs
@@ -15,7 +15,7 @@
 using MvvmCross;
 using MvvmCross.Platforms.Android;
 
-namespace Chameleon.Android
+namespace Chameleon.Droid
 {
     public class ThemeService : ThemeServiceBase
     {
diff --git a/Chameleon.Android/appcenter-pre-build.sh b/Chameleon.Droid/appcenter-pre-build.sh
similarity index 95%
rename from Chameleon.Android/appcenter-pre-build.sh
rename to Chameleon.Droid/appcenter-pre-build.sh
index ccf05295..ec03a12b 100644
--- a/Chameleon.Android/appcenter-pre-build.sh
+++ b/Chameleon.Droid/appcenter-pre-build.sh
@@ -21,7 +21,7 @@ then
     exit
 fi
 
-ANDROID_MANIFEST_FILE=$APPCENTER_SOURCE_DIRECTORY/Chameleon.Android/Properties/AndroidManifest.xml
+ANDROID_MANIFEST_FILE=$APPCENTER_SOURCE_DIRECTORY/Chameleon.Droid/Properties/AndroidManifest.xml
 VERSION=${VERSION_NAME}.${APPCENTER_BUILD_ID}
 if [ ${APPCENTER_BRANCH} != "master" ]
 then
diff --git a/Chameleon.sln b/Chameleon.sln
index 42c59f5a..c7909135 100644
--- a/Chameleon.sln
+++ b/Chameleon.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Chameleon.Core", "Chameleon.Core\Chameleon.Core.csproj", "{77A38872-12A8-4E03-AD48-827F2AAB5318}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chameleon.Android", "Chameleon.Android\Chameleon.Android.csproj", "{23B9D7A8-8013-483A-ABB3-839DA8A7D930}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chameleon.Droid", "Chameleon.Droid\Chameleon.Droid.csproj", "{23B9D7A8-8013-483A-ABB3-839DA8A7D930}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chameleon.iOS", "Chameleon.iOS\Chameleon.iOS.csproj", "{84BCE6E4-7B30-4A78-A73F-D188F4A57C86}"
 EndProject