restruct project directory (#128)

diff --git a/Directory.Build.props b/Directory.Build.props
deleted file mode 100644 (file)
index 98270b5..0000000
--- a/Directory.Build.props
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <__XFBuildTasksLocation>$(_XFBuildTasksLocation)</__XFBuildTasksLocation>
-    <__XFBuildTasksLocation Condition="'$(__XFBuildTasksLocation)' == '' AND '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory).nuspec\netstandard2.0\</__XFBuildTasksLocation>
-    <__XFBuildTasksLocation Condition="'$(__XFBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).nuspec\net46\</__XFBuildTasksLocation>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DebugType>portable</DebugType>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <IncludeSymbols>true</IncludeSymbols>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <Company>Microsoft</Company>
-    <Product>Xamarin.Forms</Product>
-    <LangVersion>7.3</LangVersion>
-    <ProduceReferenceAssembly Condition="'$(UsingMicrosoftNETSdk)' == 'True' AND '$(Configuration)' == 'Debug'">True</ProduceReferenceAssembly>
-  </PropertyGroup>
-  <!-- This target is replaced by GitInfo when restored. Allows Version.targets to rely on it before restore. -->
-  <PropertyGroup Condition="'$(CI)' == ''">
-    <CI>false</CI>
-    <CI Condition="'$(TF_BUILD)' == 'true'">true</CI>
-  </PropertyGroup>
- </Project>

diff --git a/EmbeddingTestBeds/Embedding.iOS/ViewController.designer.cs b/EmbeddingTestBeds/Embedding.iOS/ViewController.designer.cs
deleted file mode 100644 (file)
index 6c14ed8..0000000
--- a/EmbeddingTestBeds/Embedding.iOS/ViewController.designer.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// WARNING
-//
-// This file has been generated automatically by Visual Studio from the outlets and
-// actions declared in your storyboard file.
-// Manual changes to this file will not be maintained.
-//
-using Foundation;
-using System;
-using System.CodeDom.Compiler;
-using UIKit;
-
-namespace Embedding.iOS
-{
-    [Register ("ViewController")]
-    partial class ViewController
-    {
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UIButton ShowAlertsAndActionSheets { get; set; }
-
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UIButton ShowWebView { get; set; }
-
-        [Outlet]
-        [GeneratedCode ("iOS Designer", "1.0")]
-        UIKit.UIView UIViewController { get; set; }
-
-        void ReleaseDesignerOutlets ()
-        {
-            if (ShowAlertsAndActionSheets != null) {
-                ShowAlertsAndActionSheets.Dispose ();
-                ShowAlertsAndActionSheets = null;
-            }
-
-            if (ShowWebView != null) {
-                ShowWebView.Dispose ();
-                ShowWebView = null;
-            }
-
-            if (UIViewController != null) {
-                UIViewController.Dispose ();
-                UIViewController = null;
-            }
-        }
-    }
-}
\ No newline at end of file

diff --git a/Test/Directory.Build.props b/Test/Directory.Build.props
new file mode 100644 (file)
index 0000000..a4c4865
--- /dev/null
+++ b/Test/Directory.Build.props
@@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup>
+    <XamarinFormsSource Condition="'$(XamarinFormsSource)' == ''">..\Xamarin.Forms\</XamarinFormsSource>
+    <CircularUISource>..\Tizen.CircularUI\</CircularUISource>
+
+    <__XFBuildTasksLocation>$(XamarinFormsSource).nuspec\netstandard2.0\</__XFBuildTasksLocation>
+    
+    <FromSource Condition="'$(FromSource)' == ''">true</FromSource>
+    
+    <XamarinFormsVersion>4.3.0.908675</XamarinFormsVersion>
+    <CircularUIVersion>1.3.2</CircularUIVersion>
+  </PropertyGroup>
+
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.props"/>
+  <Import Project="$(XamarinFormsSource)Directory.Build.props"/>
+ </Project>

diff --git a/Test/Directory.Build.targets b/Test/Directory.Build.targets
new file mode 100644 (file)
index 0000000..2714669
--- /dev/null
+++ b/Test/Directory.Build.targets
@@ -0,0 +1,12 @@
+<Project>
+  <!--<ItemGroup>
+    <PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.1" PrivateAssets="All" />
+       </ItemGroup>
+  --><!-- this makes sure the build tasks dll is generated into nuspec folder for Xamarin.Forms.targets --><!--
+  <Target Name="EnsureXamarinFormsTasksBuilt" BeforeTargets="Restore">
+    <MSBuild Projects="$(XamarinFormsSource)\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" Targets="Restore"></MSBuild>
+    <MSBuild Projects="$(XamarinFormsSource)\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj"></MSBuild>
+  </Target>-->
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(__XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll')" />
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
+ </Project>

diff --git a/Test/XStopWatch/XStopWatch/LapsPage.xaml b/Test/XStopWatch/XStopWatch/LapsPage.xaml
new file mode 100644 (file)
index 0000000..7b007ce
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/LapsPage.xaml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<cu:CirclePage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:cu="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=Tizen.Wearable.CircularUI.Forms"
+             x:Class="XStopWatch.LapsPage" x:Name="Self">
+    <ContentPage.Content>
+        <AbsoluteLayout>
+            <cu:CircleListView ItemsSource="{Binding Laps, Source={x:Reference Self}}"
+                               x:Name="LapList"
+                               BackgroundColor="Black"
+                               AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
+                               AbsoluteLayout.LayoutFlags="SizeProportional">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <AbsoluteLayout>
+                                <!-- Label that present Index of Lap -->
+                                <Label Text="{Binding Item1, StringFormat='{0:D2}'}"
+                                   AbsoluteLayout.LayoutBounds="0,0,0.3,1"
+                                   AbsoluteLayout.LayoutFlags="All"
+                                   HorizontalTextAlignment="End"
+                                   TextColor="White"
+                                   FontSize="18"/>
+                                <!-- Label that present total elapsed time -->
+                                <Label Text="{Binding Item2, StringFormat='{}{0:mm\\:ss\\.ff}'}"
+                                   AbsoluteLayout.LayoutBounds="0.2,0,1,0.5"
+                                   AbsoluteLayout.LayoutFlags="All"
+                                   HorizontalTextAlignment="Center"
+                                   TextColor="White"
+                                   FontSize="Medium"/>
+                                <!-- Label that present a lap time -->
+                                <Label Text="{Binding Item3, StringFormat='{}{0:mm\\:ss\\.ff}'}"
+                                   AbsoluteLayout.LayoutBounds="0.2,0.55,1,0.5"
+                                   AbsoluteLayout.LayoutFlags="All"
+                                   HorizontalTextAlignment="Center"
+                                   TextColor="White"
+                                   FontSize="Medium"/>
+                            </AbsoluteLayout>
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </cu:CircleListView>
+            <StackLayout AbsoluteLayout.LayoutBounds="0, 0, 1, 100" AbsoluteLayout.LayoutFlags="WidthProportional" BackgroundColor="Black">
+                <!-- Label that present the count of laps -->
+                <Label Text="{Binding Path=Laps.Count,  Source={x:Reference Self}, StringFormat='{0} Laps'}"
+                       MinimumWidthRequest="100"
+                       HorizontalTextAlignment="Center"
+                       HorizontalOptions="CenterAndExpand"
+                       VerticalOptions="StartAndExpand"
+                       TextColor="Yellow"
+                       FontSize="10"/>
+                <!-- Label that present the current elapsed time -->
+                <Label Text="{Binding Time, Source={x:Reference Self}, StringFormat='{}{0:mm\\:ss\\.ff}'}"
+                           TextColor="Yellow"
+                           FontSize="10"
+                           VerticalOptions="StartAndExpand"
+                           HorizontalOptions="CenterAndExpand"/>
+            </StackLayout>
+        </AbsoluteLayout>
+    </ContentPage.Content>
+</cu:CirclePage>
\ No newline at end of file

diff --git a/Test/XStopWatch/XStopWatch/LapsPage.xaml.cs b/Test/XStopWatch/XStopWatch/LapsPage.xaml.cs
new file mode 100644 (file)
index 0000000..db16f2e
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/LapsPage.xaml.cs
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tizen.Wearable.CircularUI.Forms;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace XStopWatch
+{
+    using Lap = Tuple<int, TimeSpan, TimeSpan>;
+
+    /// <summary>
+    /// LapsPage is a Page that present measured Laps time list
+    /// </summary>
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+       public partial class LapsPage : CirclePage
+    {
+        public static BindableProperty TimeProperty = BindableProperty.Create(nameof(Time), typeof(TimeSpan), typeof(StopWatch), TimeSpan.Zero);
+
+        public static BindableProperty LapsProperty = BindableProperty.Create(nameof(Laps), typeof(ObservableCollection<Lap>), typeof(LapsPage));
+        public ObservableCollection<Lap> Laps { get => (ObservableCollection<Lap>)GetValue(LapsProperty); set => SetValue(LapsProperty, value); }
+
+        public TimeSpan Time { get => (TimeSpan)GetValue(TimeProperty); set => SetValue(TimeProperty, value); }
+
+        public LapsPage()
+               {
+            Laps = new ObservableCollection<Lap>();
+            InitializeComponent();
+               }
+
+        // this method put the recorded the elapsed and the lap time to internal collection.
+        public void AddLap((TimeSpan Main, TimeSpan Sub) lap)
+        {
+            Laps.Add(new Lap(Laps.Count + 1, lap.Main, lap.Sub));
+        }
+
+        // reset the internal collection.
+        public void Reset()
+        {
+            Laps.Clear();
+        }
+    }
+}
\ No newline at end of file

diff --git a/Test/XStopWatch/XStopWatch/StopWatch.xaml b/Test/XStopWatch/XStopWatch/StopWatch.xaml
new file mode 100644 (file)
index 0000000..8e3905d
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/StopWatch.xaml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<cu:CirclePage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:cu="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=Tizen.Wearable.CircularUI.Forms"
+             xmlns:local="clr-namespace:XStopWatch"
+             x:Name="Self"
+             x:Class="XStopWatch.StopWatch">
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <!-- this style change the color to the gray of the Label for showing the time. -->
+            <Style x:Key="TimeStyle"  TargetType="Span">
+                <Setter Property="TextColor" Value="White"/>
+                <Style.Triggers>
+                    <Trigger TargetType="Span" Property="Text" Value="00">
+                        <Setter Property="TextColor" Value="#666666"/>
+                    </Trigger>
+                </Style.Triggers>
+            </Style>
+        </ResourceDictionary>
+    </ContentPage.Resources>
+    <!-- CirclePage has a special item list to show a circular progressbar or a circular slider.-->
+    <cu:CirclePage.CircleSurfaceItems>
+        <!-- this circular progressbar show the elapsed time -->
+        <cu:CircleProgressBarSurfaceItem x:Name="Timebar"
+                                         BarColor="#12b4ff"
+                                         BarRadius="108"
+                                         BarLineWidth="6"
+                                         IsVisible="true"
+                                         Value="0"/>
+    </cu:CirclePage.CircleSurfaceItems>
+    <ContentPage.Content>
+        <AbsoluteLayout BackgroundColor="Black" x:Name="RootView">
+            <!-- Background image that show the numbers and pins -->
+            <Image Source="images/b_stopwatch_unit_number.png"
+                   AbsoluteLayout.LayoutBounds="0,0,1,1"
+                   AbsoluteLayout.LayoutFlags="All"/>
+            <!-- Red bar image that present current elapsed time -->
+            <Image Source="images/b_stopwatch_mark_red.png"
+                   x:Name="RedBar"
+                   AbsoluteLayout.LayoutBounds="0,0,1,1"
+                   AbsoluteLayout.LayoutFlags="All"/>
+            <!-- Blue bar image that present Lap time. it is visible only Lap measurement started -->
+            <Image Source="images/b_stopwatch_mark_blue.png"
+                   x:Name="BlueBar"
+                   AbsoluteLayout.LayoutBounds="0,0,1,1"
+                   AbsoluteLayout.LayoutFlags="All"
+                   IsVisible="False"/>
+
+            <!-- Upward Label for start / stop button -->
+            <Label x:Name="StateLabel"
+                   TextColor="#00CC4D"
+                   FontSize="6"
+                   HorizontalTextAlignment="Center"
+                   VerticalTextAlignment="Center"
+                   AbsoluteLayout.LayoutBounds="130, 120, 100, 20"
+                   AbsoluteLayout.LayoutFlags="None">
+                <Label.Triggers>
+                    <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference Self}, Path=State}" Value="Started">
+                        <Setter Property="Text" Value="STOP"/>
+                        <Setter Property="TextColor" Value="Red"/>
+                    </DataTrigger>
+                    <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference Self}, Path=State}" Value="Paused">
+                        <Setter Property="Text" Value="RESUME"/>
+                    </DataTrigger>
+                    <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference Self}, Path=State}" Value="Stopped">
+                        <Setter Property="Text" Value="START"/>
+                    </DataTrigger>
+                </Label.Triggers>
+            </Label>
+            <!-- Downward Label for reset / lap button -->
+            <Label x:Name="ResetOrLapLabel"
+                   TextColor="#0080dd"
+                   FontSize="6"
+                   HorizontalTextAlignment="Center"
+                   VerticalTextAlignment="Center"
+                   AbsoluteLayout.LayoutBounds="130, 224, 100, 20"
+                   AbsoluteLayout.LayoutFlags="None">
+                <Label.Triggers>
+                    <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference Self}, Path=State}" Value="Started">
+                        <Setter Property="Text" Value="LAP"/>
+                    </DataTrigger>
+                    <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference Self}, Path=State}" Value="Paused">
+                        <Setter Property="Text" Value="RESET"/>
+                    </DataTrigger>
+                    <DataTrigger TargetType="Label" Binding="{Binding Source={x:Reference Self}, Path=State}" Value="Stopped">
+                        <Setter Property="Text" Value=""/>
+                    </DataTrigger>
+                </Label.Triggers>
+            </Label>
+
+            <!-- Central Label that present elapsed tiem -->
+            <Label FontSize="10"
+                   HorizontalTextAlignment="Center"
+                   VerticalTextAlignment="Center"
+                   AbsoluteLayout.LayoutBounds="96, 152, 168, 58"
+                   AbsoluteLayout.LayoutFlags="None">
+                <Label.FormattedText>
+                    <FormattedString>
+                        <Span Text="{Binding AllTime, Source={x:Reference Self}, StringFormat='{}{0:mm}', Mode=OneWay}" Style="{StaticResource TimeStyle}"/>
+                        <Span Text=" : "/>
+                        <Span Text="{Binding AllTime, Source={x:Reference Self}, StringFormat='{}{0:ss}', Mode=OneWay}" Style="{StaticResource TimeStyle}"/>
+                        <Span Text=" . "/>
+                        <Span Text="{Binding AllTime, Source={x:Reference Self}, StringFormat='{}{0:ff}', Mode=OneWay}" Style="{StaticResource TimeStyle}"/>
+                    </FormattedString>
+                </Label.FormattedText>
+            </Label>
+
+            <!-- If Lap is added, this small bracket image show the bounce animation -->
+            <Image Source="images/wc_visual_cue.png"
+                   x:Name="CueBtn"
+                   IsVisible="False"
+                   AbsoluteLayout.LayoutBounds="315, 164, 18, 32"/>
+
+            <!-- this translucent images indicate the area to receive the touch. -->
+            <Image Source="images/event_spot.png"
+                   Opacity="0"
+                   AbsoluteLayout.LayoutBounds="80, 126, 200, 200"
+                   AbsoluteLayout.LayoutFlags="None">
+                <Image.GestureRecognizers>
+                    <TapGestureRecognizer Tapped="OnBottomEventTapped"/>
+                </Image.GestureRecognizers>
+            </Image>
+            <Image Source="images/event_spot.png"
+                   Opacity="0"
+                   AbsoluteLayout.LayoutBounds="80, 22, 200, 200"
+                   AbsoluteLayout.LayoutFlags="None">
+                <Image.GestureRecognizers>
+                    <TapGestureRecognizer Tapped="OnTopEventTapped"/>
+                </Image.GestureRecognizers>
+            </Image>
+        </AbsoluteLayout>
+    </ContentPage.Content>
+</cu:CirclePage>
\ No newline at end of file

diff --git a/Test/XStopWatch/XStopWatch/StopWatch.xaml.cs b/Test/XStopWatch/XStopWatch/StopWatch.xaml.cs
new file mode 100644 (file)
index 0000000..6620af4
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/StopWatch.xaml.cs
@@ -0,0 +1,264 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+using NStopWatch = System.Diagnostics.Stopwatch;
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.System;
+
+namespace XStopWatch
+{
+    /// <summary>
+    /// StopWatch is a Page that present stopwatch main screen
+    /// This page has Time label and the color bar for present measuring time.
+    /// </summary>
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class StopWatch : CirclePage
+    {
+        public static BindableProperty StateProperty = BindableProperty.Create(nameof(State), typeof(State), typeof(StopWatch), State.Stopped);
+        public static BindableProperty AllTimeProperty = BindableProperty.Create(nameof(AllTime), typeof(TimeSpan), typeof(StopWatch), TimeSpan.Zero);
+
+        // stop watch for measuring elapsed time
+        NStopWatch _mainStopWatch;
+        // stop watch for measuring lap time
+        NStopWatch _subStopWatch;
+
+        // this State is used in the text of buttons and stopwatch processing.
+        public State State { get => (State)GetValue(StateProperty); set => SetValue(StateProperty, value); }
+
+        // this TimeSpan property is elapsed time that present in the center of the page.
+        public TimeSpan AllTime { get => (TimeSpan)GetValue(AllTimeProperty); set => SetValue(AllTimeProperty, value); }
+
+        // event for Lap Add button pressed
+        public event EventHandler<(TimeSpan, TimeSpan) > LapPressed;
+
+        // event for stop button pressed
+        public event EventHandler StopPressed;
+
+        public StopWatch()
+               {
+            _mainStopWatch = new NStopWatch();
+            _subStopWatch = new NStopWatch();
+
+            InitializeComponent();
+
+            Stop();
+        }
+
+        /// <summary>
+        /// upward button tapped event that can start/pause/restart measuring
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="args">An object that contains no event data.</param>
+        void OnTopEventTapped(object sender, EventArgs args)
+        {
+            DoSpotAnimation(sender as Image);
+            if (State == State.Stopped)
+            {
+                Start();
+            }
+            else if (State == State.Started)
+            {
+                Pause();
+            }
+            else if (State == State.Paused)
+            {
+                Start();
+            }
+        }
+
+        /// <summary>
+        /// downward button tapped event that can stop the measuring or add lap time measuring.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="args">An object that contains no event data.</param>
+        void OnBottomEventTapped(object sender, EventArgs args)
+        {
+            DoSpotAnimation(sender as Image);
+            if (State == State.Started)
+            {
+                OnLapPressed();
+            }
+            else if (State == State.Paused)
+            {
+                Stop();
+            }
+        }
+
+        /// <summary>
+        /// this method is used to show the upward or downward button clicking effect
+        /// </summary>
+        /// <param name="spot">The button clicking effect image</param>
+        void DoSpotAnimation(Image spot)
+        {
+            spot.Opacity = 1;
+            Device.StartTimer(TimeSpan.FromMilliseconds(80), () =>
+            {
+                spot.Opacity = 0;
+                return false;
+            });
+        }
+
+        /// <summary>
+        /// this method is used to add current lap time
+        /// </summary>
+        void OnLapPressed()
+        {
+            if (!BlueBar.IsVisible)
+            {
+                BlueBar.IsVisible = true;
+            }
+
+            _subStopWatch.Reset();
+            _subStopWatch.Start();
+            BlueBar.Rotation = 0;
+
+            if (!CueBtn.AnimationIsRunning("CueAnimation"))
+            {
+                DoShowCueButton();
+            }
+
+            LapPressed?.Invoke(this, (_mainStopWatch.Elapsed, _subStopWatch.IsRunning ? _subStopWatch.Elapsed : _mainStopWatch.Elapsed));
+        }
+
+        /// <summary>
+        /// this method is used to show small bracket and animation
+        /// </summary>
+        void DoShowCueButton()
+        {
+            CueBtn.IsVisible = true;
+
+            var X = CueBtn.TranslationX;
+            var TX = CueBtn.TranslationX - CueBtn.Width;
+            var anim = new Animation();
+            var opacityAnim = new Animation(f => CueBtn.Opacity = f, 1, 0.2);
+            var transfAnim = new Animation(f => CueBtn.TranslationX = f, X, TX);
+            anim.Add(0, 1, opacityAnim);
+            anim.Add(0, 1, transfAnim);
+
+            anim.Commit(CueBtn, "CueAnimation", 16, 1000, finished: (f, b) =>
+            {
+                CueBtn.Opacity = 1;
+                CueBtn.TranslationX = X;
+            });
+        }
+
+        /// <summary>
+        /// start measuring time
+        /// </summary>
+        void Start()
+        {
+            State = State.Started;
+            // Power.RequestCpuLock(Int32) is deperecated but there are no alternative on TizenFX 4.0
+            // Use RequestLock(PowerLock, Int32) if you use version after TizenFX 5.0.
+            Device.BeginInvokeOnMainThread(() => Power.RequestCpuLock(0));
+
+            _mainStopWatch.Start();
+            if (_subStopWatch.ElapsedMilliseconds > 0)
+            {
+                _subStopWatch.Start();
+            }
+
+            Timebar.IsVisible = true;
+
+            // Synchronize the TimeSpan property on every 10 milliseconds.
+            // Minimum time that presented in Central Label is 10 milliseconds.
+            Device.StartTimer(TimeSpan.FromMilliseconds(10), OnTimeChanged);
+
+            // Rotate Red and Blue Bar on every 16 milliseconds to fit 60 fps.
+            Device.StartTimer(TimeSpan.FromMilliseconds(16), OnTimeBarAnimate);
+        }
+
+        /// <summary>
+        /// pause measuring time
+        /// </summary>
+        void Pause()
+        {
+            State = State.Paused;
+
+            // Power.ReleaseCpuLock() is deperecated but there are no alternative on TizenFX 4.0
+            // Use ReleaseLock(PowerLock) if you use version after TizenFX 5.0.
+            Device.BeginInvokeOnMainThread(() => Power.ReleaseCpuLock());
+
+            _mainStopWatch.Stop();
+            _subStopWatch.Stop();
+        }
+
+        /// <summary>
+        /// reset measuring time
+        /// </summary>
+        void Stop()
+        {
+            State = State.Stopped;
+            _mainStopWatch.Reset();
+            _subStopWatch.Reset();
+            BlueBar.IsVisible = false;
+            CueBtn.IsVisible = false;
+            Timebar.IsVisible = false;
+            OnTimeChanged();
+            OnTimeBarAnimate();
+            StopPressed?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// set the elapsed time to TimeSpan property
+        /// </summary>
+        /// <returns>the timer will keep recurring if return true.</returns>
+        bool OnTimeChanged()
+        {
+            AllTime = _mainStopWatch.Elapsed;
+            return State == State.Started;
+        }
+
+        /// <summary>
+        /// the method present the Red, Blue Bar and the circular progressbar animation.
+        /// </summary>
+        /// <returns>the timer will keep recurring if return true.</returns>
+        bool OnTimeBarAnimate()
+        {
+            double sec = TimeToRotation(_mainStopWatch.Elapsed);
+            double lap = TimeToRotation(_subStopWatch.Elapsed);
+            double timeBarValue = (_mainStopWatch.ElapsedMilliseconds / 600000.0) % 1;
+
+            RedBar.Rotation = sec;
+            BlueBar.Rotation = lap;
+            Timebar.Value = timeBarValue;
+
+            return State == State.Started;
+        }
+
+        /// <summary>
+        /// To calculate the rotation, use the seconds and the milliseconds.
+        /// </summary>
+        /// <param name="ts">The TimeSpan to change to angle of rotation.</param>
+        /// <returns>The angle of rotation.</returns>
+        static double TimeToRotation(TimeSpan ts) => ts.Seconds * 6 + ts.Milliseconds / 1000.0 * 6.0;
+    }
+
+    /// <summary>
+    /// State is present a current status of StopWatch
+    /// </summary>
+    public enum State
+    {
+        Started,
+        Stopped,
+        Paused
+    }
+}

diff --git a/Test/XStopWatch/XStopWatch/StopWatchApplication.xaml b/Test/XStopWatch/XStopWatch/StopWatchApplication.xaml
new file mode 100644 (file)
index 0000000..f9af398
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/StopWatchApplication.xaml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Application xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:cu="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=Tizen.Wearable.CircularUI.Forms"
+             xmlns:local="clr-namespace:XStopWatch"
+             x:Class="XStopWatch.StopWatchApplication">
+    <Application.MainPage>
+        <!-- Use CarouselPage to swipe the main page and Laps page -->
+        <CarouselPage x:Name="RootPage">
+            <!-- Main page of the Stopwatch -->
+            <local:StopWatch x:Name="StopWatch" LapPressed="OnAddLap" StopPressed="OnStopLap"/>
+            <!-- A page to shows a list of the recorded Lap times. Time property is used to show the time, and is associated with the time of the StopWatch. -->
+            <local:LapsPage x:Name="Laps" Time="{Binding AllTime, Source={x:Reference StopWatch}}"/>
+        </CarouselPage>
+    </Application.MainPage>
+</Application>
\ No newline at end of file

diff --git a/Test/XStopWatch/XStopWatch/StopWatchApplication.xaml.cs b/Test/XStopWatch/XStopWatch/StopWatchApplication.xaml.cs
new file mode 100644 (file)
index 0000000..1c36039
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/StopWatchApplication.xaml.cs
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms.Xaml;
+
+namespace XStopWatch
+{
+    /// <summary>
+    /// StopWatchApplication is implementation of a Xamarin Forms Application.
+    /// </summary>
+       [XamlCompilation(XamlCompilationOptions.Compile)]
+       public partial class StopWatchApplication : Application
+       {
+        public StopWatchApplication()
+               {
+            InitializeComponent();
+
+            // register handle to property changed event for catching changed state.
+            StopWatch.PropertyChanged += (s, e) =>
+            {
+                if (e.PropertyName == StopWatch.StateProperty.PropertyName)
+                {
+                // request AlwaysOn on StopWatch is started.
+                AlwaysOnRequest?.Invoke(this, StopWatch.State == State.Started);
+                }
+            };
+        }
+
+        /// <summary>
+        /// Event that requests the AlwaysOn method of the window when screen should not be turned off.
+        /// </summary>
+        public event EventHandler<bool> AlwaysOnRequest;
+
+        /// <summary>
+        /// this method handles StopWatch's Lap add button click event, witch total and lap time as event arguments.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">ValueTuple, Item1 is a elapsed time and item2 is lap time.</param>
+        void OnAddLap(object sender, (TimeSpan, TimeSpan) e)
+        {
+            // Add Lap record to LapsPage
+            Laps.AddLap(e);
+        }
+
+        /// <summary>
+        /// this method handles StopWatch's Stop button click event.
+        /// </summary>
+        /// <param name="sender">The source of the event.</param>
+        /// <param name="e">An object that contains no event data.</param>
+        void OnStopLap(object sender, EventArgs e)
+        {
+            // Reset the LapsPage
+            Laps.Reset();
+        }
+    }
+}
\ No newline at end of file

diff --git a/Test/XStopWatch/XStopWatch/WindowExtension.cs b/Test/XStopWatch/XStopWatch/WindowExtension.cs
new file mode 100644 (file)
index 0000000..f83b01b
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/WindowExtension.cs
@@ -0,0 +1,69 @@
+using ElmSharp;
+using System;
+using System.Runtime.InteropServices;
+
+namespace XStopWatch
+{
+    static class WindowExtension
+    {
+        // native shared object name of ui-efl-util API.
+        const string EFLUtil = "libcapi-ui-efl-util.so.0";
+
+        // A mode for the Window AlwaysOn
+        enum ScreenMode
+        {
+            Default, // default don't block the screen off
+            AlwaysOn // the screen will not turn off on the AlwaysOn mode
+        }
+
+        /// <summary>
+        /// PInvoke AlwaysOn setter Native function
+        /// </summary>
+        /// <param name="window">A handle of the Elementary Window</param>
+        /// <param name="mode">A mode for the Window AlwaysOn</param>
+        /// <returns></returns>
+        [DllImport(EFLUtil)]
+        static extern int efl_util_set_window_screen_mode(IntPtr window, ScreenMode mode);
+
+        /// <summary>
+        /// PInvoke AlwaysOn getter Native function
+        /// </summary>
+        /// <param name="window">A handle of the Elementary Window</param>
+        /// <param name="mode">A mode for the Window AlwaysOn output parameter</param>
+        /// <returns></returns>
+        [DllImport(EFLUtil)]
+        static extern int efl_util_get_window_screen_mode(IntPtr window, out ScreenMode mode);
+
+        /// <summary>
+        /// Extension method for ElmSharp Window object for set a AlwaysOn mode.
+        /// </summary>
+        /// <param name="window">ElmSharp.Window object</param>
+        /// <param name="isAlwaysOn">true if AlwaysOn mode or not</param>
+        public static void SetAlwaysOn(this Window window, bool isAlwaysOn)
+        {
+            if (efl_util_set_window_screen_mode(window, isAlwaysOn ? ScreenMode.AlwaysOn : ScreenMode.Default) != 0)
+            {
+                // efl_util_set_window_screen_mode return TIZEN_ERROR_NONE on success
+                // throw exception if not success
+                throw new ArgumentException($"native efl_util_set_window_screen_mode return error, window=[{window.Handle.ToInt32()}] isAlwaysOn = [{isAlwaysOn}]");
+            }
+        }
+
+        /// <summary>
+        /// Extension method for ElmSharp Window object for get a AlwaysOn mode.
+        /// </summary>
+        /// <param name="window">ElmSharp.Window object</param>
+        /// <returns>true if AlwaysOn mode or not</returns>
+        public static bool GetAlwaysOn(this Window window)
+        {
+            if (efl_util_get_window_screen_mode(window, out var mode) != 0)
+            {
+                // efl_util_set_window_screen_mode return TIZEN_ERROR_NONE on success
+                // throw exception if not success
+                throw new ArgumentException($"native efl_util_set_window_screen_mode return error, window=[{window.Handle.ToInt32()}] isAlwaysOn = [{mode == ScreenMode.AlwaysOn}]");
+            }
+
+            return mode == ScreenMode.AlwaysOn;
+        }
+    }
+}

diff --git a/Test/XStopWatch/XStopWatch/XStopWatch.cs b/Test/XStopWatch/XStopWatch/XStopWatch.cs
new file mode 100644 (file)
index 0000000..534eb92
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/XStopWatch.cs
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.Wearable.CircularUI.Forms.Renderer;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+
+namespace XStopWatch
+{
+    /// <summary>
+    /// This class has a main function, which is the starting point of the program.
+    /// It is a class that controls the lifecycle of the application.
+    /// You must use FormsApplication to control the lifecycle.
+    /// This class is a class that makes use of Xamarin.Forms.Application by inheriting CoreUIApplication with definition of Lifecycle of Tizen C # Application.
+    /// </summary>
+    class Program : global::Xamarin.Forms.Platform.Tizen.ApplicationLifecycle
+    {
+
+        /// <summary>
+        /// Called when this application is launched.
+        /// </summary>
+        protected override void OnCreate()
+        {
+            var stopwatch = new StopWatchApplication();
+            FormsApplication.LoadApplication(stopwatch);
+
+            // If AlwaysOn is enable, the screen will not turn off as long as the window is on the screen.
+            stopwatch.AlwaysOnRequest += (s, e) => FormsApplication.MainWindow.SetAlwaysOn(e);
+        }
+
+        static void Main(string[] args)
+        {
+            var app = new Program();
+            // define your custom handlers
+            var customRenderers = new Dictionary<Type, Func<IRegisterable>>()
+            {
+                { typeof(CirclePage), ()=> new CirclePageRenderer() },
+                { typeof(global:: Tizen.Wearable.CircularUI.Forms.CircleListView), () => new CircleListViewRenderer() }
+            };
+            var option = new InitializationOptions(app)
+            {
+                UseMessagingCenter = false,
+                UseStyle = false,
+                UseShell = false,
+                UseVisual = false,
+                StaticRegistarStrategy = StaticRegistrarStrategy.StaticRegistrarOnly,
+                CustomHandlers = customRenderers,
+                Flags = InitializationFlags.DisableCss
+            };
+
+            Forms.Init(option);
+
+            // It's mandatory to initialize Circular UI for using Tizen Wearable Circular UI API
+            global::Tizen.Wearable.CircularUI.Forms.Renderer.FormsCircularUI.Init();
+            app.FormsApplication.Run(args);
+        }
+    }
+}

diff --git a/Test/XStopWatch/XStopWatch/XStopWatch.csproj b/Test/XStopWatch/XStopWatch/XStopWatch.csproj
new file mode 100644 (file)
index 0000000..d780eb1
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/XStopWatch.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Tizen.NET.Sdk/1.0.8">
+
+  <!-- Property Group for Tizen40 Project -->
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>tizen40</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>portable</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>None</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="lib\" />
+    <Folder Include="res\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms.Renderer\Tizen.Wearable.CircularUI.Forms.Renderer.csproj" />
+  </ItemGroup>
+
+  <!-- Include Nuget Package for Tizen Project building -->
+
+</Project>

diff --git a/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_mark_blue.png b/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_mark_blue.png
new file mode 100644 (file)
index 0000000..0201315
Binary files /dev/null and b/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_mark_blue.png differ

diff --git a/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_mark_red.png b/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_mark_red.png
new file mode 100644 (file)
index 0000000..9ae9a01
Binary files /dev/null and b/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_mark_red.png differ

diff --git a/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_unit_number.png b/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_unit_number.png
new file mode 100644 (file)
index 0000000..fccf443
Binary files /dev/null and b/Test/XStopWatch/XStopWatch/res/images/b_stopwatch_unit_number.png differ

diff --git a/Test/XStopWatch/XStopWatch/res/images/event_spot.png b/Test/XStopWatch/XStopWatch/res/images/event_spot.png
new file mode 100644 (file)
index 0000000..ff4f6f3
Binary files /dev/null and b/Test/XStopWatch/XStopWatch/res/images/event_spot.png differ

diff --git a/Test/XStopWatch/XStopWatch/res/images/wc_visual_cue.png b/Test/XStopWatch/XStopWatch/res/images/wc_visual_cue.png
new file mode 100644 (file)
index 0000000..6959578
Binary files /dev/null and b/Test/XStopWatch/XStopWatch/res/images/wc_visual_cue.png differ

diff --git a/Test/XStopWatch/XStopWatch/shared/res/XStopWatch.png b/Test/XStopWatch/XStopWatch/shared/res/XStopWatch.png
new file mode 100644 (file)
index 0000000..16f3830
Binary files /dev/null and b/Test/XStopWatch/XStopWatch/shared/res/XStopWatch.png differ

diff --git a/Test/XStopWatch/XStopWatch/tizen-manifest.xml b/Test/XStopWatch/XStopWatch/tizen-manifest.xml
new file mode 100644 (file)
index 0000000..5904f01
--- /dev/null
+++ b/Test/XStopWatch/XStopWatch/tizen-manifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="org.tizen.example.XStopWatch" version="1.0.0" api-version="4" xmlns="http://tizen.org/ns/packages">
+    <profile name="common" />
+    <ui-application appid="org.tizen.example.XStopWatch" exec="XStopWatch.dll" multiple="false" nodisplay="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+        <label>XStopWatch</label>
+        <icon>XStopWatch.png</icon>
+        <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
+        <splash-screens />
+    </ui-application>
+    <shortcut-list />
+    <privileges>
+        <privilege>http://tizen.org/privilege/display</privilege>
+    </privileges>
+    <provides-appdefined-privileges />
+</manifest>

diff --git a/Tizen.CircularUI/Directory.Build.props b/Tizen.CircularUI/Directory.Build.props
new file mode 100644 (file)
index 0000000..a4c4865
--- /dev/null
+++ b/Tizen.CircularUI/Directory.Build.props
@@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup>
+    <XamarinFormsSource Condition="'$(XamarinFormsSource)' == ''">..\Xamarin.Forms\</XamarinFormsSource>
+    <CircularUISource>..\Tizen.CircularUI\</CircularUISource>
+
+    <__XFBuildTasksLocation>$(XamarinFormsSource).nuspec\netstandard2.0\</__XFBuildTasksLocation>
+    
+    <FromSource Condition="'$(FromSource)' == ''">true</FromSource>
+    
+    <XamarinFormsVersion>4.3.0.908675</XamarinFormsVersion>
+    <CircularUIVersion>1.3.2</CircularUIVersion>
+  </PropertyGroup>
+
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.props"/>
+  <Import Project="$(XamarinFormsSource)Directory.Build.props"/>
+ </Project>

diff --git a/Tizen.CircularUI/Directory.Build.targets b/Tizen.CircularUI/Directory.Build.targets
new file mode 100644 (file)
index 0000000..2714669
--- /dev/null
+++ b/Tizen.CircularUI/Directory.Build.targets
@@ -0,0 +1,12 @@
+<Project>
+  <!--<ItemGroup>
+    <PackageReference Include="MSBuilder.GenerateAssemblyInfo" Version="0.2.1" PrivateAssets="All" />
+       </ItemGroup>
+  --><!-- this makes sure the build tasks dll is generated into nuspec folder for Xamarin.Forms.targets --><!--
+  <Target Name="EnsureXamarinFormsTasksBuilt" BeforeTargets="Restore">
+    <MSBuild Projects="$(XamarinFormsSource)\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj" Targets="Restore"></MSBuild>
+    <MSBuild Projects="$(XamarinFormsSource)\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj"></MSBuild>
+  </Target>-->
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' == 'true' AND Exists('$(__XFBuildTasksLocation)Xamarin.Forms.Build.Tasks.dll')" />
+  <Import Project="$(XamarinFormsSource).nuspec\Xamarin.Forms.targets" Condition="'$(BuildingInsideVisualStudio)' != 'true'" />
+ </Project>

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CheckRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CheckRenderer.cs
new file mode 100644 (file)
index 0000000..040f152
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CheckRenderer.cs
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.Wearable.CircularUI.Forms.Renderer;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using ECheck = ElmSharp.Check;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(Check), typeof(CheckRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    internal static class CheckStyle
+    {
+        public const string Default = "default";
+        public const string Onoff = "on&off";
+        public const string Small = "small";
+    }
+
+    public class CheckRenderer : SwitchRenderer
+    {
+        public CheckRenderer()
+        {
+            RegisterPropertyHandler(Check.DisplayStyleProperty, UpdateStyle);
+            RegisterPropertyHandler(Check.ColorProperty, UpdateColor);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Switch> e)
+        {
+            if (Control == null)
+            {
+                SetNativeControl(new ECheck(XForms.NativeParent)
+                {
+                    PropagateEvents = false,
+                    Style = CheckStyle.Default
+                });
+                Control.StateChanged += OnStateChanged;
+            }
+            base.OnElementChanged(e);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (Control != null)
+                {
+                    Control.StateChanged -= OnStateChanged;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        void UpdateStyle()
+        {
+            var style = ((Check)Element).DisplayStyle;
+            switch (style)
+            {
+                case CheckDisplayStyle.Onoff:
+                    Control.Style = CheckStyle.Onoff;
+                    break;
+                case CheckDisplayStyle.Small:
+                    Control.Style = CheckStyle.Small;
+                    break;
+                default:
+                    Control.Style = CheckStyle.Default;
+                    break;
+            }
+            ((IVisualElementController)Element).NativeSizeChanged();
+        }
+
+        void UpdateColor()
+        {
+            var color = ((Check)Element).Color;
+            if(color != Color.Default)
+            {
+                Control.Color = ((Check)Element).Color.ToNative();
+            }
+        }
+
+        void OnStateChanged(object sender, EventArgs e)
+        {
+            Element.SetValue(Switch.IsToggledProperty, Control.IsChecked);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleDateTimeSelectorRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleDateTimeSelectorRenderer.cs
new file mode 100644 (file)
index 0000000..1b0984d
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleDateTimeSelectorRenderer.cs
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+using ECircleDateTimeSelector = ElmSharp.Wearable.CircleDateTimeSelector;
+using EDateTimeFieldType = ElmSharp.DateTimeFieldType;
+
+[assembly: ExportRenderer(typeof(Tizen.Wearable.CircularUI.Forms.CircleDateTimeSelector), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.CircleDateTimeSelectorRenderer))]
+
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class CircleDateTimeSelectorRenderer : ViewRenderer<CircleDateTimeSelector, ECircleDateTimeSelector>
+    {
+        public CircleDateTimeSelectorRenderer()
+        {
+#pragma warning disable CS0618 // MarkerColorProperty is obsolete
+            RegisterPropertyHandler(CircleDateTimeSelector.MarkerColorProperty, UpdateMarkerColor);
+#pragma warning restore CS0618 // MarkerColorProperty is obsolete
+            RegisterPropertyHandler(CircleDateTimeSelector.ValueTypeProperty, UpdateValueType);
+            RegisterPropertyHandler(CircleDateTimeSelector.DateTimeProperty, UpdateDateTime);
+            RegisterPropertyHandler(CircleDateTimeSelector.MaximumDateProperty, UpdateMaximum);
+            RegisterPropertyHandler(CircleDateTimeSelector.MinimumDateProperty, UpdateMinimum);
+
+            RegisterPropertyHandler(CircleDateTimeSelector.IsVisibleOfYearProperty, UpdateFieldVisibilityOfYear);
+            RegisterPropertyHandler(CircleDateTimeSelector.IsVisibleOfMonthProperty, UpdateFieldVisibilityOfMonth);
+            RegisterPropertyHandler(CircleDateTimeSelector.IsVisibleOfDateProperty, UpdateFieldVisibilityOfDate);
+            RegisterPropertyHandler(CircleDateTimeSelector.IsVisibleOfHourProperty, UpdateFieldVisibilityOfHour);
+            RegisterPropertyHandler(CircleDateTimeSelector.IsVisibleOfMinuteProperty, UpdateFieldVisibilityOfMinute);
+            RegisterPropertyHandler(CircleDateTimeSelector.IsVisibleOfAmPmProperty, UpdateFieldVisibilityOfAmPm);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<CircleDateTimeSelector> e)
+        {
+            if (Control == null)
+            {
+                var surface = this.GetSurface();
+                if (null != surface)
+                {
+                    SetNativeControl(new ECircleDateTimeSelector(XForms.NativeParent, surface));
+                    Control.DateTimeChanged += OnDateTimeChanged;
+                }
+                else
+                {
+                    throw new CirclePageNotFoundException();
+                }
+            }
+            base.OnElementChanged(e);
+        }
+
+        protected override Xamarin.Forms.Size MinimumSize()
+        {
+            return new ElmSharp.Size(300, 290).ToDP();
+        }
+
+        protected override ElmSharp.Size Measure(int availableWidth, int availableHeight)
+        {
+            return new ElmSharp.Size(300, 290);
+        }
+
+        void UpdateMinimum()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.MinimumDateTime = Element.MinimumDate;
+            }
+        }
+
+        void UpdateMaximum()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.MaximumDateTime = Element.MaximumDate;
+            }
+        }
+
+        void UpdateDateTime()
+        {
+            if (null != Control && null != Element && Element.DateTime != Control.DateTime)
+            {
+                Control.DateTime = Element.DateTime;
+            }
+        }
+
+        void UpdateValueType()
+        {
+            if (null != Control && null != Element)
+            {
+                if (Element.ValueType == DateTimeType.Date)
+                {
+                    Control.Style = "datepicker/circle";
+                }
+                else if (Element.ValueType == DateTimeType.Time)
+                {
+                    Control.Style = "timepicker/circle";
+                    Control.Format = "%d/%b/%Y%I:%M%p";
+                }
+            }
+        }
+
+        void UpdateMarkerColor()
+        {
+#pragma warning disable CS0618 // MarkerColor is obsolete
+            if (null != Control && null != Element && Element.MarkerColor != Xamarin.Forms.Color.Default)
+            {
+                Control.MarkerColor = Element.MarkerColor.ToNative();
+            }
+#pragma warning restore CS0618 // MarkerColor is obsolete
+        }
+
+        void OnDateTimeChanged(object sender, EventArgs e)
+        {
+            if (null != Control && null != Element)
+            {
+                Element.DateTime = Control.DateTime;
+            }
+        }
+
+        void UpdateFieldVisibilityOfYear()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.SetFieldVisible(EDateTimeFieldType.Year, Element.IsVisibleOfYear);
+            }
+        }
+
+        void UpdateFieldVisibilityOfMonth()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.SetFieldVisible(EDateTimeFieldType.Month, Element.IsVisibleOfMonth);
+            }
+        }
+
+        void UpdateFieldVisibilityOfDate()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.SetFieldVisible(EDateTimeFieldType.Date, Element.IsVisibleOfDate);
+            }
+        }
+
+        void UpdateFieldVisibilityOfHour()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.SetFieldVisible(EDateTimeFieldType.Hour, Element.IsVisibleOfHour);
+            }
+        }
+
+        void UpdateFieldVisibilityOfMinute()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.SetFieldVisible(EDateTimeFieldType.Minute, Element.IsVisibleOfMinute);
+            }
+        }
+
+        void UpdateFieldVisibilityOfAmPm()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.SetFieldVisible(EDateTimeFieldType.AmPm, Element.IsVisibleOfAmPm);
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleImageRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleImageRenderer.cs
new file mode 100644 (file)
index 0000000..0291cbe
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleImageRenderer.cs
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using UIComponents.Tizen.Wearable.Renderers;
+using Xamarin.Forms.Platform.Tizen;
+using FormsNative = Xamarin.Forms.Platform.Tizen.Native;
+using System.ComponentModel;
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.Wearable.CircularUI.Forms.Renderer;
+using Xamarin.Forms;
+
+[assembly: ExportRenderer(typeof(CircleImage), typeof(CircleImageRenderer))]
+namespace UIComponents.Tizen.Wearable.Renderers
+{
+    public class CircleImageRenderer : ViewRenderer<CircleImage, FormsNative.Image>
+    {
+        ElmSharp.EvasImage _circleImage;
+        ElmSharp.EvasObject _nativeParent;
+
+        protected override void OnElementChanged(ElementChangedEventArgs<CircleImage> e)
+        {
+            if (Control == null)
+            {
+                _nativeParent = Platform.GetRenderer(Element.Parent).NativeView;
+                _circleImage = new ElmSharp.EvasImage(_nativeParent);
+                _circleImage.IsFilled = true;
+                GetClipImage();
+
+                var image = new FormsNative.Image(_nativeParent);
+                SetNativeControl(image);
+                Control.Resized += Control_Resized;
+                Control.Moved += Control_Moved;
+                Control.Deleted += Control_Deleted;
+            }
+
+            UpdateAll();
+            base.OnElementChanged(e);
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            base.OnElementPropertyChanged(sender, e);
+            if (e.PropertyName == Image.SourceProperty.PropertyName)
+            {
+                UpdateSource();
+            }
+            else if (e.PropertyName == Image.AspectProperty.PropertyName)
+            {
+                UpdateAspect();
+            }
+            else if (e.PropertyName == Image.IsOpaqueProperty.PropertyName)
+            {
+                UpdateIsOpaque();
+            }
+            else if (e.PropertyName == VisualElement.BackgroundColorProperty.PropertyName)
+            {
+                UpdateBackgroundColor();
+            }
+        }
+
+        void UpdateAll()
+        {
+            UpdateBackgroundColor();
+            UpdateSource();
+            UpdateAspect();
+        }
+
+        async void GetClipImage()
+        {
+            var imageSource = ImageSource.FromResource("Tizen.Wearable.CircularUI.Forms.Renderer.res.circle.png", GetType().Assembly);
+            var streamsource = imageSource as StreamImageSource;
+
+            if (streamsource != null && streamsource.Stream != null)
+            {
+                using (var streamImage = await ((IStreamImageSource)streamsource).GetStreamAsync())
+                {
+                    if (streamImage != null)
+                    {
+                        _circleImage.SetStream(streamImage);
+                    }
+                    else
+                    {
+                        global::Tizen.Log.Error(FormsCircularUI.Tag, $"streamImage == null ");
+                    }
+                }
+            }
+        }
+
+        async void UpdateSource()
+        {
+            ImageSource source = Element.Source;
+            ((IImageController)Element).SetIsLoading(true);
+
+            if (Control != null)
+            {
+                bool success = await Control.LoadFromImageSourceAsync(source);
+                if (!IsDisposed && success)
+                {
+                    ((IVisualElementController)Element).NativeSizeChanged();
+                    _circleImage.Show();
+                    _circleImage.Geometry = Control.Geometry;
+                    Control.SetClip(_circleImage);
+
+                    UpdateAfterLoading();
+                }
+            }
+
+            if (!IsDisposed)
+                ((IImageController)Element).SetIsLoading(false);
+        }
+
+        protected virtual void UpdateAfterLoading()
+        {
+            UpdateIsOpaque();
+        }
+
+        void UpdateAspect()
+        {
+            Control.Aspect = Element.Aspect;
+        }
+
+        void UpdateIsOpaque()
+        {
+            Control.IsOpaque = Element.IsOpaque;
+        }
+
+        void UpdateBackgroundColor()
+        {
+            if (_nativeParent == null) return;
+
+            if (Element.BackgroundColor.ToNative() != ElmSharp.Color.Transparent
+                    && Element.BackgroundColor.ToNative() != ElmSharp.Color.Default)
+            {
+                _nativeParent.Color = Element.BackgroundColor.ToNative();
+            }
+        }
+
+        private void Control_Deleted(object sender, EventArgs e)
+        {
+            _circleImage?.Unrealize();
+            _circleImage = null;
+        }
+
+        private void Control_Moved(object sender, EventArgs e)
+        {
+            _circleImage.Geometry = Control.Geometry;
+        }
+
+        private void Control_Resized(object sender, EventArgs e)
+        {
+            _circleImage.Geometry = Control.Geometry;
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleListView.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleListView.cs
new file mode 100644 (file)
index 0000000..2555f83
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleListView.cs
@@ -0,0 +1,449 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp.Wearable;
+using System;
+using System.Collections.Generic;
+using Xamarin.Forms;
+using ElmSharp;
+using System.Collections;
+using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms.Internals;
+using System.ComponentModel;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    using GroupList = TemplatedItemsList<ItemsView<Cell>, Cell>;
+
+    public class CircleListView : CircleGenList
+    {
+        const int HeaderMinimumHeight = 115;
+        const int GroupHeaderMinimumHeight = 83;
+
+        readonly Dictionary<Cell, GenListItem> _itemContexts = new Dictionary<Cell, GenListItem>();
+
+        VisualElement _header;
+        VisualElement _footer;
+        int _rowHeight;
+
+        public CircleListView(EvasObject parent, CircleSurface surface) : base(parent, surface)
+        {
+        }
+
+        public VisualElement Header
+        {
+            get => _header;
+            set
+            {
+                if (_header == value) return;
+                _header = value;
+                UpdateHeader();
+            }
+        }
+        public VisualElement Footer
+        {
+            get => _footer;
+            set
+            {
+                if (_footer == value) return;
+                _footer = value;
+                UpdateFooter();
+            }
+        }
+
+        public int HeaderRowHeight
+        {
+            get => _rowHeight;
+            set
+            {
+                if (_rowHeight == value) return;
+                _rowHeight = value;
+            }
+        }
+
+        public void ResetGroup(GroupList group)
+        {
+            GenListItem groupItem;
+            if (_itemContexts.TryGetValue(group.HeaderContent, out groupItem))
+            {
+                groupItem.ClearSubitems();
+            }
+        }
+
+        public void AddSource(IEnumerable source)
+        {
+            UpdateHeader();
+            foreach (var data in source)
+            {
+                var groupList = data as GroupList;
+                if (groupList != null)
+                {
+                    AddGroup(groupList);
+                    foreach (var item in groupList)
+                    {
+                        AddItem(item as Cell, groupList);
+                    }
+                }
+                else
+                {
+                    AddItem(data as Cell, null);
+                }
+            }
+            UpdateFooter();
+        }
+        public void AddSource(IEnumerable source, Cell before)
+        {
+            foreach (var data in source)
+            {
+                var groupList = data as GroupList;
+                if (groupList != null)
+                {
+                    InsertGroup(groupList, before);
+                    foreach (var item in groupList)
+                    {
+                        AddItem(item as Cell, groupList);
+                    }
+                }
+                else
+                {
+                    InsertItem(data as Cell, before, null);
+                }
+            }
+        }
+        public void AddSource(IEnumerable source, GroupList group, Cell before)
+        {
+            foreach (var data in source)
+            {
+                InsertItem(data as Cell, before, group);
+            }
+        }
+        public void AddSource(IEnumerable source, GroupList group)
+        {
+            foreach (var data in source)
+            {
+                AddItem(data as Cell, group);
+            }
+        }
+
+        public void RemoveSource(IEnumerable source)
+        {
+            foreach (var data in source)
+            {
+                if (data is GroupList)
+                    Remove(data as GroupList);
+                else
+                    Remove(data as Cell);
+            }
+        }
+
+        public void ApplyScrollTo(Cell cell, Xamarin.Forms.ScrollToPosition position, bool animated)
+        {
+            GenListItem item;
+            if (_itemContexts.TryGetValue(cell, out item))
+            {
+                ScrollTo(item, position.ToNative(), animated);
+            }
+        }
+
+        public void ApplySelectedItem(Cell cell)
+        {
+            GenListItem item;
+            if (_itemContexts.TryGetValue(cell, out item))
+            {
+                item.IsSelected = true;
+            }
+        }
+
+        public void AddItem(Cell cell, GroupList group)
+        {
+            CellRenderer renderer = ListViewCache.Get(cell);
+            GenListItem groupItem = group == null ? null : _itemContexts.GetValueOrDefault(group.HeaderContent);
+            GenListItem item = null;
+            var lastCtx = LastItem?.Data as TypedItemContext;
+            if (lastCtx != null && (lastCtx.Type == ItemType.Footer || lastCtx.Type == ItemType.BottomPadding))
+            {
+                item = InsertBefore(renderer.Class, new ListViewItemContext(cell, group), LastItem, GenListItemType.Normal, groupItem);
+            }
+            else
+            {
+                item = Append(renderer.Class, new ListViewItemContext(cell, group), GenListItemType.Normal, groupItem);
+            }
+            RegisterItem(cell, item);
+        }
+        public void InsertItem(Cell cell, Cell before, GroupList group)
+        {
+            CellRenderer renderer = ListViewCache.Get(cell);
+            GenListItem groupItem = group == null ? null : _itemContexts.GetValueOrDefault(group.HeaderContent);
+            GenListItem beforeItem = _itemContexts.GetValueOrDefault(before);
+            var item = InsertBefore(renderer.Class, new ListViewItemContext(cell, group), beforeItem, GenListItemType.Normal, groupItem);
+            RegisterItem(cell, item);
+        }
+        public void AddGroup(GroupList group)
+        {
+            CellRenderer renderer = ListViewCache.Get(group.HeaderContent, true);
+            var lastCtx = LastItem?.Data as TypedItemContext;
+            GenListItem item = null;
+            if (lastCtx != null && (lastCtx.Type == ItemType.Footer || lastCtx.Type == ItemType.BottomPadding))
+            {
+                item = InsertBefore(renderer.Class, new ListViewItemContext(group), LastItem, GenListItemType.Group);
+            }
+            else
+            {
+                item = Append(renderer.Class, new ListViewItemContext(group), GenListItemType.Group);
+            }
+            RegisterItem(group.HeaderContent, item, true);
+        }
+        public void InsertGroup(GroupList group, Cell before)
+        {
+            CellRenderer renderer = ListViewCache.Get(group.HeaderContent, true);
+            GenListItem beforeItem = _itemContexts.GetValueOrDefault(before);
+            var item = InsertBefore(renderer.Class, new ListViewItemContext(group), beforeItem, GenListItemType.Group);
+            RegisterItem(group.HeaderContent, item, true);
+        }
+        public void Remove(Cell cell)
+        {
+            GenListItem item;
+            if (_itemContexts.TryGetValue(cell, out item))
+            {
+                item.Delete();
+            }
+        }
+        public void Remove(GroupList group)
+        {
+            Remove(group.HeaderContent);
+            foreach (var data in group)
+            {
+                Remove(data as Cell);
+            }
+        }
+
+        public new void Clear()
+        {
+            base.Clear();
+        }
+
+        protected override void OnRealized()
+        {
+            base.OnRealized();
+
+            ItemRealized += OnItemAppear;
+            ItemUnrealized += OnItemDisappear;
+        }
+
+        void OnItemDisappear(object sender, GenListItemEventArgs e)
+        {
+            ListViewItemContext ctx = e?.Item?.Data as ListViewItemContext;
+            if (ctx?.Cell != null)
+            {
+                ctx.Cell.SendDisappearing();
+                var renderer = ListViewCache.Get(ctx.Cell);
+                renderer.SendUnrealizedCell(ctx.Cell);
+            }
+        }
+
+        void OnItemAppear(object sender, GenListItemEventArgs e)
+        {
+            ListViewItemContext ctx = e?.Item?.Data as ListViewItemContext;
+            if (ctx?.Cell != null)
+            {
+                ctx.Cell.SendAppearing();
+            }
+        }
+
+        void UpdateHeaderHeightForGroup(bool isPreviousOfGroup)
+        {
+            if (Header == null) return;
+            if (isPreviousOfGroup)
+            {
+                Header.MinimumHeightRequest = GroupHeaderMinimumHeight; // correct visible height on the Group Header
+            }
+            else
+            {
+                if (Header.HeightRequest < 0 && HeaderRowHeight < 0)
+                {
+                    Header.MinimumHeightRequest = HeaderMinimumHeight;  // correct visible height on the None group header
+                }
+                else if(HeaderRowHeight > 0)
+                {
+                    Header.MinimumHeightRequest = HeaderRowHeight;
+                }
+            }
+        }
+
+        void UpdateHeader()
+        {
+            GenItemClass cls = null;
+            ItemType type = ItemType.TopPadding;
+            var ctx = FirstItem?.Data as TypedItemContext;
+
+            if (Header == null)
+            {
+                cls = ListViewCache.PaddingItemClass;
+            }
+            else
+            {
+                cls = Forms.CircleListView.GetCancelEffect(Header) ? ListViewCache.InformalItemClassWithoutFishEye : ListViewCache.InformalItemClass;
+                type = ItemType.Header;
+            }
+
+            if (FirstItem == null)
+            {
+                Append(cls, new TypedItemContext(Header, type));
+            }
+            else
+            {
+                if (ctx == null || ctx.Type == ItemType.Footer || ctx.Type == ItemType.BottomPadding)
+                {
+                    InsertBefore(cls, new TypedItemContext(Header, type), FirstItem);
+                }
+                else
+                {
+                    FirstItem.UpdateItemClass(cls, new TypedItemContext(Header, type));
+                }
+            }
+
+            if (Header != null && FirstItem?.Next != null)
+            {
+                var nextCtx = FirstItem.Next?.Data as ListViewItemContext;
+                var isNextItemIsGroupHeader = nextCtx == null ? false : nextCtx.IsGroupItem;
+
+                UpdateHeaderHeightForGroup(isNextItemIsGroupHeader);
+            }
+        }
+
+        void UpdateFooter()
+        {
+            GenItemClass cls = null;
+            ItemType type;
+            var ctx = LastItem?.Data as TypedItemContext;
+            if (Footer == null)
+            {
+                cls = ListViewCache.PaddingItemClass;
+                type = ItemType.BottomPadding;
+            }
+            else
+            {
+                cls = Forms.CircleListView.GetCancelEffect(Footer) ? ListViewCache.InformalItemClassWithoutFishEye : ListViewCache.InformalItemClass;
+                type = ItemType.Footer;
+            }
+
+            if (ctx == null || ctx.Type == ItemType.Header || ctx.Type == ItemType.TopPadding)
+            {
+                Append(cls, new TypedItemContext(Footer, type));
+            }
+            else
+            {
+                LastItem.UpdateItemClass(cls, new TypedItemContext(Footer, type));
+            }
+        }
+
+        void RegisterItem(Cell cell, GenListItem item, bool IsGroup = false)
+        {
+            item.SelectionMode = IsGroup ? GenItemSelectionMode.None : GenItemSelectionMode.Always;
+            item.IsEnabled = cell.IsEnabled;
+            item.Deleted += ItemDeletedHandler;
+            _itemContexts[cell] = item;
+
+
+            if (Header != null && item == FirstItem.Next)
+            {
+                UpdateHeaderHeightForGroup(IsGroup);
+            }
+
+            if (!IsGroup)
+            {
+                cell.PropertyChanged += OnCellPropertyChanged;
+                (cell as ICellController).ForceUpdateSizeRequested += OnForceUpdateSizeRequested;
+            }
+        }
+        void OnCellPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            var cell = sender as Cell;
+            var renderer = ListViewCache.Get(cell);
+            GenListItem item;
+            if (_itemContexts.TryGetValue(cell, out item))
+            {
+                renderer.SendCellPropertyChanged(cell, item, e.PropertyName);
+            }
+        }
+        void OnForceUpdateSizeRequested(object sender, EventArgs e)
+        {
+            var cell = sender as Cell;
+            GenListItem item;
+            if (_itemContexts.TryGetValue(cell, out item))
+            {
+                item.Update();
+            }
+        }
+        void ItemDeletedHandler(object sender, EventArgs e)
+        {
+            var context = (sender as GenListItem)?.Data as ListViewItemContext;
+            if (context != null)
+            {
+                Cell cell;
+                if (!context.IsGroupItem)
+                {
+                    cell = context.Cell;
+                    cell.PropertyChanged -= OnCellPropertyChanged;
+                    (cell as ICellController).ForceUpdateSizeRequested -= OnForceUpdateSizeRequested;
+                }
+                else
+                {
+                    cell = context.Group.HeaderContent;
+                }
+                _itemContexts.Remove(cell);
+            }
+        }
+    }
+
+    enum ItemType
+    {
+        TopPadding,
+        BottomPadding,
+        Header,
+        Footer
+    }
+
+    class TypedItemContext
+    {
+        public TypedItemContext(VisualElement element, ItemType type)
+        {
+            Element = element;
+            Type = type;
+        }
+        public VisualElement Element { get; set; }
+        public ItemType Type { get; set; }
+    }
+
+    public class ListViewItemContext : Xamarin.Forms.Platform.Tizen.Native.ListView.ItemContext
+    {
+        public ListViewItemContext(Cell cell, GroupList group, bool isGroup)
+        {
+            Cell = cell;
+            Group = group;
+            IsGroupItem = isGroup;
+        }
+        public ListViewItemContext(Cell cell, GroupList group) : this(cell, group, false)
+        {
+        }
+
+        public ListViewItemContext(GroupList group) : this(group.HeaderContent, group, true)
+        {
+        }
+
+        public GroupList Group { get; set; }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleListViewRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleListViewRenderer.cs
new file mode 100644 (file)
index 0000000..4699382
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleListViewRenderer.cs
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using System.Collections;
+using System.Collections.Specialized;
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+
+using CCircularListView = global::Tizen.Wearable.CircularUI.Forms.CircleListView;
+
+[assembly: ExportRenderer(typeof(Tizen.Wearable.CircularUI.Forms.CircleListView), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.CircleListViewRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    using GroupList = TemplatedItemsList<ItemsView<Cell>, Cell>;
+
+    public class CircleListViewRenderer : ViewRenderer<CCircularListView, CircleListView>
+    {
+        int _selectedItemChanging;
+
+        public CircleListViewRenderer()
+        {
+            RegisterPropertyHandler(global::Tizen.Wearable.CircularUI.Forms.CircleListView.HasUnevenRowsProperty, UpdateHasUnevenRows);
+            RegisterPropertyHandler(CCircularListView.RowHeightProperty, UpdateRowHeight);
+            RegisterPropertyHandler(CCircularListView.SelectedItemProperty, UpdateSelectedItem);
+            RegisterPropertyHandler(CCircularListView.ItemsSourceProperty, UpdateSource);
+            RegisterPropertyHandler("HeaderElement", UpdateHeader);
+            RegisterPropertyHandler("FooterElement", UpdateFooter);
+            RegisterPropertyHandler(CCircularListView.BarColorProperty, UpdateBarColor);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<CCircularListView> e)
+        {
+            if (Control == null)
+            {
+                var surface = this.GetSurface();
+                SetNativeControl(new CircleListView(XForms.NativeParent, surface));
+
+                Control.ItemSelected += OnListViewItemSelected;
+            }
+
+            if (e.NewElement != null)
+            {
+                e.NewElement.ScrollToRequested += OnScrollToRequested;
+                e.NewElement.TemplatedItems.GroupedCollectionChanged += OnGroupedCollectionChanged;
+                e.NewElement.TemplatedItems.CollectionChanged += OnCollectionChanged;
+            }
+            if (e.OldElement != null)
+            {
+                e.OldElement.ScrollToRequested -= OnScrollToRequested;
+                e.OldElement.TemplatedItems.GroupedCollectionChanged -= OnGroupedCollectionChanged;
+                e.OldElement.TemplatedItems.CollectionChanged -= OnCollectionChanged;
+            }
+            base.OnElementChanged(e);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (Element != null)
+                {
+                    Element.ScrollToRequested -= OnScrollToRequested;
+                    Element.TemplatedItems.GroupedCollectionChanged -= OnGroupedCollectionChanged;
+                    Element.TemplatedItems.CollectionChanged -= OnCollectionChanged;
+                }
+                if (Control != null)
+                {
+                    Control.ItemSelected -= OnListViewItemSelected;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        void UpdateFooter()
+        {
+            var footer = (Element as IListViewController)?.FooterElement as VisualElement;
+            Control.Footer = footer;
+        }
+
+        void UpdateHeader()
+        {
+            var header = (Element as IListViewController)?.HeaderElement as VisualElement;
+            Control.Header = header;
+        }
+
+        void UpdateBarColor()
+        {
+            var color = Element.BarColor;
+            if (color != Xamarin.Forms.Color.Default)
+            {
+                Control.VerticalScrollBarColor = color.ToNative();
+            }
+        }
+
+        void UpdateSource(bool init)
+        {
+            if (!init)
+                Control.Clear();
+            Control.AddSource(Element.TemplatedItems);
+            UpdateSelectedItem();
+        }
+
+        void UpdateSelectedItem()
+        {
+            if (Element.SelectedItem == null)
+            {
+                if (Control.SelectedItem != null)
+                    Control.SelectedItem.IsSelected = false;
+            }
+            else
+            {
+                var results = Element.TemplatedItems.GetGroupAndIndexOfItem(Element.SelectedItem);
+                if (results.Item1 != -1 && results.Item2 != -1)
+                {
+                    var group = (Element.TemplatedItems as ITemplatedItemsList<Cell>).GetGroup(results.Item1);
+                    var cell = group[results.Item2];
+
+                    _selectedItemChanging++;
+                    Control.ApplySelectedItem(cell);
+                    _selectedItemChanging--;
+                }
+            }
+        }
+
+        void UpdateRowHeight(bool initialize)
+        {
+            Control.HeaderRowHeight = Element.RowHeight;
+            if (!initialize)
+                Control.UpdateRealizedItems();
+        }
+
+        void UpdateHasUnevenRows()
+        {
+            Control.Homogeneous = !Element.HasUnevenRows;
+            Control.UpdateRealizedItems();
+        }
+
+        void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                if (e.NewStartingIndex + e.NewItems.Count < Element.TemplatedItems.Count)
+                {
+                    Cell before = Element.TemplatedItems[e.NewStartingIndex + e.NewItems.Count];
+                    Control.AddSource(e.NewItems, before);
+                }
+                else
+                {
+                    Control.AddSource(e.NewItems);
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                Control.RemoveSource(e.OldItems);
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                UpdateSource(false);
+            }
+        }
+
+        void OnGroupedCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                GroupList group = sender as GroupList;
+                if (e.NewStartingIndex + e.NewItems.Count < Element.TemplatedItems.Count)
+                {
+                    Cell before = Element.TemplatedItems[e.NewStartingIndex + e.NewItems.Count];
+                    Control.AddSource(e.NewItems, group, before);
+                }
+                else
+                {
+                    Control.AddSource(e.NewItems, group);
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                Control.RemoveSource(e.OldItems);
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                Control.ResetGroup(sender as GroupList);
+            }
+        }
+
+        void OnScrollToRequested(object sender, ScrollToRequestedEventArgs e)
+        {
+            Cell cell;
+            var args = e as ITemplatedItemsListScrollToRequestedEventArgs;
+            if (Element.IsGroupingEnabled)
+            {
+                var results = Element.TemplatedItems.GetGroupAndIndexOfItem(args.Group, args.Item);
+                if (results.Item1 == -1 || results.Item2 == -1)
+                    return;
+
+                var group = (Element.TemplatedItems as ITemplatedItemsList<Cell>).GetGroup(results.Item1);
+                cell = group[results.Item2];
+            }
+            else
+            {
+                int index = (Element.TemplatedItems as ITemplatedItemsList<Cell>).GetGlobalIndexOfItem(args.Item);
+                cell = Element.TemplatedItems[index];
+            }
+
+            Control.ApplyScrollTo(cell, e.Position, e.ShouldAnimate);
+        }
+
+        void OnListViewItemSelected(object sender, GenListItemEventArgs e)
+        {
+            var context = e.Item?.Data as ListViewItemContext;
+
+            if (context == null)
+            {
+                return;
+            }
+
+            if (_selectedItemChanging != 0 || context.IsGroupItem)
+            {
+                return;
+            }
+
+            if (Element.IsGroupingEnabled)
+            {
+                int groupIndex = (Element.TemplatedItems as IList).IndexOf(context.Group);
+                int subIndex = context.Group.IndexOf(context.Cell);
+                _selectedItemChanging++;
+                Element.NotifyRowTapped(groupIndex, subIndex);
+                _selectedItemChanging--;
+            }
+            else
+            {
+                int index = Element.TemplatedItems.IndexOf(context.Cell);
+                _selectedItemChanging++;
+                Element.NotifyRowTapped(index);
+                _selectedItemChanging--;
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CirclePageRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CirclePageRenderer.cs
new file mode 100644 (file)
index 0000000..15aae63
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CirclePageRenderer.cs
@@ -0,0 +1,532 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using ElmSharp.Wearable;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using Tizen.Wearable.CircularUI.Forms;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms.Platform.Tizen.Native;
+using XForms = Xamarin.Forms.Forms;
+
+using XToolbarItem = Xamarin.Forms.ToolbarItem;
+
+[assembly: ExportRenderer(typeof(CirclePage), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.CirclePageRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class CirclePageRenderer : VisualElementRenderer<CirclePage>
+    {
+        ObservableBox _box;
+
+        ElmSharp.Rectangle _bgColorObject;
+        ElmSharp.EvasImage _bgImageObject;
+        ElmSharp.Layout _surfaceLayout;
+        ElmSharp.Button _actionButton;
+        ImageSource _bgImage;
+
+        ElmSharp.Wearable.CircleSurface _surface;
+        IRotaryFocusable _currentRotaryFocusObject;
+
+        ElmSharp.Wearable.MoreOption _moreOption;
+        Dictionary<XToolbarItem, ElmSharp.Wearable.MoreOptionItem> _toolbarItemMap;
+        Dictionary<ICircleSurfaceItem, ElmSharp.Wearable.ICircleWidget> _circleSurfaceItems;
+
+        public CirclePageRenderer()
+        {
+            RegisterPropertyHandler(Xamarin.Forms.Page.BackgroundImageSourceProperty, UpdateBackgroundImage);
+            RegisterPropertyHandler(CirclePage.ActionButtonProperty, UpdateActionButton);
+            RegisterPropertyHandler(CirclePage.RotaryFocusObjectProperty, UpdateRotaryFocusObject);
+        }
+
+        public ElmSharp.Wearable.CircleSurface CircleSurface => _surface;
+
+        protected override void OnElementChanged(ElementChangedEventArgs<CirclePage> e)
+        {
+            if (_box == null)
+            {
+                OnRealized();
+            }
+            if (e.NewElement != null)
+            {
+                e.NewElement.Appearing += OnPageAppearing;
+                e.NewElement.Disappearing += OnPageDisappearing;
+                var toolbarItems = e.NewElement.ToolbarItems as ObservableCollection<XToolbarItem>;
+                if (toolbarItems != null)
+                    toolbarItems.CollectionChanged += OnToolbarItemChanged;
+                var circleSurfaceItems = e.NewElement.CircleSurfaceItems as ObservableCollection<ICircleSurfaceItem>;
+                if (circleSurfaceItems != null)
+                {
+                    circleSurfaceItems.CollectionChanged += OnCircleSurfaceItemsChanged;
+
+                    foreach (var item in circleSurfaceItems)
+                    {
+                        AddCircleSurfaceItem(item);
+                    }
+                }
+            }
+            if (e.OldElement != null)
+            {
+                e.OldElement.Appearing -= OnPageAppearing;
+                e.OldElement.Disappearing -= OnPageDisappearing;
+                var toolbarItems = e.NewElement.ToolbarItems as ObservableCollection<XToolbarItem>;
+                if (toolbarItems != null)
+                    toolbarItems.CollectionChanged -= OnToolbarItemChanged;
+                var circleSurfaceItems = e.NewElement.CircleSurfaceItems as ObservableCollection<ICircleSurfaceItem>;
+                if (circleSurfaceItems != null)
+                    circleSurfaceItems.CollectionChanged -= OnCircleSurfaceItemsChanged;
+            }
+            base.OnElementChanged(e);
+        }
+        protected override void UpdateBackgroundColor(bool initialize)
+        {
+            if (initialize && Element.BackgroundColor.IsDefault) return;
+
+            if (Element.BackgroundColor.A == 0)
+            {
+                _bgColorObject.Color = ElmSharp.Color.Transparent;
+            }
+            else
+            {
+                _bgColorObject.Color = Element.BackgroundColor.ToNative();
+            }
+            UpdateBackground();
+        }
+        protected void UpdateBackgroundImage(bool initialize)
+        {
+            if (initialize && Element.BackgroundImageSource.IsNullOrEmpty())
+                return;
+
+            var bgImageSource = Element.BackgroundImageSource as FileImageSource;
+            if (bgImageSource.IsNullOrEmpty())
+            {
+                _bgImageObject.File = null;
+                _bgImage = null;
+            }
+            else
+            {
+                _bgImageObject.File = ResourcePath.GetPath(bgImageSource);
+                _bgImage = Element.BackgroundImageSource;
+            }
+            UpdateBackground();
+        }
+        protected override void Dispose(bool disposing)
+        {
+            if (Element != null)
+            {
+                Element.Appearing -= OnPageAppearing;
+                Element.Disappearing -= OnPageDisappearing;
+                if (Element.ActionButton != null)
+                {
+                    Element.ActionButton.PropertyChanged -= OnActionButtonItemChanged;
+                }
+                var toolbarItems = Element.ToolbarItems as ObservableCollection<XToolbarItem>;
+                if (toolbarItems != null)
+                    toolbarItems.CollectionChanged -= OnToolbarItemChanged;
+
+                var circleSurfaceItems = Element.CircleSurfaceItems as ObservableCollection<ICircleSurfaceItem>;
+                if (circleSurfaceItems != null)
+                    circleSurfaceItems.CollectionChanged -= OnCircleSurfaceItemsChanged;
+            }
+            base.Dispose(disposing);
+        }
+        void OnRealized()
+        {
+            _box = new ObservableBox(XForms.NativeParent);
+            _box.SetLayoutCallback(OnLayout);
+
+            _bgColorObject = new ElmSharp.Rectangle(_box)
+            {
+                Color = ElmSharp.Color.Transparent
+            };
+            _bgImageObject = new EvasImage(_box);
+            _surfaceLayout = new ElmSharp.Layout(_box);
+            _surface = new ElmSharp.Wearable.CircleSurface(_surfaceLayout);
+
+
+            _toolbarItemMap = new Dictionary<XToolbarItem, ElmSharp.Wearable.MoreOptionItem>();
+            _circleSurfaceItems = new Dictionary<ICircleSurfaceItem, ICircleWidget>();
+
+            _box.PackEnd(_bgColorObject);
+            _box.PackEnd(_bgImageObject);
+            _box.PackEnd(_surfaceLayout);
+
+            _bgColorObject.Show();
+            _bgImageObject.Hide();
+            _surfaceLayout.Show();
+
+            if (Element.ToolbarItems.Count > 0)
+            {
+                Device.BeginInvokeOnMainThread(() =>
+                {
+                    SetVisibleMoreOption(true);
+
+                    foreach (var item in Element.ToolbarItems)
+                    {
+                        AddToolbarItem(item);
+                    }
+                });
+
+            }
+
+            SetNativeView(_box);
+        }
+        void OnLayout()
+        {
+            var rect = _box.Geometry;
+            Element.Layout(rect.ToDP());
+            _bgColorObject.Geometry = rect;
+            _bgImageObject.Geometry = rect;
+
+            _bgImageObject.StackAbove(_bgColorObject);
+            EvasObject prev = _bgImageObject;
+
+            IContainable<EvasObject> container = _box;
+            foreach (var obj in container.Children)
+            {
+                obj.StackAbove(prev);
+                prev = obj;
+            }
+
+            if (_actionButton != null)
+            {
+                var btnRect = _actionButton.Geometry;
+                var btnW = Math.Max(_actionButton.MinimumWidth, btnRect.Width);
+                var btnH = Math.Max(_actionButton.MinimumHeight, btnRect.Height);
+                var btnX = rect.X + (rect.Width - btnW)/2;
+                var btnY = rect.Height - btnH;
+                _actionButton.Geometry = new Rect(btnX, btnY, btnW, btnH);
+                _actionButton.StackAbove(prev);
+                prev = _actionButton;
+            }
+
+            _surfaceLayout.Geometry = rect;
+            _surfaceLayout.StackAbove(prev);
+            prev = _surfaceLayout;
+
+            if (_moreOption != null)
+            {
+                _moreOption.Geometry = rect;
+                _moreOption.StackAbove(prev);
+            }
+        }
+
+        void UpdateBackground()
+        {
+            if (_bgImage.IsNullOrEmpty())
+            {
+                _bgImageObject.Hide();
+            }
+            else
+            {
+                _bgImageObject.Show();
+            }
+        }
+        void UpdateActionButton(bool initialize)
+        {
+            if (Element.ActionButton != null)
+            {
+                if (_actionButton == null)
+                {
+                    _actionButton = new ElmSharp.Button(_box)
+                    {
+                        Style = "bottom"
+                    };
+                    _actionButton.Clicked += OnActionButtonClicked;
+                    _box.PackEnd(_actionButton);
+                }
+
+                SetVisibleActionButton(Element.ActionButton.IsVisible);
+
+                Element.ActionButton.PropertyChanged += OnActionButtonItemChanged;
+                _actionButton.Text = Element.ActionButton.Text;
+                _actionButton.IsEnabled = Element.ActionButton.IsEnable;
+                if (!Element.ActionButton.IconImageSource.IsNullOrEmpty())
+                {
+                    var imageSource = Element.ActionButton.IconImageSource as FileImageSource;
+                    var path = ResourcePath.GetPath(imageSource);
+                    var buttonImage = new ElmSharp.Image(_actionButton);
+                    buttonImage.LoadAsync(path);
+                    buttonImage.Show();
+                    _actionButton.SetPartContent("elm.swallow.content", buttonImage);
+                }
+
+                if (Element.ActionButton.BackgroundColor != Xamarin.Forms.Color.Default)
+                {
+                    _actionButton.BackgroundColor = Element.ActionButton.BackgroundColor.ToNative();
+                }
+            }
+            else
+            {
+                if (_actionButton != null)
+                {
+                    _actionButton.Clicked -= OnActionButtonClicked;
+                    _box.UnPack(_actionButton);
+                    _actionButton.Unrealize();
+                    _actionButton = null;
+                }
+            }
+        }
+        void OnActionButtonItemChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (_actionButton == null)
+            {
+                return;
+            }
+            if (e.PropertyName == MenuItem.TextProperty.PropertyName)
+            {
+                _actionButton.Text = Element.ActionButton.Text;
+            }
+            else if (e.PropertyName == ActionButtonItem.IsEnableProperty.PropertyName)
+            {
+                _actionButton.IsEnabled = Element.ActionButton.IsEnable;
+            }
+            else if (e.PropertyName == ActionButtonItem.IsVisibleProperty.PropertyName)
+            {
+                SetVisibleActionButton(Element.ActionButton.IsVisible);
+            }
+        }
+        void OnActionButtonClicked(object sender, EventArgs e)
+        {
+            if (Element.ActionButton != null)
+            {
+                ((IMenuItemController)Element.ActionButton).Activate();
+            }
+        }
+        void OnToolbarItemChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            SetVisibleMoreOption(Element.ToolbarItems.Count > 0);
+            if (e.Action == NotifyCollectionChangedAction.Add ||
+                e.Action == NotifyCollectionChangedAction.Replace)
+            {
+                foreach (XToolbarItem item in e.NewItems) AddToolbarItem(item);
+            }
+            if (e.Action == NotifyCollectionChangedAction.Remove ||
+                e.Action == NotifyCollectionChangedAction.Replace)
+            {
+                foreach (XToolbarItem item in e.OldItems) RemoveToolbarITem(item);
+            }
+        }
+        void AddToolbarItem(XToolbarItem item)
+        {
+            var moreOptionItem = new ActionMoreOptionItem();
+            var icon = item.IconImageSource;
+            if (!icon.IsNullOrEmpty())
+            {
+                var iconSource = icon as FileImageSource;
+                var img = new ElmSharp.Image(_moreOption);
+                img.LoadAsync(ResourcePath.GetPath(iconSource));
+                moreOptionItem.Icon = img;
+            }
+            var text = item.Text;
+            if (!string.IsNullOrEmpty(text))
+            {
+                moreOptionItem.MainText = text;
+            }
+            if (item is CircleToolbarItem)
+            {
+                var subText = ((CircleToolbarItem)item).SubText;
+                if (!string.IsNullOrEmpty(subText))
+                {
+                    moreOptionItem.SubText = subText;
+                }
+            }
+            moreOptionItem.Action = () => ((IMenuItemController)item).Activate();
+            _moreOption.Items.Add(moreOptionItem);
+            _toolbarItemMap[item] = moreOptionItem;
+        }
+        void RemoveToolbarITem(XToolbarItem item)
+        {
+            if (_toolbarItemMap.TryGetValue(item, out var moreOptionItem))
+            {
+                _moreOption?.Items.Remove(moreOptionItem);
+                _toolbarItemMap.Remove(item);
+            }
+        }
+        void OnMoreOptionClicked(object sender, ElmSharp.Wearable.MoreOptionItemEventArgs e)
+        {
+            var item = e.Item as ActionMoreOptionItem;
+            if (item != null)
+            {
+                item.Action?.Invoke();
+            }
+            _moreOption.IsOpened = false;
+        }
+        void UpdateRotaryFocusObject(bool initialize)
+        {
+            if (initialize)
+            {
+                _currentRotaryFocusObject = Element.RotaryFocusObject;
+            }
+            else
+            {
+                DeactivateRotaryWidget();
+                _currentRotaryFocusObject = Element.RotaryFocusObject;
+                ActivateRotaryWidget();
+            }
+        }
+        void OnPageDisappearing(object sender, EventArgs e)
+        {
+            DeactivateRotaryWidget();
+        }
+        void OnPageAppearing(object sender, EventArgs e)
+        {
+            ActivateRotaryWidget();
+        }
+        void ToolbarClosed(object sender, EventArgs e)
+        {
+            ActivateRotaryWidget();
+        }
+        void ToolbarOpened(object sender, EventArgs e)
+        {
+            DeactivateRotaryWidget();
+        }
+
+        void ActivateRotaryWidget()
+        {
+            if (_currentRotaryFocusObject is IRotaryEventReceiver)
+            {
+                RotaryEventManager.Rotated += OnRotaryEventChanged;
+            }
+            else if (_currentRotaryFocusObject is IRotaryFocusable)
+            {
+                GetRotaryWidget(_currentRotaryFocusObject)?.Activate();
+            }
+        }
+        void DeactivateRotaryWidget()
+        {
+            if (_currentRotaryFocusObject is IRotaryEventReceiver)
+            {
+                RotaryEventManager.Rotated -= OnRotaryEventChanged;
+            }
+            else if (_currentRotaryFocusObject is IRotaryFocusable)
+            {
+                GetRotaryWidget(_currentRotaryFocusObject)?.Deactivate();
+            }
+        }
+        void OnRotaryEventChanged(ElmSharp.Wearable.RotaryEventArgs e)
+        {
+            if (_currentRotaryFocusObject is IRotaryEventReceiver)
+            {
+                var receiver = _currentRotaryFocusObject as IRotaryEventReceiver;
+                receiver.Rotate(new RotaryEventArgs { IsClockwise = e.IsClockwise });
+            }
+        }
+
+        void OnCircleSurfaceItemsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add ||
+                e.Action == NotifyCollectionChangedAction.Replace)
+            {
+                foreach (ICircleSurfaceItem item in e.NewItems)
+                    AddCircleSurfaceItem(item);
+            }
+            if (e.Action == NotifyCollectionChangedAction.Remove ||
+                e.Action == NotifyCollectionChangedAction.Replace)
+            {
+                foreach (ICircleSurfaceItem item in e.OldItems)
+                    RemoveCircleSurfaceItem(item);
+            }
+        }
+
+        void AddCircleSurfaceItem(ICircleSurfaceItem item)
+        {
+            if (item is CircleProgressBarSurfaceItem)
+            {
+                var widget = new CircleProgressBarSurfaceItemImplements(item as CircleProgressBarSurfaceItem, _surfaceLayout, _surface);
+                _circleSurfaceItems[item] = widget;
+            }
+            else if (item is CircleSliderSurfaceItem)
+            {
+                var widget = new CircleSliderSurfaceItemImplements(item as CircleSliderSurfaceItem, _surfaceLayout, _surface);
+                _circleSurfaceItems[item] = widget;
+            }
+        }
+        void RemoveCircleSurfaceItem(ICircleSurfaceItem item)
+        {
+            if (_circleSurfaceItems.TryGetValue(item, out var widget))
+            {
+                ElmSharp.EvasObject obj = widget as ElmSharp.EvasObject;
+                obj?.Unrealize();
+                _circleSurfaceItems.Remove(item);
+            }
+        }
+
+        IRotaryActionWidget GetRotaryWidget(IRotaryFocusable focusable)
+        {
+            var consumer = focusable as BindableObject;
+            IRotaryActionWidget rotaryWidget = null;
+            if (consumer != null)
+            {
+                if (consumer is CircleSliderSurfaceItem)
+                {
+                    ICircleSurfaceItem item = consumer as ICircleSurfaceItem;
+                    rotaryWidget = GetCircleWidget(item) as IRotaryActionWidget;
+                }
+                else
+                {
+                    var consumerRenderer = Xamarin.Forms.Platform.Tizen.Platform.GetRenderer(consumer);
+                    rotaryWidget = consumerRenderer?.NativeView as IRotaryActionWidget;
+                }
+            }
+            return rotaryWidget;
+        }
+
+        ICircleWidget GetCircleWidget(ICircleSurfaceItem item)
+        {
+            ElmSharp.Wearable.ICircleWidget widget;
+            if (_circleSurfaceItems.TryGetValue(item, out widget))
+            {
+                return widget;
+            }
+            return null;
+        }
+
+        void SetVisibleActionButton(bool visible)
+        {
+            if (_actionButton == null)
+            {
+                return;
+            }
+            if (visible) _actionButton.Show();
+            else _actionButton.Hide();
+        }
+
+        void SetVisibleMoreOption(bool visible)
+        {
+            if (_moreOption == null)
+            {
+                _moreOption = new ElmSharp.Wearable.MoreOption(_box);
+                _moreOption.Clicked += OnMoreOptionClicked;
+                _moreOption.Opened += ToolbarOpened;
+                _moreOption.Closed += ToolbarClosed;
+                _box.PackEnd(_moreOption);
+            }
+            if (visible) _moreOption.Show();
+            else _moreOption.Hide();
+        }
+
+        class ActionMoreOptionItem : MoreOptionItem
+        {
+            public Action Action { get; set; }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleProgressBarSurfaceItemImplements.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleProgressBarSurfaceItemImplements.cs
new file mode 100644 (file)
index 0000000..0cb1d38
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleProgressBarSurfaceItemImplements.cs
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using Tizen.Wearable.CircularUI.Forms;
+
+using Xamarin.Forms.Platform.Tizen;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    class CircleProgressBarSurfaceItemImplements : ElmSharp.Wearable.CircleProgressBar
+    {
+        CircleProgressBarSurfaceItem _item;
+
+        public CircleProgressBarSurfaceItemImplements(CircleProgressBarSurfaceItem item, EvasObject parent, ElmSharp.Wearable.CircleSurface surface) : base(parent, surface)
+        {
+            _item = item;
+            item.PropertyChanged += ItemPropertyChanged;
+
+            BackgroundAngle = item.BackgroundAngle;
+            BackgroundAngleOffset = item.BackgroundAngleOffset;
+            if (item.BackgroundColor != default(Xamarin.Forms.Color)) BackgroundColor = item.BackgroundColor.ToNative();
+            if (item.BackgroundLineWidth != -1) BackgroundLineWidth = item.BackgroundLineWidth;
+            if (item.BackgroundRadius != -1) BackgroundRadius = item.BackgroundRadius;
+
+            BarAngle = item.BarAngle;
+            BarAngleOffset = item.BarAngleOffset;
+            BarAngleMaximum = item.BarAngleMaximum;
+            BarAngleMinimum = item.BarAngleMinimum;
+            if (item.BarColor != default(Xamarin.Forms.Color)) BarColor = item.BarColor.ToNative();
+            if (item.BarLineWidth != -1) BarLineWidth = item.BarLineWidth;
+            if (item.BarRadius != -1) BarRadius = item.BarRadius;
+
+            Minimum = 0;
+            Maximum = 1;
+
+            Value = item.Value;
+            IsEnabled = item.IsEnabled;
+
+            if (item.IsVisible) Show();
+            else Hide();
+        }
+
+        void ItemPropertyChanged(object sender, PropertyChangedEventArgs args)
+        {
+            if (args.PropertyName == CircleProgressBarSurfaceItem.BackgroundAngleProperty.PropertyName)
+            {
+                BackgroundAngle = _item.BackgroundAngle;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BackgroundAngleOffsetProperty.PropertyName)
+            {
+                BackgroundAngleOffset = _item.BackgroundAngleOffset;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BackgroundColorProperty.PropertyName)
+            {
+                BackgroundColor = _item.BackgroundColor.ToNative();
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BackgroundLineWidthProperty.PropertyName)
+            {
+                BackgroundLineWidth = _item.BackgroundLineWidth;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BackgroundRadiusProperty.PropertyName)
+            {
+                BackgroundRadius = _item.BackgroundRadius;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BarAngleProperty.PropertyName)
+            {
+                BarAngle = _item.BarAngle;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BarAngleOffsetProperty.PropertyName)
+            {
+                BarAngleOffset = _item.BarAngleOffset;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BarAngleMaximumProperty.PropertyName)
+            {
+                BarAngleMaximum = _item.BarAngleMaximum;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BarAngleMinimumProperty.PropertyName)
+            {
+                BarAngleMinimum = _item.BarAngleMinimum;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BarColorProperty.PropertyName)
+            {
+                BarColor = _item.BarColor.ToNative();
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BarLineWidthProperty.PropertyName)
+            {
+                BarLineWidth = _item.BarLineWidth;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.BarRadiusProperty.PropertyName)
+            {
+                BarRadius = _item.BarRadius;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.IsVisibleProperty.PropertyName)
+            {
+                if (_item.IsVisible) Show();
+                else Hide();
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.ValueProperty.PropertyName)
+            {
+                Value = _item.Value;
+            }
+            else if (args.PropertyName == CircleProgressBarSurfaceItem.IsEnabledProperty.PropertyName)
+            {
+                IsEnabled = _item.IsEnabled;
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleScrollViewRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleScrollViewRenderer.cs
new file mode 100644 (file)
index 0000000..c3521f4
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleScrollViewRenderer.cs
@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.ComponentModel;
+using System.Threading.Tasks;
+using ElmSharp;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms.Platform.Tizen.Native;
+using ERect = ElmSharp.Rect;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(Tizen.Wearable.CircularUI.Forms.CircleScrollView), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.CircleScrollViewRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    class CircleScrollViewRenderer : ViewRenderer<CircleScrollView, ElmSharp.Wearable.CircleScroller>
+    {
+        Xamarin.Forms.Platform.Tizen.Native.Box _scrollCanvas;
+        ElmSharp.SmartEvent _scrollAnimationStart, _scrollAnimationStop;
+        bool _isAnimation;
+        TaskCompletionSource<bool> _animationTaskComplateSource;
+
+        public CircleScrollViewRenderer()
+        {
+            RegisterPropertyHandler(CircleScrollView.BarColorProperty, UpdateBarColor);
+            RegisterPropertyHandler("Content", OnContent);
+        }
+
+        public override ERect GetNativeContentGeometry()
+        {
+            return _scrollCanvas.Geometry;
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<CircleScrollView> e)
+        {
+            if (Control == null)
+            {
+                var surface = this.GetSurface();
+                SetNativeControl(new ElmSharp.Wearable.CircleScroller(XForms.NativeParent, surface));
+                InitControl();
+                Control.Scrolled += OnScrolled;
+                _scrollCanvas = new Xamarin.Forms.Platform.Tizen.Native.Box(Control);
+                _scrollCanvas.LayoutUpdated += OnContentLayoutUpdated;
+                Control.SetContent(_scrollCanvas);
+            }
+            if (e.OldElement != null)
+            {
+                (e.OldElement as IScrollViewController).ScrollToRequested -= OnScrollRequestedAsync;
+            }
+            if (e.NewElement != null)
+            {
+                (e.NewElement as IScrollViewController).ScrollToRequested += OnScrollRequestedAsync;
+            }
+
+            UpdateAll();
+
+            base.OnElementChanged(e);
+        }
+
+        protected override void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (ScrollView.OrientationProperty.PropertyName == e.PropertyName)
+            {
+                UpdateOrientation();
+            }
+            else if (ScrollView.ContentSizeProperty.PropertyName == e.PropertyName)
+            {
+                UpdateContentSize();
+            }
+            else if (ScrollView.VerticalScrollBarVisibilityProperty.PropertyName == e.PropertyName)
+            {
+                UpdateVerticalScrollBarVisibility();
+            }
+            else if (ScrollView.HorizontalScrollBarVisibilityProperty.PropertyName == e.PropertyName)
+            {
+                UpdateHorizontalScrollBarVisibility();
+            }
+
+            base.OnElementPropertyChanged(sender, e);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (null != Element)
+                {
+                    (Element as IScrollViewController).ScrollToRequested -= OnScrollRequestedAsync;
+                }
+                if (Control != null)
+                {
+                    Control.Scrolled -= OnScrolled;
+                }
+                if (_scrollCanvas != null)
+                {
+                    _scrollCanvas.LayoutUpdated -= OnContentLayoutUpdated;
+                }
+                _scrollAnimationStart?.Dispose();
+                _scrollAnimationStop?.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        void UpdateAll()
+        {
+            UpdateOrientation();
+            UpdateVerticalScrollBarVisibility();
+            UpdateHorizontalScrollBarVisibility();
+        }
+
+        void UpdateVerticalScrollBarVisibility()
+        {
+            var orientation = Element.Orientation;
+            if (orientation == ScrollOrientation.Vertical || orientation == ScrollOrientation.Both)
+                Control.VerticalScrollBarVisiblePolicy = ScrollBarVisibilityToTizen(Element.VerticalScrollBarVisibility);
+        }
+
+        void UpdateHorizontalScrollBarVisibility()
+        {
+            var orientation = Element.Orientation;
+            if (orientation == ScrollOrientation.Horizontal || orientation == ScrollOrientation.Both)
+                Control.HorizontalScrollBarVisiblePolicy = ScrollBarVisibilityToTizen(Element.HorizontalScrollBarVisibility);
+        }
+
+        void UpdateBarColor()
+        {
+            var color = Element.BarColor;
+            if (color != Xamarin.Forms.Color.Default)
+            {
+                Control.VerticalScrollBarColor = color.ToNative();
+                Control.HorizontalScrollBarColor = color.ToNative();
+            }
+        }
+
+        ScrollBarVisiblePolicy ScrollBarVisibilityToTizen(ScrollBarVisibility visibility)
+        {
+            switch (visibility)
+            {
+                case ScrollBarVisibility.Always:
+                    return ScrollBarVisiblePolicy.Visible;
+                case ScrollBarVisibility.Never:
+                    return ScrollBarVisiblePolicy.Invisible;
+                default:
+                    return ScrollBarVisiblePolicy.Auto;
+            }
+        }
+
+        async void OnScrollRequestedAsync(object sender, ScrollToRequestedEventArgs e)
+        {
+            var x = e.ScrollX;
+            var y = e.ScrollY;
+            if (e.Mode == ScrollToMode.Element)
+            {
+                var itemPosition = (Element as IScrollViewController).GetScrollPositionForElement(e.Element as VisualElement, e.Position);
+                x = itemPosition.X;
+                y = itemPosition.Y;
+            }
+            var region = new Xamarin.Forms.Rectangle(x, y, Element.Width, Element.Height).ToPixel();
+            await ScrollToAsync(region, e.ShouldAnimate).ConfigureAwait(false);
+            Element.SendScrollFinished();
+        }
+
+        void OnScrolled(object sender, EventArgs e)
+        {
+            var region = Control.CurrentRegion.ToDP();
+            ((IScrollViewController)Element).SetScrolledPosition(region.X, region.Y);
+        }
+
+        void OnContent()
+        {
+            _scrollCanvas.UnPackAll();
+            if (Element.Content != null)
+            {
+                _scrollCanvas.PackEnd(Platform.GetOrCreateRenderer(Element.Content).NativeView);
+                UpdateContentSize();
+            }
+        }
+
+        void UpdateContentSize()
+        {
+            _scrollCanvas.MinimumWidth = XForms.ConvertToScaledPixel(Element.ContentSize.Width + Element.Padding.HorizontalThickness);
+            _scrollCanvas.MinimumHeight = XForms.ConvertToScaledPixel(Element.ContentSize.Height + Element.Padding.VerticalThickness);
+
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                if (Control != null)
+                {
+                    OnScrolled(Control, EventArgs.Empty);
+                }
+            });
+        }
+
+        void OnContentLayoutUpdated(object sender, LayoutEventArgs e)
+        {
+            UpdateContentSize();
+        }
+
+        void UpdateOrientation()
+        {
+            switch (Element.Orientation)
+            {
+                case ScrollOrientation.Horizontal:
+                    Control.ScrollBlock = ElmSharp.ScrollBlock.Vertical;
+                    Control.HorizontalScrollBarVisiblePolicy = ElmSharp.ScrollBarVisiblePolicy.Auto;
+                    Control.VerticalScrollBarVisiblePolicy = ElmSharp.ScrollBarVisiblePolicy.Invisible;
+                    break;
+                case ScrollOrientation.Vertical:
+                    Control.ScrollBlock = ElmSharp.ScrollBlock.Horizontal;
+                    Control.HorizontalScrollBarVisiblePolicy = ElmSharp.ScrollBarVisiblePolicy.Invisible;
+                    Control.VerticalScrollBarVisiblePolicy = ElmSharp.ScrollBarVisiblePolicy.Auto;
+                    break;
+                case ScrollOrientation.Both:
+                    Control.ScrollBlock = ElmSharp.ScrollBlock.None;
+                    Control.HorizontalScrollBarVisiblePolicy = ElmSharp.ScrollBarVisiblePolicy.Auto;
+                    Control.VerticalScrollBarVisiblePolicy = ElmSharp.ScrollBarVisiblePolicy.Auto;
+                    break;
+                default:
+                    throw new InvalidOperationException("Not supported orientation.");
+            }
+        }
+
+        void InitControl()
+        {
+            _scrollAnimationStart = new ElmSharp.SmartEvent(Control, Control.RealHandle, "scroll,anim,start");
+            _scrollAnimationStop = new ElmSharp.SmartEvent(Control, Control.RealHandle, "scroll,anim,stop");
+            _scrollAnimationStart.On += (s, e) => _isAnimation = true;
+            _scrollAnimationStop.On += (s, e) =>
+            {
+                if (_animationTaskComplateSource != null)
+                {
+                    _animationTaskComplateSource.TrySetResult(true);
+                }
+                _isAnimation = false;
+            };
+        }
+
+        Task ScrollToAsync(Rect region, bool shouldAnimate)
+        {
+            CheckTaskCompletionSource();
+            Control.ScrollTo(region, shouldAnimate);
+            return shouldAnimate && _isAnimation ? _animationTaskComplateSource.Task : Task.CompletedTask;
+        }
+
+        void CheckTaskCompletionSource()
+        {
+            if (_animationTaskComplateSource != null)
+            {
+                if (_animationTaskComplateSource.Task.Status == TaskStatus.Running)
+                {
+                    _animationTaskComplateSource.TrySetCanceled();
+                }
+            }
+            _animationTaskComplateSource = new TaskCompletionSource<bool>();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleSliderSurfaceItemImplements.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleSliderSurfaceItemImplements.cs
new file mode 100644 (file)
index 0000000..615800e
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleSliderSurfaceItemImplements.cs
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using ElmSharp.Wearable;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using Tizen.Wearable.CircularUI.Forms;
+using Xamarin.Forms.Platform.Tizen;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class CircleSliderSurfaceItemImplements : ElmSharp.Wearable.CircleSlider
+    {
+        CircleSliderSurfaceItem _item;
+
+        public CircleSliderSurfaceItemImplements(CircleSliderSurfaceItem item, EvasObject parent, CircleSurface surface) : base(parent, surface)
+        {
+            _item = item;
+            item.PropertyChanged += ItemPropertyChanged;
+            ValueChanged += OnValueChanged;
+
+            BackgroundAngle = item.BackgroundAngle;
+            BackgroundAngleOffset = item.BackgroundAngleOffset;
+            if (item.BackgroundColor != default(Xamarin.Forms.Color)) BackgroundColor = item.BackgroundColor.ToNative();
+            if (item.BackgroundLineWidth != -1) BackgroundLineWidth = item.BackgroundLineWidth;
+            if (item.BackgroundRadius != -1) BackgroundRadius = item.BackgroundRadius;
+
+            BarAngleOffset = item.BarAngleOffset;
+            BarAngleMaximum = item.BarAngleMaximum;
+            BarAngleMinimum = item.BarAngleMinimum;
+            if (item.BarColor != default(Xamarin.Forms.Color)) BarColor = item.BarColor.ToNative();
+            if (item.BarLineWidth != -1) BarLineWidth = item.BarLineWidth;
+            if (item.BarRadius != -1) BarRadius = item.BarRadius;
+
+            Minimum = item.Minimum;
+            Maximum = item.Maximum;
+            Step = item.Increment;
+
+            if (item.Value == item.Minimum && item.BarAngle != 0)
+            {
+                BarAngle = item.BarAngle;
+            }
+            else
+            {
+                Value = item.Value;
+            }
+
+            IsEnabled = item.IsEnabled;
+
+            if (item.IsVisible) Show();
+            else Hide();
+        }
+
+        void ItemPropertyChanged(object sender, PropertyChangedEventArgs args)
+        {
+            if (args.PropertyName == CircleSliderSurfaceItem.BackgroundAngleProperty.PropertyName)
+            {
+                BackgroundAngle = _item.BackgroundAngle;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BackgroundAngleOffsetProperty.PropertyName)
+            {
+                BackgroundAngleOffset = _item.BackgroundAngleOffset;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BackgroundColorProperty.PropertyName)
+            {
+                BackgroundColor = _item.BackgroundColor.ToNative();
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BackgroundLineWidthProperty.PropertyName)
+            {
+                BackgroundLineWidth = _item.BackgroundLineWidth;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BackgroundRadiusProperty.PropertyName)
+            {
+                BackgroundRadius = _item.BackgroundRadius;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BarAngleProperty.PropertyName)
+            {
+                BarAngle = _item.BarAngle;
+                _item.Value = Value;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BarAngleOffsetProperty.PropertyName)
+            {
+                BarAngleOffset = _item.BarAngleOffset;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BarAngleMaximumProperty.PropertyName)
+            {
+                BarAngleMaximum = _item.BarAngleMaximum;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BarAngleMinimumProperty.PropertyName)
+            {
+                BarAngleMinimum = _item.BarAngleMinimum;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BarColorProperty.PropertyName)
+            {
+                BarColor = _item.BarColor.ToNative();
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BarLineWidthProperty.PropertyName)
+            {
+                BarLineWidth = _item.BarLineWidth;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.BarRadiusProperty.PropertyName)
+            {
+                BarRadius = _item.BarRadius;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.IsVisibleProperty.PropertyName)
+            {
+                if (_item.IsVisible) Show();
+                else Hide();
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.ValueProperty.PropertyName)
+            {
+                if (_item.Value != Value) Value = _item.Value;
+                _item.BarAngle = BarAngle;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.IsEnabledProperty.PropertyName)
+            {
+                IsEnabled = _item.IsEnabled;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.MinimumProperty.PropertyName)
+            {
+                Minimum = _item.Minimum;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.MaximumProperty.PropertyName)
+            {
+                Maximum = _item.Maximum;
+            }
+            else if (args.PropertyName == CircleSliderSurfaceItem.IncrementProperty.PropertyName)
+            {
+                Step = _item.Increment;
+            }
+        }
+
+        private void OnValueChanged(object sender, EventArgs e)
+        {
+            if (_item.Value != Value) _item.Value = Value;
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleStepperRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleStepperRenderer.cs
new file mode 100644 (file)
index 0000000..5708046
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleStepperRenderer.cs
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using ESpinner = ElmSharp.Wearable.CircleSpinner;
+using ESize = ElmSharp.Size;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(Tizen.Wearable.CircularUI.Forms.CircleStepper), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.CircleStepperRenderer))]
+
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class CircleStepperRenderer : ViewRenderer<CircleStepper, ESpinner>
+    {
+        public CircleStepperRenderer()
+        {
+#pragma warning disable CS0618 // MarkerColorProperty and MarkerLineWidthProperty are obsolete
+            RegisterPropertyHandler(CircleStepper.MarkerColorProperty, UpdateMarkerColor);
+            RegisterPropertyHandler(CircleStepper.MarkerLineWidthProperty, UpdateMarkerLineWidth);
+#pragma warning restore CS0618 // MarkerColorProperty and MarkerLineWidthProperty are obsolete
+            RegisterPropertyHandler(CircleStepper.LabelFormatProperty, UpdateLabelFormat);
+            RegisterPropertyHandler(CircleStepper.TitleProperty, UpdateTitle);
+            RegisterPropertyHandler(Stepper.MinimumProperty, UpdateMinimum);
+            RegisterPropertyHandler(Stepper.MaximumProperty, UpdateMaximum);
+            RegisterPropertyHandler(Stepper.ValueProperty, UpdateValue);
+            RegisterPropertyHandler(Stepper.IncrementProperty, UpdateIncrement);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<CircleStepper> e)
+        {
+            if (Control == null)
+            {
+                var surface = this.GetSurface();
+                if (null != surface)
+                {
+                    var spinner = new ESpinner(XForms.NativeParent, surface);
+                    spinner.Style = "circle";
+
+                    SetNativeControl(spinner);
+                    Control.ValueChanged += OnValueChanged;
+                }
+                else
+                {
+                    throw new CirclePageNotFoundException();
+                }
+            }
+
+            base.OnElementChanged(e);
+        }
+
+        private void OnValueChanged(object sender, EventArgs e)
+        {
+            double newValue = Control.Value;
+            ((IElementController)Element).SetValueFromRenderer(Stepper.ValueProperty, newValue);
+
+            if (Element.LabelFormat == null)
+            {
+                // Determines how many decimal places are there in current Stepper's value.
+                // The 15 pound characters below correspond to the maximum precision of Double type.
+                var decimalValue = Decimal.Parse(newValue.ToString("0.###############"));
+
+                // GetBits() method returns an array of four 32-bit integer values.
+                // The third (0-indexing) element of an array contains the following information:
+                //     bits 00-15: unused, required to be 0
+                //     bits 16-23: an exponent between 0 and 28 indicating the power of 10 to divide the integer number passed as a parameter.
+                //                 Conversely this is the number of decimal digits in the number as well.
+                //     bits 24-30: unused, required to be 0
+                //     bit     31: indicates the sign. 0 means positive number, 1 is for negative numbers.
+                //
+                // The precision information needs to be extracted from bits 16-23 of third element of an array
+                // returned by GetBits() call. Right-shifting by 16 bits followed by zeroing anything else results
+                // in a nice conversion of this data to integer variable.
+                var precision = (Decimal.GetBits(decimalValue)[3] >> 16) & 0x000000FF;
+
+                // Sets Stepper's inner label decimal format to use exactly as many decimal places as needed:
+                Control.LabelFormat = string.Format("%.{0}f", precision);
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (Control != null)
+                {
+                    Control.ValueChanged -= OnValueChanged;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        protected override Size MinimumSize()
+        {
+            // This width and height are values taken from SPINNER_LAYOUT_CONTENT_AREA_SIZE of elm-theme-tizen-wearable module
+            return new ESize(360, 110).ToDP();
+        }
+
+        protected override ESize Measure(int availableWidth, int availableHeight)
+        {
+            return new ESize(360, 110);
+        }
+
+        void UpdateMarkerColor()
+        {
+#pragma warning disable CS0618 // MarkerColor is obsolete
+            if (null != Control && null != Element && Element.MarkerColor != Color.Default)
+            {
+                Control.MarkerColor = Element.MarkerColor.ToNative();
+            }
+#pragma warning restore CS0618 // MarkerColor is obsolete
+        }
+
+        void UpdateMarkerLineWidth()
+        {
+            if (null != Control && null != Element)
+            {
+#pragma warning disable CS0618 // MarkerLineWidth is obsolete
+                Control.MarkerLineWidth = Element.MarkerLineWidth;
+#pragma warning restore CS0618 // MarkerLineWidth is obsolete
+            }
+        }
+
+        void UpdateLabelFormat()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.LabelFormat = Element.LabelFormat;
+            }
+        }
+
+        void UpdateTitle()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.SetPartText("elm.text", Element.Title);
+            }
+        }
+
+        void UpdateValue()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.Value = Element.Value;
+            }
+        }
+
+        void UpdateMaximum()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.Maximum = Element.Maximum;
+            }
+        }
+
+        void UpdateMinimum()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.Minimum = Element.Minimum;
+            }
+        }
+
+        void UpdateIncrement()
+        {
+            if (null != Control && null != Element)
+            {
+                Control.Step = Element.Increment;
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleSurfaceNotFoundException.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleSurfaceNotFoundException.cs
new file mode 100644 (file)
index 0000000..6e2d575
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleSurfaceNotFoundException.cs
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Runtime.Serialization;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    [Serializable]
+    public class CircleSurfaceNotFoundException : Exception
+    {
+        public CircleSurfaceNotFoundException()
+        {
+        }
+
+        public CircleSurfaceNotFoundException(string message) : base(message)
+        {
+        }
+
+        public CircleSurfaceNotFoundException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        protected CircleSurfaceNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleWidgetRendererExtension.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleWidgetRendererExtension.cs
new file mode 100644 (file)
index 0000000..d3ef3b3
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircleWidgetRendererExtension.cs
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    static class CircleWidgetRendererExtension
+    {
+        internal static ElmSharp.Wearable.CircleSurface GetSurface(this IVisualElementRenderer renderer)
+        {
+            if (null != renderer.Element)
+            {
+                Element element = renderer.Element;
+                while (element != null)
+                {
+                    if (element is CirclePage)
+                    {
+                        var circlePageRenderer = Platform.GetRenderer(element) as CirclePageRenderer;
+                        return circlePageRenderer?.CircleSurface;
+                    }
+                    foreach (var effect in element.Effects)
+                    {
+                        if (effect is TizenCircleSurfaceEffect)
+                        {
+                            return CircleSurfaceEffectBehavior.GetSurface(element) as ElmSharp.Wearable.CircleSurface;
+                        }
+                    }
+
+                    element = element.Parent;
+                }
+            }
+            throw new CircleSurfaceNotFoundException();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircularUI.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircularUI.cs
new file mode 100644 (file)
index 0000000..643a665
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/CircularUI.cs
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Diagnostics;
+using ElmSharp;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public static class FormsCircularUI
+    {
+        public static readonly string Tag = "CircularUI";
+
+        public static bool IsInitialized { get; private set; }
+
+        public static void Init()
+        {
+            if (IsInitialized) return;
+            IsInitialized = true;
+        }
+
+        public static void Init(string apiKey)
+        {
+            if (!string.IsNullOrEmpty(apiKey))
+            {
+                GoogleMaps.Init(apiKey);
+            }
+            else
+            {
+                Debug.Assert(!string.IsNullOrEmpty(apiKey), "apiKey is null or empty!");
+            }
+
+            Init();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GoogleMapViewRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GoogleMapViewRenderer.cs
new file mode 100644 (file)
index 0000000..1010d96
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GoogleMapViewRenderer.cs
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Text;
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.Wearable.CircularUI.Forms.Renderer;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms.Platform.Tizen.Native;
+using TChromium = Tizen.WebView.Chromium;
+using TWebView = Tizen.WebView.WebView;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(GoogleMapView), typeof(GoogleMapViewRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class GoogleMapViewRenderer : ViewRenderer<GoogleMapView, WebViewContainer>
+    {
+        private const string HtmlStyle = "<html><head><style>html, body {height: 100%; margin: 0; padding: 0;} #map {height: 100%;}</style>";
+        private const string GoogleMapURL = "http://maps.googleapis.com/maps/api/";
+        private const double DefaultLatitude = 41.890202;
+        private const double DefaultLongitude = 12.492049;
+
+        private string[] _positions = { "LEFT_TOP", "RIGHT_TOP", "LEFT_CENTER", "RIGHT_CENTER", "LEFT_BOTTOM", "RIGHT_BOTTOM", "TOP_CENTER", "BOTTOM_CENTER" };
+
+        string _maphtml;
+
+        TWebView NativeWebView => Control.WebView;
+
+        protected override void OnElementChanged(ElementChangedEventArgs<GoogleMapView> e)
+        {
+            if (Control == null)
+            {
+                TChromium.Initialize();
+                XForms.Context.Terminated += (sender, arg) => TChromium.Shutdown();
+                SetNativeControl(new WebViewContainer(XForms.NativeParent));
+                NativeWebView.LoadStarted += OnLoadStarted;
+                NativeWebView.LoadFinished += OnLoadFinished;
+                NativeWebView.LoadError += OnLoadError;
+            }
+
+            if (e.OldElement != null)
+            {
+                ((ObservableCollection<Marker>)e.OldElement.Markers).CollectionChanged -= OnCollectionChanged;
+                e.OldElement.LoadMapRequested -= OnLoadMapRequested;
+            }
+
+            if (e.NewElement != null)
+            {
+                ((ObservableCollection<Marker>)e.NewElement.Markers).CollectionChanged += OnCollectionChanged;
+                e.NewElement.LoadMapRequested += OnLoadMapRequested;
+                LoadMap();
+            }
+            base.OnElementChanged(e);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (Control != null)
+                {
+                    NativeWebView.StopLoading();
+                    NativeWebView.LoadStarted -= OnLoadStarted;
+                    NativeWebView.LoadFinished -= OnLoadFinished;
+                    NativeWebView.LoadError -= OnLoadError;
+                }
+                if (Element != null)
+                {
+                    ((ObservableCollection<Marker>)Element.Markers).CollectionChanged -= OnCollectionChanged;
+                    Element.LoadMapRequested -= OnLoadMapRequested;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        private void OnLoadError(object sender, global::Tizen.WebView.SmartCallbackLoadErrorArgs e)
+        {
+            string url = e.Url;
+            Log.Error(FormsCircularUI.Tag, $"OnLoadError() url:{url}");
+        }
+
+        private void OnLoadStarted(object sender, EventArgs e)
+        {
+            string url = NativeWebView.Url;
+            Log.Debug(FormsCircularUI.Tag, "OnLoadStarted()");
+        }
+
+        private void OnLoadFinished(object sender, EventArgs e)
+        {
+            string url = NativeWebView.Url;
+            Log.Debug(FormsCircularUI.Tag, "OnLoadFinished()");
+            NativeWebView.SetFocus(true);
+        }
+
+        private void LoadMap()
+        {
+            _maphtml = CreateMapViewScript();
+            var baseUrl = default(string);
+            NativeWebView.LoadHtml(_maphtml, baseUrl);
+        }
+
+        private string CreateMapViewScript()
+        {
+            string source = null;
+            StringBuilder sb = new StringBuilder();
+            var apiKey = GoogleMaps.GetKey();
+
+            sb.Append(HtmlStyle);
+            sb.AppendLine();
+            sb.Append("<script src=\"");
+            sb.Append(GoogleMapURL);
+            sb.Append("js?key=");
+            sb.Append(apiKey);
+            sb.Append("\"></script>");
+            sb.AppendLine();
+
+            sb = CreateMapOptionScript(sb);
+            sb.AppendLine();
+            sb.Append("function initialize(){\n    var map = new google.maps.Map(document.getElementById(\"map\"), mapProp); ");
+
+            if (Element.Markers.Count > 0)
+            {
+                sb = CreatePinsScript(sb);
+            }
+
+            sb.Append("\n}\ngoogle.maps.event.addDomListener(window, \'load\', initialize);\n");
+            sb.Append("</script></head><body><div id =\"map\"></div></body></html>");
+
+            source = sb.ToString();
+            return source;
+        }
+
+        private StringBuilder CreateMapOptionScript(StringBuilder sb)
+        {
+            if (Element.MapOption != null)
+            {
+                if(Element.MapOption.Center.Latitude == 0 && Element.MapOption.Center.Longitude == 0)
+                    sb.Append($"<script>\nvar myCenter = new google.maps.LatLng({DefaultLatitude}, {DefaultLongitude});");
+                else
+                    sb.Append($"<script>\nvar myCenter = new google.maps.LatLng({Element.MapOption.Center.Latitude}, {Element.MapOption.Center.Longitude});");
+
+                sb.AppendLine();
+                var type = Element.MapOption.MapType;
+                var mapTypeId = type.ToString().ToUpper();
+                sb.Append("var mapProp = {\n  center:myCenter,\n");
+                sb.Append($"  zoom: {Element.MapOption.Zoom},\n  mapTypeId: google.maps.MapTypeId.{mapTypeId},\n");
+
+                if (Element.MapOption.HasGestureEnabled == false)
+                {
+                    sb.Append("  gestureHandling: 'none',\n");
+                }
+
+                if (Element.MapOption.IsZoomControlVisible == true)
+                {
+                    sb.Append("  mapTypeControl: false,\n  rotateControl: false,\n  fullscreenControl: false,\n  streetViewControl: false,\n");
+                    sb.Append("  zoomControl: true,\n");
+                    sb.Append("  zoomControlOptions:{\n");
+                    int index = (int)Element.MapOption.ZoomControlPosition;
+                    sb.Append($"    position: google.maps.ControlPosition.{_positions[index]},\n");
+                    sb.Append("  }\n");
+                    sb.Append("};");
+                }
+                else
+                {
+                    sb.Append("  disableDefaultUI: true\n};");
+                }
+            }
+            else
+            {
+                sb.Append($"<script>\nvar myCenter = new google.maps.LatLng({DefaultLatitude}, {DefaultLongitude});");
+                sb.AppendLine();
+                sb.Append("var mapProp = {\n  center:myCenter,\n  zoom: 10,\n  mapTypeId: google.maps.MapTypeId.ROADMAP,\n  disableDefaultUI: true\n};");
+            }
+
+            return sb;
+        }
+
+        private StringBuilder CreatePinsScript(StringBuilder _sb)
+        {
+            int index = 1;
+            if (_sb == null || _sb.Length == 0) return _sb;
+
+            Log.Debug(FormsCircularUI.Tag, $"Markers count:{Element.Markers.Count}");
+            foreach (var marker in Element.Markers)
+            {
+                _sb.AppendLine();
+                _sb.Append($"    var marker{index} = new google.maps.Marker({{position: new google.maps.LatLng({marker.Position.Latitude}, {marker.Position.Longitude}), title:\"{marker.Description}\" }}); ");
+                _sb.AppendLine();
+                _sb.Append($"    marker{index}.setMap(map);");
+                _sb.AppendLine();
+                _sb.Append($"    var infowindow{index} = new google.maps.InfoWindow({{ content: \"{marker.Description}\" }});");
+                _sb.AppendLine();
+                if (marker.IsPopupOpened == true)
+                {
+                    _sb.Append($"    infowindow{index}.open(map, marker{index});");
+                }
+                else
+                {
+                    _sb.Append($"    marker{index}.addListener('click', function() {{ infowindow{index}.open(map, marker{index});}});");
+                }
+                index++;
+            }
+
+            return _sb;
+        }
+
+        private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            Log.Debug(FormsCircularUI.Tag, $"e.Action:{e.Action}");
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                case NotifyCollectionChangedAction.Remove:
+                case NotifyCollectionChangedAction.Replace:
+                case NotifyCollectionChangedAction.Reset:
+                    LoadMap();
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                    //do nothing
+                    break;
+            }
+        }
+
+        private void OnLoadMapRequested(object sender, EventArgs eventArgs)
+        {
+            Log.Debug(FormsCircularUI.Tag, $"Load Requested");
+            LoadMap();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GoogleMaps.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GoogleMaps.cs
new file mode 100644 (file)
index 0000000..74cad27
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GoogleMaps.cs
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    internal static class GoogleMaps
+    {
+        private static string _apiKey;
+
+        internal static bool IsInitialized { get; private set; }
+
+
+        /// <summary>
+        /// Initialize Map service with authentication key value.
+        /// </summary>
+        public static void Init(string apiKey)
+        {
+            if (IsInitialized)
+                return;
+
+            _apiKey = apiKey;
+            IsInitialized = true;
+        }
+
+        public static string GetKey()
+        {
+            return _apiKey;
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GroupTextCellRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GroupTextCellRenderer.cs
new file mode 100644 (file)
index 0000000..dc6b44a
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/GroupTextCellRenderer.cs
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms.Platform.Tizen;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    class GroupTextCellRenderer : TextCellRenderer
+    {
+        public GroupTextCellRenderer() : base("group_index")
+        {
+            DetailPart = "elm.text.end";
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/IMediaViewProvider.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/IMediaViewProvider.cs
new file mode 100644 (file)
index 0000000..0ef830b
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/IMediaViewProvider.cs
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using MMView = Tizen.Multimedia.MediaView;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    public interface IMediaViewProvider
+    {
+        MMView GetMediaView();
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ImageExtension.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ImageExtension.cs
new file mode 100644 (file)
index 0000000..0ed2298
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ImageExtension.cs
@@ -0,0 +1,11 @@
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    internal static class ImageExtension
+    {
+        internal static bool IsNullOrEmpty(this ImageSource imageSource) =>
+        imageSource == null || imageSource.IsEmpty;
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/IndexPageRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/IndexPageRenderer.cs
new file mode 100644 (file)
index 0000000..f1d4285
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/IndexPageRenderer.cs
@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.Wearable.CircularUI.Forms.Renderer;
+using ElmSharp;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(IndexPage), typeof(IndexPageRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    internal static class IndexStyle
+    {
+        public const string Thumbnail = "thumbnail";
+        public const string Circle = "circle";
+    }
+
+    public class IndexPageRenderer : VisualElementRenderer<IndexPage>
+    {
+        const int ItemMaxCount = 20;
+        const int OddMiddleItem = 10;
+        const int EvenMiddleItem = 11;
+        private int _pageIndex;
+        private int _changedByScroll;
+
+        Index _index;
+        List<IndexItem> _items = new List<IndexItem>();
+        ElmSharp.Layout _outterLayout;
+        ElmSharp.Box _innerContainer;
+        Scroller _scroller;
+
+        private ElmSharp.Size _layoutBound;
+        bool _isInitalized;
+        bool _isUpdateCarousel;
+
+        int _childCount;
+
+        protected override void OnElementChanged(ElementChangedEventArgs<IndexPage> e)
+        {
+            if (NativeView == null)
+            {
+                Initialize();
+                SetNativeView(_outterLayout);
+            }
+
+            if (e.OldElement != null)
+            {
+                e.OldElement.CurrentPageChanged -= OnCurrentPageChanged;
+                e.OldElement.PagesChanged -= OnPagesChanged;
+                _isInitalized = false;
+            }
+
+            if (e.NewElement != null)
+            {
+                Element.CurrentPageChanged += OnCurrentPageChanged;
+                Element.PagesChanged += OnPagesChanged;
+            }
+
+            base.OnElementChanged(e);
+        }
+
+        protected override void OnElementReady()
+        {
+            base.OnElementReady();
+            _isInitalized = true;
+            UpdateCarouselContent();
+            UpdateIndexItem();
+        }
+
+        private void Initialize()
+        {
+            _outterLayout = new ElmSharp.Layout(XForms.NativeParent)
+            {
+                AlignmentX = -1,
+                AlignmentY = -1,
+                WeightX = 1,
+                WeightY = 1,
+            };
+            _outterLayout.Show();
+            _outterLayout.SetTheme("layout", "application", "default");
+
+            _index = new Index(_outterLayout)
+            {
+                IsHorizontal = true,
+                AutoHide = false,
+            };
+            _index.Show();
+            _outterLayout.SetPartContent("elm.swallow.content", _index);
+
+            _scroller = new Scroller(_outterLayout);
+            _scroller.PageScrolled += OnPageScrolled;
+
+            // Disables the visibility of the scrollbar in both directions:
+            _scroller.HorizontalScrollBarVisiblePolicy = ElmSharp.ScrollBarVisiblePolicy.Invisible;
+            _scroller.VerticalScrollBarVisiblePolicy = ElmSharp.ScrollBarVisiblePolicy.Invisible;
+            // Sets the limit of scroll to one page maximum:
+            _scroller.HorizontalPageScrollLimit = 1;
+            _scroller.SetPageSize(1.0, 1.0);
+            _scroller.SetAlignment(-1, -1);
+            _scroller.SetWeight(1.0, 1.0);
+            _scroller.Show();
+
+            _innerContainer = new Box(_outterLayout);
+            _innerContainer.SetLayoutCallback(OnInnerLayoutUpdate);
+            _innerContainer.SetAlignment(-1, -1);
+            _innerContainer.SetWeight(1.0, 1.0);
+            _innerContainer.Show();
+            _scroller.SetContent(_innerContainer);
+
+            _outterLayout.SetPartContent("elm.swallow.bg", _scroller);
+        }
+
+        private void OnInnerLayoutUpdate()
+        {
+            if (!_isInitalized || (_layoutBound == _innerContainer.Geometry.Size && _childCount == Element.Children.Count))
+                return;
+
+            _layoutBound = _innerContainer.Geometry.Size;
+            _childCount = Element.Children.Count;
+            int baseX = _innerContainer.Geometry.X;
+            Rect bound = _scroller.Geometry;
+            int index = 0;
+            foreach (var page in Element.Children)
+            {
+                var nativeView = Xamarin.Forms.Platform.Tizen.Platform.GetRenderer(page).NativeView;
+                bound.X = baseX + index * bound.Width;
+                nativeView.Geometry = bound;
+                (nativeView as ElmSharp.Widget)?.AllowFocus(true);
+                index++;
+            }
+            _innerContainer.MinimumWidth = Element.Children.Count * bound.Width;
+
+            if (_scroller.HorizontalPageIndex != _pageIndex)
+            {
+                _scroller.ScrollTo(_pageIndex, 0, false);
+            }
+        }
+
+        private void OnPageScrolled(object sender, EventArgs e)
+        {
+            Log.Debug(FormsCircularUI.Tag, $"OnPageScrolled()  _pageIndex:{_pageIndex}, HorizontalPageIndex:{_scroller.HorizontalPageIndex}, _isUpdateCarousel:{_isUpdateCarousel}");
+            if (_isUpdateCarousel)
+            {
+                _isUpdateCarousel = false;
+                return;
+            }
+
+            _changedByScroll++;
+            int previousIndex = _pageIndex;
+            _pageIndex = _scroller.HorizontalPageIndex;
+            if (previousIndex != _pageIndex)
+            {
+                (Element.Children[previousIndex] as IPageController)?.SendDisappearing();
+                Element.CurrentPage = Element.Children[_pageIndex];
+                (Element.CurrentPage as IPageController)?.SendAppearing();
+                var selectIndex = _pageIndex;
+                if (selectIndex >= ItemMaxCount) selectIndex = ItemMaxCount - 1;
+                _items[selectIndex].Select(true);
+            }
+
+            Element.UpdateFocusTreePolicy();
+            _changedByScroll--;
+        }
+
+        void OnPagesChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            UpdateCarouselContent();
+
+            //update Index items.
+            _index.Clear();
+            UpdateIndexItem();
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (Element != null)
+                {
+                    Element.CurrentPageChanged -= OnCurrentPageChanged;
+                    Element.PagesChanged -= OnPagesChanged;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        void OnCurrentPageChanged(object sender, EventArgs ea)
+        {
+            if (IsChangedByScroll())
+                return;
+
+            Element.UpdateFocusTreePolicy();
+            if (Element.CurrentPage != Element.Children[_pageIndex])
+            {
+                var previousPageIndex = _pageIndex;
+                _pageIndex = Element.Children.IndexOf(Element.CurrentPage);
+                if (previousPageIndex != _pageIndex)
+                {
+                    // notify disappearing/appearing pages and scroll to the requested page
+                    (Element.Children[previousPageIndex] as IPageController)?.SendDisappearing();
+                    _scroller.ScrollTo(_pageIndex, 0, false);
+                    (Element.CurrentPage as IPageController)?.SendAppearing();
+                    var selectIndex = _pageIndex;
+                    if (selectIndex >= ItemMaxCount) selectIndex = ItemMaxCount - 1;
+                    _items[selectIndex].Select(true);
+                }
+            }
+        }
+
+        private bool IsChangedByScroll()
+        {
+            return _changedByScroll > 0;
+        }
+
+        void UpdateCarouselContent()
+        {
+            _innerContainer.UnPackAll();
+            foreach (var page in Element.Children)
+            {
+                var nativeView = Xamarin.Forms.Platform.Tizen.Platform.GetRenderer(page).NativeView;
+                _innerContainer.PackEnd(nativeView);
+            }
+            _pageIndex = Element.Children.IndexOf(Element.CurrentPage);
+            _isUpdateCarousel = true;
+            _scroller.ScrollTo(_pageIndex, 0, false);
+            Element.UpdateFocusTreePolicy();
+            _isUpdateCarousel = false;
+        }
+
+        private void UpdateIndexItem()
+        {
+            _index.Style = IndexStyle.Circle;
+            _items.Clear();
+
+            var indexCount = Element.Children.Count;
+            if (indexCount > ItemMaxCount) indexCount = ItemMaxCount;
+            for (int i = 0; i < indexCount; i++)
+            {
+                var item = _index.Append(null);
+                item.Style = getItemStyle(indexCount, i);
+                _items.Add(item);
+            }
+            _index.Update(0);
+            var selectIndex = _pageIndex;
+            if (selectIndex >= ItemMaxCount) selectIndex = ItemMaxCount - 1;
+            _items[selectIndex].Select(true);
+        }
+
+        string getItemStyle(int itemCount, int offset)
+        {
+            String returnValue = "";
+            int startItem;
+            int styleNumber;
+
+            if (itemCount % 2 == 0)  //Item count is even.
+            {
+                startItem = EvenMiddleItem - itemCount / 2;
+                styleNumber = startItem + offset;
+                returnValue = "item/even_" + styleNumber;
+            }
+            else  //Item count is odd.
+            {
+                startItem = OddMiddleItem - itemCount / 2;
+                styleNumber = startItem + offset;
+                returnValue = "item/odd_" + styleNumber;
+            }
+            return returnValue;
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/InformationPopupImplementation.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/InformationPopupImplementation.cs
new file mode 100644 (file)
index 0000000..ce30fa5
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/InformationPopupImplementation.cs
@@ -0,0 +1,373 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: Dependency(typeof(Tizen.Wearable.CircularUI.Forms.Renderer.InformationPopupImplementation))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class InformationPopupImplementation : IInformationPopup, IDisposable
+    {
+        MenuItem _bottomMenuItem;
+        Color _buttonBgColor;
+
+        ElmSharp.Popup _popUp;
+        ElmSharp.ProgressBar _progress;
+        ElmSharp.Layout _layout;
+        ElmSharp.Button _bottomButton;
+        ElmSharp.Box _box;
+        ElmSharp.Label _progressLabel;
+
+        string _title;
+        string _text;
+        bool _isProgressRunning;
+        bool _isDisposed;
+
+        public event EventHandler BackButtonPressed;
+
+        public InformationPopupImplementation()
+        {
+            _popUp = new ElmSharp.Popup(XForms.NativeParent);
+            _popUp.Style = "circle";
+
+            _layout = new ElmSharp.Layout(_popUp);
+            _layout.SetTheme("layout", "popup", "content/circle");
+            _popUp.SetContent(_layout);
+
+            _popUp.BackButtonPressed += BackButtonPressedHandler;
+            _popUp.Dismissed += OnDismissed;
+        }
+
+        ~InformationPopupImplementation()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed)
+                return;
+
+            if (disposing)
+            {
+                if (_bottomButton != null)
+                {
+                    _bottomButton.Unrealize();
+                    _bottomButton = null;
+                }
+
+                if (_box != null)
+                {
+                    _box.Unrealize();
+                    _box = null;
+                }
+
+                if(_progress != null)
+                {
+                    _progress.Unrealize();
+                    _progress = null;
+                }
+
+                if (_progressLabel != null)
+                {
+                    _progressLabel.Unrealize();
+                    _progressLabel = null;
+                }
+
+                if (_popUp != null)
+                {
+                    _layout.Unrealize();
+                    _layout = null;
+                    _popUp.BackButtonPressed -= BackButtonPressedHandler;
+                    _popUp.Unrealize();
+                    _popUp = null;
+                }
+            }
+
+            _isDisposed = true;
+        }
+
+        void BackButtonPressedHandler(object sender, EventArgs e)
+        {
+            BackButtonPressed?.Invoke(this, EventArgs.Empty);
+        }
+
+        public bool IsProgressRunning
+        {
+            get
+            {
+                return _isProgressRunning;
+            }
+            set
+            {
+                _isProgressRunning = value;
+                UpdateProcessVisibility();
+            }
+        }
+
+        public MenuItem BottomButton
+        {
+            get
+            {
+                return _bottomMenuItem;
+            }
+            set
+            {
+                if (_bottomMenuItem == value) return;
+
+                if (value is ColorMenuItem)
+                {
+                    _buttonBgColor = ((ColorMenuItem)value).BackgroundColor;
+                }
+                else
+                {
+                    _buttonBgColor = Color.Default;
+                }
+                _bottomMenuItem = value;
+                UpdateButton();
+            }
+        }
+
+        public string Title
+        {
+            get
+            {
+                return _title;
+            }
+            set
+            {
+                if (_title == value) return;
+                _title = value;
+                UpdateTitle();
+            }
+        }
+
+        public string Text
+        {
+            get
+            {
+                return _text;
+            }
+            set
+            {
+                if (_text == value) return;
+                _text = value;
+                UpdateText();
+            }
+        }
+
+        void UpdateProcessVisibility()
+        {
+            if(!XForms.IsInitialized)
+            {
+                Log.Debug(FormsCircularUI.Tag, "Tizen Forms is not initialized");
+                return;
+            }
+
+            if (_isProgressRunning)
+            {
+                _box = new ElmSharp.Box(XForms.NativeParent);
+                _box.Show();
+
+                _progress = new ElmSharp.ProgressBar(XForms.NativeParent)
+                {
+                    Style = "process/popup/small",
+                };
+                _progress.Show();
+                _progress.PlayPulse();
+                _box.PackEnd(_progress);
+
+                _layout.SetPartContent("elm.swallow.content", _box, true);
+            }
+            else
+            {
+                if (_box != null)
+                {
+                    if (_progress != null)
+                    {
+                        _progress.Unrealize();
+                        _progress = null;
+                    }
+
+                    if (_progressLabel != null)
+                    {
+                        _progressLabel.Unrealize();
+                        _progressLabel = null;
+                    }
+
+                    _box.Unrealize();
+                    _box = null;
+                }
+                _layout.SetPartContent("elm.swallow.content", null, true);
+            }
+
+            UpdateTitle();
+            UpdateText();
+        }
+
+        void UpdateButton()
+        {
+            _bottomButton?.Hide();
+
+            if (BottomButton != null)
+            {
+                _bottomButton = new ElmSharp.Button(_popUp)
+                {
+                    WeightX = 1.0,
+                    WeightY = 1.0,
+                    Style = "bottom"
+                };
+
+                if (!string.IsNullOrEmpty(BottomButton.Text))_bottomButton.Text = BottomButton.Text;
+
+                if (!BottomButton.IconImageSource.IsNullOrEmpty())
+                {
+                    var iconSource = BottomButton.IconImageSource as FileImageSource;
+                    var buttonImage = new ElmSharp.Image(_bottomButton);
+                    buttonImage.LoadAsync(ResourcePath.GetPath(iconSource));
+                    buttonImage.Show();
+                    _bottomButton.SetPartContent("elm.swallow.content", buttonImage);
+                }
+
+                _bottomButton.Clicked += (s, e) =>
+                {
+                    ((IMenuItemController)BottomButton).Activate();
+                };
+
+                if (_buttonBgColor != Color.Default)
+                {
+                    Log.Debug(FormsCircularUI.Tag, $"InformationPopup set button background color:{_buttonBgColor.ToNative()}");
+                    _bottomButton.BackgroundColor = _buttonBgColor.ToNative();
+                }
+            }
+            else
+            {
+                _bottomButton.Unrealize();
+                _bottomButton = null;
+            }
+
+            _popUp.SetPartContent("button1", _bottomButton);
+        }
+
+        void UpdateTitle()
+        {
+            if (!_isProgressRunning)
+            {
+                _layout.SetPartText("elm.text.title", _title);
+            }
+            else
+            {
+                _layout.SetPartText("elm.text.title", null);
+            }
+        }
+
+        void UpdateText()
+        {
+            if (!_isProgressRunning)
+            {
+                _layout.SetPartText("elm.text", _text);
+            }
+            else
+            {
+                _layout.SetPartText("elm.text", null);
+                if (!string.IsNullOrEmpty(_text))
+                {
+                    if (_progressLabel == null)
+                    {
+                        _progressLabel = new ElmSharp.Label(XForms.NativeParent)
+                        {
+                            TextStyle = "DEFAULT ='font=Tizen:style=Light color=#F9F9F9FF font_size=32 align=center valign=top wrap=word'",
+                        };
+                    }
+                    _progressLabel.Text = _text;
+                    _progressLabel.Show();
+                    if (_box != null)
+                    {
+                        _box.PackEnd(_progressLabel);
+                    }
+                }
+            }
+        }
+
+        public void Show()
+        {
+            if (!XForms.IsInitialized)
+            {
+                throw new InvalidOperationException("When the Application's Platform is not initialized, it can not show the Dialog.");
+            }
+
+            if (_popUp != null)
+            {
+                _popUp.Show();
+            }
+        }
+
+        public void Dismiss()
+        {
+            _popUp.Hide();
+
+            if (_bottomButton != null)
+            {
+                _bottomButton.Unrealize();
+                _bottomButton = null;
+                _popUp.SetPartContent("button1", null);
+            }
+
+            if (_box != null)
+            {
+                _box.Unrealize();
+                _box = null;
+            }
+
+            if (_progress != null)
+            {
+                _progress.Unrealize();
+                _progress = null;
+            }
+
+            if (_progressLabel != null)
+            {
+                _progressLabel.Unrealize();
+                _progressLabel = null;
+            }
+
+            if (_popUp != null)
+            {
+                _layout.Unrealize();
+                _layout = null;
+                _popUp.BackButtonPressed -= BackButtonPressedHandler;
+                _popUp.Unrealize();
+                _popUp = null;
+            }
+        }
+
+        void OnDismissed(object sender, EventArgs e)
+        {
+            Log.Debug(FormsCircularUI.Tag, $"OnDismissed called");
+            Dispose();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Interop/efl.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Interop/efl.cs
new file mode 100644 (file)
index 0000000..1c2e263
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Interop/efl.cs
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer.Interop
+{
+    static class EFL
+    {
+        const string Ecore_IMF = "libecore_imf.so.1";
+        const string Elementary = "libelementary.so.1";
+
+        //enum Ecore_IMF_Input_Panel_Event
+        internal enum InputPanelEventType
+        {
+            State,
+            Language,
+            ShiftMode,
+            Geometry,
+            CandidateState,
+            CandidateGeometry,
+            KeyboardMode
+        };
+
+        // enum Ecore_IMF_Input_Panel_State
+        internal enum InputPanelState
+        {
+            Show,
+            Hide,
+            WillShow
+        };
+
+        internal delegate void InputPanelEventCallback(IntPtr data, IntPtr ctx, int value);
+
+        [DllImport(Ecore_IMF)]
+        internal static extern void ecore_imf_context_input_panel_event_callback_add(IntPtr ctx, InputPanelEventType type, InputPanelEventCallback func, IntPtr data);
+
+        [DllImport(Ecore_IMF)]
+        internal static extern void ecore_imf_context_input_panel_event_callback_del(IntPtr ctx, InputPanelEventType type, InputPanelEventCallback func);
+
+        [DllImport(Elementary)]
+        internal static extern IntPtr elm_entry_imf_context_get(IntPtr entryHandle);
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/LayoutCanvas.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/LayoutCanvas.cs
new file mode 100644 (file)
index 0000000..c3dcfd3
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/LayoutCanvas.cs
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using ElmSharp;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using Xamarin.Forms.Platform.Tizen.Native;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    public class LayoutCanvas : ElmSharp.Layout, IContainable<EvasObject>
+    {
+        /// <summary>
+        /// The list of Views.
+        /// </summary>
+        readonly ObservableCollection<EvasObject> _children = new ObservableCollection<EvasObject>();
+        Xamarin.Forms.Platform.Tizen.Native.Box _box;
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Xamarin.Forms.Platform.Tizen.Native.Canvas"/> class.
+        /// </summary>
+        /// <remarks>Canvas doesn't support replacing its children, this will be ignored.</remarks>
+        /// <param name="parent">Parent of this instance.</param>
+        public LayoutCanvas(EvasObject parent) : base(parent)
+        {
+            SetTheme("layout", "elm_widget", "default");
+            _box = new Xamarin.Forms.Platform.Tizen.Native.Box(parent);
+            SetContent(_box);
+
+            _children.CollectionChanged += (o, e) =>
+            {
+                if (e.Action == NotifyCollectionChangedAction.Add)
+                {
+                    foreach (var v in e.NewItems)
+                    {
+                        var view = v as EvasObject;
+                        if (null != view)
+                        {
+                            OnAdd(view);
+                        }
+                    }
+                }
+                else if (e.Action == NotifyCollectionChangedAction.Remove)
+                {
+                    foreach (var v in e.OldItems)
+                    {
+                        if (v is EvasObject view)
+                        {
+                            OnRemove(view);
+                        }
+                    }
+                }
+                else if (e.Action == NotifyCollectionChangedAction.Reset)
+                {
+                    OnRemoveAll();
+                }
+            };
+        }
+
+        public event EventHandler<LayoutEventArgs> LayoutUpdated
+        {
+            add { _box.LayoutUpdated += value; }
+            remove { _box.LayoutUpdated -= value; }
+        }
+
+        /// <summary>
+        /// Gets list of native elements that are placed in the canvas.
+        /// </summary>
+        public new IList<EvasObject> Children
+        {
+            get
+            {
+                return _children;
+            }
+        }
+
+        /// <summary>
+        /// Provides destruction for native element and contained elements.
+        /// </summary>
+        protected override void OnUnrealize()
+        {
+            foreach (var child in _children)
+            {
+                child.Unrealize();
+            }
+
+            base.OnUnrealize();
+        }
+
+        /// <summary>
+        /// Adds a new child to a container.
+        /// </summary>
+        /// <param name="view">Native element which will be added</param>
+        void OnAdd(EvasObject view)
+        {
+            _box.PackEnd(view);
+        }
+
+        /// <summary>
+        /// Removes a child from a container.
+        /// </summary>
+        /// <param name="view">Child element to be removed from canvas</param>
+        void OnRemove(EvasObject view)
+        {
+            _box.UnPack(view);
+        }
+
+        /// <summary>
+        /// Removes all children from a canvas.
+        /// </summary>
+        void OnRemoveAll()
+        {
+            _box.UnPackAll();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ListViewCache.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ListViewCache.cs
new file mode 100644 (file)
index 0000000..bba4c9b
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ListViewCache.cs
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using ElmSharp;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms.Internals;
+using XForms = Xamarin.Forms.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public static class ListViewCache
+    {
+        static readonly Dictionary<Type, CellRenderer> _cellRendererCache = new Dictionary<Type, CellRenderer>();
+        static GenItemClass _informalItemClass;
+        static GenItemClass _informalItemClassWithoutFishEye;
+        static GenItemClass _paddingItemClass;
+        static GroupTextCellRenderer _groupCache;
+
+        public static CellRenderer Get(Cell cell, bool IsGroupHeader)
+        {
+            if (IsGroupHeader)
+            {
+                if (_groupCache == null)
+                {
+                    _groupCache = new GroupTextCellRenderer();
+                }
+                return _groupCache;
+            }
+
+            Type type = cell.GetType();
+            CellRenderer renderer;
+            if (_cellRendererCache.TryGetValue(type, out renderer))
+            {
+                return renderer;
+            }
+            else
+            {
+                renderer = XForms.GetHandler<CellRenderer>(type);
+                if (renderer == null)
+                {
+                    throw new ArgumentNullException("Unsupported cell type");
+                }
+                return _cellRendererCache[type] = renderer;
+            }
+        }
+        public static CellRenderer Get(Cell cell) => Get(cell, false);
+
+        public static GenItemClass InformalItemClass => _informalItemClass ?? (_informalItemClass = new HeaderOrFooterItemClass());
+        public static GenItemClass PaddingItemClass => _paddingItemClass ?? (_paddingItemClass = new PaddingItemClass());
+        public static GenItemClass InformalItemClassWithoutFishEye => _informalItemClassWithoutFishEye ?? (_informalItemClassWithoutFishEye = new HeaderOrFooterItemClass(false));
+    }
+
+    public class HeaderOrFooterItemClass : GenItemClass
+    {
+        static int ToPx(double dp)
+        {
+            return (int)Math.Round(dp * Device.Info.ScalingFactor);
+        }
+        public HeaderOrFooterItemClass(bool fishEye) : base(fishEye ? "full" : "full_off")
+        {
+            GetContentHandler = OnGetContent;
+        }
+
+        public HeaderOrFooterItemClass() : this(true)
+        {
+        }
+
+        protected EvasObject OnGetContent(object data, string part)
+        {
+            var ctx = data as TypedItemContext;
+            if (ctx != null)
+            {
+                var element = ctx.Element;
+                var renderer = Platform.GetOrCreateRenderer(element);
+                if (element.MinimumHeightRequest == -1)
+                {
+                    var request = element.Measure(double.PositiveInfinity, double.PositiveInfinity);
+                    renderer.NativeView.MinimumHeight = ToPx(request.Request.Height);
+                }
+                else
+                {
+                    renderer.NativeView.MinimumHeight = ToPx(element.MinimumHeightRequest);
+                }
+                (renderer as LayoutRenderer)?.RegisterOnLayoutUpdated();
+                return renderer.NativeView;
+            }
+            return null;
+        }
+    }
+
+    public class PaddingItemClass : GenItemClass
+    {
+        public PaddingItemClass() : base("padding")
+        {
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaPlayerImpl.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaPlayerImpl.cs
new file mode 100644 (file)
index 0000000..2dd8f3b
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaPlayerImpl.cs
@@ -0,0 +1,384 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Tizen.Multimedia;
+using Tizen.Wearable.CircularUI.Forms.Renderer;
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.Platform.Tizen;
+
+[assembly: Xamarin.Forms.Dependency(typeof(MediaPlayerImpl))]
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class MediaPlayerImpl : IPlatformMediaPlayer
+    {
+        Player _player;
+
+        bool _cancelToStart;
+        DisplayAspectMode _aspectMode = DisplayAspectMode.AspectFit;
+        Task _taskPrepare;
+        TaskCompletionSource<bool> _tcsForStreamInfo;
+        IVideoOutput _videoOutput;
+        MediaSource _source;
+
+        public MediaPlayerImpl()
+        {
+            _player = new Player();
+            _player.PlaybackCompleted += OnPlaybackCompleted;
+            _player.BufferingProgressChanged += OnBufferingProgressChanged;
+        }
+
+        public bool UsesEmbeddingControls
+        {
+            get; set;
+        }
+
+        public bool AutoPlay { get; set; }
+
+        public bool AutoStop { get; set; }
+
+        public double Volume
+        {
+            get => _player.Volume;
+            set => _player.Volume = (float)value;
+        }
+
+        public int Duration => _player.StreamInfo.GetDuration();
+
+        public bool IsMuted
+        {
+            get => _player.Muted;
+            set => _player.Muted = value;
+        }
+
+        public int Position
+        {
+            get
+            {
+                if (_player.State == PlayerState.Idle || _player.State == PlayerState.Preparing)
+                    return 0;
+                return _player.GetPlayPosition();
+            }
+        }
+
+        public DisplayAspectMode AspectMode
+        {
+            get { return _aspectMode; }
+            set
+            {
+                _aspectMode = value;
+                ApplyAspectMode();
+            }
+        }
+
+        bool HasSource => _source != null;
+
+        IVideoOutput VideoOutput
+        {
+            get { return _videoOutput; }
+            set
+            {
+                if (TargetView != null)
+                    TargetView.PropertyChanged -= OnTargetViewPropertyChanged;
+
+                _videoOutput = value;
+
+                if (TargetView != null)
+                    TargetView.PropertyChanged += OnTargetViewPropertyChanged;
+            }
+        }
+
+        VisualElement TargetView => VideoOutput?.MediaView;
+
+        Task TaskPrepare
+        {
+            get => _taskPrepare ?? Task.CompletedTask;
+            set => _taskPrepare = value;
+        }
+
+        public event EventHandler UpdateStreamInfo;
+        public event EventHandler PlaybackCompleted;
+        public event EventHandler PlaybackStarted;
+        public event EventHandler<BufferingProgressUpdatedEventArgs> BufferingProgressUpdated;
+        public event EventHandler PlaybackStopped;
+        public event EventHandler PlaybackPaused;
+
+
+        public async Task<bool> Start()
+        {
+            Log.Debug(FormsCircularUI.Tag, "Start");
+
+            _cancelToStart = false;
+            if (!HasSource)
+                return false;
+
+            if (_player.State == PlayerState.Idle)
+            {
+                await Prepare();
+            }
+
+            if (_cancelToStart)
+                return false;
+
+            try
+            {
+                _player.Start();
+            }
+            catch (Exception e)
+            {
+                Log.Error(FormsCircularUI.Tag, $"Error On Start : {e.Message}");
+                return false;
+            }
+            PlaybackStarted?.Invoke(this, EventArgs.Empty);
+            return true;
+        }
+
+        public void Pause()
+        {
+            Log.Debug(FormsCircularUI.Tag, "Pause");
+
+            try
+            {
+                _player.Pause();
+                PlaybackPaused.Invoke(this, EventArgs.Empty);
+            }
+            catch (Exception e)
+            {
+                Log.Error(FormsCircularUI.Tag, $"Error on Pause : {e.Message}");
+            }
+        }
+
+        public void Stop()
+        {
+            Log.Debug(FormsCircularUI.Tag, "Stop");
+
+            _cancelToStart = true;
+            var unusedTask = ChangeToIdleState();
+            PlaybackStopped.Invoke(this, EventArgs.Empty);
+        }
+
+        public void SetDisplay(IVideoOutput output)
+        {
+            VideoOutput = output;
+        }
+
+        public async Task<int> Seek(int ms)
+        {
+            try
+            {
+                await _player.SetPlayPositionAsync(ms, false);
+            }
+            catch (Exception e)
+            {
+                Log.Error(FormsCircularUI.Tag, $"Fail to seek : {e.Message}");
+            }
+            return Position;
+        }
+
+        public void SetSource(MediaSource source)
+        {
+            _source = source;
+        }
+
+        public async Task<Stream> GetAlbumArts()
+        {
+            if (_player.State == PlayerState.Idle)
+            {
+                if (_tcsForStreamInfo == null || _tcsForStreamInfo.Task.IsCompleted)
+                {
+                    _tcsForStreamInfo = new TaskCompletionSource<bool>();
+                }
+                await _tcsForStreamInfo.Task;
+            }
+            await TaskPrepare;
+
+            var imageData = _player.StreamInfo.GetAlbumArt();
+            if (imageData == null)
+                return null;
+            return new MemoryStream(imageData);
+        }
+
+        public async Task<IDictionary<string, string>> GetMetadata()
+        {
+            if (_player.State == PlayerState.Idle)
+            {
+                if (_tcsForStreamInfo == null || _tcsForStreamInfo.Task.IsCompleted)
+                {
+                    _tcsForStreamInfo = new TaskCompletionSource<bool>();
+                }
+                await _tcsForStreamInfo.Task;
+            }
+            await TaskPrepare;
+
+            Dictionary<string, string> metadata = new Dictionary<string, string>
+            {
+                [nameof(StreamMetadataKey.Album)] = _player.StreamInfo.GetMetadata(StreamMetadataKey.Album),
+                [nameof(StreamMetadataKey.Artist)] = _player.StreamInfo.GetMetadata(StreamMetadataKey.Artist),
+                [nameof(StreamMetadataKey.Author)] = _player.StreamInfo.GetMetadata(StreamMetadataKey.Author),
+                [nameof(StreamMetadataKey.Genre)] = _player.StreamInfo.GetMetadata(StreamMetadataKey.Genre),
+                [nameof(StreamMetadataKey.Title)] = _player.StreamInfo.GetMetadata(StreamMetadataKey.Title),
+                [nameof(StreamMetadataKey.Year)] = _player.StreamInfo.GetMetadata(StreamMetadataKey.Year)
+            };
+            return metadata;
+        }
+
+        void ApplyDisplay()
+        {
+            if (VideoOutput == null)
+            {
+                _player.Display = null;
+            }
+            else
+            {
+                var renderer = Platform.GetRenderer(TargetView);
+                if (renderer is IMediaViewProvider provider && provider.GetMediaView() != null)
+                {
+                    try
+                    {
+                        Display display = new Display(provider.GetMediaView());
+                        _player.Display = display;
+                        _player.DisplaySettings.Mode = _aspectMode.ToMultimeida();
+                    }
+                    catch
+                    {
+                        Log.Error(FormsCircularUI.Tag, "Error on MediaView");
+                    }
+                }
+            }
+        }
+
+        async Task ApplySource()
+        {
+            if (_source == null)
+            {
+                return;
+            }
+            IMediaSourceHandler handler = Registrar.Registered.GetHandlerForObject<IMediaSourceHandler>(_source);
+            await handler.SetSource(_player, _source);
+        }
+
+        async void OnTargetViewPropertyChanged(object sender, global::System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "Renderer")
+            {
+                if (Platform.GetRenderer(sender as BindableObject) != null && HasSource && AutoPlay)
+                {
+                    await Start();
+                }
+                else if (Platform.GetRenderer(sender as BindableObject) == null && AutoStop)
+                {
+                    Stop();
+                }
+            }
+        }
+
+        async Task Prepare()
+        {
+            TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
+            var prevTask = TaskPrepare;
+            TaskPrepare = tcs.Task;
+            await prevTask;
+
+            if (_player.State == PlayerState.Ready)
+                return;
+
+            ApplyDisplay();
+            await ApplySource();
+
+            try {
+                await _player.PrepareAsync();
+                UpdateStreamInfo?.Invoke(this, EventArgs.Empty);
+                _tcsForStreamInfo?.TrySetResult(true);
+            }
+            catch (Exception e)
+            {
+                Log.Error(FormsCircularUI.Tag, $"Error on prepare : {e.Message}");
+            }
+            tcs.SetResult(true);
+        }
+
+        async void ApplyAspectMode()
+        {
+            if (_player.State == PlayerState.Preparing)
+            {
+                await TaskPrepare;
+            }
+            _player.DisplaySettings.Mode = AspectMode.ToMultimeida();
+        }
+
+        void OnBufferingProgressChanged(object sender, BufferingProgressChangedEventArgs e)
+        {
+            BufferingProgressUpdated?.Invoke(this, new BufferingProgressUpdatedEventArgs { Progress = e.Percent / 100.0 });
+        }
+
+        void OnPlaybackCompleted(object sender, EventArgs e)
+        {
+            PlaybackCompleted?.Invoke(this, EventArgs.Empty);
+        }
+
+        async Task ChangeToIdleState()
+        {
+            switch (_player.State)
+            {
+                case PlayerState.Playing:
+                case PlayerState.Paused:
+                    _player.Stop();
+                    _player.Unprepare();
+                    break;
+                case PlayerState.Ready:
+                    _player.Unprepare();
+                    break;
+                case PlayerState.Preparing:
+                    await TaskPrepare;
+                    _player.Unprepare();
+                    break;
+            }
+        }
+    }
+
+    public static class MultimediaConvertExtensions
+    {
+        public static Multimedia.Rectangle ToMultimedia(this ElmSharp.Rect rect)
+        {
+            return new Multimedia.Rectangle(rect.X, rect.Y, rect.Width, rect.Height);
+        }
+
+        public static PlayerDisplayMode ToMultimeida(this DisplayAspectMode mode)
+        {
+            PlayerDisplayMode ret = PlayerDisplayMode.LetterBox;
+            switch (mode)
+            {
+                case DisplayAspectMode.AspectFill:
+                    ret = PlayerDisplayMode.CroppedFull;
+                    break;
+                case DisplayAspectMode.AspectFit:
+                    ret = PlayerDisplayMode.LetterBox;
+                    break;
+                case DisplayAspectMode.Fill:
+                    ret = PlayerDisplayMode.FullScreen;
+                    break;
+                case DisplayAspectMode.OrignalSize:
+                    ret = PlayerDisplayMode.OriginalOrFull;
+                    break;
+            }
+            return ret;
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaSourceHandler.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaSourceHandler.cs
new file mode 100644 (file)
index 0000000..91428d3
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaSourceHandler.cs
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Threading.Tasks;
+using Tizen.Multimedia;
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.Wearable.CircularUI.Forms.Renderer;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+
+[assembly: ExportHandler(typeof(UriMediaSource), typeof(UriMediaSourceHandler))]
+[assembly: ExportHandler(typeof(FileMediaSource), typeof(FileMediaSourceHandler))]
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+
+    public interface IMediaSourceHandler : IRegisterable
+    {
+        Task<bool> SetSource(Player player, MediaSource imageSource);
+    }
+
+    public sealed class UriMediaSourceHandler : IMediaSourceHandler
+    {
+        public Task<bool> SetSource(Player player, MediaSource source)
+        {
+            if (source is UriMediaSource uriSource)
+            {
+                Log.Info(FormsCircularUI.Tag, $"Set UriMediaSource");
+                var uri = uriSource.Uri;
+                player.SetSource(new MediaUriSource(uri.IsFile ? uri.LocalPath : uri.AbsoluteUri));
+            }
+            return Task.FromResult<bool>(true);
+        }
+    }
+
+    public sealed class FileMediaSourceHandler : IMediaSourceHandler
+    {
+        public Task<bool> SetSource(Player player, MediaSource source)
+        {
+            if (source is FileMediaSource fileSource)
+            {
+                Log.Info(FormsCircularUI.Tag, $"Set FileMediaSource");
+                player.SetSource(new MediaUriSource(ResourcePath.GetPath(fileSource.File)));
+            }
+            return Task.FromResult<bool>(true);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaViewRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaViewRenderer.cs
new file mode 100644 (file)
index 0000000..ccf306f
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/MediaViewRenderer.cs
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.Wearable.CircularUI.Renderer;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using MMView = Tizen.Multimedia.MediaView;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(MediaView), typeof(MediaViewRenderer))]
+namespace Tizen.Wearable.CircularUI.Renderer
+{
+    public class MediaViewRenderer : ViewRenderer<MediaView, LayoutCanvas>, IMediaViewProvider
+    {
+        MMView _mediaView;
+        protected override void OnElementChanged(ElementChangedEventArgs<MediaView> e)
+        {
+            if (Control == null)
+            {
+                _mediaView = new MMView(XForms.NativeParent);
+                SetNativeControl(new LayoutCanvas(XForms.NativeParent));
+                Control.LayoutUpdated += (s, evt) => OnLayout();
+                Control.Children.Add(_mediaView);
+                Control.AllowFocus(true);
+            }
+            base.OnElementChanged(e);
+        }
+
+        MMView IMediaViewProvider.GetMediaView()
+        {
+            return _mediaView;
+        }
+
+        void OnLayout()
+        {
+            _mediaView.Geometry = Control.Geometry;
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ObservableBox.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ObservableBox.cs
new file mode 100644 (file)
index 0000000..dc39d09
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ObservableBox.cs
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using ElmSharp;
+using Tizen.Wearable.CircularUI.Forms;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen.Native;
+
+[assembly: ExportRenderer(typeof(CirclePage), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.CirclePageRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    class ObservableBox : ElmSharp.Box, IContainable<EvasObject>
+    {
+        ReObservableCollection<EvasObject> _children;
+        public ObservableBox(EvasObject parent) : base(parent)
+        {
+            _children = new ReObservableCollection<EvasObject>();
+            _children.CollectionChanged += OnChildrenChanged;
+        }
+        IList<EvasObject> IContainable<EvasObject>.Children => _children;
+
+        void OnChildrenChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                foreach (var child in e.NewItems)
+                {
+                    if (child is EvasObject)
+                    {
+                        PackEnd(child as EvasObject);
+                    }
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                foreach (var child in e.OldItems)
+                {
+                    if (child is EvasObject)
+                    {
+                        UnPack(child as EvasObject);
+                    }
+                }
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/PopupEntryRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/PopupEntryRenderer.cs
new file mode 100644 (file)
index 0000000..f81f262
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/PopupEntryRenderer.cs
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms.Platform.Tizen.Native;
+using EColor = ElmSharp.Color;
+using ELayout = ElmSharp.Layout;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(Tizen.Wearable.CircularUI.Forms.PopupEntry), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.PopupEntryRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class PopupEntryRenderer : EntryRenderer
+    {
+        Background _editorPopup;
+        EColor _popupBackgroundColor;
+
+        Xamarin.Forms.Platform.Tizen.Native.Entry _editor;
+
+        Interop.EFL.InputPanelEventCallback _editorStateChanged;
+
+        Interop.EFL.InputPanelState _IMEState;
+
+        EColor DefaultColor { get; set; }
+
+        bool _IsPopupOpened = false;
+
+        public PopupEntryRenderer()
+        {
+            DefaultColor = new EColor(40, 40, 40, 255); //editfield bg default color
+            RegisterPropertyHandler(PopupEntry.PopupBackgroundColorProperty, UpdatePopupBackgroundColor);
+            RegisterPropertyHandler(PopupEntry.IsPopupOpenedProperty, UpdateIsPopupOpened);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Xamarin.Forms.Entry> e)
+        {
+            base.OnElementChanged(e);
+            if (e.NewElement != null)
+            {
+                Control.IsEditable = false;
+                Control.SetInputPanelEnabled(false);
+                Control.Clicked += OnClicked;
+
+                // Set Text again for apply text style because IsEditable reset the style of text
+                Control.Text = string.Empty;
+                Control.Text = Element.Text;
+            }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (_editor != null)
+                {
+                    IntPtr entryHandle = Interop.EFL.elm_entry_imf_context_get(_editor.RealHandle);
+                    Interop.EFL.ecore_imf_context_input_panel_event_callback_del(entryHandle, Interop.EFL.InputPanelEventType.State, _editorStateChanged);
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        void OnClicked(object sender, EventArgs e) => ShowPopup();
+
+        Window FindWindow(EvasObject obj)
+        {
+            EvasObject parent = obj.Parent;
+            while (!(parent is Window) && parent != null)
+            {
+                parent = parent.Parent;
+            }
+            return parent as Window;
+        }
+
+        void CreatePopup()
+        {
+            var rect = XForms.NativeParent.Geometry;
+
+            var root = FindWindow(XForms.NativeParent);
+
+            _editorPopup = new Background(root)
+            {
+                Geometry = rect
+            };
+
+            var layout = new ELayout(_editorPopup);
+            layout.SetTheme("layout", "entry", "default");
+            layout.Show();
+
+            _editorPopup.SetPartContent("overlay", layout);
+
+            _editor = new Xamarin.Forms.Platform.Tizen.Native.Entry(layout);
+            _editor.IsSingleLine = true;
+            _editor.Scrollable = true;
+            _editor.SetInputPanelEnabled(false);
+            _editor.AllowFocus(true);
+            _editor.Show();
+
+            _editor.SetInputPanelReturnKeyType(Element.ReturnType.ToInputPanelReturnKeyType());
+
+            _editor.UpdateKeyboard(Element.Keyboard, Element.IsSpellCheckEnabled, Element.IsTextPredictionEnabled);
+
+            _editorPopup.BackButtonPressed += (s, e) => HidePopup();
+
+            _editor.Activated += (s, e) => HidePopup();
+
+            IntPtr entryHandle = Interop.EFL.elm_entry_imf_context_get(_editor.RealHandle);
+
+            _editorStateChanged = EditorStateChanged;
+            Interop.EFL.ecore_imf_context_input_panel_event_callback_add(entryHandle, Interop.EFL.InputPanelEventType.State, _editorStateChanged, IntPtr.Zero);
+
+            layout.SetPartContent("elm.swallow.content", _editor);
+        }
+
+        void PopupEntryTextChanged(object sender, TextChangedEventArgs e)
+        {
+            Control.Text = e.NewTextValue;
+        }
+
+        void PopupEntryActivated(object sender, EventArgs e)
+        {
+            ((IEntryController)Element).SendCompleted();
+        }
+
+        void HidePopup()
+        {
+            if (Control is IEntry ie)
+            {
+                ie.TextChanged -= OnTextChanged;
+            }
+
+            if (_IMEState != Interop.EFL.InputPanelState.Hide)
+            {
+                _editor.HideInputPanel();
+            }
+            else if (_IMEState == Interop.EFL.InputPanelState.Hide)
+            {
+                _editorPopup.Hide();
+                _editor.TextChanged -= PopupEntryTextChanged;
+                _editor.Activated -= PopupEntryActivated;
+            }
+            _IsPopupOpened = false;
+            ((PopupEntry)Element).IsPopupOpened = false;
+        }
+
+        void ShowPopup()
+        {
+            if (_editorPopup == null)
+            {
+                CreatePopup();
+            }
+            _editor.IsPassword = Control.IsPassword;
+            if (Control is IEntry ie)
+            {
+                _editor.HorizontalTextAlignment = ie.HorizontalTextAlignment;
+                ie.TextChanged += OnTextChanged;
+            }
+
+            _editor.Text = Control.Text;
+            _editor.TextChanged += PopupEntryTextChanged;
+            _editor.Activated += PopupEntryActivated;
+
+            _editor.TextStyle = Control.TextStyle;
+            _editorPopup.Color = _popupBackgroundColor;
+
+            _editor.MoveCursorEnd();
+            _editor.ShowInputPanel();
+
+            _IsPopupOpened = true;
+            ((PopupEntry)Element).IsPopupOpened = true;
+        }
+
+        void EditorStateChanged(IntPtr data, IntPtr ctx, int value)
+        {
+            _IMEState = (Interop.EFL.InputPanelState)value;
+            if (_IMEState == Interop.EFL.InputPanelState.Hide)
+            {
+                HidePopup();
+            }
+            else if (_IMEState == Interop.EFL.InputPanelState.Show)
+            {
+                _editor.SetFocus(true);
+                _editorPopup.RaiseTop();
+                _editorPopup.Show();
+            }
+        }
+
+        void UpdatePopupBackgroundColor()
+        {
+            Xamarin.Forms.Color bgColor = ((PopupEntry)Element).PopupBackgroundColor;
+            if (bgColor == Xamarin.Forms.Color.Default)
+            {
+                _popupBackgroundColor = DefaultColor;
+            }
+            else
+            {
+                _popupBackgroundColor = bgColor.ToNative();
+            }
+        }
+
+        void OnTextChanged(object sender, EventArgs e)
+        {
+            if (_editor != null)
+            {
+                if (_editor.Text != Control.Text)
+                {
+                    _editor.Text = Control.Text;
+                    if (!_editor.IsFocused)
+                    {
+                        _editor.MoveCursorEnd();
+                    }
+                }
+            }
+        }
+
+        void UpdateIsPopupOpened()
+        {
+            bool isOpended = ((PopupEntry)Element).IsPopupOpened;
+            if (isOpended == _IsPopupOpened)
+            {
+                return;
+            }
+
+            _IsPopupOpened = isOpended;
+            if (isOpended)
+            {
+                ShowPopup();
+            }
+            else
+            {
+                HidePopup();
+            }
+        }
+    }
+
+    internal static class EntryExtensions
+    {
+        internal static InputPanelReturnKeyType ToInputPanelReturnKeyType(this ReturnType returnType)
+        {
+            switch (returnType)
+            {
+                case ReturnType.Go:
+                    return InputPanelReturnKeyType.Go;
+                case ReturnType.Next:
+                    return InputPanelReturnKeyType.Next;
+                case ReturnType.Send:
+                    return InputPanelReturnKeyType.Send;
+                case ReturnType.Search:
+                    return InputPanelReturnKeyType.Search;
+                case ReturnType.Done:
+                    return InputPanelReturnKeyType.Done;
+                case ReturnType.Default:
+                    return InputPanelReturnKeyType.Default;
+                default:
+                    throw new NotImplementedException($"ReturnType {returnType} not supported");
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/RadioRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/RadioRenderer.cs
new file mode 100644 (file)
index 0000000..3692aec
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/RadioRenderer.cs
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Tizen.Wearable.CircularUI.Forms;
+using Tizen.Wearable.CircularUI.Forms.Renderer;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using ERadio = ElmSharp.Radio;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(Radio), typeof(RadioRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+
+    public class RadioRenderer : ViewRenderer<Radio, ERadio>
+    {
+        static Lazy<RadioGroupManager> s_GroupManager = new Lazy<RadioGroupManager>();
+        int _changedCallbackDepth;
+
+        public RadioRenderer()
+        {
+            RegisterPropertyHandler(Radio.GroupNameProperty, UpdateGroupName);
+            RegisterPropertyHandler(Radio.IsSelectedProperty, UpdateIsSelected);
+            RegisterPropertyHandler(Radio.ColorProperty, UpdateColor);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<Radio> e)
+        {
+            if (Control == null)
+            {
+                var radio = new ERadio(XForms.NativeParent) { StateValue = 1 };
+                SetNativeControl(radio);
+                Control.ValueChanged += ChangedEventHandler;
+            }
+            base.OnElementChanged(e);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (Control != null)
+                {
+                    Control.ValueChanged -= ChangedEventHandler;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        void UpdateIsSelected()
+        {
+            if (_changedCallbackDepth == 0)
+            {
+                Control.GroupValue = Element.IsSelected ? 1 : 0;
+            }
+            s_GroupManager.Value.UpdateChecked(Element.GroupName, Element);
+        }
+
+        void UpdateGroupName()
+        {
+            s_GroupManager.Value.PartGroup(Element);
+            s_GroupManager.Value.JoinGroup(Element.GroupName, Element);
+        }
+
+        void ChangedEventHandler(object sender, EventArgs e)
+        {
+            _changedCallbackDepth++;
+            Element.IsSelected = Control.GroupValue == 1 ? true : false;
+            _changedCallbackDepth--;
+        }
+
+        void UpdateColor()
+        {
+            var color = Element.Color;
+            if (color != Xamarin.Forms.Color.Default)
+            {
+                Control.Color = Element.Color.ToNative();
+            }
+        }
+    }
+
+    internal class RadioGroupManager
+    {
+        Dictionary<string, List<Radio>> _groupMap = new Dictionary<string, List<Radio>>();
+
+        public void JoinGroup(string groupName, Radio radio)
+        {
+            if (string.IsNullOrEmpty(groupName))
+            {
+                return;
+            }
+
+            if (!_groupMap.ContainsKey(groupName))
+            {
+                _groupMap.Add(groupName, new List<Radio>());
+            }
+            _groupMap[groupName].Add(radio);
+            UpdateChecked(groupName, radio);
+        }
+
+        public void PartGroup(Radio radio)
+        {
+            string groupName = null;
+            foreach (var list in _groupMap)
+            {
+                if (list.Value.Contains(radio))
+                {
+                    groupName = list.Key;
+                }
+            }
+            PartGroup(groupName, radio);
+        }
+
+        public void PartGroup(string groupName, Radio radio)
+        {
+            if (string.IsNullOrEmpty(groupName))
+            {
+                return;
+            }
+
+            if (_groupMap.ContainsKey(groupName))
+            {
+                _groupMap[groupName].Remove(radio);
+            }
+        }
+
+        public void UpdateChecked(string groupName, Radio radio)
+        {
+            if (string.IsNullOrEmpty(groupName))
+            {
+                return;
+            }
+
+            if (radio.IsSelected)
+            {
+                foreach (var btn in _groupMap[groupName].Where(b => b.IsSelected && b != radio))
+                {
+                    btn.IsSelected = false;
+                }
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ReObservableCollection.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ReObservableCollection.cs
new file mode 100644 (file)
index 0000000..490157d
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ReObservableCollection.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Linq;
+using Tizen.Wearable.CircularUI.Forms;
+using Xamarin.Forms;
+
+[assembly: ExportRenderer(typeof(CirclePage), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.CirclePageRenderer))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    class ReObservableCollection<T> : ObservableCollection<T>
+    {
+        protected override void ClearItems()
+        {
+            var oldItems = Items.ToList();
+            Items.Clear();
+            using (BlockReentrancy())
+            {
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, oldItems));
+            }
+            base.ClearItems();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Tizen.Wearable.CircularUI.Forms.Renderer.csproj b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Tizen.Wearable.CircularUI.Forms.Renderer.csproj
new file mode 100644 (file)
index 0000000..5c4f703
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Tizen.Wearable.CircularUI.Forms.Renderer.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>tizen40</TargetFramework>
+    <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="res\circle.png" />
+    <EmbeddedResource Include="res\circle.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Tizen.NET" Version="4.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\Xamarin.Forms.Platform.Tizen.csproj" />
+    <ProjectReference Include="..\Tizen.Wearable.CircularUI.Forms\Tizen.Wearable.CircularUI.Forms.csproj" />
+  </ItemGroup>
+
+</Project>

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TizenCircleSurfaceEffect.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TizenCircleSurfaceEffect.cs
new file mode 100644 (file)
index 0000000..ca8c4d9
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TizenCircleSurfaceEffect.cs
@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using ElmSharp.Wearable;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+
+[assembly: ExportEffect(typeof(Tizen.Wearable.CircularUI.Forms.Renderer.TizenCircleSurfaceEffect), "CircleSurfaceEffect")]
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class TizenCircleSurfaceEffect : PlatformEffect
+    {
+        ElmSharp.Layout _surfaceLayout;
+        ElmSharp.Wearable.CircleSurface _surface;
+
+        EvasObjectEvent _showEvent;
+        EvasObjectEvent _hideEvent;
+        EvasObjectEvent _restackEvent;
+        EvasObjectEvent _moveEvent;
+        EvasObjectEvent _resizeEvent;
+
+        IRotaryEventReceiver _rotaryReceiver;
+
+        protected override void OnAttached()
+        {
+            var rect = Control.Geometry;
+
+            _surfaceLayout = new ElmSharp.Layout(Container);
+            _surfaceLayout.Show();
+            _surface = new ElmSharp.Wearable.CircleSurface(_surfaceLayout);
+            _surfaceLayout.Geometry = rect;
+            _surfaceLayout.StackAbove(Control);
+
+            CircleSurfaceEffectBehavior.SetSurface(Element, _surface);
+
+            _showEvent = new EvasObjectEvent(Control, EvasObjectCallbackType.Show);
+            _hideEvent = new EvasObjectEvent(Control, EvasObjectCallbackType.Hide);
+            _restackEvent = new EvasObjectEvent(Control, EvasObjectCallbackType.Restack);
+            _moveEvent = new EvasObjectEvent(Control, EvasObjectCallbackType.Move);
+            _resizeEvent = new EvasObjectEvent(Control, EvasObjectCallbackType.Resize);
+
+            _showEvent.On += ControlShowed;
+            _hideEvent.On += ControlHided;
+            _restackEvent.On += ControlRestacked;
+            _moveEvent.On += ControlChanged;
+            _resizeEvent.On += ControlChanged;
+
+            Element.PropertyChanging += ElementPropertyChanging;
+            Element.PropertyChanged += ElementPropertyChanged;
+
+            if (Element is Page)
+            {
+                (Element as Page).Appearing += (s, e) =>
+                {
+                    var obj = CircleSurfaceEffectBehavior.GetRotaryFocusObject(Element);
+                    ActivateRotaryFocusable(obj);
+                };
+            }
+            else
+            {
+                EcoreMainloop.Post(() =>
+                {
+                    var obj = CircleSurfaceEffectBehavior.GetRotaryFocusObject(Element);
+                    ActivateRotaryFocusable(obj);
+                });
+            }
+        }
+
+        protected override void OnDetached()
+        {
+            var obj = CircleSurfaceEffectBehavior.GetRotaryFocusObject(Element);
+            DeativateRotaryFocusable(obj);
+
+            _surface.Delete();
+            _surface = null;
+            _surfaceLayout.Unrealize();
+            _surfaceLayout = null;
+            CircleSurfaceEffectBehavior.SetSurface(Element, null);
+
+            _showEvent.Dispose();
+            _hideEvent.Dispose();
+            _restackEvent.Dispose();
+            _moveEvent.Dispose();
+            _resizeEvent.Dispose();
+        }
+
+        void ElementPropertyChanging(object sender, PropertyChangingEventArgs e)
+        {
+            if (e.PropertyName == CircleSurfaceEffectBehavior.RotaryFocusObjectProperty.PropertyName)
+            {
+                var obj = CircleSurfaceEffectBehavior.GetRotaryFocusObject(Element);
+                DeativateRotaryFocusable(obj);
+            }
+        }
+
+        void ElementPropertyChanged(object sender, global::System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == CircleSurfaceEffectBehavior.RotaryFocusObjectProperty.PropertyName)
+            {
+                var obj = CircleSurfaceEffectBehavior.GetRotaryFocusObject(Element);
+                ActivateRotaryFocusable(obj);
+            }
+        }
+
+        void OnRotaryEventChanged(ElmSharp.Wearable.RotaryEventArgs e)
+        {
+            _rotaryReceiver?.Rotate(new RotaryEventArgs { IsClockwise = e.IsClockwise });
+        }
+
+        void ControlShowed(object sender, EventArgs e)
+        {
+            _surfaceLayout.Show();
+        }
+
+        void ControlHided(object sender, EventArgs e)
+        {
+            _surfaceLayout.Hide();
+        }
+
+        void ControlRestacked(object sender, EventArgs e)
+        {
+            _surfaceLayout.StackAbove(Control);
+        }
+
+        void ControlChanged(object sender, EventArgs e)
+        {
+            _surfaceLayout.Geometry = Control.Geometry;
+        }
+
+        void ActivateRotaryFocusable(IRotaryFocusable focusable)
+        {
+            if (focusable is IRotaryEventReceiver)
+            {
+                _rotaryReceiver = focusable as IRotaryEventReceiver;
+                RotaryEventManager.Rotated += OnRotaryEventChanged;
+            }
+            else if (focusable is IRotaryFocusable)
+            {
+                var consumer = focusable as BindableObject;
+                if (consumer != null)
+                {
+                    var renderer = Xamarin.Forms.Platform.Tizen.Platform.GetRenderer(consumer);
+                    (renderer?.NativeView as IRotaryActionWidget)?.Activate();
+                }
+            }
+        }
+
+        void DeativateRotaryFocusable(IRotaryFocusable focusable)
+        {
+            if (focusable is IRotaryEventReceiver)
+            {
+                _rotaryReceiver = null;
+                RotaryEventManager.Rotated -= OnRotaryEventChanged;
+            }
+            else if (focusable is IRotaryFocusable)
+            {
+                var consumer = focusable as BindableObject;
+                if (consumer != null)
+                {
+                    var renderer = Xamarin.Forms.Platform.Tizen.Platform.GetRenderer(consumer);
+                    (renderer?.NativeView as IRotaryActionWidget)?.Deactivate();
+                }
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TizenConfirmPopupEffect.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TizenConfirmPopupEffect.cs
new file mode 100644 (file)
index 0000000..ad64131
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TizenConfirmPopupEffect.cs
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.ComponentModel;
+using ElmSharp;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ResolutionGroupName("CircleUI")]
+[assembly: ExportEffect(typeof(Tizen.Wearable.CircularUI.Forms.Renderer.TizenConfirmPopupEffect), "ContextPopupEffectBehavior")]
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class TizenConfirmPopupEffect : PlatformEffect
+    {
+        SelectContextPopup _popup;
+        ContextPopupEffectBehavior _behavior;
+
+        protected override void OnAttached()
+        {
+            _behavior = Element.GetValue(ContextPopupEffectBehavior.ContextPopupEffectBehaviorProperty) as ContextPopupEffectBehavior;
+            _behavior.PropertyChanged += OnBehaviorPropertyChanged;
+
+            if (_behavior != null)
+                UpdatePopupVisibility();
+
+        }
+
+        protected override void OnDetached()
+        {
+            if (_popup != null)
+            {
+                _popup.Dismiss();
+                _popup.Unrealize();
+            }
+            if (_behavior != null)
+                _behavior.PropertyChanged -= OnBehaviorPropertyChanged;
+        }
+
+        void OnBehaviorPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == ContextPopupEffectBehavior.VisibilityProperty.PropertyName)
+            {
+                UpdatePopupVisibility();
+            }
+        }
+
+        void UpdatePopupVisibility()
+        {
+            if (_behavior == null) return;
+            if (_behavior.Visibility)
+            {
+                CreatePopup();
+                _popup.Show();
+            }
+            else
+            {
+                if (_popup == null) return;
+                _popup.Dismiss();
+                _popup.Unrealize();
+                _popup = null;
+            }
+        }
+
+        void CreatePopup()
+        {
+            if (_popup != null) return;
+
+            ElmSharp.EvasObject parent = null;
+            if (Control?.Parent != null)
+            {
+                parent = Control.Parent;
+            }
+            if (parent == null)
+            {
+                parent = XForms.NativeParent;
+            }
+
+            _popup = new SelectContextPopup(parent);
+            _popup.Dismissed += (s, e) => _behavior.Visibility = false;
+
+            _popup.Accepted += (s, e) => _behavior?.AcceptCommand?.Execute(_behavior?.AcceptCommandParameter);
+            _popup.Canceled += (s, e) => _behavior?.CancelCommand?.Execute(_behavior?.CancelCommandParameter);
+
+            string accept = _behavior.AcceptText ?? "";
+
+            var acceptItem = _popup.Append(accept);
+
+            string cancel = _behavior.CancelText;
+            if (!string.IsNullOrEmpty(cancel))
+            {
+                var cancelItem = _popup.Append(cancel);
+
+                acceptItem.Style = "select_mode/top";
+                cancelItem.Style = "select_mode/bottom";
+                cancelItem.Selected += (s, e) => _popup.Cancel();
+            }
+            acceptItem.Selected += (s, e) => _popup.Accept();
+
+            var option = _behavior.PositionOption;
+            var offset = _behavior.Offset;
+            int x, y;
+            Rect rect;
+            Rect ctxRect = _popup.Geometry;
+            switch (option)
+            {
+                case PositionOption.Absolute:
+                    x = XForms.ConvertToPixel(offset.X);
+                    y = XForms.ConvertToPixel(offset.Y);
+                    break;
+                case PositionOption.BottomOfView:
+                    rect = Control.Geometry;
+                    x = rect.X + rect.Width / 2 + XForms.ConvertToPixel(offset.X);
+                    y = rect.Y + rect.Height + XForms.ConvertToPixel(offset.Y);
+                    break;
+                case PositionOption.CenterOfParent:
+                    rect = XForms.NativeParent.Geometry;
+
+                    x = rect.Width / 2 + XForms.ConvertToPixel(offset.X);
+                    y = rect.Height / 2 - ctxRect.Height / 2 + XForms.ConvertToPixel(offset.Y);
+                    break;
+                case PositionOption.Relative:
+                    rect = XForms.NativeParent.Geometry;
+                    x = (int)(rect.Width * offset.X);
+                    y = (int)(rect.Height * offset.Y);
+                    break;
+                default:
+                    x = 0;
+                    y = 0;
+                    break;
+            }
+
+            var window = XForms.NativeParent.Geometry;
+            if (y + ctxRect.Height > window.Height)
+            {
+                y = window.Height - ctxRect.Height;
+            }
+
+            _popup.Move(x, y);
+        }
+
+        class SelectContextPopup : ElmSharp.ContextPopup
+        {
+            public SelectContextPopup(EvasObject parent) : base(parent)
+            {
+                Style = "select_mode";
+                Dismissed += OnDismissed;
+                IsAccepted = false;
+
+                SetDirectionPriorty(ContextPopupDirection.Down, ContextPopupDirection.Down, ContextPopupDirection.Down, ContextPopupDirection.Down);
+            }
+
+            public bool IsAccepted { get; set; }
+            public void Accept()
+            {
+                IsAccepted = true;
+                Accepted?.Invoke(this, EventArgs.Empty);
+                Dismiss();
+            }
+
+            public void Cancel()
+            {
+                IsAccepted = false;
+                Dismiss();
+            }
+
+            public event EventHandler Accepted;
+            public event EventHandler Canceled;
+
+            void OnDismissed(object sender, EventArgs e)
+            {
+                if (!IsAccepted)
+                {
+                    Canceled?.Invoke(this, EventArgs.Empty);
+                }
+                Unrealize();
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ToastImplementation.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ToastImplementation.cs
new file mode 100644 (file)
index 0000000..4bffc73
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/ToastImplementation.cs
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+using EPopup = ElmSharp.Popup;
+
+[assembly: Dependency(typeof(Tizen.Wearable.CircularUI.Forms.Renderer.ToastImplementation))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    class ToastImplementation : IToast, IDisposable
+    {
+        static readonly string DefaultStyle = "toast/circle";
+        static readonly string IconPart = "toast,icon";
+
+        EPopup _control;
+        FileImageSource _icon;
+        int _duration = 3000;
+        string _text;
+        bool _isDisposed;
+
+        public ToastImplementation()
+        {
+            _control = new ElmSharp.Popup(XForms.NativeParent)
+            {
+                Style = DefaultStyle,
+                AllowEvents = false,
+            };
+
+            _control.BackButtonPressed += (s, e) => _control.Dismiss();
+            _control.TimedOut += (s, e) => _control.Dismiss();
+            _control.OutsideClicked += (s, e) => _control.Dismiss();
+            _control.Dismissed += OnDismissed;
+
+            UpdateIcon();
+            UpdateText();
+            UpdateDuration();
+        }
+
+        ~ToastImplementation()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed)
+                return;
+
+            if (disposing)
+            {
+                if (_control != null)
+                {
+                    _control.Unrealize();
+                    _control = null;
+                }
+            }
+
+            _isDisposed = true;
+        }
+
+        public FileImageSource Icon
+        {
+            get
+            {
+                return _icon;
+            }
+            set
+            {
+                _icon = value;
+                UpdateIcon();
+            }
+        }
+
+        public string Text
+        {
+            get
+            {
+                return _text;
+            }
+            set
+            {
+                if (_text == value) return;
+                _text = value;
+                UpdateText();
+            }
+        }
+
+        public int Duration
+        {
+            get
+            {
+                return _duration;
+            }
+            set
+            {
+                _duration = value;
+                UpdateDuration();
+            }
+        }
+
+        void UpdateDuration()
+        {
+            _control.Timeout = Duration / 1000.0;
+        }
+
+        void UpdateIcon()
+        {
+            if (Icon != null)
+            {
+                var path = ResourcePath.GetPath(_icon);
+                var image = new ElmSharp.Image(_control);
+                image.LoadAsync(path);
+                image.Show();
+                _control.SetPartContent(IconPart, image);
+            }
+        }
+
+        void UpdateText()
+        {
+            _control.Text = _text;
+        }
+
+        public void Show()
+        {
+            _control.Show();
+        }
+        public void Dismiss()
+        {
+            _control.Dismiss();
+        }
+
+        void OnDismissed(object sender, EventArgs e)
+        {
+            Dispose();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPageRenderer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPageRenderer.cs
new file mode 100644 (file)
index 0000000..b038924
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPageRenderer.cs
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using System;
+using Tizen.Wearable.CircularUI.Forms;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: ExportRenderer(typeof(TwoButtonPage), typeof(Tizen.Wearable.CircularUI.Forms.Renderer.TwoButtonPageRenderer))]
+
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class TwoButtonPageRenderer : VisualElementRenderer<TwoButtonPage>
+    {
+        TwoButtonPageWidget _widget;
+
+        public TwoButtonPageRenderer()
+        {
+            RegisterPropertyHandler(TwoButtonPage.BackgroundImageSourceProperty, UpdateBackgroundImage);
+            RegisterPropertyHandler(TwoButtonPage.FirstButtonProperty, UpdateFirstButton);
+            RegisterPropertyHandler(TwoButtonPage.SecondButtonProperty, UpdateSecondButton);
+            RegisterPropertyHandler(TwoButtonPage.OverlapProperty, UpdateOverlap);
+        }
+
+        protected override void OnElementChanged(ElementChangedEventArgs<TwoButtonPage> e)
+        {
+            if (_widget == null)
+            {
+                _widget = new TwoButtonPageWidget(XForms.NativeParent);
+                _widget.Canvas.LayoutUpdated += OnLayoutUpdated;
+                SetNativeView(_widget);
+            }
+
+            base.OnElementChanged(e);
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (_widget != null)
+                {
+                    _widget.Canvas.LayoutUpdated -= OnLayoutUpdated;
+                }
+            }
+            base.Dispose(disposing);
+        }
+
+        protected override void UpdateBackgroundColor(bool initialize)
+        {
+            if (initialize && Element.BackgroundColor.IsDefault) return;
+
+            if (Element.BackgroundColor.A == 0)
+            {
+                _widget.BackgroundColor = ElmSharp.Color.Transparent;
+            }
+            else
+            {
+                _widget.BackgroundColor = Element.BackgroundColor.ToNative();
+            }
+        }
+
+        protected override void UpdateLayout()
+        {
+            // Do Nothing because ignore base UpdateLayout
+        }
+
+        public override Rect GetNativeContentGeometry()
+        {
+            return _widget.Canvas.Geometry;
+        }
+
+        void UpdateOverlap()
+        {
+            _widget.Overlap = Element.Overlap;
+        }
+
+        void OnLayoutUpdated(object sender, Xamarin.Forms.Platform.Tizen.Native.LayoutEventArgs e)
+        {
+            Element.Layout(e.Geometry.ToDP());
+        }
+
+        void UpdateBackgroundImage(bool initialize)
+        {
+            if (initialize && Element.BackgroundImageSource.IsNullOrEmpty())
+                return;
+
+            var bgImage = Element.BackgroundImageSource as FileImageSource;
+            if (bgImage.IsNullOrEmpty())
+                _widget.File = null;
+            else
+                _widget.File = ResourcePath.GetPath(bgImage);
+        }
+
+        void UpdateSecondButton(bool initialize)
+        {
+            if (initialize && Element.SecondButton == null) return;
+            if (Element.SecondButton != null)
+            {
+                if (Element.SecondButton is ColorMenuItem)
+                {
+                    var item = ((ColorMenuItem)Element.SecondButton);
+                    _widget.ShowButton2(item.Text, item.IconImageSource as FileImageSource, item.BackgroundColor.ToNative(), () => ((IMenuItemController)item).Activate());
+                }
+                else
+                {
+                    var item = Element.SecondButton;
+                    _widget.ShowButton2(item.Text, item.IconImageSource as FileImageSource, () => ((IMenuItemController)item).Activate());
+                }
+            }
+            else
+            {
+                _widget.HideButton2();
+            }
+        }
+
+        void UpdateFirstButton(bool initialize)
+        {
+            if (initialize && Element.FirstButton == null) return;
+            if (Element.FirstButton != null)
+            {
+                if (Element.FirstButton is ColorMenuItem)
+                {
+                    var item = ((ColorMenuItem)Element.FirstButton);
+                    _widget.ShowButton1(item.Text, item.IconImageSource as FileImageSource, item.BackgroundColor.ToNative(), () => ((IMenuItemController)item).Activate());
+                }
+                else
+                {
+                    var item = Element.FirstButton;
+                    _widget.ShowButton1(item.Text, item.IconImageSource as FileImageSource, () => ((IMenuItemController)item).Activate());
+                }
+            }
+            else
+            {
+                _widget.HideButton1();
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPageWidget.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPageWidget.cs
new file mode 100644 (file)
index 0000000..9d14f91
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPageWidget.cs
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using System;
+using System.Collections.Generic;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using Xamarin.Forms.Platform.Tizen.Native;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class TwoButtonPageWidget : Background, IContainable<EvasObject>
+    {
+        ObservableBox _outbox;
+
+        ElmSharp.Layout _frame;
+        ElmSharp.Layout _buttonLayer;
+        ElmSharp.Button[] _buttons;
+        Canvas _canvas;
+
+        bool _overlap;
+
+        public TwoButtonPageWidget(EvasObject parent) : base(parent)
+        {
+            _frame = new ElmSharp.Layout(parent);
+            _frame.SetTheme("popup", "base", "circle");
+            SetPartContent("overlay", _frame);
+            _frame.Show();
+
+            _buttonLayer = new ElmSharp.Layout(_frame);
+            _buttonLayer.SetTheme("popup", "buttons2", "popup/circle");
+            _frame.SetPartContent("elm.swallow.action_area", _buttonLayer);
+            _buttonLayer.Show();
+
+            _outbox = new ObservableBox(parent);
+            _outbox.SetAlignment(NamedHint.Fill, NamedHint.Fill);
+            _outbox.SetWeight(NamedHint.Expand, NamedHint.Expand);
+            _outbox.SetLayoutCallback(() => { });
+
+            _frame.SetPartContent("elm.swallow.content", _outbox);
+            _outbox.Show();
+
+            _canvas = new Canvas(_outbox);
+            EcoreMainloop.Post(() => _canvas.Geometry = _outbox.Geometry);
+            _outbox.PackEnd(_canvas);
+            _canvas.Show();
+
+            _buttons = new ElmSharp.Button[2];
+            _overlap = false;
+        }
+
+        public bool Overlap
+        {
+            get => _overlap;
+            set
+            {
+                if (_overlap != value)
+                {
+                    _overlap = value;
+                    if (_overlap)
+                    {
+                        _canvas.Geometry = _outbox.Geometry;
+                    }
+                    else
+                    {
+                        OnLayout();
+                    }
+                }
+            }
+        }
+
+        public Canvas Canvas => _canvas;
+
+        public new IList<EvasObject> Children => _canvas.Children;
+
+        public event EventHandler<LayoutEventArgs> LayoutUpdated
+        {
+            add => _canvas.LayoutUpdated += value;
+            remove => _canvas.LayoutUpdated -= value;
+        }
+
+        protected override void OnUnrealize()
+        {
+            _canvas.Unrealize();
+            HideButton(0);
+            HideButton(1);
+            _buttonLayer.Unrealize();
+            _frame.Unrealize();
+            base.OnUnrealize();
+        }
+
+        public void ShowButton1(string text, FileImageSource image, ElmSharp.Color backgroundColor, Action action) => ShowButton(0, "popup/circle/left", "actionbtn1", text, backgroundColor, image, action);
+        public void ShowButton1(string text, FileImageSource image, Action action) => ShowButton1(text, image, ElmSharp.Color.Default, action);
+        public void ShowButton1(string text, Action action) => ShowButton1(text, null, action);
+        public void ShowButton1(string text) => ShowButton1(text, null, null);
+
+        public void HideButton1() => HideButton(0);
+        public void ShowButton2(string text, FileImageSource image, ElmSharp.Color backgroundColor, Action action) => ShowButton(1, "popup/circle/right", "actionbtn2", text, backgroundColor, image, action);
+        public void ShowButton2(string text, FileImageSource image, Action action) => ShowButton2(text, image, ElmSharp.Color.Default, action);
+        public void ShowButton2(string text, FileImageSource image) => ShowButton2(text, image, null);
+        public void ShowButton2(string text) => ShowButton2(text, null, null);
+        public void HideButton2() => HideButton(1);
+
+        void OnLayout()
+        {
+            var rect = _outbox.Geometry;
+            if (_buttons[0] != null)
+            {
+                var rect1 = _buttons[0].Geometry;
+                rect.X = rect1.Right;
+                rect.Width -= rect1.Width;
+            }
+            if (_buttons[1] != null)
+            {
+                var rect2 = _buttons[1].Geometry;
+                rect.Width -= rect2.Width;
+            }
+            Canvas.Geometry = rect;
+        }
+
+        void ShowButton(int id, string style, string part, string text, ElmSharp.Color buttonBgColor, FileImageSource image = null, Action action = null)
+        {
+            HideButton(id);
+
+            _buttons[id] = new ElmSharp.Button(_buttonLayer)
+            {
+                Text = text,
+                Style = style
+            };
+            if (!image.IsNullOrEmpty())
+            {
+                var path = ResourcePath.GetPath(image);
+                var buttonImage = new ElmSharp.Image(_buttons[id]);
+                buttonImage.LoadAsync(path);
+                buttonImage.Show();
+                _buttons[id].SetPartContent("elm.swallow.content", buttonImage);
+            }
+
+            if (buttonBgColor != ElmSharp.Color.Default)
+            {
+                _buttons[id].BackgroundColor = buttonBgColor;
+            }
+
+            if (action != null)
+            {
+                _buttons[id].Clicked += (s, e) => action();
+            }
+            _buttonLayer.SetPartContent(part, _buttons[id]);
+
+            if (_overlap) EcoreMainloop.Post(OnLayout);
+        }
+        void HideButton(int id)
+        {
+            if (_buttons[id] != null)
+            {
+                _buttons[id].Unrealize();
+                _buttons[id].SetPartContent("elm.swallow.button", null);
+                _buttons[id] = null;
+                if (_overlap) EcoreMainloop.Post(OnLayout);
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPopupImplementation.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPopupImplementation.cs
new file mode 100644 (file)
index 0000000..3b8102b
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/TwoButtonPopupImplementation.cs
@@ -0,0 +1,393 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using XForms = Xamarin.Forms.Forms;
+
+[assembly: Dependency(typeof(Tizen.Wearable.CircularUI.Forms.Renderer.TwoButtonPopupImplementation))]
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer
+{
+    public class TwoButtonPopupImplementation : ITwoButtonPopup, IDisposable
+    {
+        View _content;
+        StackLayout _contentView;
+        MenuItem _firstMenuItem;
+        MenuItem _secondMenuItem;
+        Color _firstButtonBgColor;
+        Color _secondButtonBgColor;
+
+        ElmSharp.Popup _popUp;
+        ElmSharp.Layout _layout;
+        ElmSharp.Button _firstButton;
+        ElmSharp.Button _secondButton;
+        ElmSharp.EvasObject _nativeContent;
+
+        string _title;
+        string _text;
+        bool _isDisposed;
+
+        public event EventHandler BackButtonPressed;
+
+        public TwoButtonPopupImplementation()
+        {
+            _popUp = new ElmSharp.Popup(XForms.NativeParent);
+            _popUp.Style = "circle";
+
+            _layout = new ElmSharp.Layout(_popUp);
+            _layout.SetTheme("layout", "popup", "content/circle/buttons2");
+            _popUp.SetContent(_layout);
+
+            _popUp.BackButtonPressed += BackButtonPressedHandler;
+            _popUp.Dismissed += OnDismissed;
+
+            _contentView = new StackLayout();
+        }
+
+        ~TwoButtonPopupImplementation()
+        {
+            Dispose(false);
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_isDisposed)
+                return;
+
+            if (disposing)
+            {
+                if (_firstButton != null)
+                {
+                    _firstButton.Unrealize();
+                    _firstButton = null;
+                }
+
+                if (_secondButton != null)
+                {
+                    _secondButton.Unrealize();
+                    _secondButton = null;
+                }
+
+                if (_nativeContent != null)
+                {
+                    _nativeContent.Unrealize();
+                    _nativeContent = null;
+                }
+
+                if (_popUp != null)
+                {
+                    _layout.Unrealize();
+                    _layout = null;
+                    _popUp.Unrealize();
+                    _popUp = null;
+                }
+            }
+
+            _isDisposed = true;
+        }
+
+        void BackButtonPressedHandler(object sender, EventArgs e)
+        {
+            BackButtonPressed?.Invoke(this, EventArgs.Empty);
+        }
+
+        public View Content
+        {
+            get
+            {
+                return _content;
+            }
+            set
+            {
+                _content = value;
+                UpdateContent();
+            }
+        }
+
+        public MenuItem FirstButton
+        {
+            get
+            {
+                return _firstMenuItem;
+            }
+            set
+            {
+                if (_firstMenuItem == value) return;
+                _firstMenuItem = value;
+
+                if (value is ColorMenuItem)
+                {
+                    _firstButtonBgColor = ((ColorMenuItem)value).BackgroundColor;
+                }
+                else
+                {
+                    _firstButtonBgColor = Color.Default;
+                }
+
+                UpdateFirstButton();
+            }
+        }
+
+        public MenuItem SecondButton
+        {
+            get
+            {
+                return _secondMenuItem;
+            }
+            set
+            {
+                if (_secondMenuItem == value) return;
+                _secondMenuItem = value;
+
+                if (value is ColorMenuItem)
+                {
+                    _secondButtonBgColor = ((ColorMenuItem)value).BackgroundColor;
+                }
+                else
+                {
+                    _secondButtonBgColor = Color.Default;
+                }
+
+                UpdateSecondButton();
+            }
+        }
+
+        public string Title
+        {
+            get
+            {
+                return _title;
+            }
+            set
+            {
+                if (_title == value) return;
+                _title = value;
+                UpdateTitle();
+            }
+        }
+
+        public string Text
+        {
+            get
+            {
+                return _text;
+            }
+            set
+            {
+                if (_text == value) return;
+                _text = value;
+                UpdateText();
+            }
+        }
+
+        void UpdateContent()
+        {
+            if (!XForms.IsInitialized)
+            {
+                Log.Debug(FormsCircularUI.Tag, "Tizen Forms is not initialized");
+                return;
+            }
+
+            _contentView.Children.Clear();
+            if (Content != null)
+            {
+                _contentView.Children.Add(Content);
+
+                var renderer = Xamarin.Forms.Platform.Tizen.Platform.GetOrCreateRenderer(_contentView);
+                (renderer as LayoutRenderer)?.RegisterOnLayoutUpdated();
+                var sizeRequest = _contentView.Measure(XForms.NativeParent.Geometry.Width, XForms.NativeParent.Geometry.Height).Request.ToPixel();
+
+                _nativeContent = renderer.NativeView;
+                _nativeContent.MinimumHeight = sizeRequest.Height;
+
+                _layout.SetPartContent("elm.swallow.content", _nativeContent, true);
+            }
+            else
+            {
+                _layout.SetPartContent("elm.swallow.content", null, true);
+            }
+        }
+
+        void UpdateFirstButton()
+        {
+            _firstButton?.Hide();
+
+            if (FirstButton != null)
+            {
+                _firstButton = new ElmSharp.Button(_popUp)
+                {
+                    WeightX = 1.0,
+                    WeightY = 1.0,
+                    Style = "popup/circle/left"
+                };
+
+                if (!string.IsNullOrEmpty(FirstButton.Text)) _firstButton.Text = FirstButton.Text;
+
+                if (!FirstButton.IconImageSource.IsNullOrEmpty())
+                {
+                    var iconSource = FirstButton.IconImageSource as FileImageSource;
+                    if (!iconSource.IsNullOrEmpty())
+                    {
+                        var buttonImage = new ElmSharp.Image(_firstButton);
+                        buttonImage.LoadAsync(ResourcePath.GetPath(iconSource));
+                        buttonImage.Show();
+                        _firstButton.SetPartContent("elm.swallow.content", buttonImage);
+                    }
+                }
+
+                _firstButton.Clicked += (s, e) =>
+                {
+                    ((IMenuItemController)FirstButton).Activate();
+                };
+
+                if (_firstButtonBgColor != Color.Default)
+                {
+                    Log.Debug(FormsCircularUI.Tag, $"TwoButtonPopup set first button background color:{_firstButtonBgColor.ToNative()}");
+                    _firstButton.BackgroundColor = _firstButtonBgColor.ToNative();
+                }
+            }
+            else
+            {
+                _firstButton = null;
+            }
+
+            _popUp.SetPartContent("button1", _firstButton);
+        }
+
+        void UpdateSecondButton()
+        {
+            _secondButton?.Hide();
+
+            if (SecondButton != null)
+            {
+                _secondButton = new ElmSharp.Button(_popUp)
+                {
+                    WeightX = 1.0,
+                    WeightY = 1.0,
+                    Style = "popup/circle/right"
+                };
+
+                if (!string.IsNullOrEmpty(SecondButton.Text)) _secondButton.Text = SecondButton.Text;
+
+                if (!SecondButton.IconImageSource.IsNullOrEmpty())
+                {
+                    var iconSource = SecondButton.IconImageSource as FileImageSource;
+                    if (!iconSource.IsNullOrEmpty())
+                    {
+                        var buttonImage = new ElmSharp.Image(_secondButton);
+                        buttonImage.LoadAsync(ResourcePath.GetPath(iconSource));
+                        buttonImage.Show();
+                        _secondButton.SetPartContent("elm.swallow.content", buttonImage);
+                    }
+                }
+
+                _secondButton.Clicked += (s, e) =>
+                {
+                    ((IMenuItemController)SecondButton).Activate();
+                };
+
+                if (_secondButtonBgColor != Color.Default)
+                {
+                    Log.Debug(FormsCircularUI.Tag, $"TwoButtonPopup set second button background color:{_secondButtonBgColor.ToNative()}");
+                    _secondButton.BackgroundColor = _secondButtonBgColor.ToNative();
+                }
+
+                _popUp.SetPartContent("button2", _secondButton);
+            }
+            else
+            {
+                /* This is workaround fix for Left button occupied whole window when right button is null*/
+                _secondButton = new ElmSharp.Button(_popUp)
+                {
+                    WeightX = 1.0,
+                    WeightY = 1.0,
+                    Style = "popup/circle/right"
+                };
+                _popUp.SetPartContent("button2", _secondButton);
+                _secondButton.Unrealize();
+                _secondButton = null;
+            }
+        }
+
+        void UpdateTitle()
+        {
+            _layout.SetPartText("elm.text.title", _title);
+        }
+
+        void UpdateText()
+        {
+            _layout.SetPartText("elm.text", _text);
+        }
+
+        public void Show()
+        {
+            if (!XForms.IsInitialized)
+            {
+                throw new InvalidOperationException("When the Application's Platform is not initialized, it can not show the Dialog.");
+            }
+
+            if (_popUp != null)
+            {
+                _popUp.Show();
+            }
+        }
+
+        public void Dismiss()
+        {
+            if (_firstButton != null)
+            {
+                _firstButton.Unrealize();
+                _firstButton = null;
+                _popUp.SetPartContent("button1", null);
+            }
+
+            if (_secondButton != null)
+            {
+                _secondButton.Unrealize();
+                _secondButton = null;
+                _popUp.SetPartContent("button2", null);
+            }
+
+            if (_nativeContent != null)
+            {
+                _nativeContent.Unrealize();
+                _nativeContent = null;
+            }
+
+            if (_popUp != null)
+            {
+                _layout.Unrealize();
+                _layout = null;
+                _popUp.Unrealize();
+                _popUp = null;
+            }
+        }
+
+        void OnDismissed(object sender, EventArgs e)
+        {
+            Log.Debug(FormsCircularUI.Tag, $"OnDismissed called");
+            Dispose();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Watchface/FormsWatchface.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Watchface/FormsWatchface.cs
new file mode 100644 (file)
index 0000000..5107f58
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Watchface/FormsWatchface.cs
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using ElmSharp;
+using System;
+using NSystem = System;
+using Tizen.Applications;
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.Platform.Tizen;
+using XApplication = Xamarin.Forms.Application;
+using XForms = Xamarin.Forms.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer.Watchface
+{
+    public class FormsWatchface : WatchApplication
+    {
+        XApplication _application;
+        bool _isInitialStart;
+
+        public FormsWatchface()
+        {
+            XForms.SetFlags("LightweightPlatform_Experimental");
+            _isInitialStart = true;
+        }
+
+        public void LoadWatchface(XApplication application)
+        {
+            if (application == null) throw new ArgumentException("application");
+            _application = application;
+            XApplication.Current = application;
+            application.SendStart();
+
+            var rootView = application.MainPage.CreateEvasObject(Window);
+            OnRootViewUpdated(rootView);
+
+            application.PropertyChanging += (s, e) =>
+            {
+                if (e.PropertyName == nameof(XApplication.MainPage))
+                {
+                    Platform.GetRenderer(application?.MainPage)?.Dispose();
+                }
+            };
+            application.PropertyChanged += (s, e) =>
+            {
+                if (e.PropertyName == nameof(XApplication.MainPage))
+                {
+                    OnRootViewUpdated(application.MainPage.CreateEvasObject(Window));
+                }
+            };
+        }
+
+        public void Run()
+        {
+            Run(NSystem.Environment.GetCommandLineArgs());
+        }
+
+        protected virtual void OnRootViewUpdated(EvasObject rootView)
+        {
+            rootView.Geometry = new Rect(0, 0, Window.ScreenSize.Width, Window.ScreenSize.Height);
+        }
+
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+            XApplication.ClearCurrent();
+            Device.Info.CurrentOrientation = GetDeviceOrientation();
+            Window.RotationChanged += (sender, e) => Device.Info.CurrentOrientation = GetDeviceOrientation();
+            Window.BackButtonPressed += (sender, e) => _application?.MainPage?.SendBackButtonPressed();
+        }
+
+        protected override void OnTerminate()
+        {
+            base.OnTerminate();
+            Platform.GetRenderer(_application?.MainPage)?.Dispose();
+        }
+
+        protected override void OnAppControlReceived(AppControlReceivedEventArgs e)
+        {
+            base.OnAppControlReceived(e);
+            if (!_isInitialStart && _application != null)
+            {
+                _application.SendResume();
+            }
+            _isInitialStart = false;
+        }
+
+        protected override void OnPause()
+        {
+            base.OnPause();
+            if (_application != null)
+            {
+                _application.SendSleepAsync();
+            }
+        }
+
+        protected override void OnResume()
+        {
+            base.OnResume();
+            if (_application != null)
+            {
+                _application.SendResume();
+            }
+        }
+
+        Xamarin.Forms.Internals.DeviceOrientation GetDeviceOrientation()
+        {
+            Xamarin.Forms.Internals.DeviceOrientation orientation;
+            var isPortraitDevice = XForms.NaturalOrientation.IsPortrait();
+            switch (Window.Rotation)
+            {
+                case 0:
+                case 180:
+                    orientation = isPortraitDevice ? Xamarin.Forms.Internals.DeviceOrientation.Portrait : Xamarin.Forms.Internals.DeviceOrientation.Landscape;
+                    break;
+
+                case 90:
+                case 270:
+                    orientation = isPortraitDevice ? Xamarin.Forms.Internals.DeviceOrientation.Landscape : Xamarin.Forms.Internals.DeviceOrientation.Portrait;
+                    break;
+                default:
+                    orientation = Xamarin.Forms.Internals.DeviceOrientation.Other;
+                    break;
+            }
+            return orientation;
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Widget/FormsWidgetApplication.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Widget/FormsWidgetApplication.cs
new file mode 100644 (file)
index 0000000..1f84548
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Widget/FormsWidgetApplication.cs
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using Tizen.Applications;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer.Widget
+{
+    public class FormsWidgetApplication : WidgetApplication
+    {
+        protected FormsWidgetApplication(Type type) : base(type)
+        {
+            Xamarin.Forms.Forms.SetFlags("LightweightPlatform_Experimental");
+        }
+
+        protected FormsWidgetApplication(IDictionary<Type, string> typeInfo) : base(typeInfo)
+        {
+            Xamarin.Forms.Forms.SetFlags("LightweightPlatform_Experimental");
+        }
+
+        public override void Exit()
+        {
+            // It is intended, disable to terminate.
+            Log.Debug(FormsCircularUI.Tag, "Exit() called!");
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Widget/FormsWidgetBase.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Widget/FormsWidgetBase.cs
new file mode 100644 (file)
index 0000000..fb535ce
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/Widget/FormsWidgetBase.cs
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.ComponentModel;
+using Xamarin.Forms;
+using Xamarin.Forms.Platform.Tizen;
+using Tizen.Applications;
+using ElmSharp;
+using XApplication = Xamarin.Forms.Application;
+using XPropertyChangingEventArgs = Xamarin.Forms.PropertyChangingEventArgs;
+using XPropertyChangingEventHandler = Xamarin.Forms.PropertyChangingEventHandler;
+
+namespace Tizen.Wearable.CircularUI.Forms.Renderer.Widget
+{
+    public abstract class FormsWidgetBase : WidgetBase
+    {
+        XApplication _application;
+
+        public override void OnCreate(Bundle content, int w, int h)
+        {
+            base.OnCreate(content, w, h);
+            XApplication.ClearCurrent();
+        }
+
+        public override void OnPause()
+        {
+            base.OnPause();
+            if (_application != null)
+            {
+                _application.SendSleepAsync();
+            }
+        }
+
+        public override void OnResume()
+        {
+            base.OnResume();
+            if (_application != null)
+            {
+                _application.SendResume();
+            }
+        }
+
+        public override void OnDestroy(WidgetDestroyType reason, Bundle content)
+        {
+            base.OnDestroy(reason, content);
+            Platform.GetRenderer(_application?.MainPage)?.Dispose();
+        }
+
+        public void LoadApplication(XApplication application)
+        {
+            if (Window == null)
+            {
+                throw new NullReferenceException("MainWindow is not prepared, This method should be called in OnCreated().");
+            }
+
+            if (application == null)
+            {
+                throw new ArgumentException("application cannot be null.");
+            }
+            _application = application;
+            XApplication.Current = application;
+            application.SendStart();
+
+            var rootView = application.MainPage.CreateEvasObject(Window);
+            OnRootViewUpdated(rootView);
+
+            application.PropertyChanging += new XPropertyChangingEventHandler(AppOnPropertyChanging);
+            application.PropertyChanged += new PropertyChangedEventHandler(AppOnPropertyChanged);
+        }
+
+        protected virtual void OnRootViewUpdated(EvasObject rootView)
+        {
+            rootView.Geometry = new Rect(0, 0, Window.ScreenSize.Width, Window.ScreenSize.Height);
+        }
+
+        void AppOnPropertyChanging(object sender, XPropertyChangingEventArgs args)
+        {
+            if (args.PropertyName == nameof(XApplication.MainPage))
+            {
+                Platform.GetRenderer(_application?.MainPage)?.Dispose();
+            }
+        }
+
+        void AppOnPropertyChanged(object sender, PropertyChangedEventArgs args)
+        {
+            if (args.PropertyName == nameof(XApplication.MainPage))
+            {
+                OnRootViewUpdated(_application.MainPage.CreateEvasObject(Window));
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/res/circle.png b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/res/circle.png
new file mode 100644 (file)
index 0000000..fc3aea5
Binary files /dev/null and b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms.Renderer/res/circle.png differ

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ActionButtonItem.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ActionButtonItem.cs
new file mode 100644 (file)
index 0000000..0b6f6f4
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ActionButtonItem.cs
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The ActionButtonItem is a class that presents a menu item and associates it with a command
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class ActionButtonItem : MenuItem
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the IsEnable bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsEnableProperty = BindableProperty.Create(nameof(IsEnable), typeof(bool), typeof(ActionButtonItem), true);
+        /// <summary>
+        /// BindableProperty. Identifies the IsVisible bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsVisibleProperty = BindableProperty.Create(nameof(IsVisible), typeof(bool), typeof(ActionButtonItem), true);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BackgroundColor bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(ActionButtonItem), Color.Default);
+
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether this ActionButtonItem is enabled.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsEnable
+        {
+            get => (bool)GetValue(IsEnableProperty);
+            set => SetValue(IsEnableProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether this ActionButtonItem is visible.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsVisible
+        {
+            get => (bool)GetValue(IsVisibleProperty);
+            set => SetValue(IsVisibleProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a background color value of ActionButtonItem.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color BackgroundColor
+        {
+            get => (Color)GetValue(BackgroundColorProperty);
+            set => SetValue(BackgroundColorProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Check.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Check.cs
new file mode 100644 (file)
index 0000000..2ad9f43
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Check.cs
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The check widget allows for toggling a value between true and false.
+    /// The check is extension of Xamarin.Forms.Switch.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    /// <example>
+    /// <code>
+    /// var check = new Check
+    /// {
+    ///     HorizontalOptions = LayoutOptions.Center,
+    ///     VerticalOptions = LayoutOptions.Center,
+    ///     DisplayStyle = "Onoff"
+    /// }
+    /// </code>
+    /// </example>
+    public class Check : Switch
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the DisplayStyle bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty DisplayStyleProperty = BindableProperty.Create(nameof(DisplayStyle), typeof(CheckDisplayStyle), typeof(Check), defaultValue: CheckDisplayStyle.Default);
+
+        /// <summary>
+        /// BindableProperty. Identifies the Color bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(Check), Color.Default);
+
+        /// <summary>
+        /// Gets or sets display style of Check.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public CheckDisplayStyle DisplayStyle
+        {
+            get { return (CheckDisplayStyle)GetValue(DisplayStyleProperty); }
+            set { SetValue(DisplayStyleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a color value of Check.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color Color
+        {
+            get => (Color)GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CheckDisplayStyle.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CheckDisplayStyle.cs
new file mode 100644 (file)
index 0000000..e711e21
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CheckDisplayStyle.cs
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Enumeration for the style of the Check.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public enum CheckDisplayStyle 
+    {
+        /// <summary>
+        /// The default style is checkbox style.
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// The toggle switch style.
+        /// </summary>
+        Onoff,
+
+        /// <summary>
+        /// The small checkbox style. this style is only for circular devices 
+        /// </summary>
+        Small
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleDateTimeSelector.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleDateTimeSelector.cs
new file mode 100644 (file)
index 0000000..cf6ca3a
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleDateTimeSelector.cs
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleDateTimeSelector is a view that can change the value by bezel action by touching each item of "Year: Month: Day" and "Hour: Minute: AM / PM"
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleDateTimeSelector : Xamarin.Forms.View, IRotaryFocusable
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the MarkerColor bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        [Obsolete("MarkerColor bindable property is obsolete as of Tizen.NET version 4.0.0 and is no longer supported")]
+        public static readonly BindableProperty MarkerColorProperty = BindableProperty.Create(nameof(MarkerColor), typeof(Color), typeof(CircleDateTimeSelector), Color.Default);
+        /// <summary>
+        /// BindableProperty. Identifies the ValueType bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty ValueTypeProperty = BindableProperty.Create(nameof(ValueType), typeof(DateTimeType), typeof(CircleDateTimeSelector), DateTimeType.Date);
+        /// <summary>
+        /// BindableProperty. Identifies the DateTime bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty DateTimeProperty = BindableProperty.Create(nameof(DateTime), typeof(DateTime), typeof(CircleDateTimeSelector), DateTime.Now);
+        /// <summary>
+        /// BindableProperty. Identifies the MaximumDate bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty MaximumDateProperty = BindableProperty.Create(nameof(MaximumDate), typeof(DateTime), typeof(CircleDateTimeSelector), DateTime.Now + TimeSpan.FromDays(3650));
+        /// <summary>
+        /// BindableProperty. Identifies the MinimumDate bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty MinimumDateProperty = BindableProperty.Create(nameof(MinimumDate), typeof(DateTime), typeof(CircleDateTimeSelector), new DateTime(1900, 1, 1));
+
+        /// <summary>
+        /// BindableProperty. Identifies the IsVisibleOfYear bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsVisibleOfYearProperty = BindableProperty.Create(nameof(IsVisibleOfYear), typeof(bool), typeof(CircleDateTimeSelector), true);
+        /// <summary>
+        /// BindableProperty. Identifies the IsVisibleOfMonth bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsVisibleOfMonthProperty = BindableProperty.Create(nameof(IsVisibleOfMonth), typeof(bool), typeof(CircleDateTimeSelector), true);
+        /// <summary>
+        /// BindableProperty. Identifies the IsVisibleOfDate bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsVisibleOfDateProperty = BindableProperty.Create(nameof(IsVisibleOfDate), typeof(bool), typeof(CircleDateTimeSelector), true);
+        /// <summary>
+        /// BindableProperty. Identifies the IsVisibleOfHour bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsVisibleOfHourProperty = BindableProperty.Create(nameof(IsVisibleOfHour), typeof(bool), typeof(CircleDateTimeSelector), true);
+        /// <summary>
+        /// BindableProperty. Identifies the IsVisibleOfMinute bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsVisibleOfMinuteProperty = BindableProperty.Create(nameof(IsVisibleOfMinute), typeof(bool), typeof(CircleDateTimeSelector), true);
+        /// <summary>
+        /// BindableProperty. Identifies the IsVisibleOfAmPm bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsVisibleOfAmPmProperty = BindableProperty.Create(nameof(IsVisibleOfAmPm), typeof(bool), typeof(CircleDateTimeSelector), true);
+
+        /// <summary>
+        /// Gets or sets Marker color
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        [Obsolete("MarkerColor is obsolete as of Tizen.NET version 4.0.0 and is no longer supported")]
+        public Color MarkerColor { get => (Color)GetValue(MarkerColorProperty); set => SetValue(MarkerColorProperty, value); }
+        /// <summary>
+        /// Gets or sets DateTimeType value. If it is Time, the UI will be changed to enable time selection. If it is a Date, the date can be changed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public DateTimeType ValueType { get => (DateTimeType)GetValue(ValueTypeProperty); set => SetValue(ValueTypeProperty, value); }
+        /// <summary>
+        /// Gets or sets the date / time.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public DateTime DateTime { get => (DateTime)GetValue(DateTimeProperty); set => SetValue(DateTimeProperty, value); }
+        /// <summary>
+        /// Gets or sets the maximum date when ValueType is Date.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public DateTime MaximumDate { get => (DateTime)GetValue(MaximumDateProperty); set => SetValue(MaximumDateProperty, value); }
+        /// <summary>
+        /// Gets or sets the minimum date when ValueType is Date.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public DateTime MinimumDate { get => (DateTime)GetValue(MinimumDateProperty); set => SetValue(MinimumDateProperty, value); }
+
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether the year field type is visible.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsVisibleOfYear
+        {
+            get => (bool)GetValue(IsVisibleOfYearProperty);
+            set => SetValue(IsVisibleOfYearProperty, value);
+        }
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether the month field type is visible.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsVisibleOfMonth
+        {
+            get => (bool)GetValue(IsVisibleOfMonthProperty);
+            set => SetValue(IsVisibleOfMonthProperty, value);
+        }
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether the date field type is visible.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsVisibleOfDate
+        {
+            get => (bool)GetValue(IsVisibleOfDateProperty);
+            set => SetValue(IsVisibleOfDateProperty, value);
+        }
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether the hour field type is visible.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsVisibleOfHour
+        {
+            get => (bool)GetValue(IsVisibleOfHourProperty);
+            set => SetValue(IsVisibleOfHourProperty, value);
+        }
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether the minute field type is visible.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsVisibleOfMinute
+        {
+            get => (bool)GetValue(IsVisibleOfMinuteProperty);
+            set => SetValue(IsVisibleOfMinuteProperty, value);
+        }
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether the AmPm field type is visible.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsVisibleOfAmPm
+        {
+            get => (bool)GetValue(IsVisibleOfAmPmProperty);
+            set => SetValue(IsVisibleOfAmPmProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleImage.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleImage.cs
new file mode 100644 (file)
index 0000000..c20b6d7
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleImage.cs
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleImage is view that hold an image with circle shape.
+    /// The CircleImage is extension of Xamarin.Forms.Image.
+    /// </summary>
+    public class CircleImage : Image
+    {
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleListView.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleListView.cs
new file mode 100644 (file)
index 0000000..32e6b94
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleListView.cs
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleListView is a view that represents Xamarin.Forms.ListView on Circular UI.
+    /// You can move the list through bezel action.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleListView : ListView, IRotaryFocusable
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the Header, Footer cancel the Fish Eye Effect or not.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty CancelEffectProperty = BindableProperty.CreateAttached("CancelEffect", typeof(bool), typeof(CircleListView), false);
+
+        /// <summary>
+        /// BindableProperty. Identifies color of the scroll bar.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarColorProperty = BindableProperty.CreateAttached("BarColor", typeof(Color), typeof(CircleListView), Color.Default);
+
+        /// <summary>
+        /// Gets the Header, Footer cancel the Fish Eye Effect or not.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static bool GetCancelEffect(BindableObject view) => (bool)view.GetValue(CancelEffectProperty);
+
+        /// <summary>
+        /// Sets the Header, Footer cancel the Fish Eye Effect or not.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static void SetCancelEffect(BindableObject view, bool value) => view.SetValue(CancelEffectProperty, value);
+
+
+        /// <summary>
+        /// Gets or sets a scroll bar color value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color BarColor
+        {
+            get => (Color)GetValue(BarColorProperty);
+            set => SetValue(BarColorProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CirclePage.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CirclePage.cs
new file mode 100644 (file)
index 0000000..a92a2a2
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CirclePage.cs
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CirclePage is a ContentPage, which allows you to insert views that require CircleSurface, and you can show ToolbarItems with MoreOption.
+    /// It has an ActionButton, and can use the MenuItem type as text, icon, command, and so on.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CirclePage : ContentPage
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the ActionButton bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty ActionButtonProperty = BindableProperty.Create(nameof(ActionButton), typeof(ActionButtonItem), typeof(CirclePage), null,
+            propertyChanged: (b, o, n) =>
+            {
+                if (n != null)
+                    ((Element)n).Parent = (Element)b;
+            });
+
+        /// <summary>
+        /// BindableProperty. Identifies the RotaryFocusObject bindable property Key.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty RotaryFocusObjectProperty = BindableProperty.Create(nameof(RotaryFocusObject), typeof(IRotaryFocusable), typeof(CirclePage), null);
+
+        /// <summary>
+        /// Creates and initializes a new instance of the CirclePage class.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public CirclePage()
+        {
+            var surfaceItems = new ObservableCollection<ICircleSurfaceItem>();
+            surfaceItems.CollectionChanged += OnSurfaceItemsChanged;
+            CircleSurfaceItems = surfaceItems;
+        }
+        /// <summary>
+        /// Gets a list of CircleSurfaceItems represented through CircleSurface.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public IList<ICircleSurfaceItem> CircleSurfaceItems { get; }
+
+        /// <summary>
+        /// Gets or sets ActionButton that presents a menu item and associates it with a command
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public ActionButtonItem ActionButton
+        {
+            get => (ActionButtonItem)GetValue(ActionButtonProperty);
+            set => SetValue(ActionButtonProperty, value);
+        }
+        /// <summary>
+        /// Gets or sets object of RotaryFocusObject to receive bezel action(take a rotary event) from the current page.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public IRotaryFocusable RotaryFocusObject
+        {
+            get => (IRotaryFocusable)GetValue(RotaryFocusObjectProperty);
+            set => SetValue(RotaryFocusObjectProperty, value);
+        }
+
+        protected override void OnBindingContextChanged()
+        {
+            base.OnBindingContextChanged();
+            foreach (var item in CircleSurfaceItems)
+            {
+                var element = item as Element;
+                if (element != null)
+                    SetInheritedBindingContext(element, BindingContext);
+            }
+        }
+
+        void OnSurfaceItemsChanged(object sender, NotifyCollectionChangedEventArgs args)
+        {
+            if (args.Action != NotifyCollectionChangedAction.Add) return;
+
+            foreach (Element item in args.NewItems)
+            {
+                item.Parent = this;
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CirclePageNotFoundException.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CirclePageNotFoundException.cs
new file mode 100644 (file)
index 0000000..5bba303
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CirclePageNotFoundException.cs
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CirclePageNotFoundException is an Exception class that occurs when a CircleSurface has no child.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CirclePageNotFoundException : Exception
+    {
+        /// <summary>
+        /// Creates and initializes a new instance of the CirclePageNotFoundException class.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public CirclePageNotFoundException() : base("Circle widget must be child of Circle Page.")
+        {
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleProgressBarSurfaceItem.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleProgressBarSurfaceItem.cs
new file mode 100644 (file)
index 0000000..ceebc2b
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleProgressBarSurfaceItem.cs
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleProgressBarSurfaceItem displays circular progressbar at CirclePage.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleProgressBarSurfaceItem : CircleSurfaceItem
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the Value bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty ValueProperty = BindableProperty.Create(nameof(Value), typeof(double), typeof(CircleProgressBarSurfaceItem), 0.0 , coerceValue:CoerceValue);
+
+        /// <summary>
+        /// Gets or sets the value of the progressbar.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double Value { get => (double)GetValue(ValueProperty); set => SetValue(ValueProperty, value); }
+
+        internal static object CoerceValue(BindableObject bindable, object value)
+        {
+            return ((double)value).Clamp(0.0, 1.0);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleScrollView.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleScrollView.cs
new file mode 100644 (file)
index 0000000..ad8d661
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleScrollView.cs
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleScrollView has circular scroll bar. it can be scrolled by bezel action.
+    /// The CircleScrollView is extension of Xamarin.Forms.ScrollView.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleScrollView : ScrollView, IRotaryFocusable
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the Header, Footer cancel the Fish Eye Effect or not.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarColorProperty = BindableProperty.CreateAttached("BarColor", typeof(Color), typeof(CircleScrollView), Color.Default);
+
+        /// <summary>
+        /// Gets or sets a scroll bar color value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color BarColor
+        {
+            get => (Color)GetValue(BarColorProperty);
+            set => SetValue(BarColorProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSliderSurfaceItem.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSliderSurfaceItem.cs
new file mode 100644 (file)
index 0000000..5c12af4
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSliderSurfaceItem.cs
@@ -0,0 +1,109 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleSliderSurfaceItem displays circular slider at CirclePage.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleSliderSurfaceItem : CircleSurfaceItem, IRotaryFocusable
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the Minimum bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty MinimumProperty = BindableProperty.Create(nameof(Minimum), typeof(double), typeof(CircleSliderSurfaceItem), 0d, coerceValue: (bindable, v) =>
+        {
+            var slider = (CircleSliderSurfaceItem)bindable;
+            slider.Value = slider.Value.Clamp((double)v, slider.Maximum);
+            return v;
+        });
+
+        /// <summary>
+        /// BindableProperty. Identifies the Maximum bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty MaximumProperty = BindableProperty.Create(nameof(Maximum), typeof(double), typeof(CircleSliderSurfaceItem), 11d, coerceValue: (bindable, v) =>
+        {
+            var slider = (CircleSliderSurfaceItem)bindable;
+            slider.Value = slider.Value.Clamp(slider.Minimum, (double)v);
+            return v;
+        });
+
+        /// <summary>
+        /// BindableProperty. Identifies the Increment bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IncrementProperty = BindableProperty.Create(nameof(Increment), typeof(double), typeof(CircleSliderSurfaceItem), 1d, coerceValue: (bindable, v) =>
+        {
+            if ((double)v < 0d)
+            {
+                v = 1d;
+            }
+            return v;
+        });
+
+        /// <summary>
+        /// BindableProperty. Identifies the Value bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty ValueProperty = BindableProperty.Create(nameof(Value), typeof(double), typeof(CircleSliderSurfaceItem), 0d, coerceValue: (bindable, v) =>
+        {
+            var slider = (CircleSliderSurfaceItem)bindable;
+            return ((double)v).Clamp(slider.Minimum, slider.Maximum);
+        });
+
+        /// <summary>
+        /// Gets or sets the minimum value of the slider.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double Minimum { get => (double)GetValue(MinimumProperty); set => SetValue(MinimumProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the maximum value of the slider.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double Maximum { get => (double)GetValue(MaximumProperty); set => SetValue(MaximumProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the value of the slider.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double Value
+        {
+            get
+            {
+                return (double)GetValue(ValueProperty);
+            }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the Increment value.
+        /// The value of the slider is increased/decreased by the Increment value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double Increment
+        {
+            get { return (double)GetValue(IncrementProperty); }
+            set { SetValue(IncrementProperty, value); }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleStackLayout.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleStackLayout.cs
new file mode 100644 (file)
index 0000000..8d15f2a
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleStackLayout.cs
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Linq;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    public class CircleStackLayout : StackLayout
+    {
+        protected override void LayoutChildren(double x, double y, double width, double height)
+        {
+            double r = Math.Min(width, height) / 2;
+
+            double gap1 = CalcGap(Children.FirstOrDefault(), r);
+            double gap2 = CalcGap(Children.LastOrDefault(), r);
+
+            if (Orientation == StackOrientation.Horizontal)
+            {
+                base.LayoutChildren(x + gap1, y, width - gap1 - gap2, height);
+            }
+            else
+            {
+                base.LayoutChildren(x, y + gap1, width, height - gap1 - gap2);
+            }
+
+            foreach (var child in Children)
+            {
+                if (!child.IsVisible) continue;
+                RecalcForCirlce(child, x, y, width, height, r);
+            }
+        }
+
+        protected override SizeRequest OnMeasure(double widthConstraint, double heightConstraint)
+        {
+            var requested = base.OnMeasure(widthConstraint, heightConstraint);
+
+            var minimum = requested.Minimum;
+            var request = requested.Request;
+
+            double r = Math.Min(widthConstraint, heightConstraint) / 2;
+
+            double gap = CalcGap(Children.FirstOrDefault(), r) + CalcGap(Children.LastOrDefault(), r);
+
+            if (Orientation == StackOrientation.Vertical)
+            {
+                minimum.Height += gap;
+                request.Height += gap;
+            }
+            if (Orientation == StackOrientation.Horizontal)
+            {
+                minimum.Width += gap;
+                request.Width += gap;
+            }
+
+            return new SizeRequest(request, minimum);
+        }
+
+        void CalcVector(double offset, double r, double field, double start, double end, double marginStart, double marginEnd, double old, Action<double> offsetSetter, Action<double> vectorSetter)
+        {
+            double center = offset + r;
+
+            double w1, w2;
+
+            if (field > r * 2)
+            {
+                double midField = field - r * 2;
+                double max = r / 1.414213;
+                bool centerhanger = false;
+
+                if (start > center && start < center + midField)
+                {
+                    centerhanger = true;
+                    w1 = Math.Max(CircleV(center - (end - start) / 2, r), CircleV(center - max, r));
+                }
+                else if (start > center + midField)
+                {
+                    centerhanger = true;
+                    w1 = CircleV(start - midField, r);
+                }
+                else
+                {
+                    w1 = CircleV(start, r);
+                }
+
+                if (end > center && end < center + midField)
+                {
+                    w2 = Math.Max(CircleV(center - (end - start) / 2, r), CircleV(center - max, r));
+                }
+                else if (centerhanger && end > center + midField)
+                {
+                    w2 = CircleV(end - midField, r);
+                }
+                else
+                {
+                    w2 = CircleV(end, r);
+                }
+            }
+            else
+            {
+                w1 = CircleV(start, r);
+                w2 = CircleV(end, r);
+            }
+
+            double w;
+            if (double.IsNaN(w1))
+                w = w2;
+            else if (double.IsNaN(w2))
+                w = w1;
+            else
+                w = Math.Min(w1, w2);
+
+            if (old + (marginStart + marginEnd) > w)
+            {
+                offsetSetter(r - w + marginStart);
+                vectorSetter(w * 2 - marginStart + marginEnd);
+            }
+        }
+
+        void RecalcForCirlce(View view, double x, double y, double width, double height, double r)
+        {
+            var bounds = view.Bounds;
+            var margin = view.Margin;
+
+            if (bounds.Bottom < 0 || bounds.Top > height || bounds.Right < 0 || bounds.Left > width)
+                return;
+
+            if (Orientation == StackOrientation.Vertical)
+            {
+                CalcVector(y, r, height, bounds.Top, bounds.Bottom, margin.Left, margin.Right, bounds.Width, v => bounds.X = v, v => bounds.Width = v);
+            }
+            else
+            {
+                CalcVector(x, r, width, bounds.Left, bounds.Right, margin.Top, margin.Bottom, bounds.Height, v => bounds.Y = v, v => bounds.Height = v);
+            }
+
+            if (bounds != view.Bounds)
+                view.Layout(bounds);
+        }
+
+        double CircleV(double v, double r) => Math.Sqrt(r * r - (v-r) * (v-r));
+
+        double CalcGap(View view, double r)
+        {
+            if (view == null) return 0;
+            var m = view.Measure(r, r);
+            var minimum = Orientation == StackOrientation.Vertical ? m.Minimum.Width : m.Minimum.Height;
+            if (minimum > r) minimum = r;
+            return r - Math.Sqrt(Math.Pow(r, 2) - Math.Pow(minimum / 2, 2));
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleStepper.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleStepper.cs
new file mode 100644 (file)
index 0000000..bac2c2e
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleStepper.cs
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleStepper is a class that extends Xamarin.Forms.Stepper for Circular UI.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleStepper : Xamarin.Forms.Stepper, IRotaryFocusable
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the MarkerColor bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        [Obsolete("MarkerColor bindable property is obsolete as of Tizen.NET version 4.0.0 and is no longer supported")]
+        public static readonly BindableProperty MarkerColorProperty = BindableProperty.Create(nameof(MarkerColor), typeof(Color), typeof(CircleStepper), Color.Default);
+        /// <summary>
+        /// BindableProperty. Identifies the MarkerLineWidth bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        [Obsolete("MarkerLineWidth bindable property is obsolete as of Tizen.NET version 4.0.0 and is no longer supported")]
+        public static readonly BindableProperty MarkerLineWidthProperty = BindableProperty.Create(nameof(MarkerLineWidth), typeof(int), typeof(CircleStepper), 23);
+        /// <summary>
+        /// BindableProperty. Identifies the LabelFormat bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty LabelFormatProperty = BindableProperty.Create(nameof(LabelFormat), typeof(string), typeof(CircleStepper), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the Title bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty TitleProperty = BindableProperty.Create(nameof(Title), typeof(string), typeof(CircleStepper), null);
+
+        /// <summary>
+        /// Gets or sets Marker color
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        [Obsolete("MarkerColor is obsolete as of Tizen.NET version 4.0.0 and is no longer supported")]
+        public Color MarkerColor { get => (Color)GetValue(MarkerColorProperty); set => SetValue(MarkerColorProperty, value); }
+        /// <summary>
+        /// Gets or sets length of Marker
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        [Obsolete("MarkerLineWidth is obsolete as of Tizen.NET version 4.0.0 and is no longer supported")]
+        public int MarkerLineWidth { get => (int)GetValue(MarkerLineWidthProperty); set => SetValue(MarkerLineWidthProperty, value); }
+        /// <summary>
+        /// Gets or sets format in which Value is shown
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string LabelFormat { get => (string)GetValue(LabelFormatProperty); set => SetValue(LabelFormatProperty, value); }
+        /// <summary>
+        /// Gets or sets title
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string Title { get => (string)GetValue(TitleProperty); set => SetValue(TitleProperty, value); }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSurfaceEffectBehavior.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSurfaceEffectBehavior.cs
new file mode 100644 (file)
index 0000000..cb4d67c
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSurfaceEffectBehavior.cs
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleSurfaceEffectBehavior is a behavior which allows you to add views that require CircleSurface.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleSurfaceEffectBehavior : Behavior<Page>
+    {
+        internal static readonly BindableProperty SurfaceProperty = BindableProperty.CreateAttached("CircleSurface", typeof(object), typeof(CircleSurfaceEffectBehavior), null);
+
+        public static readonly BindableProperty RotaryFocusObjectProperty = BindableProperty.CreateAttached("RotaryFocusObject", typeof(IRotaryFocusable), typeof(CircleSurfaceEffectBehavior), null);
+
+        internal static object GetSurface(BindableObject obj) => obj.GetValue(SurfaceProperty);
+        internal static void SetSurface(BindableObject obj, object surface) => obj.SetValue(SurfaceProperty, surface);
+
+        public static IRotaryFocusable GetRotaryFocusObject(BindableObject obj) => (IRotaryFocusable)obj.GetValue(RotaryFocusObjectProperty);
+        public static void SetRotaryFocusObject(BindableObject obj, IRotaryFocusable focusable) => obj.SetValue(RotaryFocusObjectProperty, focusable);
+
+        protected override void OnAttachedTo(Page page)
+        {
+            base.OnAttachedTo(page);
+
+            var effect = Effect.Resolve("CircleUI.CircleSurfaceEffect");
+            if (effect != null)
+            {
+                page.Effects.Add(effect);
+            }
+        }
+
+        protected override void OnDetachingFrom(Page page)
+        {
+            var effect = Effect.Resolve("CircleUI.CircleSurfaceEffect");
+            if (effect != null)
+            {
+                page.Effects.Remove(effect);
+            }
+            base.OnDetachingFrom(page);
+            page.RemoveBinding(RotaryFocusObjectProperty);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSurfaceItem.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSurfaceItem.cs
new file mode 100644 (file)
index 0000000..a5869fc
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleSurfaceItem.cs
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleSurfaceItem is a class that controls the items represented in the CircleSurface.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleSurfaceItem : Element, ICircleSurfaceItem
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the BackgroundAngle bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BackgroundAngleProperty = BindableProperty.Create(nameof(BackgroundAngle), typeof(double), typeof(CircleSurfaceItem), 360.0);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BackgroundAngleOffset bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BackgroundAngleOffsetProperty = BindableProperty.Create(nameof(BackgroundAngleOffset), typeof(double), typeof(CircleSurfaceItem), 0.0);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BackgroundColor bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(CircleSurfaceItem), default(Color));
+
+        /// <summary>
+        /// BindableProperty. Identifies the BackgroundLineWidth bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BackgroundLineWidthProperty = BindableProperty.Create(nameof(BackgroundLineWidth), typeof(int), typeof(CircleSurfaceItem), -1);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BackgroundRadius bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BackgroundRadiusProperty = BindableProperty.Create(nameof(BackgroundRadius), typeof(double), typeof(CircleSurfaceItem), -1.0);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BarAngle bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarAngleProperty = BindableProperty.Create(nameof(BarAngle), typeof(double), typeof(CircleSurfaceItem), 0.0);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BarAngleOffset bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarAngleOffsetProperty = BindableProperty.Create(nameof(BarAngleOffset), typeof(double), typeof(CircleSurfaceItem), 0.0);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BarAngleMaximum bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarAngleMaximumProperty = BindableProperty.Create(nameof(BarAngleMaximum), typeof(double), typeof(CircleSurfaceItem), 360.0);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BarAngleMinimum bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarAngleMinimumProperty = BindableProperty.Create(nameof(BarAngleMinimum), typeof(double), typeof(CircleSurfaceItem), 0.0);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BarColor bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarColorProperty = BindableProperty.Create(nameof(BarColor), typeof(Color), typeof(CircleSurfaceItem), default(Color));
+
+        /// <summary>
+        /// BindableProperty. Identifies the BarLineWidth bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarLineWidthProperty = BindableProperty.Create(nameof(BarLineWidth), typeof(int), typeof(CircleSurfaceItem), -1);
+
+        /// <summary>
+        /// BindableProperty. Identifies the BarRadius bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BarRadiusProperty = BindableProperty.Create(nameof(BarRadius), typeof(double), typeof(CircleSurfaceItem), -1.0);
+
+        /// <summary>
+        /// BindableProperty. Identifies the IsVisible bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsVisibleProperty = BindableProperty.Create(nameof(IsVisible), typeof(bool), typeof(CircleSurfaceItem), true);
+
+        /// <summary>
+        /// BindableProperty. Identifies the IsEnabled bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsEnabledProperty = BindableProperty.Create(nameof(IsEnabled), typeof(bool), typeof(CircleSurfaceItem), true);
+
+        /// <summary>
+        /// Gets or sets the background angle value.
+        /// If background angle is 180, background of surface item draw 180 degree from background angle offset.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double BackgroundAngle { get => (double)GetValue(BackgroundAngleProperty); set => SetValue(BackgroundAngleProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the background angle offset value.
+        /// if background angle offset is 30, background of surface item start at 30 degree.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double BackgroundAngleOffset { get => (double)GetValue(BackgroundAngleOffsetProperty); set => SetValue(BackgroundAngleOffsetProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the background color value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color BackgroundColor { get => (Color)GetValue(BackgroundColorProperty); set => SetValue(BackgroundColorProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the background line width value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public int BackgroundLineWidth { get => (int)GetValue(BackgroundLineWidthProperty); set => SetValue(BackgroundLineWidthProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the background radius value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double BackgroundRadius { get => (double)GetValue(BackgroundRadiusProperty); set => SetValue(BackgroundRadiusProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the bar angle value.
+        /// If bar angle is 180, bar of surface item draw 180 degree from bar angle offset.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double BarAngle { get => (double)GetValue(BarAngleProperty); set => SetValue(BarAngleProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the bar angle offset value.
+        /// if bar angle offset is 30, bar of surface item start at 30 degree.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double BarAngleOffset { get => (double)GetValue(BarAngleOffsetProperty); set => SetValue(BarAngleOffsetProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the bar angle maximum value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double BarAngleMaximum { get => (double)GetValue(BarAngleMaximumProperty); set => SetValue(BarAngleMaximumProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the bar angle minimum value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double BarAngleMinimum { get => (double)GetValue(BarAngleMinimumProperty); set => SetValue(BarAngleMinimumProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the bar color value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color BarColor { get => (Color)GetValue(BarColorProperty); set => SetValue(BarColorProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the bar line width value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public int BarLineWidth { get => (int)GetValue(BarLineWidthProperty); set => SetValue(BarLineWidthProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the bar radius value.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public double BarRadius { get => (double)GetValue(BarRadiusProperty); set => SetValue(BarRadiusProperty, value); }
+
+        /// <summary>
+        /// Gets or sets the visibility value of circle surface item.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsVisible { get => (bool)GetValue(IsVisibleProperty); set => SetValue(IsVisibleProperty, value); }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this element is enabled.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsEnabled { get => (bool)GetValue(IsEnabledProperty); set => SetValue(IsEnabledProperty, value); }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleToolbarItem.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleToolbarItem.cs
new file mode 100644 (file)
index 0000000..6b945d8
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/CircleToolbarItem.cs
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The CircleToolbarItem is a class that extends Xamarin.Forms.ToolbarItem for Circular UI.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class CircleToolbarItem : ToolbarItem
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the Subtext bindable property to display on the menu item.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty SubTextProperty = BindableProperty.Create(nameof(SubText), typeof(string), typeof(CircleToolbarItem), null);
+
+        /// <summary>
+        /// Gets or sets Subtext to display on the menu item
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string SubText
+        {
+            get => (string)GetValue(SubTextProperty);
+            set => SetValue(SubTextProperty, value);
+        }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ColorMenuItem.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ColorMenuItem.cs
new file mode 100644 (file)
index 0000000..ebe54d7
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ColorMenuItem.cs
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    public class ColorMenuItem : MenuItem
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the BackgroundColor bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BackgroundColorProperty = BindableProperty.Create(nameof(BackgroundColor), typeof(Color), typeof(ActionButtonItem), Color.Default);
+
+        /// <summary>
+        /// Gets or sets a background color value of this ActionButtonItem.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color BackgroundColor
+        {
+            get => (Color)GetValue(BackgroundColorProperty);
+            set => SetValue(BackgroundColorProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ContextPopupEffectBehavior.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ContextPopupEffectBehavior.cs
new file mode 100644 (file)
index 0000000..83c83d9
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ContextPopupEffectBehavior.cs
@@ -0,0 +1,190 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows.Input;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The ContextPopupEffectBehavior is a behavior which allows you to add a context popup.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class ContextPopupEffectBehavior : Behavior<View>
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the AcceptText bindable property. AcceptText is to use as Accept button
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty AcceptTextProperty = BindableProperty.Create(nameof(AcceptText), typeof(string), typeof(ContextPopupEffectBehavior), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the AcceptCommand bindable property. AcceptCommand is executed when the Accept button is pressed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty AcceptCommandProperty = BindableProperty.Create(nameof(AcceptCommand), typeof(ICommand), typeof(ContextPopupEffectBehavior), null);
+        /// <summary>
+        /// BindableProperty. Identifies the AcceptCommandParameter bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty AcceptCommandParameterProperty = BindableProperty.Create(nameof(AcceptCommandParameter), typeof(object), typeof(ContextPopupEffectBehavior), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the CancelText bindable property. CancelText is to use as Cancel button
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty CancelTextProperty = BindableProperty.Create(nameof(CancelText), typeof(string), typeof(ContextPopupEffectBehavior), null);
+        /// <summary>
+        /// BindableProperty. Identifies the CancelCommand bindable property. CancelCommand is executed when the Cancel button is pressed, even if the popup disappears by selecting outside the popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty CancelCommandProperty = BindableProperty.Create(nameof(CancelCommand), typeof(ICommand), typeof(ContextPopupEffectBehavior), null);
+        /// <summary>
+        /// BindableProperty. Identifies the CancelCommandParameter bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty CancelCommandParameterProperty = BindableProperty.Create(nameof(CancelCommandParameter), typeof(object), typeof(ContextPopupEffectBehavior), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the ConfirmVisibility bindable property. Popup appears if ConfirmVisibility is True, and disappears when it becomes False. CancelCommand works even if it disappears to False.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty VisibilityProperty = BindableProperty.Create(nameof(Visibility), typeof(bool), typeof(ContextPopupEffectBehavior), false);
+
+        /// <summary>
+        /// BindableProperty. Identifies the PositionOption bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty PositionOptionProperty = BindableProperty.Create(nameof(PositionOption), typeof(PositionOption), typeof(ContextPopupEffectBehavior), PositionOption.BottomOfView);
+        /// <summary>
+        /// BindableProperty. Identifies the Offset bindable property. Offset is a value of how far to move from the base tap position represented by the PositionOption type. If it isn't set, it returns 0,0.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty OffsetProperty = BindableProperty.Create(nameof(Offset), typeof(Point), typeof(ContextPopupEffectBehavior), default(Point));
+
+        internal static readonly BindableProperty ContextPopupEffectBehaviorProperty = BindableProperty.CreateAttached("ContextPopupEffectBehavior", typeof(ContextPopupEffectBehavior), typeof(View), null);
+
+        View TargetView { get; set; }
+
+        /// <summary>
+        /// Gets or sets text of Accept button
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string AcceptText
+        {
+            get => (string)GetValue(AcceptTextProperty);
+            set => SetValue(AcceptTextProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets command that is executed when the Accept button is pressed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public ICommand AcceptCommand
+        {
+            get => (ICommand)GetValue(AcceptCommandProperty);
+            set => SetValue(AcceptCommandProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets command paramter that is executed when the Accept button is pressed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public object AcceptCommandParameter
+        {
+            get => GetValue(AcceptCommandParameterProperty);
+            set => SetValue(AcceptCommandParameterProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets text of Cancel button
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string CancelText
+        {
+            get => (string)GetValue(CancelTextProperty);
+            set => SetValue(CancelTextProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets command that is executed when the Cancel button is pressed, even if the popup disappears by selecting outside the popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public ICommand CancelCommand
+        {
+            get => (ICommand)GetValue(CancelCommandProperty);
+            set => SetValue(CancelCommandProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets command that is executed when the Cancel button is pressed, even if the popup disappears by selecting outside the popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public object CancelCommandParameter
+        {
+            get => GetValue(CancelCommandParameterProperty);
+            set => SetValue(CancelCommandParameterProperty, value);
+        }
+
+        /// <summary>
+        /// Gets visibility of Confirmation popup. Popup appears if ConfirmVisibility is True, and disappears when it becomes False. CancelCommand works even if it disappears to False.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool Visibility
+        {
+            get => (bool)GetValue(VisibilityProperty);
+            set => SetValue(VisibilityProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets position type of popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public PositionOption PositionOption
+        {
+            get => (PositionOption)GetValue(PositionOptionProperty);
+            set => SetValue(PositionOptionProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets offset. Offset is a value of how far to move from the base tap position represented by the PositionOption type. If it isn't set, it returns 0,0.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Point Offset
+        {
+            get => (Point)GetValue(OffsetProperty);
+            set => SetValue(OffsetProperty, value);
+        }
+
+        protected override void OnAttachedTo(View view)
+        {
+            base.OnAttachedTo(view);
+            TargetView = view;
+            view.SetValue(ContextPopupEffectBehaviorProperty, this);
+
+            global::System.Diagnostics.Debug.WriteLine($"TargetView = {TargetView}");
+
+            var effect = Effect.Resolve("CircleUI.ContextPopupEffectBehavior");
+            if (effect != null)
+            {
+                view.Effects.Add(effect);
+            }
+
+            global::System.Diagnostics.Debug.WriteLine($"OnAttachedTo");
+        }
+
+        protected override void OnDetachingFrom(View view)
+        {
+            view.RemoveBinding(ContextPopupEffectBehaviorProperty);
+
+            var effect = Effect.Resolve("CircleUI.ContextPopupEffectBehavior");
+            if (effect != null)
+            {
+                view.Effects.Remove(effect);
+            }
+            base.OnDetachingFrom(view);
+
+            global::System.Diagnostics.Debug.WriteLine($"OnDettachedTo");
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/DateTimeType.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/DateTimeType.cs
new file mode 100644 (file)
index 0000000..de48c5a
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/DateTimeType.cs
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Enumeration for style type of CircleDateTimeSelector
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public enum DateTimeType
+    {
+        /// <summary>
+        /// Style type of "timepicker/circle"
+        /// </summary>
+        Time,
+        /// <summary>
+        /// Style type of "datepicker/circle"
+        /// </summary>
+        Date
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControls.xaml b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControls.xaml
new file mode 100644 (file)
index 0000000..edc0f97
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControls.xaml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:Tizen.Wearable.CircularUI.Forms"
+             x:Class="Tizen.Wearable.CircularUI.Forms.EmbeddingControls">
+    <ContentView.Resources>
+        <ResourceDictionary>
+            <local:ProgressToBoundTextConverter x:Key="progressToBound"/>
+            <local:MillisecondToTextConverter x:Key="millisecondToText"/>
+        </ResourceDictionary>
+    </ContentView.Resources>
+    <ContentView.Content>
+        <AbsoluteLayout HorizontalOptions="FillAndExpand" VerticalOptions="FillAndExpand">
+            <StackLayout AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All">
+                <StackLayout VerticalOptions="FillAndExpand"></StackLayout>
+                <StackLayout Margin="20" VerticalOptions="End" HorizontalOptions="FillAndExpand" BackgroundColor="#50000000">
+                    <AbsoluteLayout HorizontalOptions="FillAndExpand" HeightRequest="23" BackgroundColor="#80000000">
+                        <BoxView Color="#4286f4" AbsoluteLayout.LayoutBounds="{Binding Progress, Converter={StaticResource progressToBound}}" AbsoluteLayout.LayoutFlags="SizeProportional"></BoxView>
+                        <Label Margin="80, 0, 0, 0" Text="{Binding Position, Converter={StaticResource millisecondToText}}" FontSize="Micro" HorizontalTextAlignment="Start" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All" />
+                        <Label Margin="0, 0, 80, 0" Text="{Binding Duration, Converter={StaticResource millisecondToText}}" FontSize="Micro" HorizontalTextAlignment="End" AbsoluteLayout.LayoutBounds="0, 0, 1, 1" AbsoluteLayout.LayoutFlags="All" />
+                    </AbsoluteLayout>
+                </StackLayout>
+            </StackLayout>
+            <Image x:Name="PlayImage" AbsoluteLayout.LayoutFlags="All" AbsoluteLayout.LayoutBounds="0.5, 0.5, 0.25, 0.25" IsVisible="False">
+                <Image.GestureRecognizers>
+                    <TapGestureRecognizer Command="{Binding StartCommand}"/>
+                </Image.GestureRecognizers>
+            </Image>
+            <Image x:Name="PauseImage" AbsoluteLayout.LayoutFlags="All" AbsoluteLayout.LayoutBounds="0.5, 0.5, 0.25, 0.25" IsVisible="False">
+                <Image.GestureRecognizers>
+                    <TapGestureRecognizer Command="{Binding StartCommand}"/>
+                </Image.GestureRecognizers>
+            </Image>
+            <Label FontSize="Large"
+               HorizontalTextAlignment="Center"
+               Text="{Binding BufferingProgress, StringFormat='{}{0:0%}'}"
+               TextColor="#eeeeeeee"
+               AbsoluteLayout.LayoutFlags="All"
+               AbsoluteLayout.LayoutBounds="0.5, 0.5, .25, .25"
+               IsVisible="{Binding IsBuffering}"/>
+        </AbsoluteLayout>
+    </ContentView.Content>
+</ContentView>
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControls.xaml.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControls.xaml.cs
new file mode 100644 (file)
index 0000000..e368f95
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControls.xaml.cs
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// A built-in media controls.
+    /// </summary>
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    partial class EmbeddingControls : ContentView
+    {
+        /// <summary>
+        /// Internal use only, initializes a new instance of the EmbeddingControls.
+        /// </summary>
+        public EmbeddingControls()
+        {
+            InitializeComponent();
+            PlayImage.Source = ImageSource.FromResource("Tizen.Wearable.CircularUI.Forms.Resources.img_button_play.png", GetType().Assembly);
+            PauseImage.Source = ImageSource.FromResource("Tizen.Wearable.CircularUI.Forms.Resources.img_button_pause.png", GetType().Assembly);
+        }
+
+        protected override void OnBindingContextChanged()
+        {
+            base.OnBindingContextChanged();
+            if (BindingContext is MediaPlayer player)
+            {
+                player.PlaybackPaused += OnPlaybackStateChanged;
+                player.PlaybackStarted += OnPlaybackStateChanged;
+                player.PlaybackStopped += OnPlaybackStateChanged;
+            }
+        }
+
+        async void OnPlaybackStateChanged(object sender, EventArgs e)
+        {
+            if (BindingContext is MediaPlayer player)
+            {
+                if (player.State == PlaybackState.Playing)
+                {
+                    var unused = PlayImage.FadeTo(0, 100);
+                    await PlayImage.ScaleTo(3.0, 300);
+                    PlayImage.IsVisible = false;
+                    PlayImage.Scale = 1.0;
+
+                    PauseImage.IsVisible = true;
+                    unused = PauseImage.FadeTo(1, 50);
+                }
+                else
+                {
+                    var unused = PauseImage.FadeTo(0, 100);
+                    await PauseImage.ScaleTo(3.0, 300);
+                    PauseImage.IsVisible = false;
+                    PauseImage.Scale = 1.0;
+
+                    PlayImage.IsVisible = true;
+                    unused = PlayImage.FadeTo(1, 50);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControlsConverter.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControlsConverter.cs
new file mode 100644 (file)
index 0000000..052bc3b
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/EmbeddingControlsConverter.cs
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Class that the XAML parser uses to convert Progress to Bound.
+    /// </summary>
+    internal class ProgressToBoundTextConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            double progress = (double)value;
+            if (Double.IsNaN(progress))
+            {
+                progress = 0d;
+            }
+            return new Rectangle(80, 0, progress*0.5, 1);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            Rectangle rect = (Rectangle)value;
+            return rect.Width;
+        }
+    }
+
+    /// <summary>
+    /// Class that the XAML parser uses to convert milliseconds to Text format.
+    /// </summary>
+    internal class MillisecondToTextConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            int millisecond = (int)value;
+            int second = (millisecond / 1000) % 60;
+            int min = (millisecond / 1000 / 60) % 60;
+            int hour = (millisecond / 1000 / 60 / 60);
+            if (hour > 0)
+            {
+                return string.Format("{0:d2}:{1:d2}:{2:d2}", hour, min, second);
+            }
+            else
+            {
+                return string.Format("{0:d2}:{1:d2}", min, second);
+            }
+            
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/FileMediaSource.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/FileMediaSource.cs
new file mode 100644 (file)
index 0000000..5a19543
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/FileMediaSource.cs
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// A MediaSource that reads a media from a file.
+    /// </summary>
+    [TypeConverter(typeof(FileMediaSourceConverter))]
+    public sealed class FileMediaSource : MediaSource
+    {
+        /// <summary>
+        /// Identifies the File bindable property.
+        /// </summary>
+        public static readonly BindableProperty FileProperty = BindableProperty.Create("File", typeof(string), typeof(FileMediaSource), default(string));
+
+        /// <summary>
+        /// Gets or sets the file from which this FileMediaSource will load a media.
+        /// </summary>
+        public string File
+        {
+            get { return (string)GetValue(FileProperty); }
+            set { SetValue(FileProperty, value); }
+        }
+
+        /// <summary>
+        /// Returns a string representation of `File`.
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return $"File: {File}";
+        }
+
+        /// <summary>
+        /// Allows implicit casting from a string.
+        /// </summary>
+        /// <param name="file"></param>
+        public static implicit operator FileMediaSource(string file)
+        {
+            return (FileMediaSource)FromFile(file);
+        }
+
+        /// <summary>
+        /// Allows implicit casting to a string.
+        /// </summary>
+        /// <param name="file"></param>
+        public static implicit operator string(FileMediaSource file)
+        {
+            return file?.File;
+        }
+
+        protected override void OnPropertyChanged(string propertyName = null)
+        {
+            if (propertyName == FileProperty.PropertyName)
+                OnSourceChanged();
+            base.OnPropertyChanged(propertyName);
+        }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/FileMediaSourceConverter.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/FileMediaSourceConverter.cs
new file mode 100644 (file)
index 0000000..ce53d4a
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/FileMediaSourceConverter.cs
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// A TypeConverter that converts to FileMediaSource.
+    /// </summary>
+    [TypeConverter(typeof(FileMediaSource))]
+    public sealed class FileMediaSourceConverter : TypeConverter
+    {
+        /// <summary>
+        /// Creates a file media source given a path to a media.
+        /// </summary>
+        /// <param name="value">The value to convert.</param>
+        /// <returns>FileMediaSource</returns>
+        public override object ConvertFromInvariantString(string value)
+        {
+            if (value != null)
+                return (FileMediaSource)MediaSource.FromFile(value);
+
+            throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", value, typeof(FileMediaSource)));
+        }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapOption.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapOption.cs
new file mode 100644 (file)
index 0000000..dee6721
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapOption.cs
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The GoogleMapOption struct used to define the properties that can be set on a GoogleMapView.
+    /// </summary>
+    public struct GoogleMapOption
+    {
+        private double _zoom;
+
+        /// <summary>
+        /// Constructor a new GoogleMapOption structure
+        /// </summary>
+        public GoogleMapOption(LatLng center, GoogleMapType type = GoogleMapType.Roadmap, int zoomLevel = 10, bool visibleZoomControl = false,
+                        bool enableGesture = true, ZoomControlPosition controlPosition = ZoomControlPosition.RightBottom )
+        {
+            Center = center;
+            MapType = type;
+            _zoom = Math.Min(Math.Max(zoomLevel, 1.0), 20.0); ;
+            IsZoomControlVisible = visibleZoomControl;
+            HasGestureEnabled = enableGesture;
+            ZoomControlPosition = controlPosition;
+        }
+
+        /// <summary>
+        /// Gets or sets a Google Map type value of GoogleMapOption.
+        /// </summary>
+        public GoogleMapType MapType { get; set; }
+
+        /// <summary>
+        /// Gets or sets a center postion of GoogleMapOption.
+        /// This value set center of MapView. But getting value not mean current center of MapView because value can't reflect user interaction.
+        /// </summary>
+        public LatLng Center { get; set; }
+
+        /// <summary>
+        /// Gets or sets a zoom level of GoogleMapOption.
+        /// This value set zoom level of MapView. But getting value not mean current zoom level of MapView because value can't reflect user interaction.
+        /// </summary>
+        public double Zoom 
+        {
+            get { return _zoom; }
+            set {
+                if (value > 20.0)
+                    _zoom = 20;
+                else if(value < 1.0)
+                    _zoom = 1;
+                else
+                    _zoom = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether zoom control is visible.
+        /// </summary>
+        public bool IsZoomControlVisible { get; set; }
+
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether zoom and pan interaction is enable.
+        /// </summary>
+        public bool HasGestureEnabled { get; set; }
+
+
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether zoom and pan interaction is enable.
+        /// </summary>
+        public ZoomControlPosition ZoomControlPosition { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+                return false;
+            if (obj.GetType() != GetType())
+                return false;
+            var other = (GoogleMapOption)obj;
+            if (MapType != other.MapType)
+                return false;
+            if (Center.Latitude != other.Center.Latitude || Center.Longitude == other.Center.Longitude)
+                return false;
+            if (Zoom != other.Zoom)
+                return false;
+            if (IsZoomControlVisible != other.IsZoomControlVisible)
+                return false;
+            if (HasGestureEnabled != other.HasGestureEnabled)
+                return false;
+            if (ZoomControlPosition != other.ZoomControlPosition)
+                return false;
+            return true;
+        }
+
+        public static bool operator ==(GoogleMapOption left, GoogleMapOption right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(GoogleMapOption left, GoogleMapOption right)
+        {
+            return !Equals(left, right);
+        }
+
+        /// <summary>
+        /// Returns the values of GoogleMapOption".
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return $"Center[{Center.Latitude},{Center.Longitude}], MapType:{MapType}, Zoom:{Zoom}, HasGestureEnabled:{HasGestureEnabled}, IsZoomControlVisible:{IsZoomControlVisible}, ZoomControlPosition:{ZoomControlPosition}";
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = MapType.GetHashCode();
+                hashCode = hashCode * 397 ^ Center.GetHashCode();
+                hashCode = hashCode * 397 ^ Zoom.GetHashCode();
+                hashCode = hashCode * 397 ^ IsZoomControlVisible.GetHashCode();
+                hashCode = hashCode * 397 ^ HasGestureEnabled.GetHashCode();
+                hashCode = hashCode * 397 ^ ZoomControlPosition.GetHashCode();
+                return hashCode;
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapType.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapType.cs
new file mode 100644 (file)
index 0000000..7a8b39a
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapType.cs
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Enumeration for the Google Map type of the MapView.
+    /// </summary>
+    public enum GoogleMapType
+    {
+        /// <summary>
+        /// The default road map view. This is the default map type.
+        /// </summary>
+        Roadmap,
+        /// <summary>
+        /// The Google Earth satellite images.
+        /// </summary>
+        Satellite,
+        /// <summary>
+        /// The mixture of normal and satellite views.
+        /// </summary>
+        Hybrid,
+        /// <summary>
+        /// The physical map based on terrain information.
+        /// </summary>
+        Terrain
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapView.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapView.cs
new file mode 100644 (file)
index 0000000..b0b7872
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/GoogleMapView.cs
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The MapView class is used to display a map on the screen.
+    /// </summary>
+    public class GoogleMapView : View, IGoogleMapViewController
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the ItemsSource bindable property.
+        /// </summary>
+        public static readonly BindableProperty ItemsSourceProperty = BindableProperty.Create(nameof(IEnumerable), typeof(IEnumerable), typeof(GoogleMapView),
+            default(IEnumerable), propertyChanged: (b, o, n) => ((GoogleMapView)b).OnItemsSourcePropertyChanged((IEnumerable)o, (IEnumerable)n));
+
+        /// <summary>
+        /// BindableProperty. Identifies the ItemTemplate bindable property.
+        /// </summary>
+        public static readonly BindableProperty ItemTemplateProperty = BindableProperty.Create(nameof(ItemTemplate), typeof(DataTemplate), typeof(GoogleMapView),
+            default(DataTemplate), propertyChanged: (b, o, n) => ((GoogleMapView)b).OnItemTemplatePropertyChanged((DataTemplate)o, (DataTemplate)n));
+
+        readonly ObservableCollection<Marker> _markers = new ObservableCollection<Marker>();
+
+        private GoogleMapOption _option;
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public event EventHandler LoadMapRequested;
+
+        public GoogleMapView()
+        {
+            var option = new GoogleMapOption(new LatLng(41.890202, 12.492049));
+            MapOption = option;
+        }
+
+        internal GoogleMapOption MapOption
+        {
+            get
+            {
+                return _option;
+            }
+            set
+            {
+                if (_option.Equals(value))
+                    return;
+                _option = value;
+            }
+        }
+
+        /// <summary>
+        /// An IList of the Pins on this MapView.
+        /// </summary>
+        public IList<Marker> Markers
+        {
+            get { return _markers; }
+        }
+
+        /// <summary>
+        /// Gets or sets the source of items to template and display.
+        /// </summary>
+        public IEnumerable ItemsSource
+        {
+            get { return (IEnumerable)GetValue(ItemsSourceProperty); }
+            set { SetValue(ItemsSourceProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the DataTemplate to apply to the ItemsSource.
+        /// </summary>
+        public DataTemplate ItemTemplate
+        {
+            get { return (DataTemplate)GetValue(ItemTemplateProperty); }
+            set { SetValue(ItemTemplateProperty, value); }
+        }
+
+        void OnItemsSourcePropertyChanged(IEnumerable oldItemsSource, IEnumerable newItemsSource)
+        {
+            if (oldItemsSource is INotifyCollectionChanged ncc)
+            {
+                ncc.CollectionChanged -= OnItemsSourceCollectionChanged;
+            }
+
+            if (newItemsSource is INotifyCollectionChanged ncc1)
+            {
+                ncc1.CollectionChanged += OnItemsSourceCollectionChanged;
+            }
+
+            _markers.Clear();
+            CreateMarkerItems();
+        }
+
+        void OnItemTemplatePropertyChanged(DataTemplate oldItemTemplate, DataTemplate newItemTemplate)
+        {
+            if (newItemTemplate is DataTemplateSelector)
+            {
+                throw new NotSupportedException($"You are using an instance of {nameof(DataTemplateSelector)} to set the {nameof(GoogleMapView)}.{ItemTemplateProperty.PropertyName} property. Use an instance of a {nameof(DataTemplate)} property instead to set an item template.");
+            }
+
+            _markers.Clear();
+            CreateMarkerItems();
+        }
+
+        void OnItemsSourceCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    if (e.NewStartingIndex == -1)
+                        goto case NotifyCollectionChangedAction.Reset;
+                    foreach (object item in e.NewItems)
+                        CreateMarker(item);
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                    if (e.OldStartingIndex == -1 || e.NewStartingIndex == -1)
+                        goto case NotifyCollectionChangedAction.Reset;
+                    // Not tracking order
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    if (e.OldStartingIndex == -1)
+                        goto case NotifyCollectionChangedAction.Reset;
+                    foreach (object item in e.OldItems)
+                        RemoveMarker(item);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    if (e.OldStartingIndex == -1)
+                        goto case NotifyCollectionChangedAction.Reset;
+                    foreach (object item in e.OldItems)
+                        RemoveMarker(item);
+                    foreach (object item in e.NewItems)
+                        CreateMarker(item);
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    _markers.Clear();
+                    break;
+            }
+        }
+
+        void CreateMarkerItems()
+        {
+            if (ItemsSource == null || ItemTemplate == null)
+            {
+                return;
+            }
+
+            foreach (object item in ItemsSource)
+            {
+                CreateMarker(item);
+            }
+        }
+
+        void CreateMarker(object newItem)
+        {
+            if (ItemTemplate == null)
+            {
+                return;
+            }
+
+            var marker = (Marker)ItemTemplate.CreateContent();
+            marker.BindingContext = newItem;
+            _markers.Add(marker);
+        }
+
+        void RemoveMarker(object itemToRemove)
+        {
+            Marker pinToRemove = _markers.FirstOrDefault(marker => marker.BindingContext?.Equals(itemToRemove) == true);
+            if (pinToRemove != null)
+            {
+                _markers.Remove(pinToRemove);
+            }
+        }
+
+        /// <summary>
+        /// Set GoogleMapOption value to MapView.
+        /// </summary>
+        public void Update(GoogleMapOption value)
+        {
+            MapOption = value;
+            LoadMapRequested?.Invoke(this, EventArgs.Empty);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ICircleSurfaceItem.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ICircleSurfaceItem.cs
new file mode 100644 (file)
index 0000000..73ce36f
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ICircleSurfaceItem.cs
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The ICircleSurfaceItem is an interface that controls the items represented in the CircleSurface.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public interface ICircleSurfaceItem
+    {
+        /// <summary>
+        /// Gets or sets CircleSurfaceItem's visibility
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        bool IsVisible { get; set; }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IGoogleMapViewController.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IGoogleMapViewController.cs
new file mode 100644 (file)
index 0000000..dd2f17c
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IGoogleMapViewController.cs
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// For internal use by renderers.
+    /// </summary>
+    public interface IGoogleMapViewController : IViewController
+    {
+        /// <summary>
+        /// Internal Event for GoogleMapView renderer
+        /// </summary>
+        event EventHandler LoadMapRequested;
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IInformationPopup.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IInformationPopup.cs
new file mode 100644 (file)
index 0000000..0932b2a
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IInformationPopup.cs
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The IInformationPopup is an interface to describe information pop-up which has circular bottom button, title, text, and content area
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    internal interface IInformationPopup
+    {
+        /// <summary>
+        /// Occurs when the Back button is pressed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        event EventHandler BackButtonPressed;
+
+        /// <summary>
+        /// Gets or sets progress visibility of the Popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        bool IsProgressRunning { get; set; }
+
+        /// <summary>
+        /// Gets or sets bottom button of the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        MenuItem BottomButton { get; set; }
+
+        /// <summary>
+        /// Gets or sets title of the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        string Title { get; set; }
+
+        /// <summary>
+        /// Gets or sets text of the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        string Text { get; set; }
+
+        /// <summary>
+        /// Shows the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        void Show();
+        /// <summary>
+        /// Dismisses the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        void Dismiss();
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IPlatformMediaPlayer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IPlatformMediaPlayer.cs
new file mode 100644 (file)
index 0000000..21e35b8
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IPlatformMediaPlayer.cs
@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Enumerates values that define how a media content is displayed.
+    /// </summary>
+    public enum DisplayAspectMode
+    {
+        /// <summary>
+        /// Scale the media content to so it exactly fills the view.
+        /// </summary>
+        Fill,
+        /// <summary>
+        /// Scale the media content to fit the view.
+        /// </summary>
+        AspectFit,
+        /// <summary>
+        /// Scale the media content to fill the view.
+        /// </summary>
+        AspectFill,
+        /// <summary>
+        /// The original size of the media content.
+        /// </summary>
+        OrignalSize
+    }
+
+    /// <summary>
+    /// Internal use only. Contains arguments for the event that is raised when the buffering progress is updated.
+    /// </summary>
+    public class BufferingProgressUpdatedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// The value indicating the buffering status(0-1).
+        /// </summary>
+        public double Progress { get; set; }
+    }
+
+    /// <summary>
+    /// For internal use by platform renderers.
+    /// </summary>
+    public interface IPlatformMediaPlayer
+    {
+        bool UsesEmbeddingControls { get; set; }
+        bool AutoPlay { get; set; }
+        bool AutoStop { get; set; }
+        double Volume { get; set; }
+        bool IsMuted { get; set; }
+        int Position { get; }
+
+        int Duration { get; }
+
+        DisplayAspectMode AspectMode { get; set; }
+
+        event EventHandler PlaybackCompleted;
+        event EventHandler PlaybackStarted;
+        event EventHandler PlaybackPaused;
+        event EventHandler PlaybackStopped;
+        event EventHandler UpdateStreamInfo;
+        event EventHandler<BufferingProgressUpdatedEventArgs> BufferingProgressUpdated;
+
+        void SetDisplay(IVideoOutput output);
+
+        void SetSource(MediaSource source);
+
+        Task<bool> Start();
+        void Stop();
+        void Pause();
+        Task<int> Seek(int ms);
+        Task<Stream> GetAlbumArts();
+
+        Task<IDictionary<string, string>> GetMetadata();
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IRotaryFocusable.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IRotaryFocusable.cs
new file mode 100644 (file)
index 0000000..f2a7463
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IRotaryFocusable.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The IRotaryFocusable is an interface to take a Rotary Event
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public interface IRotaryFocusable
+    {
+    }
+
+    /// <summary>
+    /// The IRotaryEventReceiver is a receiver interface to take Rotary Events
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public interface IRotaryEventReceiver : IRotaryFocusable
+    {
+        /// <summary>
+        /// Rotate it by the RotaryEventArgs value.
+        /// </summary>
+        /// <param name="args">Rotated direction of Rotary device</param>
+        /// <since_tizen> 4 </since_tizen>
+        void Rotate(RotaryEventArgs args);
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IToast.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IToast.cs
new file mode 100644 (file)
index 0000000..9244e37
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IToast.cs
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// This interface, which defines the ability to display simple text, is used internally.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    internal interface IToast
+    {
+        /// <summary>
+        /// Gets or sets the duration.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        int Duration { get; set; }
+
+        /// <summary>
+        /// Gets or sets the text.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        string Text { get; set; }
+
+        /// <summary>
+        /// Gets or sets the file path of icon.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        FileImageSource Icon { get; set; }
+
+        /// <summary>
+        /// Shows the view for the specified duration.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        void Show();
+
+        /// <summary>
+        /// Dismisses the specified view.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        void Dismiss();
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ITwoButtonPopup.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ITwoButtonPopup.cs
new file mode 100644 (file)
index 0000000..913caca
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ITwoButtonPopup.cs
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The ITwoButtonPopup is an interface to describe confirmation pop-up which has circular two button, title, text, and content area
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    internal interface ITwoButtonPopup
+    {
+        /// <summary>
+        /// Occurs when the Back button is pressed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        event EventHandler BackButtonPressed;
+
+        /// <summary>
+        /// Gets or sets content view of the Popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        View Content { get; set; }
+
+        /// <summary>
+        /// Gets or sets left button of the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        MenuItem FirstButton { get; set; }
+        /// <summary>
+        /// Gets or sets right button of the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        MenuItem SecondButton { get; set; }
+
+        /// <summary>
+        /// Gets or sets title of the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        string Title { get; set; }
+
+        /// <summary>
+        /// Gets or sets text of the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        string Text { get; set; }
+
+        /// <summary>
+        /// Shows the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        void Show();
+        /// <summary>
+        /// Dismisses the Popup
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        void Dismiss();
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IVideoOutput.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IVideoOutput.cs
new file mode 100644 (file)
index 0000000..5a71864
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IVideoOutput.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Enumeration that specifies the video ouput.
+    /// </summary>
+    public enum VideoOuputType
+    {
+        /// <summary>
+        /// An overlay type.
+        /// </summary>
+        Overlay,
+        /// <summary>
+        /// A buffer type.
+        /// </summary>
+        Buffer,
+    }
+
+    /// <summary>
+    /// Interface indicating the ouput type of the media.
+    /// </summary>
+    public interface IVideoOutput
+    {
+        VisualElement MediaView { get; }
+        View Controller { get; set; }
+        VideoOuputType OuputType { get; }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IndexPage.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IndexPage.cs
new file mode 100644 (file)
index 0000000..e60737d
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/IndexPage.cs
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The IndexPage is extension of Xamarin.Forms.MultiPage.
+    /// When Page is added/removed at Multipage. circular index is added/removed automatically at the top of window.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class IndexPage : MultiPage<ContentPage>
+    {
+        protected override ContentPage CreateDefault(object item)
+        {
+            var page = new ContentPage();
+            return page;
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/InformationPopup.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/InformationPopup.cs
new file mode 100644 (file)
index 0000000..db2399b
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/InformationPopup.cs
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+using Tizen.Wearable.CircularUI.Forms;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    public class InformationPopup : BindableObject
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the IsProgressRunning bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsProgressRunningProperty = BindableProperty.Create(nameof(IsProgressRunning), typeof(bool), typeof(InformationPopup), false);
+
+        /// <summary>
+        /// BindableProperty. Identifies the title bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty TitleProperty = BindableProperty.Create(nameof(Title), typeof(string), typeof(InformationPopup), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the title bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty TextProperty = BindableProperty.Create(nameof(Text), typeof(string), typeof(InformationPopup), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the first button bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty BottomButtonProperty = BindableProperty.Create(nameof(BottomButton), typeof(MenuItem), typeof(InformationPopup), null);
+
+        IInformationPopup _popUp;
+
+        static IList<IInformationPopup> _popUpList = new ObservableCollection<IInformationPopup>();
+
+        /// <summary>
+        /// Occurs when the device's back button is pressed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public event EventHandler BackButtonPressed;
+
+        public InformationPopup()
+        {
+            _popUp = DependencyService.Get<IInformationPopup>(DependencyFetchTarget.NewInstance);
+            if (_popUp == null)
+            {
+                throw new InvalidOperationException("Object reference not set to an instance of a Popup.");
+            }
+
+            _popUp.BackButtonPressed += (s, e) =>
+            {
+                BackButtonPressed?.Invoke(this, EventArgs.Empty);
+            };
+
+            SetBinding(IsProgressRunningProperty, new Binding(nameof(IsProgressRunning), mode: BindingMode.OneWayToSource, source: _popUp));
+            SetBinding(BottomButtonProperty, new Binding(nameof(BottomButton), mode: BindingMode.OneWayToSource, source: _popUp));
+            SetBinding(TitleProperty, new Binding(nameof(Title), mode: BindingMode.OneWayToSource, source: _popUp));
+            SetBinding(TextProperty, new Binding(nameof(Text), mode: BindingMode.OneWayToSource, source: _popUp));
+        }
+
+        /// <summary>
+        /// Gets or sets progress visibility of the Popup.
+        /// If this value is true. Popup displays circular progress and hides Title automatically.
+        /// </summary>
+        public bool IsProgressRunning
+        {
+            get { return (bool)GetValue(IsProgressRunningProperty); }
+            set { SetValue(IsProgressRunningProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets title of the Popup.
+        /// </summary>
+        public string Title
+        {
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets text of the Popup.
+        /// </summary>
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets bottom button of the Popup.
+        /// You should use only one property between Icon property and Text property because two area has the same position.
+        /// </summary>
+        public MenuItem BottomButton
+        {
+            get { return (MenuItem)GetValue(BottomButtonProperty); }
+            set { SetValue(BottomButtonProperty, value); }
+        }
+
+        /// <summary>
+        /// Shows the Popup.
+        /// </summary>
+        public void Show()
+        {
+            _popUp.Show();
+            _popUpList.Add(_popUp);
+        }
+
+        /// <summary>
+        /// Dismisses the InformationPopup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public void Dismiss()
+        {
+            _popUp.Dismiss();
+            _popUpList.Remove(_popUp);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/LatLng.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/LatLng.cs
new file mode 100644 (file)
index 0000000..d5f0db4
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/LatLng.cs
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// A struct that has a latitude and longitude.
+    /// </summary>
+    public struct LatLng
+    {
+        /// <summary>
+        /// Constructor a new LatLng structure
+        /// </summary>
+        public LatLng(double latitude, double longitude)
+        {
+            Latitude = Math.Min(Math.Max(latitude, -90.0), 90.0);
+            Longitude = Math.Min(Math.Max(longitude, -180.0), 180.0);
+        }
+
+        /// <summary>
+        /// Gets or sets a latitude degrees.
+        /// </summary>
+        public double Latitude { get; }
+
+        /// <summary>
+        /// Gets or sets a longitude degrees.
+        /// </summary>
+        public double Longitude { get; }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+                return false;
+            if (obj.GetType() != GetType())
+                return false;
+            var other = (LatLng)obj;
+            return Latitude == other.Latitude && Longitude == other.Longitude;
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = Latitude.GetHashCode();
+                hashCode = (hashCode * 397) ^ Longitude.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(LatLng left, LatLng right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(LatLng left, LatLng right)
+        {
+            return !Equals(left, right);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Marker.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Marker.cs
new file mode 100644 (file)
index 0000000..9dcbadd
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Marker.cs
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// A struct that has a latitude and longitude.
+    /// </summary>
+       public class Marker : Element
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the Position bindable property.
+        /// </summary>
+        public static readonly BindableProperty PositionProperty = BindableProperty.Create("Position", typeof(LatLng), typeof(Marker), default(LatLng));
+
+        /// <summary>
+        /// BindableProperty. Identifies the Address bindable property.
+        /// </summary>
+        public static readonly BindableProperty AddressProperty = BindableProperty.Create("Address", typeof(string), typeof(Marker), default(string));
+
+        /// <summary>
+        /// BindableProperty. Identifies the Description bindable property.
+        /// </summary>
+        public static readonly BindableProperty DescriptionProperty = BindableProperty.Create("Description", typeof(string), typeof(Marker), default(string));
+
+        /// <summary>
+        /// BindableProperty. Identifies the IsPopupOpened bindable property.
+        /// </summary>
+        public static readonly BindableProperty IsPopupOpenedProperty = BindableProperty.Create("IsPopupOpened", typeof(bool), typeof(Marker), false);
+
+        /// <summary>
+        /// Gets or sets an address string of Marker.
+        /// </summary>
+        public string Address
+        {
+            get { return (string)GetValue(AddressProperty); }
+            set { SetValue(AddressProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a label string of Marker pop-up.
+        /// </summary>
+        public string Description
+        {
+            get { return (string)GetValue(DescriptionProperty); }
+            set { SetValue(DescriptionProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a position of Marker.
+        /// </summary>
+        public LatLng Position
+        {
+            get { return (LatLng)GetValue(PositionProperty); }
+            set { SetValue(PositionProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether Marker popup is opened.
+        /// </summary>
+        public bool IsPopupOpened
+        {
+            get { return (bool)GetValue(IsPopupOpenedProperty); }
+            set { SetValue(IsPopupOpenedProperty, value); }
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj))
+                return false;
+            if (ReferenceEquals(this, obj))
+                return true;
+            if (obj.GetType() != GetType())
+                return false;
+            return Equals((Marker)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = Position.GetHashCode();
+                hashCode = (hashCode * 397) ^ (Description?.GetHashCode() ?? 0);
+                hashCode = (hashCode * 397) ^ (Address?.GetHashCode() ?? 0);
+                hashCode = (hashCode * 397) ^ IsPopupOpened.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public static bool operator ==(Marker left, Marker right)
+        {
+            return Equals(left, right);
+        }
+
+        public static bool operator !=(Marker left, Marker right)
+        {
+            return !Equals(left, right);
+        }
+
+        bool Equals(Marker other)
+        {
+            return string.Equals(Description, other.Description) && Equals(Position, other.Position) && string.Equals(Address, other.Address) && bool.Equals(IsPopupOpened, other.IsPopupOpened);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaPlayer.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaPlayer.cs
new file mode 100644 (file)
index 0000000..927f709
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaPlayer.cs
@@ -0,0 +1,642 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+using Xamarin.Forms.Internals;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// MediaPlayer provieds the essential components to play the media contents.
+    /// </summary>
+    public class MediaPlayer : Element
+    {
+        /// <summary>
+        /// Identifies the Source bindable property.
+        /// </summary>
+        public static readonly BindableProperty SourceProperty = BindableProperty.Create(nameof(Source), typeof(MediaSource), typeof(MediaPlayer), default(MediaSource), propertyChanging: OnSourceChanging, propertyChanged: OnSourceChanged);
+        /// <summary>
+        /// Identifies the VideoOutput bindable property.
+        /// </summary>
+        public static readonly BindableProperty VideoOutputProperty = BindableProperty.Create(nameof(VideoOutput), typeof(IVideoOutput), typeof(MediaPlayer), null, propertyChanging: null, propertyChanged: (b, o, n) => ((MediaPlayer)b).OnVideoOutputChanged());
+        /// <summary>
+        /// Identifies the UsesEmbeddingControls bindable property.
+        /// </summary>
+        public static readonly BindableProperty UsesEmbeddingControlsProperty = BindableProperty.Create(nameof(UsesEmbeddingControls), typeof(bool), typeof(MediaPlayer), true, propertyChanged: (b, o, n) => ((MediaPlayer)b).OnUsesEmbeddingControlsChanged());
+        /// <summary>
+        /// Identifies the Volume bindable property.
+        /// </summary>
+        public static readonly BindableProperty VolumeProperty = BindableProperty.Create(nameof(Volume), typeof(double), typeof(MediaPlayer), 1d, coerceValue: (bindable, value) => ((double)value).Clamp(0, 1), propertyChanged: (b, o, n)=> ((MediaPlayer)b).OnVolumeChanged());
+        /// <summary>
+        /// Identifies the IsMuted bindable property.
+        /// </summary>
+        public static readonly BindableProperty IsMutedProperty = BindableProperty.Create(nameof(IsMuted), typeof(bool), typeof(MediaPlayer), false, propertyChanged: (b, o, n) => ((MediaPlayer)b).UpdateIsMuted());
+        /// <summary>
+        /// Identifies the AspectMode bindable property.
+        /// </summary>
+        public static readonly BindableProperty AspectModeProperty = BindableProperty.Create(nameof(AspectMode), typeof(DisplayAspectMode), typeof(MediaPlayer), DisplayAspectMode.AspectFit, propertyChanged: (b, o, n) => ((MediaPlayer)b).OnAspectModeChanged());
+        /// <summary>
+        /// Identifies the AutoPlay bindable property.
+        /// </summary>
+        public static readonly BindableProperty AutoPlayProperty = BindableProperty.Create(nameof(AutoPlay), typeof(bool), typeof(MediaPlayer), false, propertyChanged: (b, o, n) => ((MediaPlayer)b).UpdateAutoPlay());
+        /// <summary>
+        /// Identifies the AutoStop bindable property.
+        /// </summary>
+        public static readonly BindableProperty AutoStopProperty = BindableProperty.Create(nameof(AutoStop), typeof(bool), typeof(MediaPlayer), true, propertyChanged: (b, o, n) => ((MediaPlayer)b).UpdateAutoStop());
+        static readonly BindablePropertyKey DurationPropertyKey = BindableProperty.CreateReadOnly(nameof(Duration), typeof(int), typeof(MediaPlayer), 0);
+        /// <summary>
+        /// Identifies the Duration bindable property.
+        /// </summary>
+        public static readonly BindableProperty DurationProperty = DurationPropertyKey.BindableProperty;
+        static readonly BindablePropertyKey BufferingProgressPropertyKey = BindableProperty.CreateReadOnly(nameof(BufferingProgress), typeof(double), typeof(MediaPlayer), 0d);
+        /// <summary>
+        /// Identifies the BufferingProgress bindable property.
+        /// </summary>
+        public static readonly BindableProperty BufferingProgressProperty = BufferingProgressPropertyKey.BindableProperty;
+        static readonly BindablePropertyKey PositionPropertyKey = BindableProperty.CreateReadOnly(nameof(Position), typeof(int), typeof(MediaPlayer), 0);
+        /// <summary>
+        /// Identifies the Position bindable property.
+        /// </summary>
+        public static readonly BindableProperty PositionProperty = PositionPropertyKey.BindableProperty;
+        static readonly BindablePropertyKey StatePropertyKey = BindableProperty.CreateReadOnly(nameof(State), typeof(PlaybackState), typeof(MediaPlayer), PlaybackState.Stopped);
+        /// <summary>
+        /// Identifies the State bindable property.
+        /// </summary>
+        public static readonly BindableProperty StateProperty = StatePropertyKey.BindableProperty;
+        /// <summary>
+        /// Identifies the PositionUpdateInterval bindable property.
+        /// </summary>
+        public static readonly BindableProperty PositionUpdateIntervalProperty = BindableProperty.Create(nameof(PositionUpdateInterval), typeof(int), typeof(MediaPlayer), 500);
+        static readonly BindablePropertyKey IsBufferingPropertyKey = BindableProperty.CreateReadOnly(nameof(IsBuffering), typeof(bool), typeof(MediaPlayer), false);
+        /// <summary>
+        /// Identifies the IsBuffering bindable property.
+        /// </summary>
+        public static readonly BindableProperty IsBufferingProperty = IsBufferingPropertyKey.BindableProperty;
+
+        IPlatformMediaPlayer _impl;
+        bool _isPlaying;
+        bool _controlsAlwaysVisible;
+        CancellationTokenSource _hideTimerCTS = new CancellationTokenSource();
+        Lazy<View> _controls;
+
+        /// <summary>
+        /// Initializes a new instance of the MediaPlayer class.
+        /// </summary>
+        public MediaPlayer()
+        {
+            _impl = DependencyService.Get<IPlatformMediaPlayer>(fetchTarget: DependencyFetchTarget.NewInstance);
+            _impl.UpdateStreamInfo += OnUpdateStreamInfo;
+            _impl.PlaybackCompleted += SendPlaybackCompleted;
+            _impl.PlaybackStarted += SendPlaybackStarted;
+            _impl.PlaybackPaused += SendPlaybackPaused;
+            _impl.PlaybackStopped += SendPlaybackStopped;
+            _impl.BufferingProgressUpdated += OnUpdateBufferingProgress;
+            _impl.UsesEmbeddingControls = true;
+            _impl.Volume = 1d;
+            _impl.AspectMode = DisplayAspectMode.AspectFit;
+            _impl.AutoPlay = false;
+            _impl.AutoStop = true;
+
+            _controlsAlwaysVisible = false;
+            _controls = new Lazy<View>(() =>
+            {
+                return new EmbeddingControls
+                {
+                    BindingContext = this
+                };
+            });
+        }
+
+        /// <summary>
+        /// Gets or sets the scaling mode for the media content.
+        /// </summary>
+        public DisplayAspectMode AspectMode
+        {
+            get { return (DisplayAspectMode)GetValue(AspectModeProperty); }
+            set { SetValue(AspectModeProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a value whether the media content plays automatically.
+        /// </summary>
+        public bool AutoPlay
+        {
+            get
+            {
+                return (bool)GetValue(AutoPlayProperty);
+            }
+            set
+            {
+                SetValue(AutoPlayProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value whether the media content stops automatically.
+        /// </summary>
+        public bool AutoStop
+        {
+            get
+            {
+                return (bool)GetValue(AutoStopProperty);
+            }
+            set
+            {
+                SetValue(AutoStopProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets the value indicating the buffering percentage.
+        /// </summary>
+        public double BufferingProgress
+        {
+            get
+            {
+                return (double)GetValue(BufferingProgressProperty);
+            }
+            private set
+            {
+                SetValue(BufferingProgressPropertyKey, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets the duration of a media content.
+        /// </summary>
+        public int Duration
+        {
+            get
+            {
+                return (int)GetValue(DurationProperty);
+            }
+            private set
+            {
+                SetValue(DurationPropertyKey, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the source of the media content.
+        /// </summary>
+        [Xamarin.Forms.TypeConverter(typeof(MediaSourceConverter))]
+        public MediaSource Source
+        {
+            get { return (MediaSource)GetValue(SourceProperty); }
+            set { SetValue(SourceProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the video output.
+        /// </summary>
+        public IVideoOutput VideoOutput
+        {
+            get { return (IVideoOutput)GetValue(VideoOutputProperty); }
+            set { SetValue(VideoOutputProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the current volume of a media content.
+        /// </summary>
+        public double Volume
+        {
+            get { return (double)GetValue(VolumeProperty); }
+            set { SetValue(VolumeProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the value whether the volume is muted.
+        /// </summary>
+        public bool IsMuted
+        {
+            get { return (bool)GetValue(IsMutedProperty); }
+            set { SetValue(IsMutedProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the desired interval time for updating position.
+        /// </summary>
+        public int PositionUpdateInterval
+        {
+            get { return (int)GetValue(PositionUpdateIntervalProperty); }
+            set { SetValue(PositionUpdateIntervalProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets whether to use the embedding controls.
+        /// </summary>
+        public bool UsesEmbeddingControls
+        {
+            get
+            {
+                return (bool)GetValue(UsesEmbeddingControlsProperty);
+            }
+            set
+            {
+                SetValue(UsesEmbeddingControlsProperty, value);
+                _impl.UsesEmbeddingControls = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the value of the current position of the media content.
+        /// </summary>
+        public int Position
+        {
+            get
+            {
+                return _impl.Position;
+            }
+            private set
+            {
+                SetValue(PositionPropertyKey, value);
+                OnPropertyChanged(nameof(Progress));
+            }
+        }
+
+        /// <summary>
+        /// Gets the current playback state.
+        /// </summary>
+        public PlaybackState State
+        {
+            get
+            {
+                return (PlaybackState)GetValue(StateProperty);
+            }
+            private set
+            {
+                SetValue(StatePropertyKey, value);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating the buffering status. 
+        /// </summary>
+        public bool IsBuffering
+        {
+            get
+            {
+                return (bool)GetValue(IsBufferingProperty);
+            }
+            private set
+            {
+                SetValue(IsBufferingPropertyKey, value);
+            }
+        }
+
+        /// <summary>
+        /// For internal use.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public double Progress
+        {
+            get
+            {
+                return Position / (double)Math.Max(Position, Duration);
+            }
+        }
+
+        /// <summary>
+        /// For internal use.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Command StartCommand => new Command(() =>
+        {
+            if (State == PlaybackState.Playing)
+            {
+                Pause();
+            }
+            else
+            {
+                Start();
+            }
+        });
+
+        /// <summary>
+        /// For internal use.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Command FastForwardCommand => new Command(() =>
+        {
+            if (State != PlaybackState.Stopped)
+            {
+                Seek(Math.Min(Position + 5000, Duration));
+            }
+        }, () => State != PlaybackState.Stopped);
+
+        /// <summary>
+        /// For internal use.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Command RewindCommand => new Command(() =>
+        {
+            if (State != PlaybackState.Stopped)
+            {
+                Seek(Math.Max(Position - 5000, 0));
+            }
+        }, () => State != PlaybackState.Stopped);
+
+        /// <summary>
+        /// Occurs when the playback is completed.
+        /// </summary>
+        public event EventHandler PlaybackCompleted;
+        /// <summary>
+        /// Occurs when the playback is started.
+        /// </summary>
+        public event EventHandler PlaybackStarted;
+        /// <summary>
+        /// Occurs when the playback is paused.
+        /// </summary>
+        public event EventHandler PlaybackPaused;
+        /// <summary>
+        /// Occurs when the playback is stopped.
+        /// </summary>
+        public event EventHandler PlaybackStopped;
+        /// <summary>
+        /// Occurs when the buffering for the media content is started.
+        /// </summary>
+        public event EventHandler BufferingStarted;
+        /// <summary>
+        /// Occurs when the buffering for the media content is completed.
+        /// </summary>
+        public event EventHandler BufferingCompleted;
+
+        /// <summary>
+        /// Pauses the player.
+        /// </summary>
+        public void Pause()
+        {
+            _impl.Pause();
+        }
+
+        /// <summary>
+        /// Attemps to seek the playback position.
+        /// </summary>
+        /// <param name="ms">The milliseconds to seek</param>
+        /// <returns>Returns a Task that seeks the play position.</returns>
+        public Task<int> Seek(int ms)
+        {
+            ShowController();
+            return _impl.Seek(ms).ContinueWith((t) => Position = _impl.Position);
+        }
+
+        /// <summary>
+        /// Starts or resumes playback.
+        /// </summary>
+        /// <returns>Returns a Task that prepares the player and play the media content.</returns>
+        public Task<bool> Start()
+        {
+            return _impl.Start();
+        }
+
+        /// <summary>
+        /// Stops playing the media content.
+        /// </summary>
+        public void Stop()
+        {
+            _impl.Stop();
+        }
+
+        /// <summary>
+        /// Retrieves the album art of the stream, or null if there is no album art data.
+        /// </summary>
+        /// <returns>Returns a Task that gets the album art of the stream</returns>
+        public Task<Stream> GetAlbumArts()
+        {
+            return _impl.GetAlbumArts();
+        }
+
+        /// <summary>
+        /// Gets the metadata of the media content.
+        /// </summary>
+        /// <returns>Returns a Task that has the metadata of the media content.</returns>
+        public Task<IDictionary<string, string>> GetMetadata()
+        {
+            return _impl.GetMetadata();
+        }
+
+        void UpdateAutoPlay()
+        {
+            _impl.AutoPlay = AutoPlay;
+        }
+
+        void UpdateAutoStop()
+        {
+            _impl.AutoStop = AutoStop;
+        }
+
+        void UpdateIsMuted()
+        {
+            _impl.IsMuted = IsMuted;
+        }
+
+        void OnUpdateStreamInfo(object sender, EventArgs e)
+        {
+            Duration = _impl.Duration;
+        }
+
+        void SendPlaybackCompleted(object sender, EventArgs e)
+        {
+            PlaybackCompleted?.Invoke(this, EventArgs.Empty);
+        }
+
+        void SendPlaybackStarted(object sender, EventArgs e)
+        {
+            _isPlaying = true;
+            State = PlaybackState.Playing;
+            StartPostionPollingTimer();
+            PlaybackStarted?.Invoke(this, EventArgs.Empty);
+            _controlsAlwaysVisible = false;
+            ShowController();
+        }
+
+        void SendPlaybackPaused(object sender, EventArgs e)
+        {
+            _isPlaying = false;
+            State = PlaybackState.Paused;
+            PlaybackPaused?.Invoke(this, EventArgs.Empty);
+            _controlsAlwaysVisible = true;
+            ShowController();
+        }
+
+
+        void SendPlaybackStopped(object sender, EventArgs e)
+        {
+            _isPlaying = false;
+            State = PlaybackState.Stopped;
+            PlaybackStopped?.Invoke(this, EventArgs.Empty);
+            _controlsAlwaysVisible = true;
+            ShowController();
+        }
+
+
+        void StartPostionPollingTimer()
+        {
+            Device.StartTimer(TimeSpan.FromMilliseconds(PositionUpdateInterval), () =>
+            {
+                Position = _impl.Position;
+                return _isPlaying;
+            });
+        }
+
+        void OnSourceChanged(object sender, EventArgs e)
+        {
+            _impl.SetSource(Source);
+        }
+
+        void OnSourceChanging(MediaSource oldValue, MediaSource newValue)
+        {
+            if (oldValue != null)
+                oldValue.SourceChanged -= OnSourceChanged;
+
+            if (newValue != null)
+                newValue.SourceChanged += OnSourceChanged;
+        }
+
+        void OnVideoOutputChanged()
+        {
+            if (VideoOutput != null)
+            {
+                if (UsesEmbeddingControls)
+                {
+                    VideoOutput.Controller = _controls.Value;
+                }
+                VideoOutput.MediaView.Focused += OnVideoOutputFocused;
+                if (VideoOutput.MediaView is View outputView)
+                {
+                    TapGestureRecognizer tapGesture = new TapGestureRecognizer();
+                    tapGesture.Tapped += OnOutputTapped;
+                    outputView.GestureRecognizers.Add(tapGesture);
+                }
+            }
+            _impl.SetDisplay(VideoOutput);
+        }
+
+        void OnOutputTapped(object sender, EventArgs e)
+        {
+            if (!UsesEmbeddingControls)
+                return;
+            if (!_controls.Value.IsVisible)
+            {
+                ShowController();
+            }
+        }
+
+        async void OnUsesEmbeddingControlsChanged()
+        {
+            if (UsesEmbeddingControls)
+            {
+                if (VideoOutput != null)
+                {
+                    VideoOutput.Controller = _controls.Value;
+                    ShowController();
+                }
+            }
+            else
+            {
+                if (VideoOutput != null)
+                {
+                    HideController(0);
+                    await Task.Delay(200);
+                    VideoOutput.Controller = null;
+                }
+            }
+        }
+
+        void OnVideoOutputFocused(object sender, FocusEventArgs e)
+        {
+            if (UsesEmbeddingControls)
+            {
+                ShowController();
+            }
+        }
+
+        void OnVolumeChanged()
+        {
+            _impl.Volume = Volume;
+        }
+
+        void OnAspectModeChanged()
+        {
+            _impl.AspectMode = AspectMode;
+        }
+
+        void OnUpdateBufferingProgress(object sender, BufferingProgressUpdatedEventArgs e)
+        {
+            if (!IsBuffering && e.Progress >= 0)
+            {
+                IsBuffering = true;
+                BufferingStarted?.Invoke(this, EventArgs.Empty);
+            }
+            else if (IsBuffering && e.Progress == 1.0)
+            {
+                IsBuffering = false;
+                BufferingCompleted?.Invoke(this, EventArgs.Empty);
+            }
+            BufferingProgress = e.Progress;
+        }
+
+        async void HideController(int after)
+        {
+            if (!_controls.IsValueCreated)
+                return;
+
+            _hideTimerCTS?.Cancel();
+            _hideTimerCTS?.Dispose();
+            _hideTimerCTS = new CancellationTokenSource();
+            try
+            {
+                await Task.Delay(after, _hideTimerCTS.Token);
+
+                if (!_controlsAlwaysVisible)
+                {
+                    await _controls.Value.FadeTo(0, 200);
+                    _controls.Value.IsVisible = false;
+                }
+            }
+            catch (Exception)
+            {
+                //Exception when canceled
+            }
+        }
+        
+        void ShowController()
+        {
+            if (_controls.IsValueCreated)
+            {
+                _controls.Value.IsVisible = true;
+                _controls.Value.FadeTo(1.0, 200);
+                HideController(5000);
+            }
+        }
+
+
+        static void OnSourceChanging(BindableObject bindable, object oldValue, object newValue)
+        {
+            (bindable as MediaPlayer)?.OnSourceChanging(oldValue as MediaSource, newValue as MediaSource);
+        }
+        static void OnSourceChanged(BindableObject bindable, object oldValue, object newValue)
+        {
+            (bindable as MediaPlayer)?.OnSourceChanged(bindable, EventArgs.Empty);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaSource.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaSource.cs
new file mode 100644 (file)
index 0000000..e06551e
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaSource.cs
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Abstract class whose implementors load media contents from files or the Web.
+    /// </summary>
+    [TypeConverter(typeof(MediaSourceConverter))]
+    public abstract class MediaSource : Element
+    {
+        protected MediaSource()
+        {
+        }
+
+        /// <summary>
+        /// Returns a new MediaSource that reads from file.
+        /// </summary>
+        /// <param name="file">The file path to use as a media source.</param>
+        /// <returns>Returns the MediaSource.</returns>
+        public static MediaSource FromFile(string file)
+        {
+            return new FileMediaSource { File = file };
+        }
+
+        /// <summary>
+        /// Returns a new MediaSource that reads from uri.
+        /// </summary>
+        /// <param name="uri">The uri path to use as a media source.</param>
+        /// <returns>Returns the MediaSource.</returns>
+        public static MediaSource FromUri(Uri uri)
+        {
+            if (!uri.IsAbsoluteUri)
+                throw new ArgumentException("uri is relative");
+            return new UriMediaSource { Uri = uri };
+        }
+
+        public static implicit operator MediaSource(string source)
+        {
+            return Uri.TryCreate(source, UriKind.Absolute, out Uri uri) && uri.Scheme != "file" ? FromUri(uri) : FromFile(source);
+        }
+
+        public static implicit operator MediaSource(Uri uri)
+        {
+            if (!uri.IsAbsoluteUri)
+                throw new ArgumentException("uri is relative");
+            return FromUri(uri);
+        }
+
+        protected void OnSourceChanged()
+        {
+            SourceChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        internal event EventHandler SourceChanged;
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaSourceConverter.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaSourceConverter.cs
new file mode 100644 (file)
index 0000000..2661436
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaSourceConverter.cs
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Class that takes a string representation of a media file location and returns a MeidaSource from the specified resource.
+    /// </summary>
+    [TypeConverter(typeof(MediaSource))]
+    public sealed class MediaSourceConverter : TypeConverter
+    {
+        /// <summary>
+        /// Returns a media source created from a URI that is contained in value.
+        /// </summary>
+        /// <param name="value">The value to convert.</param>
+        /// <returns>MediaSource</returns>
+        public override object ConvertFromInvariantString(string value)
+        {
+            if (value != null)
+            {
+                return Uri.TryCreate(value, UriKind.Absolute, out Uri uri) && uri.Scheme != "file" ? MediaSource.FromUri(uri) : MediaSource.FromFile(value);
+            }
+
+            throw new InvalidOperationException(string.Format("Cannot convert \"{0}\" into {1}", value, typeof(MediaSource)));
+        }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaView.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaView.cs
new file mode 100644 (file)
index 0000000..c244129
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/MediaView.cs
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The MediaView class is used to display the video output on the screen.
+    /// </summary>
+    [ContentProperty("Player")]
+    public class MediaView : Layout<View>, IVideoOutput
+    {
+        /// <summary>
+        /// Identifies the Player bindable property.
+        /// </summary>
+        public static readonly BindableProperty PlayerProperty = BindableProperty.Create("Player", typeof(MediaPlayer), typeof(MediaView), default(MediaPlayer), propertyChanged: (b, o, n) => ((MediaView)b).OnPlayerChanged());
+        
+        View _controller;
+
+        /// <summary>
+        /// Gets or sets the media player.
+        /// </summary>
+        public MediaPlayer Player
+        {
+            get { return (MediaPlayer)GetValue(PlayerProperty); }
+            set { SetValue(PlayerProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the video output type.
+        /// </summary>
+        public virtual VideoOuputType OuputType => VideoOuputType.Buffer;
+
+        VisualElement IVideoOutput.MediaView => this;
+        View IVideoOutput.Controller
+        {
+            get
+            {
+                return _controller;
+            }
+            set
+            {
+                if (_controller != null)
+                {
+                    Children.Remove(_controller);
+                }
+
+                _controller = value;
+
+                if (_controller != null)
+                {
+                    Children.Add(_controller);
+                }
+            }
+        }
+
+        protected override void LayoutChildren(double x, double y, double width, double height)
+        {
+            _controller?.Layout(new Rectangle(x, y, width, height));
+        }
+
+        protected override SizeRequest OnMeasure(double widthConstraint, double heightConstraint)
+        {
+            return _controller?.Measure(widthConstraint, heightConstraint) ?? base.OnMeasure(widthConstraint, heightConstraint);
+        }
+
+        protected override void OnBindingContextChanged()
+        {
+            base.OnBindingContextChanged();
+
+            if (Player != null)
+            {
+                SetInheritedBindingContext(Player, BindingContext);
+            }
+        }
+
+        void OnPlayerChanged()
+        {
+            if (Player != null)
+            {
+                Player.VideoOutput = this;
+                SetInheritedBindingContext(Player, BindingContext);
+            }
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PlaybackState.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PlaybackState.cs
new file mode 100644 (file)
index 0000000..41cd84b
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PlaybackState.cs
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Enumerates values that define the playback state of the media content.
+    /// </summary>
+    public enum PlaybackState
+    {
+        /// <summary>
+        /// Stopped.
+        /// </summary>
+        Stopped,
+        /// <summary>
+        /// Playing.
+        /// </summary>
+        Playing,
+        /// <summary>
+        /// Paused while playing media.
+        /// </summary>
+        Paused
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PopupEntry.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PopupEntry.cs
new file mode 100644 (file)
index 0000000..7235f71
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PopupEntry.cs
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The PopupEntry is a class that extends Xamarin.Forms.Entry.
+    /// It makes a new layer when editing text on the entry.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class PopupEntry : Entry
+    {
+        /// <summary>
+        /// BindableProperty. Identifies color of Popup background.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty PopupBackgroundColorProperty = BindableProperty.CreateAttached(nameof(PopupBackgroundColor), typeof(Color), typeof(PopupEntry), Color.Default);
+
+        /// <summary>
+        /// BindableProperty. Identifies whether Popup is opended or not.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsPopupOpenedProperty = BindableProperty.CreateAttached(nameof(IsPopupOpened), typeof(bool), typeof(PopupEntry), false);
+
+        /// <summary>
+        /// Gets or sets a color value of Popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color PopupBackgroundColor
+        {
+            get => (Color)GetValue(PopupBackgroundColorProperty);
+            set => SetValue(PopupBackgroundColorProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets a status of Popup's open.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsPopupOpened
+        {
+            get => (bool)GetValue(IsPopupOpenedProperty);
+            set => SetValue(IsPopupOpenedProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PositionOption.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PositionOption.cs
new file mode 100644 (file)
index 0000000..070c34e
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/PositionOption.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Enumeration for position type of popup
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public enum PositionOption
+    {
+        /// <summary>
+        /// The popup appears at the bottom of the View using the Effect. The position is changed by Offset in the center of View.
+        /// </summary>
+        BottomOfView,
+        /// <summary>
+        /// In the center of the screen, move by the Offset in the Popup.
+        /// </summary>
+        CenterOfParent,
+        /// <summary>
+        /// The value of Offset is X, Y and popup is placed on the screen.
+        /// </summary>
+        Absolute,
+        /// <summary>
+        /// Set Offset.X * Window.Width, Offset.Y * Window.Height.
+        /// </summary>
+        Relative
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Properties/AssemblyInfo.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Properties/AssemblyInfo.cs
new file mode 100644 (file)
index 0000000..f330c03
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Tizen.Wearable.CircularUI.Forms.Renderer")]

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Radio.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Radio.cs
new file mode 100644 (file)
index 0000000..7ca6153
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Radio.cs
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The Radio is a widget that allows one or more options to be displayed and have the user choose only one of them.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    /// <example>
+    /// <code>
+    /// var radio1 = new Radio
+    /// {
+    ///     GroupName = "SoundMode",
+    ///     IsSelected = true,
+    ///     Value = "sound"
+    /// }
+    ///
+    /// var radio2 = new Radio
+    /// {
+    ///     GroupName = "SoundMode",
+    ///     IsSelected = false,
+    ///     Value = "vibrate"
+    /// }
+    ///
+    /// radio1.Selected += (s,e) =>
+    /// {
+    ///     Console.WriteLine($"radio1 selected! value:{e.Value}");
+    /// };
+    ///
+    /// radio2.Selected += (s,e) =>
+    /// {
+    ///      Console.WriteLine($"radio2 selected! value:{e.Value}");
+    /// };
+    /// </code>
+    /// </example>
+    public class Radio : View
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the Value bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty ValueProperty = BindableProperty.Create("Value", typeof(string), typeof(Radio), default(string));
+
+        /// <summary>
+        /// BindableProperty. Identifies the IsSelected bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty IsSelectedProperty = BindableProperty.Create("IsSelected", typeof(bool), typeof(Radio), false,
+             propertyChanged: IsSelectedPropertyChanged);
+
+        /// <summary>
+        /// BindableProperty. Identifies the GroupName bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty GroupNameProperty = BindableProperty.Create("GroupName", typeof(string), typeof(Radio), default(string));
+
+        /// <summary>
+        /// BindableProperty. Identifies the Color bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty ColorProperty = BindableProperty.Create(nameof(Color), typeof(Color), typeof(Radio), Color.Default);
+
+
+        /// <summary>
+        /// Gets or sets the value of the Radio.
+        /// This is a bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string Value
+        {
+            get { return (string)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets the name that specifies which Radio controls are mutually exclusive.
+        /// It can be set to null.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string GroupName
+        {
+            get { return (string)GetValue(GroupNameProperty); }
+            set { SetValue(GroupNameProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a boolean value that indicates whether this Radio is selected.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsSelected
+        {
+            get { return (bool)GetValue(IsSelectedProperty); }
+            set { SetValue(IsSelectedProperty, value); }
+        }
+
+        /// <summary>
+        /// Occurs when the Radio selection was changed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public event EventHandler<SelectedEventArgs> Selected;
+
+
+        static void IsSelectedPropertyChanged(BindableObject bindable, object oldValue, object newValue)
+        {
+            var radioButton = (Radio)bindable;
+            radioButton.Selected?.Invoke(radioButton, new SelectedEventArgs(radioButton.Value, (bool)newValue));
+        }
+
+        /// <summary>
+        /// Gets or sets a color value of Radio.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public Color Color
+        {
+            get => (Color)GetValue(ColorProperty);
+            set => SetValue(ColorProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Resources/img_button_pause.png b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Resources/img_button_pause.png
new file mode 100644 (file)
index 0000000..b8a4b40
Binary files /dev/null and b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Resources/img_button_pause.png differ

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Resources/img_button_play.png b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Resources/img_button_play.png
new file mode 100644 (file)
index 0000000..f92ab44
Binary files /dev/null and b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Resources/img_button_play.png differ

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/RotaryEventHandler.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/RotaryEventHandler.cs
new file mode 100644 (file)
index 0000000..59b81f2
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/RotaryEventHandler.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Delegate for a triggering rotary event
+    /// </summary>
+    /// <param name="args">Rotated direction of Rotary device</param>
+    /// <since_tizen> 4 </since_tizen>
+    public delegate void RotaryEventHandler(RotaryEventArgs args);
+
+    /// <summary>
+    /// Event arguments for RotaryEvent.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class RotaryEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Gets or sets rotated direction of Rotary device. IsClockwise is true when Rotary device rotated in the clockwise direction or false on counter clockwise.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsClockwise { get; set; }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/SelectedEventArgs.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/SelectedEventArgs.cs
new file mode 100644 (file)
index 0000000..b0b8edd
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/SelectedEventArgs.cs
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Event arguments for events of RadioButton.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class SelectedEventArgs : EventArgs
+    {
+        /// <summary>
+        /// Creates a new SelectedEventArgs object that represents a change from RadioButton.
+        /// </summary>
+        /// <param name="value">The boolean value that checks whether the RadioButton is selected.</param>
+        /// <since_tizen> 4 </since_tizen>
+        public SelectedEventArgs(string value, bool isSelected)
+        {
+            Value = value;
+            IsSelected = isSelected;
+        }
+
+        /// <summary>
+        /// Gets the Value for the SelectedEventArgs object.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string Value { get; private set; }
+
+        /// <summary>
+        /// Gets the IsSelected for the SelectedEventArgs object.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public bool IsSelected { get; private set; }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Tizen.Wearable.CircularUI.Forms.csproj b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Tizen.Wearable.CircularUI.Forms.csproj
new file mode 100644 (file)
index 0000000..2b11418
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Tizen.Wearable.CircularUI.Forms.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\img_button_pause.png" />
+    <None Remove="Resources\img_button_play.png" />
+    <EmbeddedResource Include="Resources\img_button_pause.png" />
+    <EmbeddedResource Include="Resources\img_button_play.png" />
+    <ProjectReference Include="..\..\Xamarin.Forms\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj" />
+    <ProjectReference Include="..\..\Xamarin.Forms\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj" />
+    <ProjectReference Include="..\..\Xamarin.Forms\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj" />
+    <EmbeddedResource Update="EmbeddingControls.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
+
+</Project>

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Toast.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Toast.cs
new file mode 100644 (file)
index 0000000..19bcb92
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/Toast.cs
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The Toast class provides properties that show simple types of messages
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    /// <example>
+    /// <code>
+    /// Toast.DisplayText("Hello World", 3000)
+    /// Toast.DisplayIconText("Hello World", new FileImageSource { File = "icon.jpg" }, 3000)
+    /// </code>
+    /// </example>
+    public static class Toast
+    {
+        /// <summary>
+        /// It shows the simplest form of the message in the given duration.
+        /// </summary>
+        /// <param name="text">The body text of the toast.</param>
+        /// <param name="duration">How long to display the text in milliseconds.</param>
+        /// <since_tizen> 4 </since_tizen>
+        public static void DisplayText(string text, int duration)
+        {
+            new ToastProxy
+            {
+                Text = text,
+                Duration = duration,
+            }.Show();
+        }
+
+        /// <summary>
+        /// It shows the simplest form of the message in 3000 milliseconds.
+        /// </summary>
+        /// <param name="text">The body text of the toast.</param>
+        public static void DisplayText(string text) => DisplayText(text, 3000);
+
+        /// <summary>
+        /// It shows simplest icon and text messege.
+        /// </summary>
+        /// <param name="text">The body text of the toast.</param>
+        /// <param name="icon">The file path of the toast icon.</param>
+        /// <param name="duration">How long to display the text in milliseconds.</param>
+        /// <since_tizen> 4 </since_tizen>
+        public static void DisplayIconText(string text, FileImageSource icon, int duration)
+        {
+            new ToastProxy
+            {
+                Text = text,
+                Icon = icon,
+                Duration = duration,
+            }.Show();
+        }
+
+        /// <summary>
+        /// It shows simplest icon and text messege in 3 seconds.
+        /// </summary>
+        /// <param name="text">The body text of the toast.</param>
+        /// <param name="icon">The file path of the toast icon.</param>
+        /// <since_tizen> 4 </since_tizen>
+        public static void DisplayIconText(string text, FileImageSource icon) => DisplayIconText(text, icon, 3000);
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ToastProxy.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ToastProxy.cs
new file mode 100644 (file)
index 0000000..c9a84f2
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ToastProxy.cs
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// This class is for the internal use by toast.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    internal class ToastProxy : IToast
+    {
+        IToast _toastProxy;
+
+        public ToastProxy()
+        {
+            _toastProxy = DependencyService.Get<IToast>(DependencyFetchTarget.NewInstance);
+
+            if (_toastProxy == null)
+                throw new InvalidOperationException("Internal instance via DependecyService was not created.");
+        }
+
+        /// <summary>
+        /// Gets or sets duration of the Toast pop-up.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public int Duration
+        {
+            get
+            {
+                return _toastProxy.Duration;
+            }
+
+            set
+            {
+                _toastProxy.Duration = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets text of the Toast pop-up.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string Text
+        {
+            get
+            {
+                return _toastProxy.Text;
+            }
+
+            set
+            {
+                _toastProxy.Text = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets icon of the Toast pop-up.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public FileImageSource Icon
+        {
+            get
+            {
+                return _toastProxy.Icon;
+            }
+
+            set
+            {
+                _toastProxy.Icon = value;
+            }
+        }
+
+        /// <summary>
+        /// Dismisses the Toast pop-up.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public void Dismiss()
+        {
+            _toastProxy.Dismiss();
+        }
+
+        /// <summary>
+        /// Shows the Toast pop-up.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public void Show()
+        {
+            _toastProxy.Show();
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/TwoButtonPage.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/TwoButtonPage.cs
new file mode 100644 (file)
index 0000000..9b9820f
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/TwoButtonPage.cs
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The TwoButtonPage is a page that has a rectangular area inside the circle as contents area. It also has two buttons and a Title area.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    public class TwoButtonPage : ContentPage
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the FirstButton bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty FirstButtonProperty = BindableProperty.Create(nameof(FirstButton), typeof(MenuItem), typeof(TwoButtonPage),
+            propertyChanged: (b, o, n) =>
+            {
+                if (n != null)
+                    ((Element)n).Parent = (Element)b;
+            });
+        /// <summary>
+        /// BindableProperty. Identifies the SecondButton bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty SecondButtonProperty = BindableProperty.Create(nameof(SecondButton), typeof(MenuItem), typeof(TwoButtonPage),
+            propertyChanged: (b, o, n) =>
+            {
+                if (n != null)
+                    ((Element)n).Parent = (Element)b;
+            });
+
+        /// <summary>
+        /// BindableProperty. Identifies the Overlap bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty OverlapProperty = BindableProperty.Create(nameof(Overlap), typeof(bool), typeof(TwoButtonPage), false);
+
+        /// <summary>
+        /// Gets or sets the overlap or not overlap the buttons and page display.
+        /// </summary>
+        public bool Overlap
+        {
+            get => (bool)GetValue(OverlapProperty);
+            set => SetValue(OverlapProperty, value);
+        }
+
+        /// <summary>
+        /// Gets or sets left button of TwoButtonPage.
+        /// Text property of MenuItem is ignored since button has no space to display text.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public MenuItem FirstButton
+        {
+            get => (MenuItem)GetValue(FirstButtonProperty);
+            set => SetValue(FirstButtonProperty, value);
+        }
+        /// <summary>
+        /// Gets or sets right button of TwoButtonPage.
+        /// Text property of MenuItem is ignored since button has no space to display text.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public MenuItem SecondButton
+        {
+            get => (MenuItem)GetValue(SecondButtonProperty);
+            set => SetValue(SecondButtonProperty, value);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/TwoButtonPopup.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/TwoButtonPopup.cs
new file mode 100644 (file)
index 0000000..8060e1d
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/TwoButtonPopup.cs
@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using Xamarin.Forms;
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// The TwoButtonPopup describe pop-up which has circular two button, title, text, and content area.
+    /// </summary>
+    /// <since_tizen> 4 </since_tizen>
+    /// <example>
+    /// <code>
+    /// var leftButton = new MenuItem()
+    /// {
+    ///     Text = "Save",
+    ///     Icon = new FileImageSource{ File = "icon_save.png", },
+    ///     Command = new Command(() => { ... })
+    /// };
+    ///
+    /// var rightButton = new MenuItem()
+    /// {
+    ///     Text = "Delete",
+    ///     Icon = new FileImageSource{ File = "icon_delete.png", },
+    ///     Command = new Command(() => { ... })
+    /// };
+    ///
+    /// var popup = new TwoButtonPopup();
+    /// popup.FirstButton = leftButton;
+    /// popup.SecondButton = rightButton;
+    /// popup.Title = "Popup title";
+    /// popup.Content = new StackLayout()
+    /// {
+    ///     HorizontalOptions = LayoutOptions.FillAndExpand,
+    ///     Children =
+    ///     {
+    ///        new Label
+    ///        {
+    ///            Text = "Will be saved",
+    ///        },
+    ///     }
+    /// };
+    ///
+    /// popup.BackButtonPressed += (s, e) =>
+    /// {
+    ///     popup.Dismiss();
+    /// };
+    /// </code>
+    /// </example>
+    public class TwoButtonPopup : BindableObject
+    {
+        /// <summary>
+        /// BindableProperty. Identifies the content bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty ContentProperty = BindableProperty.Create(nameof(Content), typeof(View), typeof(TwoButtonPopup), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the title bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty TitleProperty = BindableProperty.Create(nameof(Title), typeof(string), typeof(TwoButtonPopup), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the title bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty TextProperty = BindableProperty.Create(nameof(Text), typeof(string), typeof(TwoButtonPopup), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the first button bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty FirstButtonProperty = BindableProperty.Create(nameof(FirstButton), typeof(MenuItem), typeof(TwoButtonPopup), null);
+
+        /// <summary>
+        /// BindableProperty. Identifies the second button bindable property.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public static readonly BindableProperty SecondButtonProperty = BindableProperty.Create(nameof(SecondButton), typeof(MenuItem), typeof(TwoButtonPopup), null);
+
+        ITwoButtonPopup _popUp;
+
+        static IList<ITwoButtonPopup> _popUpList = new ObservableCollection<ITwoButtonPopup>();
+
+        /// <summary>
+        /// Occurs when the device's back button is pressed.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public event EventHandler BackButtonPressed;
+
+        /// <summary>
+        /// Creates and initializes a new instance of the TwoButtonPopup class.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public TwoButtonPopup()
+        {
+            _popUp = DependencyService.Get<ITwoButtonPopup>(DependencyFetchTarget.NewInstance);
+            if (_popUp == null)
+            {
+                throw new InvalidOperationException("Object reference not set to an instance of a Popup.");
+            }
+
+            _popUp.BackButtonPressed += (s, e) =>
+            {
+                BackButtonPressed?.Invoke(this, EventArgs.Empty);
+            };
+
+            SetBinding(ContentProperty, new Binding(nameof(Content), mode: BindingMode.OneWayToSource, source: _popUp));
+            SetBinding(FirstButtonProperty, new Binding(nameof(FirstButton), mode: BindingMode.OneWayToSource, source: _popUp));
+            SetBinding(SecondButtonProperty, new Binding(nameof(SecondButton), mode: BindingMode.OneWayToSource, source: _popUp));
+            SetBinding(TitleProperty, new Binding(nameof(Title), mode: BindingMode.OneWayToSource, source: _popUp));
+            SetBinding(TextProperty, new Binding(nameof(Text), mode: BindingMode.OneWayToSource, source: _popUp));
+        }
+
+        /// <summary>
+        /// Gets or sets content view of the Popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public View Content
+        {
+            get { return (View)GetValue(ContentProperty); }
+            set { SetValue(ContentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets title of the Popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string Title
+        {
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets text of the Popup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets left button of the Popup.
+        /// Text property of MenuItem is ignored since button has no space to display text.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public MenuItem FirstButton
+        {
+            get { return (MenuItem)GetValue(FirstButtonProperty); }
+            set { SetValue(FirstButtonProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets right button of the Popup.
+        /// Text property of MenuItem is ignored since button has no space to display text.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public MenuItem SecondButton
+        {
+            get { return (MenuItem)GetValue(SecondButtonProperty); }
+            set { SetValue(SecondButtonProperty, value); }
+        }
+
+        /// <summary>
+        /// Shows the TwoButtonPopup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public void Show()
+        {
+            _popUp.Show();
+            _popUpList.Add(_popUp);
+        }
+
+        /// <summary>
+        /// Dismisses the TwoButtonPopup.
+        /// </summary>
+        /// <since_tizen> 4 </since_tizen>
+        public void Dismiss()
+        {
+            _popUp.Dismiss();
+            _popUpList.Remove(_popUp);
+        }
+    }
+}

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/UriMediaSource.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/UriMediaSource.cs
new file mode 100644 (file)
index 0000000..9fa7559
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/UriMediaSource.cs
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Threading.Tasks;
+using Xamarin.Forms;
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// A MediaSource that loads a media from a URI
+    /// </summary>
+    [TypeConverter(typeof(MediaSourceConverter))]
+    public sealed class UriMediaSource : MediaSource
+    {
+        /// <summary>
+        /// Identifies the File bindable property.
+        /// </summary>
+        public static readonly BindableProperty UriProperty = BindableProperty.Create("Uri", typeof(Uri), typeof(UriImageSource), default(Uri), validateValue: (bindable, value) => value == null || ((Uri)value).IsAbsoluteUri);
+
+        /// <summary>
+        /// Gets or sets the URI for the media to get.
+        /// </summary>
+        public Uri Uri
+        {
+            get { return (Uri)GetValue(UriProperty); }
+            set { SetValue(UriProperty, value); }
+        }
+
+        /// <summary>
+        /// Returns the path to the file for the media, prefixed with the string, "Uri: ".
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            return $"Uri: {Uri}";
+        }
+
+        /// <summary>
+        /// Allows implicit casting from a Uri.
+        /// </summary>
+        /// <param name="uri"></param>
+        public static implicit operator UriMediaSource(Uri uri)
+        {
+            return (UriMediaSource)FromUri(uri);
+        }
+
+        /// <summary>
+        /// Allows implicit casting to a string.
+        /// </summary>
+        /// <param name="uri"></param>
+        public static implicit operator string(UriMediaSource uri)
+        {
+            return uri?.ToString();
+        }
+
+        protected override void OnPropertyChanged(string propertyName = null)
+        {
+            if (propertyName == UriProperty.PropertyName)
+                OnSourceChanged();
+            base.OnPropertyChanged(propertyName);
+        }
+    }
+}
\ No newline at end of file

diff --git a/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ZoomControlPosition.cs b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ZoomControlPosition.cs
new file mode 100644 (file)
index 0000000..8c990a5
--- /dev/null
+++ b/Tizen.CircularUI/Tizen.Wearable.CircularUI.Forms/ZoomControlPosition.cs
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Flora License, Version 1.1 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace Tizen.Wearable.CircularUI.Forms
+{
+    /// <summary>
+    /// Enumeration for the Zoom control position of the GoogleMapView.
+    /// </summary>
+    public enum ZoomControlPosition
+    {
+        /// <summary>
+        /// The control should be placed along the top left of the map.
+        /// </summary>
+        LeftTop = 0,
+        /// <summary>
+        /// The control should be placed along the top right of the map.
+        /// </summary>
+        RightTop = 1,
+        /// <summary>
+        /// The control should be placed along the left center of the map.
+        /// </summary>
+        LeftCenter = 2,
+        /// <summary>
+        /// The control should be placed along the right center of the map.
+        /// </summary>
+        RightCenter = 3,
+        /// <summary>
+        /// The control should be placed along the bottom left of the map
+        /// </summary>
+        LeftBottom = 4,
+        /// <summary>
+        /// The control should be placed along the bottom right of the map
+        /// </summary>
+        RightBottom = 5,
+        /// <summary>
+        /// The control should be placed along the top center of the map
+        /// </summary>
+        TopCenter = 6,
+        /// <summary>
+        /// The control should be placed along the bottom center of the map
+        /// </summary>
+        BottomCenter= 7
+    }
+}

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Framework.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Framework.dll
deleted file mode 100755 (executable)
index 965e72f..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Framework.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Tasks.Core.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Tasks.Core.dll
deleted file mode 100755 (executable)
index 13d43d3..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Tasks.Core.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Utilities.Core.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Utilities.Core.dll
deleted file mode 100755 (executable)
index 4c961ce..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.Utilities.Core.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.dll
deleted file mode 100755 (executable)
index afebbed..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.Build.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.VisualStudio.Setup.Configuration.Interop.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.VisualStudio.Setup.Configuration.Interop.dll
deleted file mode 100755 (executable)
index bcc8fbd..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Microsoft.VisualStudio.Setup.Configuration.Interop.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Mdb.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Mdb.dll
deleted file mode 100755 (executable)
index 5ecf070..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Mdb.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Pdb.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Pdb.dll
deleted file mode 100755 (executable)
index e176614..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Pdb.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Rocks.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Rocks.dll
deleted file mode 100755 (executable)
index 5d300e8..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.Rocks.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.dll
deleted file mode 100755 (executable)
index d6e4286..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/Mono.Cecil.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Collections.Immutable.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Collections.Immutable.dll
deleted file mode 100755 (executable)
index 049149f..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Collections.Immutable.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.IO.Compression.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/System.IO.Compression.dll
deleted file mode 100644 (file)
index ebbb503..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.IO.Compression.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Runtime.InteropServices.RuntimeInformation.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Runtime.InteropServices.RuntimeInformation.dll
deleted file mode 100644 (file)
index c3e0c71..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Runtime.InteropServices.RuntimeInformation.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Threading.Tasks.Dataflow.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Threading.Tasks.Dataflow.dll
deleted file mode 100755 (executable)
index 7567471..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/System.Threading.Tasks.Dataflow.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.dll b/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.dll
deleted file mode 100644 (file)
index ce6e952..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.dll and /dev/null differ

diff --git a/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.pdb b/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.pdb
deleted file mode 100644 (file)
index 4046b45..0000000
Binary files a/XFCorePostProcessor.Tasks/bin/Debug/net461/XFCorePostProcessor.Tasks.pdb and /dev/null differ

diff --git a/XSF.sln b/XSF.sln
new file mode 100644 (file)
index 0000000..b93ea06
--- /dev/null
+++ b/XSF.sln
@@ -0,0 +1,92 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29424.173
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamarinSource", "XamarinSource", "{68B0EFBF-2ACB-46F2-91D5-263A920AD13B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Build.Tasks", "Xamarin.Forms\Xamarin.Forms.Build.Tasks\Xamarin.Forms.Build.Tasks.csproj", "{A46F34BF-826E-4527-9C41-ACA1B40A2A84}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Core", "Xamarin.Forms\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj", "{D725AE90-E651-450E-AD6D-F221A2EDA5BF}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform", "Xamarin.Forms\Xamarin.Forms.Platform\Xamarin.Forms.Platform.csproj", "{18FAD05F-8913-4241-916F-FB03C76ECA68}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Platform.Tizen", "Xamarin.Forms\Xamarin.Forms.Platform.Tizen\Xamarin.Forms.Platform.Tizen.csproj", "{2BB62D19-F9C6-46D5-8545-B63345DDBCCC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xamarin.Forms.Xaml", "Xamarin.Forms\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj", "{DB9289C6-D0BE-45AF-AA76-601B8B3D89DF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestApps", "TestApps", "{087187F9-A361-4269-88EB-47A44185FA7F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TizenCircularUISource", "TizenCircularUISource", "{32A6D9FF-AFD0-4CAF-A6E9-A3BBE8C4AEBA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAppBuild", "TestAppBuild", "{98D10EC6-7000-4877-870A-A9EC9E2327BD}"
+       ProjectSection(SolutionItems) = preProject
+               Test\Directory.Build.props = Test\Directory.Build.props
+               Test\Directory.Build.targets = Test\Directory.Build.targets
+       EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Wearable.CircularUI.Forms", "Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms\Tizen.Wearable.CircularUI.Forms.csproj", "{C9B8F56B-B2D5-4D8E-84BC-F1926160A130}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tizen.Wearable.CircularUI.Forms.Renderer", "Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms.Renderer\Tizen.Wearable.CircularUI.Forms.Renderer.csproj", "{1D58F961-6843-474B-91AB-07140137C707}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XStopWatch", "Test\XStopWatch\XStopWatch\XStopWatch.csproj", "{38700235-FC85-41F6-8801-5BBFDE5BCD65}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XStopWatch", "XStopWatch", "{CE5F5031-BE26-42D9-8B86-87770CB01226}"
+EndProject
+Global
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution
+               Debug|Any CPU = Debug|Any CPU
+               Release|Any CPU = Release|Any CPU
+       EndGlobalSection
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution
+               {A46F34BF-826E-4527-9C41-ACA1B40A2A84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {A46F34BF-826E-4527-9C41-ACA1B40A2A84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {A46F34BF-826E-4527-9C41-ACA1B40A2A84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {A46F34BF-826E-4527-9C41-ACA1B40A2A84}.Release|Any CPU.Build.0 = Release|Any CPU
+               {D725AE90-E651-450E-AD6D-F221A2EDA5BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {D725AE90-E651-450E-AD6D-F221A2EDA5BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {D725AE90-E651-450E-AD6D-F221A2EDA5BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {D725AE90-E651-450E-AD6D-F221A2EDA5BF}.Release|Any CPU.Build.0 = Release|Any CPU
+               {18FAD05F-8913-4241-916F-FB03C76ECA68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {18FAD05F-8913-4241-916F-FB03C76ECA68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {18FAD05F-8913-4241-916F-FB03C76ECA68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {18FAD05F-8913-4241-916F-FB03C76ECA68}.Release|Any CPU.Build.0 = Release|Any CPU
+               {2BB62D19-F9C6-46D5-8545-B63345DDBCCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {2BB62D19-F9C6-46D5-8545-B63345DDBCCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {2BB62D19-F9C6-46D5-8545-B63345DDBCCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {2BB62D19-F9C6-46D5-8545-B63345DDBCCC}.Release|Any CPU.Build.0 = Release|Any CPU
+               {DB9289C6-D0BE-45AF-AA76-601B8B3D89DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {DB9289C6-D0BE-45AF-AA76-601B8B3D89DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {DB9289C6-D0BE-45AF-AA76-601B8B3D89DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {DB9289C6-D0BE-45AF-AA76-601B8B3D89DF}.Release|Any CPU.Build.0 = Release|Any CPU
+               {C9B8F56B-B2D5-4D8E-84BC-F1926160A130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {C9B8F56B-B2D5-4D8E-84BC-F1926160A130}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {C9B8F56B-B2D5-4D8E-84BC-F1926160A130}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {C9B8F56B-B2D5-4D8E-84BC-F1926160A130}.Release|Any CPU.Build.0 = Release|Any CPU
+               {1D58F961-6843-474B-91AB-07140137C707}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {1D58F961-6843-474B-91AB-07140137C707}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {1D58F961-6843-474B-91AB-07140137C707}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {1D58F961-6843-474B-91AB-07140137C707}.Release|Any CPU.Build.0 = Release|Any CPU
+               {38700235-FC85-41F6-8801-5BBFDE5BCD65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {38700235-FC85-41F6-8801-5BBFDE5BCD65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {38700235-FC85-41F6-8801-5BBFDE5BCD65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {38700235-FC85-41F6-8801-5BBFDE5BCD65}.Release|Any CPU.Build.0 = Release|Any CPU
+       EndGlobalSection
+       GlobalSection(SolutionProperties) = preSolution
+               HideSolutionNode = FALSE
+       EndGlobalSection
+       GlobalSection(NestedProjects) = preSolution
+               {A46F34BF-826E-4527-9C41-ACA1B40A2A84} = {68B0EFBF-2ACB-46F2-91D5-263A920AD13B}
+               {D725AE90-E651-450E-AD6D-F221A2EDA5BF} = {68B0EFBF-2ACB-46F2-91D5-263A920AD13B}
+               {18FAD05F-8913-4241-916F-FB03C76ECA68} = {68B0EFBF-2ACB-46F2-91D5-263A920AD13B}
+               {2BB62D19-F9C6-46D5-8545-B63345DDBCCC} = {68B0EFBF-2ACB-46F2-91D5-263A920AD13B}
+               {DB9289C6-D0BE-45AF-AA76-601B8B3D89DF} = {68B0EFBF-2ACB-46F2-91D5-263A920AD13B}
+               {C9B8F56B-B2D5-4D8E-84BC-F1926160A130} = {32A6D9FF-AFD0-4CAF-A6E9-A3BBE8C4AEBA}
+               {1D58F961-6843-474B-91AB-07140137C707} = {32A6D9FF-AFD0-4CAF-A6E9-A3BBE8C4AEBA}
+               {38700235-FC85-41F6-8801-5BBFDE5BCD65} = {CE5F5031-BE26-42D9-8B86-87770CB01226}
+               {CE5F5031-BE26-42D9-8B86-87770CB01226} = {087187F9-A361-4269-88EB-47A44185FA7F}
+       EndGlobalSection
+       GlobalSection(ExtensibilityGlobals) = postSolution
+               SolutionGuid = {81158F7F-D003-4C6D-9937-5002C54D57EA}
+       EndGlobalSection
+EndGlobal

diff --git a/Xamarin.Forms.Maps.GTK/Libs/GMap.NET.Core.dll b/Xamarin.Forms.Maps.GTK/Libs/GMap.NET.Core.dll
deleted file mode 100644 (file)
index e457ada..0000000
Binary files a/Xamarin.Forms.Maps.GTK/Libs/GMap.NET.Core.dll and /dev/null differ

diff --git a/Xamarin.Forms.Maps.GTK/Libs/GMap.NET.GtkSharp.dll b/Xamarin.Forms.Maps.GTK/Libs/GMap.NET.GtkSharp.dll
deleted file mode 100644 (file)
index 3b95612..0000000
Binary files a/Xamarin.Forms.Maps.GTK/Libs/GMap.NET.GtkSharp.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/GMaps/GMap.NET.Core.dll b/Xamarin.Forms.Platform.GTK/Libs/GMaps/GMap.NET.Core.dll
deleted file mode 100644 (file)
index 92ae33f..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/GMaps/GMap.NET.Core.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/GMaps/GMap.NET.GTK.dll b/Xamarin.Forms.Platform.GTK/Libs/GMaps/GMap.NET.GTK.dll
deleted file mode 100644 (file)
index 54eaf2e..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/GMaps/GMap.NET.GTK.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/Mono.Cairo/Mono.Cairo.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/Mono.Cairo/Mono.Cairo.dll
deleted file mode 100644 (file)
index 924785a..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/Mono.Cairo/Mono.Cairo.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/Mono.Posix/Mono.Posix.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/Mono.Posix/Mono.Posix.dll
deleted file mode 100644 (file)
index 83fff46..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/Mono.Posix/Mono.Posix.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/atk-sharp.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/atk-sharp.dll
deleted file mode 100644 (file)
index 9f3ac86..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/atk-sharp.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/atk-sharp.pdb b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/atk-sharp.pdb
deleted file mode 100644 (file)
index c2bce62..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/atk-sharp.pdb and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gdk-sharp.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gdk-sharp.dll
deleted file mode 100644 (file)
index 5c799af..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gdk-sharp.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gdk-sharp.pdb b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gdk-sharp.pdb
deleted file mode 100644 (file)
index 813ff10..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gdk-sharp.pdb and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glade-sharp.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glade-sharp.dll
deleted file mode 100644 (file)
index 58248a0..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glade-sharp.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glade-sharp.pdb b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glade-sharp.pdb
deleted file mode 100644 (file)
index 3329a76..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glade-sharp.pdb and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glib-sharp.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glib-sharp.dll
deleted file mode 100644 (file)
index 0c5171b..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glib-sharp.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glib-sharp.pdb b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glib-sharp.pdb
deleted file mode 100644 (file)
index e21bdee..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/glib-sharp.pdb and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-dotnet.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-dotnet.dll
deleted file mode 100644 (file)
index 5fe8fd4..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-dotnet.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-dotnet.pdb b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-dotnet.pdb
deleted file mode 100644 (file)
index 849fc79..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-dotnet.pdb and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-sharp.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-sharp.dll
deleted file mode 100644 (file)
index 09ebb10..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/gtk-sharp.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/pango-sharp.dll b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/pango-sharp.dll
deleted file mode 100644 (file)
index 5fc3867..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/pango-sharp.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/pango-sharp.pdb b/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/pango-sharp.pdb
deleted file mode 100644 (file)
index 524a7e2..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/gtk-sharp-2.0/pango-sharp.pdb and /dev/null differ

diff --git a/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/webkit-sharp.dll b/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/webkit-sharp.dll
deleted file mode 100644 (file)
index 46646ba..0000000
Binary files a/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/webkit-sharp.dll and /dev/null differ

diff --git a/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs b/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs
deleted file mode 100644 (file)
index 6d8aeeb..0000000
--- a/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-namespace Xamarin.Forms.Platform
-{
-       internal static class Loader
-       {
-               internal static void Load()
-               {
-               }
-       }
-
-       internal class _BoxViewRenderer
-       {
-       }
-
-       internal class _EntryRenderer
-       {
-       }
-
-       internal class _EditorRenderer
-       {
-       }
-
-       internal class _LabelRenderer
-       {
-       }
-
-       internal class _ImageRenderer
-       {
-       }
-
-       internal class _ImageButtonRenderer
-       {
-       }
-
-       internal class _ButtonRenderer
-       {
-       }
-
-       internal class _TableViewRenderer
-       {
-       }
-
-       internal class _ListViewRenderer
-       {
-       }
-
-       internal class _CollectionViewRenderer
-       {
-       }
-
-       internal class _CarouselViewRenderer
-       {
-       }
-
-       internal class _SliderRenderer
-       {
-       }
-
-       internal class _WebViewRenderer
-       {
-       }
-
-       internal class _SearchBarRenderer
-       {
-       }
-
-       internal class _SwitchRenderer
-       {
-       }
-
-       internal class _DatePickerRenderer
-       {
-       }
-
-       internal class _TimePickerRenderer
-       {
-       }
-
-       internal class _PickerRenderer
-       {
-       }
-
-       internal class _StepperRenderer
-       {
-       }
-
-       internal class _ProgressBarRenderer
-       {
-       }
-
-       internal class _RefreshViewRenderer
-       {
-       }
-
-       internal class _ScrollViewRenderer
-       {
-       }
-
-       internal class _ActivityIndicatorRenderer
-       {
-       }
-
-       internal class _FrameRenderer
-       {
-       }
-
-       internal class _IndicatorViewRenderer
-       {
-       }
-
-       internal class _OpenGLViewRenderer
-       {
-       }
-
-       internal class _TabbedPageRenderer
-       {
-       }
-
-       internal class _NavigationPageRenderer
-       {
-       }
-
-       internal class _CarouselPageRenderer
-       {
-       }
-
-       internal class _PageRenderer
-       {
-       }
-
-       internal class _MasterDetailPageRenderer
-       {
-       }
-
-       internal class _SwipeViewRenderer
-       {
-       }
-}

diff --git a/.Xamarin.Forms.Android.nuget.sln b/Xamarin.Forms/.Xamarin.Forms.Android.nuget.sln
similarity index 100%
rename from .Xamarin.Forms.Android.nuget.sln
rename to Xamarin.Forms/.Xamarin.Forms.Android.nuget.sln

diff --git a/.Xamarin.Forms.Android.slnf b/Xamarin.Forms/.Xamarin.Forms.Android.slnf
similarity index 100%
rename from .Xamarin.Forms.Android.slnf
rename to Xamarin.Forms/.Xamarin.Forms.Android.slnf

diff --git a/.Xamarin.Forms.UAP.nuget.sln b/Xamarin.Forms/.Xamarin.Forms.UAP.nuget.sln
similarity index 100%
rename from .Xamarin.Forms.UAP.nuget.sln
rename to Xamarin.Forms/.Xamarin.Forms.UAP.nuget.sln

diff --git a/.Xamarin.Forms.UAP.slnf b/Xamarin.Forms/.Xamarin.Forms.UAP.slnf
similarity index 100%
rename from .Xamarin.Forms.UAP.slnf
rename to Xamarin.Forms/.Xamarin.Forms.UAP.slnf

diff --git a/.Xamarin.Forms.iOS.nuget.sln b/Xamarin.Forms/.Xamarin.Forms.iOS.nuget.sln
similarity index 100%
rename from .Xamarin.Forms.iOS.nuget.sln
rename to Xamarin.Forms/.Xamarin.Forms.iOS.nuget.sln

diff --git a/.Xamarin.Forms.iOS.slnf b/Xamarin.Forms/.Xamarin.Forms.iOS.slnf
similarity index 100%
rename from .Xamarin.Forms.iOS.slnf
rename to Xamarin.Forms/.Xamarin.Forms.iOS.slnf

diff --git a/.Xamarin.forms.nuget.sln b/Xamarin.Forms/.Xamarin.forms.nuget.sln
similarity index 100%
rename from .Xamarin.forms.nuget.sln
rename to Xamarin.Forms/.Xamarin.forms.nuget.sln

diff --git a/.Xamarin.forms.nuget.slnf b/Xamarin.Forms/.Xamarin.forms.nuget.slnf
similarity index 100%
rename from .Xamarin.forms.nuget.slnf
rename to Xamarin.Forms/.Xamarin.forms.nuget.slnf

diff --git a/.create-nuget.bat b/Xamarin.Forms/.create-nuget.bat
similarity index 100%
rename from .create-nuget.bat
rename to Xamarin.Forms/.create-nuget.bat

diff --git a/.create-stubs.bat b/Xamarin.Forms/.create-stubs.bat
similarity index 100%
rename from .create-stubs.bat
rename to Xamarin.Forms/.create-stubs.bat

diff --git a/.editorconfig b/Xamarin.Forms/.editorconfig
similarity index 100%
rename from .editorconfig
rename to Xamarin.Forms/.editorconfig

diff --git a/.nuspec/Xamarin.Forms.AppLinks.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.AppLinks.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.AppLinks.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.AppLinks.nuspec

diff --git a/.nuspec/Xamarin.Forms.Debug.targets b/Xamarin.Forms/.nuspec/Xamarin.Forms.Debug.targets
similarity index 100%
rename from .nuspec/Xamarin.Forms.Debug.targets
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Debug.targets

diff --git a/.nuspec/Xamarin.Forms.DefaultItems.props b/Xamarin.Forms/.nuspec/Xamarin.Forms.DefaultItems.props
similarity index 100%
rename from .nuspec/Xamarin.Forms.DefaultItems.props
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.DefaultItems.props

diff --git a/.nuspec/Xamarin.Forms.DefaultItems.targets b/Xamarin.Forms/.nuspec/Xamarin.Forms.DefaultItems.targets
similarity index 100%
rename from .nuspec/Xamarin.Forms.DefaultItems.targets
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.DefaultItems.targets

diff --git a/.nuspec/Xamarin.Forms.Maps.GTK.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.Maps.GTK.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.Maps.GTK.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Maps.GTK.nuspec

diff --git a/.nuspec/Xamarin.Forms.Maps.WPF.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.Maps.WPF.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.Maps.WPF.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Maps.WPF.nuspec

diff --git a/.nuspec/Xamarin.Forms.Maps.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.Maps.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.Maps.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Maps.nuspec

diff --git a/.nuspec/Xamarin.Forms.Pages.Azure.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.Pages.Azure.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.Pages.Azure.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Pages.Azure.nuspec

diff --git a/.nuspec/Xamarin.Forms.Pages.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.Pages.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.Pages.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Pages.nuspec

diff --git a/.nuspec/Xamarin.Forms.Platform.GTK.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.Platform.GTK.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.Platform.GTK.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Platform.GTK.nuspec

diff --git a/.nuspec/Xamarin.Forms.Platform.WPF.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.Platform.WPF.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.Platform.WPF.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Platform.WPF.nuspec

diff --git a/.nuspec/Xamarin.Forms.Visual.Material.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.Visual.Material.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.Visual.Material.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Visual.Material.nuspec

diff --git a/.nuspec/Xamarin.Forms.Visual.Material.targets b/Xamarin.Forms/.nuspec/Xamarin.Forms.Visual.Material.targets
similarity index 100%
rename from .nuspec/Xamarin.Forms.Visual.Material.targets
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.Visual.Material.targets

diff --git a/.nuspec/Xamarin.Forms.nuspec b/Xamarin.Forms/.nuspec/Xamarin.Forms.nuspec
similarity index 100%
rename from .nuspec/Xamarin.Forms.nuspec
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.nuspec

diff --git a/.nuspec/Xamarin.Forms.props b/Xamarin.Forms/.nuspec/Xamarin.Forms.props
similarity index 100%
rename from .nuspec/Xamarin.Forms.props
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.props

diff --git a/.nuspec/Xamarin.Forms.targets b/Xamarin.Forms/.nuspec/Xamarin.Forms.targets
similarity index 100%
rename from .nuspec/Xamarin.Forms.targets
rename to Xamarin.Forms/.nuspec/Xamarin.Forms.targets

diff --git a/.nuspec/_._ b/Xamarin.Forms/.nuspec/_._
similarity index 100%
rename from .nuspec/_._
rename to Xamarin.Forms/.nuspec/_._

diff --git a/.nuspec/proguard.cfg b/Xamarin.Forms/.nuspec/proguard.cfg
similarity index 100%
rename from .nuspec/proguard.cfg
rename to Xamarin.Forms/.nuspec/proguard.cfg

diff --git a/.xtc-manual-ios.bat b/Xamarin.Forms/.xtc-manual-ios.bat
similarity index 100%
rename from .xtc-manual-ios.bat
rename to Xamarin.Forms/.xtc-manual-ios.bat

diff --git a/AndroidNative/AndroidNative.iml b/Xamarin.Forms/AndroidNative/AndroidNative.iml
similarity index 100%
rename from AndroidNative/AndroidNative.iml
rename to Xamarin.Forms/AndroidNative/AndroidNative.iml

diff --git a/AndroidNative/FormsViewGroup/FormsViewGroup.iml b/Xamarin.Forms/AndroidNative/FormsViewGroup/FormsViewGroup.iml
similarity index 100%
rename from AndroidNative/FormsViewGroup/FormsViewGroup.iml
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/FormsViewGroup.iml

diff --git a/AndroidNative/FormsViewGroup/build.gradle b/Xamarin.Forms/AndroidNative/FormsViewGroup/build.gradle
similarity index 100%
rename from AndroidNative/FormsViewGroup/build.gradle
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/build.gradle

diff --git a/AndroidNative/FormsViewGroup/src/main/AndroidManifest.xml b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/AndroidManifest.xml
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/AndroidManifest.xml
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/AndroidManifest.xml

diff --git a/AndroidNative/FormsViewGroup/src/main/java/com/xamarin/forms/platform/android/FormsViewGroup.java b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/java/com/xamarin/forms/platform/android/FormsViewGroup.java
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/java/com/xamarin/forms/platform/android/FormsViewGroup.java
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/java/com/xamarin/forms/platform/android/FormsViewGroup.java

diff --git a/AndroidNative/FormsViewGroup/src/main/res/drawable-hdpi/ic_launcher.png b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/res/drawable-hdpi/ic_launcher.png
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/drawable-hdpi/ic_launcher.png

diff --git a/AndroidNative/FormsViewGroup/src/main/res/drawable-mdpi/ic_launcher.png b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/res/drawable-mdpi/ic_launcher.png
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/drawable-mdpi/ic_launcher.png

diff --git a/AndroidNative/FormsViewGroup/src/main/res/drawable-xhdpi/ic_launcher.png b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/res/drawable-xhdpi/ic_launcher.png
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/drawable-xhdpi/ic_launcher.png

diff --git a/AndroidNative/FormsViewGroup/src/main/res/values-v11/styles.xml b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/values-v11/styles.xml
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/res/values-v11/styles.xml
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/values-v11/styles.xml

diff --git a/AndroidNative/FormsViewGroup/src/main/res/values-v14/styles.xml b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/values-v14/styles.xml
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/res/values-v14/styles.xml
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/values-v14/styles.xml

diff --git a/AndroidNative/FormsViewGroup/src/main/res/values/strings.xml b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/values/strings.xml
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/res/values/strings.xml
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/values/strings.xml

diff --git a/AndroidNative/FormsViewGroup/src/main/res/values/styles.xml b/Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/values/styles.xml
similarity index 100%
rename from AndroidNative/FormsViewGroup/src/main/res/values/styles.xml
rename to Xamarin.Forms/AndroidNative/FormsViewGroup/src/main/res/values/styles.xml

diff --git a/AndroidNative/HOWTOBUILD b/Xamarin.Forms/AndroidNative/HOWTOBUILD
similarity index 100%
rename from AndroidNative/HOWTOBUILD
rename to Xamarin.Forms/AndroidNative/HOWTOBUILD

diff --git a/AndroidNative/build.gradle b/Xamarin.Forms/AndroidNative/build.gradle
similarity index 100%
rename from AndroidNative/build.gradle
rename to Xamarin.Forms/AndroidNative/build.gradle

diff --git a/AndroidNative/gradle/wrapper/gradle-wrapper.jar b/Xamarin.Forms/AndroidNative/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from AndroidNative/gradle/wrapper/gradle-wrapper.jar
rename to Xamarin.Forms/AndroidNative/gradle/wrapper/gradle-wrapper.jar

diff --git a/AndroidNative/gradle/wrapper/gradle-wrapper.properties b/Xamarin.Forms/AndroidNative/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from AndroidNative/gradle/wrapper/gradle-wrapper.properties
rename to Xamarin.Forms/AndroidNative/gradle/wrapper/gradle-wrapper.properties

diff --git a/AndroidNative/gradlew b/Xamarin.Forms/AndroidNative/gradlew
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from AndroidNative/gradlew
rename to Xamarin.Forms/AndroidNative/gradlew

diff --git a/AndroidNative/gradlew.bat b/Xamarin.Forms/AndroidNative/gradlew.bat
similarity index 100%
rename from AndroidNative/gradlew.bat
rename to Xamarin.Forms/AndroidNative/gradlew.bat

diff --git a/AndroidNative/settings.gradle b/Xamarin.Forms/AndroidNative/settings.gradle
similarity index 100%
rename from AndroidNative/settings.gradle
rename to Xamarin.Forms/AndroidNative/settings.gradle

diff --git a/Assets/xamarin_128x128.png b/Xamarin.Forms/Assets/xamarin_128x128.png
similarity index 100%
rename from Assets/xamarin_128x128.png
rename to Xamarin.Forms/Assets/xamarin_128x128.png

diff --git a/Xamarin.Forms/Directory.Build.props b/Xamarin.Forms/Directory.Build.props
new file mode 100644 (file)
index 0000000..9fa3996
--- /dev/null
+++ b/Xamarin.Forms/Directory.Build.props
@@ -0,0 +1,22 @@
+<Project>
+  <PropertyGroup>
+    <__XFBuildTasksLocation>$(_XFBuildTasksLocation)</__XFBuildTasksLocation>
+    <__XFBuildTasksLocation Condition="'$(__XFBuildTasksLocation)' == '' AND '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory).nuspec\netstandard2.0\</__XFBuildTasksLocation>
+    <__XFBuildTasksLocation Condition="'$(__XFBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).nuspec\net46\</__XFBuildTasksLocation>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <DebugType>portable</DebugType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IncludeSymbols>true</IncludeSymbols>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <Company>Microsoft</Company>
+    <Product>Xamarin.Forms</Product>
+    <LangVersion>7.3</LangVersion>
+    <ProduceReferenceAssembly Condition="'$(UsingMicrosoftNETSdk)' == 'True' AND '$(Configuration)' == 'Debug'">True</ProduceReferenceAssembly>
+  </PropertyGroup>
+  <!-- This target is replaced by GitInfo when restored. Allows Version.targets to rely on it before restore. -->
+  <PropertyGroup Condition="'$(CI)' == ''">
+    <CI>false</CI>
+    <CI Condition="'$(TF_BUILD)' == 'true'">true</CI>
+  </PropertyGroup>
+ </Project>
\ No newline at end of file

diff --git a/Directory.Build.targets b/Xamarin.Forms/Directory.Build.targets
similarity index 100%
rename from Directory.Build.targets
rename to Xamarin.Forms/Directory.Build.targets

diff --git a/EmbeddingTestBeds/Embedding.Droid/Assets/AboutAssets.txt b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Assets/AboutAssets.txt
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Assets/AboutAssets.txt
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Assets/AboutAssets.txt

diff --git a/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj

diff --git a/EmbeddingTestBeds/Embedding.Droid/GettingStarted.Xamarin b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/GettingStarted.Xamarin
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/GettingStarted.Xamarin
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/GettingStarted.Xamarin

diff --git a/EmbeddingTestBeds/Embedding.Droid/MainActivity.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/MainActivity.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/MainActivity.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/MainActivity.cs

diff --git a/EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest.xml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest.xml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest.xml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Properties/AndroidManifest.xml

diff --git a/EmbeddingTestBeds/Embedding.Droid/Resources/AboutResources.txt b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/AboutResources.txt
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Resources/AboutResources.txt
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/AboutResources.txt

diff --git a/EmbeddingTestBeds/Embedding.Droid/Resources/drawable/Icon.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/drawable/Icon.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Resources/drawable/Icon.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/drawable/Icon.png

diff --git a/EmbeddingTestBeds/Embedding.Droid/Resources/layout/Main.axml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/layout/Main.axml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Resources/layout/Main.axml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/layout/Main.axml

diff --git a/EmbeddingTestBeds/Embedding.Droid/Resources/layout/MainFragment.axml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/layout/MainFragment.axml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Resources/layout/MainFragment.axml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/layout/MainFragment.axml

diff --git a/EmbeddingTestBeds/Embedding.Droid/Resources/layout/Second.axml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/layout/Second.axml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Resources/layout/Second.axml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/layout/Second.axml

diff --git a/EmbeddingTestBeds/Embedding.Droid/Resources/layout/SecondFragment.axml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/layout/SecondFragment.axml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Resources/layout/SecondFragment.axml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/layout/SecondFragment.axml

diff --git a/EmbeddingTestBeds/Embedding.Droid/Resources/values/Strings.xml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/values/Strings.xml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/Resources/values/Strings.xml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/Resources/values/Strings.xml

diff --git a/EmbeddingTestBeds/Embedding.Droid/SecondActivity.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/SecondActivity.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/SecondActivity.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/SecondActivity.cs

diff --git a/EmbeddingTestBeds/Embedding.Droid/environment.txt b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/environment.txt
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Droid/environment.txt
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Droid/environment.txt

diff --git a/EmbeddingTestBeds/Embedding.Tizen/App.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Tizen/App.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Tizen/App.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Tizen/App.cs

diff --git a/EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Tizen/Embedding.Tizen.csproj

diff --git a/EmbeddingTestBeds/Embedding.Tizen/shared/res/Embedding.Tizen.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Tizen/shared/res/Embedding.Tizen.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Tizen/shared/res/Embedding.Tizen.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Tizen/shared/res/Embedding.Tizen.png

diff --git a/EmbeddingTestBeds/Embedding.Tizen/tizen-manifest.xml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.Tizen/tizen-manifest.xml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.Tizen/tizen-manifest.xml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.Tizen/tizen-manifest.xml

diff --git a/EmbeddingTestBeds/Embedding.UWP/App.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/App.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/App.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/App.xaml

diff --git a/EmbeddingTestBeds/Embedding.UWP/App.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/App.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/App.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/App.xaml.cs

diff --git a/PagesGallery/PagesGallery.UWP/Assets/LockScreenLogo.scale-200.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Assets/LockScreenLogo.scale-200.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/LockScreenLogo.scale-200.png

diff --git a/PagesGallery/PagesGallery.UWP/Assets/SplashScreen.scale-200.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Assets/SplashScreen.scale-200.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/SplashScreen.scale-200.png

diff --git a/PagesGallery/PagesGallery.UWP/Assets/Square150x150Logo.scale-200.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Assets/Square150x150Logo.scale-200.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/Square150x150Logo.scale-200.png

diff --git a/PagesGallery/PagesGallery.UWP/Assets/Square44x44Logo.scale-200.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Assets/Square44x44Logo.scale-200.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/Square44x44Logo.scale-200.png

diff --git a/PagesGallery/PagesGallery.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png

diff --git a/PagesGallery/PagesGallery.UWP/Assets/StoreLogo.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/StoreLogo.png
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Assets/StoreLogo.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/StoreLogo.png

diff --git a/PagesGallery/PagesGallery.UWP/Assets/Wide310x150Logo.scale-200.png b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Assets/Wide310x150Logo.scale-200.png
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Assets/Wide310x150Logo.scale-200.png

diff --git a/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Embedding.UWP.csproj

diff --git a/EmbeddingTestBeds/Embedding.UWP/MainPage.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/MainPage.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/MainPage.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/MainPage.xaml

diff --git a/EmbeddingTestBeds/Embedding.UWP/MainPage.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/MainPage.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/MainPage.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/MainPage.xaml.cs

diff --git a/EmbeddingTestBeds/Embedding.UWP/Package.appxmanifest b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Package.appxmanifest
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Package.appxmanifest
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Package.appxmanifest

diff --git a/EmbeddingTestBeds/Embedding.UWP/Page2.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Page2.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Page2.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Page2.xaml

diff --git a/EmbeddingTestBeds/Embedding.UWP/Page2.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Page2.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Page2.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Page2.xaml.cs

diff --git a/PagesGallery/PagesGallery.UWP/Properties/Default.rd.xml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Properties/Default.rd.xml
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Properties/Default.rd.xml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.UWP/Properties/Default.rd.xml

diff --git a/EmbeddingTestBeds/Embedding.XF/AlertsAndActionSheets.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/AlertsAndActionSheets.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/AlertsAndActionSheets.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/AlertsAndActionSheets.xaml

diff --git a/EmbeddingTestBeds/Embedding.XF/AlertsAndActionSheets.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/AlertsAndActionSheets.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/AlertsAndActionSheets.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/AlertsAndActionSheets.xaml.cs

diff --git a/PagesGallery/PagesGallery/Directory.Build.props b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Directory.Build.props
similarity index 100%
rename from PagesGallery/PagesGallery/Directory.Build.props
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Directory.Build.props

diff --git a/PagesGallery/PagesGallery/Directory.Build.targets b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Directory.Build.targets
similarity index 100%
rename from PagesGallery/PagesGallery/Directory.Build.targets
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Directory.Build.targets

diff --git a/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Embedding.XF.csproj

diff --git a/EmbeddingTestBeds/Embedding.XF/Hello.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Hello.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Hello.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Hello.xaml

diff --git a/EmbeddingTestBeds/Embedding.XF/Hello.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Hello.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Hello.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Hello.xaml.cs

diff --git a/EmbeddingTestBeds/Embedding.XF/OpenUri.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/OpenUri.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/OpenUri.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/OpenUri.xaml

diff --git a/EmbeddingTestBeds/Embedding.XF/OpenUri.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/OpenUri.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/OpenUri.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/OpenUri.xaml.cs

diff --git a/EmbeddingTestBeds/Embedding.XF/Page3.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Page3.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Page3.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Page3.xaml

diff --git a/EmbeddingTestBeds/Embedding.XF/Page3.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Page3.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Page3.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Page3.xaml.cs

diff --git a/EmbeddingTestBeds/Embedding.XF/Page4.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Page4.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Page4.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Page4.xaml

diff --git a/EmbeddingTestBeds/Embedding.XF/Page4.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Page4.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Page4.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/Page4.xaml.cs

diff --git a/EmbeddingTestBeds/Embedding.XF/WebViewExample.xaml b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/WebViewExample.xaml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/WebViewExample.xaml
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/WebViewExample.xaml

diff --git a/EmbeddingTestBeds/Embedding.XF/WebViewExample.xaml.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/WebViewExample.xaml.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/WebViewExample.xaml.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.XF/WebViewExample.xaml.cs

diff --git a/EmbeddingTestBeds/Embedding.iOS/AppDelegate.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/AppDelegate.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/AppDelegate.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/AppDelegate.cs

diff --git a/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj

diff --git a/EmbeddingTestBeds/Embedding.iOS/Entitlements.plist b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Entitlements.plist
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/Entitlements.plist
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Entitlements.plist

diff --git a/EmbeddingTestBeds/Embedding.iOS/GettingStarted.Xamarin b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/GettingStarted.Xamarin
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/GettingStarted.Xamarin
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/GettingStarted.Xamarin

diff --git a/EmbeddingTestBeds/Embedding.iOS/Info.plist b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Info.plist
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/Info.plist
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Info.plist

diff --git a/EmbeddingTestBeds/Embedding.iOS/Main.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Main.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/Main.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Main.cs

diff --git a/EmbeddingTestBeds/Embedding.iOS/Main.storyboard b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Main.storyboard
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/Main.storyboard
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Main.storyboard

diff --git a/EmbeddingTestBeds/Embedding.iOS/Resources/LaunchScreen.xib b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Resources/LaunchScreen.xib
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/Resources/LaunchScreen.xib
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/Resources/LaunchScreen.xib

diff --git a/EmbeddingTestBeds/Embedding.iOS/ViewController.cs b/Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/ViewController.cs
similarity index 100%
rename from EmbeddingTestBeds/Embedding.iOS/ViewController.cs
rename to Xamarin.Forms/EmbeddingTestBeds/Embedding.iOS/ViewController.cs

diff --git a/GitInfo.txt b/Xamarin.Forms/GitInfo.txt
similarity index 100%
rename from GitInfo.txt
rename to Xamarin.Forms/GitInfo.txt

diff --git a/LICENSE b/Xamarin.Forms/LICENSE
similarity index 100%
rename from LICENSE
rename to Xamarin.Forms/LICENSE

diff --git a/Makefile b/Xamarin.Forms/Makefile
similarity index 100%
rename from Makefile
rename to Xamarin.Forms/Makefile

diff --git a/PagesGallery/PagesGallery.Droid/Assets/AboutAssets.txt b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Assets/AboutAssets.txt
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Assets/AboutAssets.txt
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Assets/AboutAssets.txt

diff --git a/PagesGallery/PagesGallery.Droid/MainActivity.cs b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/MainActivity.cs
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/MainActivity.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/MainActivity.cs

diff --git a/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj

diff --git a/PagesGallery/PagesGallery.Droid/Properties/AndroidManifest.xml b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Properties/AndroidManifest.xml
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Properties/AndroidManifest.xml
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Properties/AndroidManifest.xml

diff --git a/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Properties/AssemblyInfo.cs

diff --git a/PagesGallery/PagesGallery.Droid/Resources/AboutResources.txt b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/AboutResources.txt
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Resources/AboutResources.txt
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/AboutResources.txt

diff --git a/PagesGallery/PagesGallery.Droid/Resources/drawable-hdpi/icon.png b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/drawable-hdpi/icon.png
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Resources/drawable-hdpi/icon.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/drawable-hdpi/icon.png

diff --git a/PagesGallery/PagesGallery.Droid/Resources/drawable-xhdpi/icon.png b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/drawable-xhdpi/icon.png
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Resources/drawable-xhdpi/icon.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/drawable-xhdpi/icon.png

diff --git a/PagesGallery/PagesGallery.Droid/Resources/drawable-xxhdpi/icon.png b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/drawable-xxhdpi/icon.png
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Resources/drawable-xxhdpi/icon.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/drawable-xxhdpi/icon.png

diff --git a/PagesGallery/PagesGallery.Droid/Resources/drawable/icon.png b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/drawable/icon.png
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Resources/drawable/icon.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/drawable/icon.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/layout/Tabbar.axml b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/layout/Tabbar.axml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/layout/Tabbar.axml
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/layout/Tabbar.axml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/layout/Toolbar.axml b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/layout/Toolbar.axml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/layout/Toolbar.axml
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/layout/Toolbar.axml

diff --git a/PagesGallery/PagesGallery.Droid/Resources/values/styles.xml b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/values/styles.xml
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Resources/values/styles.xml
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/Resources/values/styles.xml

diff --git a/Xamarin.Forms.Core.macOS.UITests/app.config b/Xamarin.Forms/PagesGallery/PagesGallery.Droid/app.config
similarity index 100%
rename from Xamarin.Forms.Core.macOS.UITests/app.config
rename to Xamarin.Forms/PagesGallery/PagesGallery.Droid/app.config

diff --git a/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.cs b/Xamarin.Forms/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.cs
similarity index 100%
rename from PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.cs

diff --git a/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj b/Xamarin.Forms/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj
similarity index 100%
rename from PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj
rename to Xamarin.Forms/PagesGallery/PagesGallery.Tizen/PagesGallery.Tizen.csproj

diff --git a/PagesGallery/PagesGallery.Tizen/shared/res/PagesGallery.Tizen.png b/Xamarin.Forms/PagesGallery/PagesGallery.Tizen/shared/res/PagesGallery.Tizen.png
similarity index 100%
rename from PagesGallery/PagesGallery.Tizen/shared/res/PagesGallery.Tizen.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.Tizen/shared/res/PagesGallery.Tizen.png

diff --git a/PagesGallery/PagesGallery.Tizen/tizen-manifest.xml b/Xamarin.Forms/PagesGallery/PagesGallery.Tizen/tizen-manifest.xml
similarity index 100%
rename from PagesGallery/PagesGallery.Tizen/tizen-manifest.xml
rename to Xamarin.Forms/PagesGallery/PagesGallery.Tizen/tizen-manifest.xml

diff --git a/PagesGallery/PagesGallery.UWP/App.xaml b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/App.xaml
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/App.xaml
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/App.xaml

diff --git a/PagesGallery/PagesGallery.UWP/App.xaml.cs b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/App.xaml.cs
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/App.xaml.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/App.xaml.cs

diff --git a/EmbeddingTestBeds/Embedding.UWP/Assets/LockScreenLogo.scale-200.png b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Assets/LockScreenLogo.scale-200.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/LockScreenLogo.scale-200.png

diff --git a/EmbeddingTestBeds/Embedding.UWP/Assets/SplashScreen.scale-200.png b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Assets/SplashScreen.scale-200.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/SplashScreen.scale-200.png

diff --git a/EmbeddingTestBeds/Embedding.UWP/Assets/Square150x150Logo.scale-200.png b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Assets/Square150x150Logo.scale-200.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/Square150x150Logo.scale-200.png

diff --git a/EmbeddingTestBeds/Embedding.UWP/Assets/Square44x44Logo.scale-200.png b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Assets/Square44x44Logo.scale-200.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/Square44x44Logo.scale-200.png

diff --git a/EmbeddingTestBeds/Embedding.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png

diff --git a/EmbeddingTestBeds/Embedding.UWP/Assets/StoreLogo.png b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/StoreLogo.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Assets/StoreLogo.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/StoreLogo.png

diff --git a/EmbeddingTestBeds/Embedding.UWP/Assets/Wide310x150Logo.scale-200.png b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Assets/Wide310x150Logo.scale-200.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Assets/Wide310x150Logo.scale-200.png

diff --git a/PagesGallery/PagesGallery.UWP/MainPage.xaml b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/MainPage.xaml
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/MainPage.xaml
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/MainPage.xaml

diff --git a/PagesGallery/PagesGallery.UWP/MainPage.xaml.cs b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/MainPage.xaml.cs
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/MainPage.xaml.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/MainPage.xaml.cs

diff --git a/PagesGallery/PagesGallery.UWP/Package.appxmanifest b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Package.appxmanifest
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/Package.appxmanifest
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Package.appxmanifest

diff --git a/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
similarity index 100%
rename from PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/PagesGallery.UWP.csproj

diff --git a/EmbeddingTestBeds/Embedding.UWP/Properties/Default.rd.xml b/Xamarin.Forms/PagesGallery/PagesGallery.UWP/Properties/Default.rd.xml
similarity index 100%
rename from EmbeddingTestBeds/Embedding.UWP/Properties/Default.rd.xml
rename to Xamarin.Forms/PagesGallery/PagesGallery.UWP/Properties/Default.rd.xml

diff --git a/PagesGallery/PagesGallery.iOS/AppDelegate.cs b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/AppDelegate.cs
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/AppDelegate.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/AppDelegate.cs

diff --git a/PagesGallery/PagesGallery.iOS/Entitlements.plist b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Entitlements.plist
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Entitlements.plist
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Entitlements.plist

diff --git a/PagesGallery/PagesGallery.iOS/Info.plist b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Info.plist
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Info.plist
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Info.plist

diff --git a/PagesGallery/PagesGallery.iOS/Main.cs b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Main.cs
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Main.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Main.cs

diff --git a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Default-568h@2x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default-568h@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Default-568h@2x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default-568h@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Default-Portrait.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default-Portrait.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Default-Portrait.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default-Portrait.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Default-Portrait@2x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default-Portrait@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Default-Portrait@2x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default-Portrait@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Default.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Default.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Default@2x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Default@2x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Default@2x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-60@2x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-60@2x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-60@2x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-60@2x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-60@3x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-60@3x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-60@3x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-60@3x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-76.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-76.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-76.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-76.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-76@2x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-76@2x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-76@2x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-76@2x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40@2x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40@2x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40@2x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40@2x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40@3x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40@3x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40@3x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small-40@3x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-Small.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-Small.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-Small@2x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small@2x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-Small@2x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small@2x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Icon-Small@3x.png b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small@3x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Icon-Small@3x.png
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/Icon-Small@3x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/LaunchScreen.storyboard b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/LaunchScreen.storyboard
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/LaunchScreen.storyboard
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/Resources/LaunchScreen.storyboard

diff --git a/Xamarin.Forms.Core.Windows.UITests/app.config b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/app.config
similarity index 100%
rename from Xamarin.Forms.Core.Windows.UITests/app.config
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/app.config

diff --git a/PagesGallery/PagesGallery.iOS/iTunesArtwork b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/iTunesArtwork
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/iTunesArtwork
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/iTunesArtwork

diff --git a/PagesGallery/PagesGallery.iOS/iTunesArtwork@2x b/Xamarin.Forms/PagesGallery/PagesGallery.iOS/iTunesArtwork@2x
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/iTunesArtwork@2x
rename to Xamarin.Forms/PagesGallery/PagesGallery.iOS/iTunesArtwork@2x

diff --git a/PagesGallery/PagesGallery/App.xaml b/Xamarin.Forms/PagesGallery/PagesGallery/App.xaml
similarity index 100%
rename from PagesGallery/PagesGallery/App.xaml
rename to Xamarin.Forms/PagesGallery/PagesGallery/App.xaml

diff --git a/PagesGallery/PagesGallery/App.xaml.cs b/Xamarin.Forms/PagesGallery/PagesGallery/App.xaml.cs
similarity index 100%
rename from PagesGallery/PagesGallery/App.xaml.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery/App.xaml.cs

diff --git a/PagesGallery/PagesGallery/CapitalizationConverter.cs b/Xamarin.Forms/PagesGallery/PagesGallery/CapitalizationConverter.cs
similarity index 100%
rename from PagesGallery/PagesGallery/CapitalizationConverter.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery/CapitalizationConverter.cs

diff --git a/EmbeddingTestBeds/Embedding.XF/Directory.Build.props b/Xamarin.Forms/PagesGallery/PagesGallery/Directory.Build.props
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Directory.Build.props
rename to Xamarin.Forms/PagesGallery/PagesGallery/Directory.Build.props

diff --git a/EmbeddingTestBeds/Embedding.XF/Directory.Build.targets b/Xamarin.Forms/PagesGallery/PagesGallery/Directory.Build.targets
similarity index 100%
rename from EmbeddingTestBeds/Embedding.XF/Directory.Build.targets
rename to Xamarin.Forms/PagesGallery/PagesGallery/Directory.Build.targets

diff --git a/PagesGallery/PagesGallery/EventsPage.xaml b/Xamarin.Forms/PagesGallery/PagesGallery/EventsPage.xaml
similarity index 100%
rename from PagesGallery/PagesGallery/EventsPage.xaml
rename to Xamarin.Forms/PagesGallery/PagesGallery/EventsPage.xaml

diff --git a/PagesGallery/PagesGallery/EventsPage.xaml.cs b/Xamarin.Forms/PagesGallery/PagesGallery/EventsPage.xaml.cs
similarity index 100%
rename from PagesGallery/PagesGallery/EventsPage.xaml.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery/EventsPage.xaml.cs

diff --git a/PagesGallery/PagesGallery/GettingStarted.Xamarin b/Xamarin.Forms/PagesGallery/PagesGallery/GettingStarted.Xamarin
similarity index 100%
rename from PagesGallery/PagesGallery/GettingStarted.Xamarin
rename to Xamarin.Forms/PagesGallery/PagesGallery/GettingStarted.Xamarin

diff --git a/PagesGallery/PagesGallery/PagesGallery.csproj b/Xamarin.Forms/PagesGallery/PagesGallery/PagesGallery.csproj
similarity index 100%
rename from PagesGallery/PagesGallery/PagesGallery.csproj
rename to Xamarin.Forms/PagesGallery/PagesGallery/PagesGallery.csproj

diff --git a/PagesGallery/PagesGallery/SpeakersPage.xaml b/Xamarin.Forms/PagesGallery/PagesGallery/SpeakersPage.xaml
similarity index 100%
rename from PagesGallery/PagesGallery/SpeakersPage.xaml
rename to Xamarin.Forms/PagesGallery/PagesGallery/SpeakersPage.xaml

diff --git a/PagesGallery/PagesGallery/SpeakersPage.xaml.cs b/Xamarin.Forms/PagesGallery/PagesGallery/SpeakersPage.xaml.cs
similarity index 100%
rename from PagesGallery/PagesGallery/SpeakersPage.xaml.cs
rename to Xamarin.Forms/PagesGallery/PagesGallery/SpeakersPage.xaml.cs

diff --git a/README.md b/Xamarin.Forms/README.md
similarity index 100%
rename from README.md
rename to Xamarin.Forms/README.md

diff --git a/SECURITY.md b/Xamarin.Forms/SECURITY.md
similarity index 100%
rename from SECURITY.md
rename to Xamarin.Forms/SECURITY.md

diff --git a/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs
similarity index 100%
rename from Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Stubs/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs

diff --git a/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj b/Xamarin.Forms/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
similarity index 100%
rename from Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
rename to Xamarin.Forms/Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj

diff --git a/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs b/Xamarin.Forms/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs
similarity index 100%
rename from Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Stubs/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs

diff --git a/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj b/Xamarin.Forms/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj
similarity index 100%
rename from Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj
rename to Xamarin.Forms/Stubs/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen (Forwarders).csproj

diff --git a/Stubs/Xamarin.Forms.Platform.cs b/Xamarin.Forms/Stubs/Xamarin.Forms.Platform.cs
similarity index 100%
rename from Stubs/Xamarin.Forms.Platform.cs
rename to Xamarin.Forms/Stubs/Xamarin.Forms.Platform.cs

diff --git a/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Stubs/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs

diff --git a/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj b/Xamarin.Forms/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj
similarity index 100%
rename from Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj
rename to Xamarin.Forms/Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj

diff --git a/Version.targets b/Xamarin.Forms/Version.targets
similarity index 100%
rename from Version.targets
rename to Xamarin.Forms/Version.targets

diff --git a/XFCorePostProcessor.Tasks/FixXFCoreAssembly.cs b/Xamarin.Forms/XFCorePostProcessor.Tasks/FixXFCoreAssembly.cs
similarity index 100%
rename from XFCorePostProcessor.Tasks/FixXFCoreAssembly.cs
rename to Xamarin.Forms/XFCorePostProcessor.Tasks/FixXFCoreAssembly.cs

diff --git a/XFCorePostProcessor.Tasks/XFCorePostProcessor.Tasks.csproj b/Xamarin.Forms/XFCorePostProcessor.Tasks/XFCorePostProcessor.Tasks.csproj
similarity index 100%
rename from XFCorePostProcessor.Tasks/XFCorePostProcessor.Tasks.csproj
rename to Xamarin.Forms/XFCorePostProcessor.Tasks/XFCorePostProcessor.Tasks.csproj

diff --git a/Xamarin.Flex/Flex.cs b/Xamarin.Forms/Xamarin.Flex/Flex.cs
similarity index 100%
rename from Xamarin.Flex/Flex.cs
rename to Xamarin.Forms/Xamarin.Flex/Flex.cs

diff --git a/Xamarin.Flex/Xamarin.Flex.projitems b/Xamarin.Forms/Xamarin.Flex/Xamarin.Flex.projitems
similarity index 100%
rename from Xamarin.Flex/Xamarin.Flex.projitems
rename to Xamarin.Forms/Xamarin.Flex/Xamarin.Flex.projitems

diff --git a/Xamarin.Flex/Xamarin.Flex.shproj b/Xamarin.Forms/Xamarin.Flex/Xamarin.Flex.shproj
similarity index 100%
rename from Xamarin.Flex/Xamarin.Flex.shproj
rename to Xamarin.Forms/Xamarin.Flex/Xamarin.Flex.shproj

diff --git a/Xamarin.Forms.Build.Tasks/BindablePropertyReferenceExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/BindablePropertyReferenceExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/BindablePropertyReferenceExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/BindablePropertyReferenceExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/BindablePropertyConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/BindablePropertyConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/BindablePropertyConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/BindablePropertyConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/BindingTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/BindingTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/BindingTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/BindingTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/BoundsTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/BoundsTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/BoundsTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/BoundsTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/ColorTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ColorTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/ColorTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ColorTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/ConstraintTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ConstraintTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/ConstraintTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ConstraintTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/ICompiledTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ICompiledTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/ICompiledTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ICompiledTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/LayoutOptionsConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/LayoutOptionsConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/LayoutOptionsConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/LayoutOptionsConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ListStringTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/RDSourceTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/RDSourceTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/RDSourceTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/RDSourceTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/RectangleTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/RectangleTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/RectangleTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/RectangleTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/ThicknessTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ThicknessTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/ThicknessTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/ThicknessTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/TypeTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/TypeTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/TypeTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/TypeTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledConverters/UriTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/UriTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledConverters/UriTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledConverters/UriTypeConverter.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/ArrayExtension.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/ArrayExtension.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/ArrayExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/ArrayExtension.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/DataTemplateExtension.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/DataTemplateExtension.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/DataTemplateExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/DataTemplateExtension.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/ICompiledMarkupExtension.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/ICompiledMarkupExtension.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/ICompiledMarkupExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/ICompiledMarkupExtension.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/NullExtension.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/NullExtension.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/NullExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/NullExtension.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/StaticExtension.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/TypeExtension.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/TypeExtension.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/TypeExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledMarkupExtensions/TypeExtension.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/ICompiledValueProvider.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledValueProviders/ICompiledValueProvider.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledValueProviders/ICompiledValueProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledValueProviders/ICompiledValueProvider.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/PassthroughValueProvider.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledValueProviders/PassthroughValueProvider.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledValueProviders/PassthroughValueProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledValueProviders/PassthroughValueProvider.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledValueProviders/SetterValueProvider.cs

diff --git a/Xamarin.Forms.Build.Tasks/CompiledValueProviders/StyleSheetProvider.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledValueProviders/StyleSheetProvider.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CompiledValueProviders/StyleSheetProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CompiledValueProviders/StyleSheetProvider.cs

diff --git a/Xamarin.Forms.Build.Tasks/CreateObjectVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CreateObjectVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CreateObjectVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CreateObjectVisitor.cs

diff --git a/Xamarin.Forms.Build.Tasks/CssGTask.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CssGTask.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CssGTask.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CssGTask.cs

diff --git a/Xamarin.Forms.Build.Tasks/CssGenerator.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/CssGenerator.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/CssGenerator.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/CssGenerator.cs

diff --git a/Xamarin.Forms.Build.Tasks/DebugXamlCTask.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/DebugXamlCTask.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/DebugXamlCTask.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/DebugXamlCTask.cs

diff --git a/Xamarin.Forms.Build.Tasks/ExpandMarkupsVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/ExpandMarkupsVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/ExpandMarkupsVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/ExpandMarkupsVisitor.cs

diff --git a/Xamarin.Forms.Build.Tasks/FieldReferenceExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/FieldReferenceExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/FieldReferenceExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/FieldReferenceExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/ILContext.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/ILContext.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/ILContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/ILContext.cs

diff --git a/Xamarin.Forms.Build.Tasks/ILProcessorExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/ILProcessorExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/ILProcessorExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/ILProcessorExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/ILRootNode.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/ILRootNode.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/ILRootNode.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/ILRootNode.cs

diff --git a/Xamarin.Forms.Build.Tasks/MethodBodyExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/MethodBodyExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/MethodBodyExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/MethodBodyExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/MethodDefinitionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/MethodDefinitionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/MethodDefinitionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/MethodDefinitionExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/MethodReferenceExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/MethodReferenceExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/MethodReferenceExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/MethodReferenceExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/ModuleDefinitionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/ModuleDefinitionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/ModuleDefinitionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/ModuleDefinitionExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/NodeILExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/NodeILExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/NodeILExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/NodeILExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/PerformanceProvider.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/PerformanceProvider.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/PerformanceProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/PerformanceProvider.cs

diff --git a/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Build.Tasks/SetFieldVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/SetFieldVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/SetFieldVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/SetFieldVisitor.cs

diff --git a/Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/SetNamescopesAndRegisterNamesVisitor.cs

diff --git a/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/SetPropertiesVisitor.cs

diff --git a/Xamarin.Forms.Build.Tasks/SetResourcesVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/SetResourcesVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/SetResourcesVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/SetResourcesVisitor.cs

diff --git a/Xamarin.Forms.Build.Tasks/TypeDefinitionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/TypeDefinitionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/TypeDefinitionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/TypeDefinitionExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/TypeReferenceExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/TypeReferenceExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/TypeReferenceExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/TypeReferenceExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/VariableDefinitionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/VariableDefinitionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/VariableDefinitionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/VariableDefinitionExtensions.cs

diff --git a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj

diff --git a/Xamarin.Forms.Build.Tasks/XamlCAssemblyResolver.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlCAssemblyResolver.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/XamlCAssemblyResolver.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlCAssemblyResolver.cs

diff --git a/Xamarin.Forms.Build.Tasks/XamlCTask.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlCTask.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/XamlCTask.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlCTask.cs

diff --git a/Xamarin.Forms.Build.Tasks/XamlGTask.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlGTask.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/XamlGTask.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlGTask.cs

diff --git a/Xamarin.Forms.Build.Tasks/XamlGenerator.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlGenerator.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/XamlGenerator.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlGenerator.cs

diff --git a/Xamarin.Forms.Build.Tasks/XamlTask.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlTask.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/XamlTask.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/XamlTask.cs

diff --git a/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Build.Tasks/XmlTypeExtensions.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Activity1.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Activity1.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Activity1.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Activity1.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/ApiLabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/ApiLabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/ApiLabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/ApiLabelRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/WebImages/XamarinLogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/WebImages/XamarinLogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/WebImages/XamarinLogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/WebImages/XamarinLogo.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/default.css b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/default.css
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/default.css
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/default.css

diff --git a/Xamarin.Forms.ControlGallery.Android/Assets/fonts/icons.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/fonts/icons.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Assets/fonts/icons.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/fonts/icons.xml

diff --git a/Xamarin.Forms.ControlGallery.iOS/ionicons.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/fonts/ionicons.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/ionicons.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/fonts/ionicons.ttf

diff --git a/Xamarin.Forms.ControlGallery.Android/Assets/local.html b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/local.html
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Assets/local.html
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/local.html

diff --git a/Xamarin.Forms.ControlGallery.iOS/test.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/test.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/test.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Assets/test.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/AttachedStateEffectRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/AttachedStateEffectRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/AttachedStateEffectRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/AttachedStateEffectRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/BorderEffect.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/BorderEffect.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/BorderEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/BorderEffect.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/BrokenImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/BrokenImageSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/BrokenImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/BrokenImageSourceHandler.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/BrokenNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/BrokenNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/BrokenNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/BrokenNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/CacheService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/CacheService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/CacheService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/CacheService.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/ColorPicker.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/ColorPicker.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/ColorPicker.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/ColorPicker.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/CustomRenderers.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/DisposeLabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/DisposeLabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/DisposeLabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/DisposeLabelRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/DisposePageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/DisposePageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/DisposePageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/DisposePageRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Environment.txt b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Environment.txt
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Environment.txt
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Environment.txt

diff --git a/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/FormsApplicationActivity.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Issue7249SwitchRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/MainApplication.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/MainApplication.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/MainApplication.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/MainApplication.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/PerformanceTrackerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/PerformanceTrackerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/PerformanceTrackerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/PerformanceTrackerRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/PlatformSpecificCoreGalleryFactory.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/PlatformSpecificCoreGalleryFactory.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/PlatformSpecificCoreGalleryFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/PlatformSpecificCoreGalleryFactory.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/PreApplicationClassActivity.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/PreApplicationClassActivity.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/PreApplicationClassActivity.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/PreApplicationClassActivity.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Properties/AndroidManifest.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Properties/MapsKey.cs.blank b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Properties/MapsKey.cs.blank
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Properties/MapsKey.cs.blank
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Properties/MapsKey.cs.blank

diff --git a/Xamarin.Forms.ControlGallery.Android/RegistrarValidationService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/RegistrarValidationService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/RegistrarValidationService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/RegistrarValidationService.cs

diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Resources/AboutResources.txt b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/AboutResources.txt
similarity index 100%
rename from Xamarin.Forms.Platform.Android.AppLinks/Resources/AboutResources.txt
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/AboutResources.txt

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/anim/enter_from_left.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/anim/enter_from_left.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/anim/enter_from_left.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/anim/enter_from_left.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/anim/enter_from_right.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/anim/enter_from_right.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/anim/enter_from_right.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/anim/enter_from_right.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/anim/exit_to_left.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/anim/exit_to_left.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/anim/exit_to_left.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/anim/exit_to_left.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/anim/exit_to_right.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/anim/exit_to_right.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/anim/exit_to_right.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/anim/exit_to_right.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/CustomSelector.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/CustomSelector.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/CustomSelector.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/CustomSelector.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/CustomSelector2.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/CustomSelector2.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/CustomSelector2.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/CustomSelector2.xml

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/FlowerBuds.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/FlowerBuds.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/FlowerBuds.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/FlowerBuds.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Fruits.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Fruits.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Fruits.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Fruits.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/GifOne.gif b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/GifOne.gif
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/GifOne.gif
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/GifOne.gif

diff --git a/Xamarin.Forms.ControlGallery.iOS/GifTwo.gif b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/GifTwo.gif
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/GifTwo.gif
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/GifTwo.gif

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Icon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Icon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/Icon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Icon.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Legumes.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Legumes.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Legumes.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Legumes.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Vegetables.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Vegetables.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Vegetables.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Vegetables.jpg

diff --git a/Xamarin.Forms.Sandbox.Android/Resources/drawable/bank.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/bank.png
similarity index 100%
rename from Xamarin.Forms.Sandbox.Android/Resources/drawable/bank.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/bank.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/bell.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/bell.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/bell.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/bell.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/books.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/books.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/books.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/books.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/booksflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/booksflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/booksflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/booksflyout.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/button_add.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/button_add.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/button_add.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/button_add.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/calculator.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/calculator.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/calculator.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/calculator.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/card.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/card.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/card.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/card.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cardBackground.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cardBackground.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/cardBackground.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cardBackground.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/caret_r.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/caret_r.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/caret_r.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/caret_r.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cartman.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cartman.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/cartman.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cartman.xml

diff --git a/Xamarin.Forms.Sandbox.Android/Resources/drawable/coffee.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/coffee.png
similarity index 100%
rename from Xamarin.Forms.Sandbox.Android/Resources/drawable/coffee.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/coffee.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/cover1.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cover1.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/cover1.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cover1.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/cover1small.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cover1small.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/cover1small.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cover1small.jpg

diff --git a/Xamarin.Forms.Core.UnitTests/Images/crimson.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/crimson.jpg
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/Images/crimson.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/crimson.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/crimsonsmall.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/crimsonsmall.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/crimsonsmall.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/crimsonsmall.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/error.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/error.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/error.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/error.xml

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/film.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/film.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/film.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/film.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/filmflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/filmflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/filmflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/filmflyout.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/games.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/games.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/games.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/games.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/gamesflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/gamesflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/gamesflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/gamesflyout.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/gear.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/gear.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/gear.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/gear.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/grid.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/grid.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/grid.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/grid.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/headphone.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/headphone.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/headphone.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/headphone.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/headphoneflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/headphoneflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/headphoneflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/headphoneflyout.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/heart.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/heart.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/heart.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/heart.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/home.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/home.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/home.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/home.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/homeflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/homeflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/homeflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/homeflyout.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/icon_bookmark.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/icon_bookmark.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/icon_bookmark.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/icon_bookmark.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/icon_search.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/icon_search.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/icon_search.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/icon_search.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/invalidimage.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/invalidimage.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/invalidimage.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/invalidimage.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/jet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/jet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/jet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/jet.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/loop.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/loop.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/loop.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/loop.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/menuIcon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/menuIcon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/menuIcon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/menuIcon.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/mic.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/mic.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/mic.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/mic.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/newspaper.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/newspaper.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/newspaper.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/newspaper.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/newspaperflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/newspaperflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/newspaperflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/newspaperflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/oasis.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/oasis.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/oasis.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/oasis.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/oasissmall.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/oasissmall.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/oasissmall.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/oasissmall.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/person.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/person.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/person.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/person.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/photo.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/photo.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/photo.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/photo.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/red_button.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/red_button.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/red_button.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/red_button.xml

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/seth.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/seth.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/seth.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/seth.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/star.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/star.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/star.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/star.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize_disabled.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize_disabled.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize_disabled.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize_disabled.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize_enabled.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize_enabled.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize_enabled.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/synchronize_enabled.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/test.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/test.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/test.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/test.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/toolbar_close.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/toolbar_close.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/toolbar_close.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/toolbar_close.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/xamarinlogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/xamarinlogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/xamarinlogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/xamarinlogo.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/xamarinstore.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/xamarinstore.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/xamarinstore.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/drawable/xamarinstore.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/layout/Layout38989.axml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/Layout38989.axml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/layout/Layout38989.axml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/Layout38989.axml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/layout/NativeAndroidCell.axml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/NativeAndroidCell.axml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/layout/NativeAndroidCell.axml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/NativeAndroidCell.axml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/layout/NativeAndroidListViewCell.axml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/NativeAndroidListViewCell.axml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/layout/NativeAndroidListViewCell.axml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/NativeAndroidListViewCell.axml

diff --git a/PagesGallery/PagesGallery.Droid/Resources/layout/Tabbar.axml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/Tabbar.axml
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Resources/layout/Tabbar.axml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/Tabbar.axml

diff --git a/PagesGallery/PagesGallery.Droid/Resources/layout/Toolbar.axml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/Toolbar.axml
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/Resources/layout/Toolbar.axml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/layout/Toolbar.axml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/values/Colors.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/values/Colors.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/values/Colors.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/values/Colors.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/values/strings.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/values/strings.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/values/strings.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/values/strings.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/values/styles.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/values/styles.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/values/styles.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Resources/values/styles.xml

diff --git a/Xamarin.Forms.ControlGallery.Android/SampleNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/SampleNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/SampleNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/SampleNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/StaggeredCollectionViewRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/TestCloudService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/TestCloudService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/TestCloudService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/TestCloudService.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj

diff --git a/Xamarin.Forms.ControlGallery.Android/_1909CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_1909CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_1909CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_1909CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_2489CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_2489CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_2489CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_2489CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_38989CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_38989CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_38989CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_38989CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_50787CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_57114CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_57114CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_57114CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_57114CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_5724CustomRenderers.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_5724CustomRenderers.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_5724CustomRenderers.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_5724CustomRenderers.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_5749CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_5749CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_5749CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_5749CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_58406EffectRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_58406EffectRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_58406EffectRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_58406EffectRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_59457CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_59457CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_59457CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_59457CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/_60122ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_60122ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/_60122ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/_60122ImageRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/app.config b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/app.config
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/app.config
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Android/app.config

diff --git a/Xamarin.Forms.ControlGallery.GTK/App.config b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/App.config
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/App.config
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/App.config

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/Icon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/Icon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/Icon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/Icon.png

diff --git a/Xamarin.Forms.ControlGallery.GTK/PlatformSpecificCoreGalleryFactory.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/PlatformSpecificCoreGalleryFactory.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/PlatformSpecificCoreGalleryFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/PlatformSpecificCoreGalleryFactory.cs

diff --git a/Xamarin.Forms.ControlGallery.GTK/Program.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/Program.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/Program.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/Program.cs

diff --git a/Xamarin.Forms.ControlGallery.GTK/RegistrarValidationService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/RegistrarValidationService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/RegistrarValidationService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/RegistrarValidationService.cs

diff --git a/Xamarin.Forms.ControlGallery.GTK/SampleNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/SampleNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/SampleNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/SampleNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/Xamarin.Forms.ControlGallery.GTK.csproj

diff --git a/Xamarin.Forms.ControlGallery.GTK/gtk_back_button.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/gtk_back_button.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/gtk_back_button.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/gtk_back_button.png

diff --git a/Xamarin.Forms.ControlGallery.GTK/gtk_hamburguer_button.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/gtk_hamburguer_button.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/gtk_hamburguer_button.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/gtk_hamburguer_button.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ic_share.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/ic_share.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ic_share.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/ic_share.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/ratchet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ratchet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/ratchet.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet_full.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/ratchet_full.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ratchet_full.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/ratchet_full.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/tdl.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/tdl.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/tdl.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/tdl.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/twitternav.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/twitternav.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/twitternav.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.GTK/twitternav.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/AppDelegate.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/AppDelegate.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/AppDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/AppDelegate.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-128.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-128.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-128.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-128.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-128@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-128@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-128@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-128@2x.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-16.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-16.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-16.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-16.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-16@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-16@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-16@2x.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-256.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-256.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-256.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-256.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-256@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-256@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-256@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-256@2x.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-32.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-32.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-32.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-32.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-32@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-32@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-32@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-32@2x.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-512.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-512.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-512.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-512.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-512@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-512@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-512@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/AppIcon-512@2x.png

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/Contents.json b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/Contents.json
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/Contents.json
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/AppIcons.appiconset/Contents.json

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/Contents.json b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/Contents.json
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/Contents.json
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Assets.xcassets/Contents.json

diff --git a/Xamarin.Forms.ControlGallery.MacOS/BrokenNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/BrokenNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/BrokenNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/BrokenNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/CustomRenderers.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Entitlements.plist b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Entitlements.plist
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Entitlements.plist
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Entitlements.plist

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Info.plist b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Info.plist
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Info.plist
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Info.plist

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Main.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Main.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Main.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Main.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Main.storyboard b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Main.storyboard
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Main.storyboard
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Main.storyboard

diff --git a/Xamarin.Forms.ControlGallery.MacOS/NativeServices.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/NativeServices.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/NativeServices.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/NativeServices.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/PlatformSpecificCoreGalleryFactory.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/PlatformSpecificCoreGalleryFactory.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/PlatformSpecificCoreGalleryFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/PlatformSpecificCoreGalleryFactory.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/RegistrarValidationService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/RegistrarValidationService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/RegistrarValidationService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/RegistrarValidationService.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Bold.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Bold.ttf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Bold.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Bold.ttf

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-BoldItalic.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-BoldItalic.ttf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-BoldItalic.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-BoldItalic.ttf

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Italic.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Italic.ttf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Italic.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Italic.ttf

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Regular.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Regular.ttf
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Regular.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/Roboto-Regular.ttf

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/ionicons.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/ionicons.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/ionicons.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/ionicons.ttf

diff --git a/Xamarin.Forms.ControlGallery.MacOS/SampleNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/SampleNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/SampleNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/SampleNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/SeparatorMenuItem.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/SeparatorMenuItem.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/SeparatorMenuItem.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/SeparatorMenuItem.cs

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj b/Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj

diff --git a/Xamarin.Forms.ControlGallery.Tizen/BorderEffect.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/BorderEffect.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/BorderEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/BorderEffect.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/ControlGallery.Tizen.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/ControlGallery.Tizen.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/ControlGallery.Tizen.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/ControlGallery.Tizen.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/DisposeLabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/DisposeLabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/DisposeLabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/DisposeLabelRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/DisposePageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/DisposePageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/DisposePageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/DisposePageRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/PlatformSpecificCoreGalleryFactory.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/PlatformSpecificCoreGalleryFactory.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/PlatformSpecificCoreGalleryFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/PlatformSpecificCoreGalleryFactory.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/RegistrarValidationService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/RegistrarValidationService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/RegistrarValidationService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/RegistrarValidationService.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/SampleNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/SampleNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/SampleNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/SampleNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/Xamarin.Forms.ControlGallery.Tizen.csproj

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/FlowerBuds.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/FlowerBuds.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/FlowerBuds.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/FlowerBuds.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Fruits.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Fruits.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Fruits.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Fruits.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/Icon-Small.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Icon-Small.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/Icon-Small.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Icon-Small.png

diff --git a/Xamarin.Forms.ControlGallery.GTK/Icon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Icon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/Icon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Icon.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Intranet-icon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Intranet-icon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Intranet-icon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Intranet-icon.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Legumes.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Legumes.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Legumes.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Legumes.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Vegetables.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Vegetables.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Vegetables.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/Vegetables.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/about.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/about.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/about.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/about.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/bank.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/bank.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/bank.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/bank.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/bell.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/bell.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/bell.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/bell.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/blog.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/blog.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/blog.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/blog.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/books.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/books.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/books.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/books.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/booksflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/booksflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/booksflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/booksflyout.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/calculator.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/calculator.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/calculator.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/calculator.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/card.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/card.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/card.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/card.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/caret_r.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/caret_r.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/caret_r.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/caret_r.png

diff --git a/Xamarin.Forms.Controls/coffee.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/coffee.png
similarity index 100%
rename from Xamarin.Forms.Controls/coffee.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/coffee.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/cover1.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/cover1.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/cover1.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1small.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/cover1small.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/cover1small.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/cover1small.jpg

diff --git a/Xamarin.Forms.Controls/GalleryPages/crimson.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/crimson.jpg
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/crimson.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/crimson.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/crimsonsmall.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/crimsonsmall.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/crimsonsmall.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/crimsonsmall.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/facebook.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/facebook.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/facebook.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/facebook.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/favorite.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/favorite.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/favorite.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/favorite.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/film.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/film.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/film.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/film.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/filmflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/filmflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/filmflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/filmflyout.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/games.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/games.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/games.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/games.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/gamesflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/gamesflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/gamesflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/gamesflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/googleplus.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/googleplus.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/googleplus.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/googleplus.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/grid.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/grid.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/grid.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/grid.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/headphone.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/headphone.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/headphone.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/headphone.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/headphoneflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/headphoneflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/headphoneflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/headphoneflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/hm.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/hm.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/hm.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/hm.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/hm_full.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/hm_full.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/hm_full.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/hm_full.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/home.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/home.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/home.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/home.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/homeflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/homeflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/homeflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/homeflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ic_pause.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ic_pause.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ic_pause.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ic_pause.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ic_play.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ic_play.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ic_play.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ic_play.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/ic_share.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ic_share.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/ic_share.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ic_share.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ic_stop.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ic_stop.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ic_stop.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ic_stop.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/instagram.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/instagram.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/instagram.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/instagram.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/invalidimage.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/invalidimage.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/jet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/jet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/jet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/jet.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/lists.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/lists.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/lists.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/lists.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/loop.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/loop.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/loop.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/loop.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/menuIcon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/menuIcon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/menuIcon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/menuIcon.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/messages.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/messages.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/messages.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/messages.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/newspaper.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/newspaper.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/newspaper.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/newspaper.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/newspaperflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/newspaperflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/newspaperflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/newspaperflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/notifications.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/notifications.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/notifications.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/notifications.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/oasis.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/oasis.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/oasis.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/oasis.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/oasissmall.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/oasissmall.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/oasissmall.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/oasissmall.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/person.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/person.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/person.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/person.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/photo.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/photo.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/photo.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/photo.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/profile.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/profile.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/profile.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/profile.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/ratchet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ratchet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/ratchet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ratchet.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/ratchet_full.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ratchet_full.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/ratchet_full.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/ratchet_full.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/refresh.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/refresh.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/refresh.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/refresh.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/reply.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/reply.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/reply.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/reply.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/retweet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/retweet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/retweet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/retweet.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/scott.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/scott.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/scott.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/scott.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/scott159.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/scott159.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/scott159.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/scott159.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/search.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/search.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/search.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/search.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/seth.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/seth.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/seth.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/seth.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/slideout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/slideout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/slideout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/slideout.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/star.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/star.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/star.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/star.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/tdl.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/tdl.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/tdl.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/tdl.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/tdl_full.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/tdl_full.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/tdl_full.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/tdl_full.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/test.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/test.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/test.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/test.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/toolbar_close.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/toolbar_close.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/toolbar_close.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/toolbar_close.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/tweet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/tweet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/tweet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/tweet.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/twitter.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/twitter.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/twitter.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/twitter.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/twitternav.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/twitternav.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/twitternav.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/twitternav.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinlogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/xamarinlogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinlogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/xamarinlogo.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/xamarinstore.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/xamarinstore.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/xamarinstore.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/res/xamarinstore.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/shared/res/Xamarin.Forms.ControlGallery.Tizen.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/shared/res/Xamarin.Forms.ControlGallery.Tizen.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/shared/res/Xamarin.Forms.ControlGallery.Tizen.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/shared/res/Xamarin.Forms.ControlGallery.Tizen.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/tizen-manifest.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/tizen-manifest.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/tizen-manifest.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.Tizen/tizen-manifest.xml

diff --git a/Xamarin.Forms.ControlGallery.WPF/App.config b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/App.config
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/App.config
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/App.config

diff --git a/Xamarin.Forms.ControlGallery.WPF/App.xaml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/App.xaml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/App.xaml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/App.xaml

diff --git a/Xamarin.Forms.ControlGallery.WPF/App.xaml.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/App.xaml.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/App.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/App.xaml.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/Assets/fontawesome-webfont.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Assets/fontawesome-webfont.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Assets/fontawesome-webfont.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Assets/fontawesome-webfont.ttf

diff --git a/Xamarin.Forms.ControlGallery.WPF/Assets/ionicons.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Assets/ionicons.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Assets/ionicons.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Assets/ionicons.ttf

diff --git a/Xamarin.Forms.ControlGallery.WPF/Assets/pickax.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Assets/pickax.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Assets/pickax.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Assets/pickax.ttf

diff --git a/Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml

diff --git a/Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/MainWindow.xaml.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/PlatformSpecificCoreGalleryFactory.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/PlatformSpecificCoreGalleryFactory.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/PlatformSpecificCoreGalleryFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/PlatformSpecificCoreGalleryFactory.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/Properties/Resources.Designer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/Resources.Designer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Properties/Resources.Designer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/Resources.Designer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Properties/Resources.resx b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/Resources.resx
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Properties/Resources.resx
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/Resources.resx

diff --git a/Xamarin.Forms.ControlGallery.WPF/Properties/Settings.Designer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/Settings.Designer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Properties/Settings.Designer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/Settings.Designer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Properties/Settings.settings b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/Settings.settings
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Properties/Settings.settings
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Properties/Settings.settings

diff --git a/Xamarin.Forms.ControlGallery.WPF/RegistrarValidationService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/RegistrarValidationService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/RegistrarValidationService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/RegistrarValidationService.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/Renderers/Issue6693ControlRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Renderers/Issue6693ControlRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Renderers/Issue6693ControlRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Renderers/Issue6693ControlRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/SampleNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/SampleNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/SampleNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/SampleNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WPF/Xamarin.Forms.ControlGallery.WPF.csproj

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/App.xaml.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/Lobster-Regular.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/Lobster-Regular.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/Lobster-Regular.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/Lobster-Regular.ttf

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/OFL.txt b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/OFL.txt
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/OFL.txt
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/OFL.txt

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/Fonts/fa-solid-900.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/fa-solid-900.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/Fonts/fa-solid-900.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/fa-solid-900.ttf

diff --git a/Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/ionicons.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/ionicons.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.MacOS/Resources/Fonts/ionicons.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/ionicons.ttf

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Logo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Logo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Logo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Logo.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SmallLogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SmallLogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SmallLogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SmallLogo.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SplashScreen.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SplashScreen.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SplashScreen.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/SplashScreen.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/StoreLogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/StoreLogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/StoreLogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/StoreLogo.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/WideLogo.scale-100.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/WideLogo.scale-100.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/WideLogo.scale-100.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/WideLogo.scale-100.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/AttachedStateEffectRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/AttachedStateEffectRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/AttachedStateEffectRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/AttachedStateEffectRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/BorderEffect.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/BorderEffect.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/BorderEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/BorderEffect.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenImageSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenImageSourceHandler.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/BrokenNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomRenderers.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomRenderers.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/CustomRenderers.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomRenderers.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomSwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomSwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/CustomSwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/CustomSwitchRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/DisposePageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/DisposePageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/DisposePageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/DisposePageRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/FlowerBuds.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/FlowerBuds.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/FlowerBuds.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/FlowerBuds.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/FocusEffect.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/FocusEffect.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/FocusEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/FocusEffect.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/Fruits.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Fruits.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/Fruits.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Fruits.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/GifOne.gif b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/GifOne.gif
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/GifOne.gif
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/GifOne.gif

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/GifTwo.gif b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/GifTwo.gif
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/GifTwo.gif
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/GifTwo.gif

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/Legumes.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Legumes.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/Legumes.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Legumes.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/MainPage.xaml.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Package.appxmanifest

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/PlatformSpecificCoreGalleryFactory.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/PlatformSpecificCoreGalleryFactory.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/PlatformSpecificCoreGalleryFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/PlatformSpecificCoreGalleryFactory.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/default.rd.xml b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/default.rd.xml
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/default.rd.xml
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Properties/default.rd.xml

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/RegistrarValidationService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/RegistrarValidationService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/RegistrarValidationService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/RegistrarValidationService.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/SampleNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/SampleNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/SampleNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/SampleNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/SecondaryWindowService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/SecondaryWindowService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/SecondaryWindowService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/SecondaryWindowService.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/Vegetables.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Vegetables.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/Vegetables.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Vegetables.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/WebImages/XamarinLogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/WebImages/XamarinLogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/WebImages/XamarinLogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/WebImages/XamarinLogo.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/_2489CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_2489CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/_2489CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_2489CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/_57114Renderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_57114Renderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/_57114Renderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_57114Renderer.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/_58406EffectRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_58406EffectRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/_58406EffectRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_58406EffectRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/_5886DependencyService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_5886DependencyService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/_5886DependencyService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_5886DependencyService.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/_60122ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_60122ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/_60122ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/_60122ImageRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/bank.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/bank.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/bank.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/bank.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/calculator.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/calculator.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/calculator.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/calculator.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/coffee.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/coffee.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/coffee.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/coffee.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/cover1.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/cover1.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/cover1small.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1small.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/cover1small.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/cover1small.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/crimson.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/crimson.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/crimson.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/crimson.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/crimsonsmall.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/crimsonsmall.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/crimsonsmall.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/crimsonsmall.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Assets/default.css b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/default.css
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Assets/default.css
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/default.css

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/invalidimage.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/invalidimage.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/invalidimage.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/local.html b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/local.html
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/local.html
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/local.html

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/menuIcon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/menuIcon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/menuIcon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/menuIcon.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/oasis.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/oasis.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/oasis.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/oasis.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/oasissmall.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/oasissmall.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/oasissmall.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/oasissmall.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/photo.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/photo.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/photo.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/photo.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/bell.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/bell.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/bell.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/bell.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/books.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/books.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/books.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/books.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/booksflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/booksflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/booksflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/booksflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/film.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/film.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/film.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/film.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/filmflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/filmflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/filmflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/filmflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/games.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/games.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/games.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/games.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/gamesflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gamesflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/gamesflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gamesflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/gear.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gear.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/gear.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gear.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/grid.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/grid.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/grid.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/grid.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/headphone.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphone.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/headphone.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphone.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/headphoneflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphoneflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/headphoneflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphoneflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/home.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/home.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/home.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/home.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/homeflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/homeflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/homeflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/homeflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/loop.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/loop.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/loop.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/loop.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/newspaper.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaper.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/newspaper.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaper.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/newspaperflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaperflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/newspaperflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaperflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/person.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/person.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/person.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/person.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/star-flyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star-flyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/star-flyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star-flyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/star.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/star.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/bell.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/bell.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/bell.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/bell.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/books.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/books.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/books.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/books.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/booksflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/booksflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/booksflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/booksflyout.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/film.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/film.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/film.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/film.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/filmflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/filmflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/filmflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/filmflyout.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/games.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/games.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/games.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/games.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gamesflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gamesflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gamesflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gamesflyout.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gear.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gear.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gear.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/gear.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/grid.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/grid.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/grid.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/grid.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphone.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphone.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphone.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphone.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphoneflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphoneflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphoneflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/headphoneflyout.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/home.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/home.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/home.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/home.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/homeflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/homeflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/homeflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/homeflyout.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/loop.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/loop.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/loop.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/loop.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaper.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaper.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaper.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaper.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaperflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaperflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaperflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/newspaperflyout.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/person.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/person.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/person.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/person.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star-flyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star-flyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star-flyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star-flyout.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-200/star.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/seth.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/seth.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/seth.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/seth.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/test.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/test.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/test.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/test.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/toolbar_close.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/toolbar_close.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/toolbar_close.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/toolbar_close.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/xamarinlogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinlogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/xamarinlogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinlogo.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinstore.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinstore.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinstore.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.WindowsUniversal/xamarinstore.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/ApiLabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/ApiLabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/ApiLabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/ApiLabelRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/AppDelegate.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Contents.json

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon1024.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon120.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon152.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon167.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon180.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon20.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon29.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon40.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon58.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon60.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon76.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon80.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Assets.xcassets/AppIcon.appiconset/Icon87.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/AttachedStateEffectRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/AttachedStateEffectRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/AttachedStateEffectRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/AttachedStateEffectRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/BrokenImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/BrokenImageSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/BrokenImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/BrokenImageSourceHandler.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/BrokenNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomApplication.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomApplication.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/CustomApplication.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomApplication.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomEffects/GradientEffect.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomEffects/GradientEffect.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/CustomEffects/GradientEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomEffects/GradientEffect.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderer40251.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderer40251.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/CustomRenderer40251.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderer40251.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRendererBugzila38731.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderers.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/CustomRenderers/CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/CustomSearchBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/CustomSearchBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/CustomRenderers/CustomSearchBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/CustomSearchBarRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/RoundedLabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/RoundedLabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/CustomRenderers/RoundedLabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/CustomRenderers/RoundedLabelRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/Entitlements.plist b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Entitlements.plist
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Entitlements.plist
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Entitlements.plist

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/GifOne.gif b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/GifOne.gif
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/GifOne.gif
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/GifOne.gif

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/GifTwo.gif b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/GifTwo.gif
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/GifTwo.gif
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/GifTwo.gif

diff --git a/Xamarin.Forms.ControlGallery.iOS/Goobuntu-icon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Goobuntu-icon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Goobuntu-icon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Goobuntu-icon.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Images/FlowerBuds.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/FlowerBuds.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Images/FlowerBuds.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/FlowerBuds.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Images/FlowerBuds@2x.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/FlowerBuds@2x.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Images/FlowerBuds@2x.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/FlowerBuds@2x.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Images/Fruits.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Fruits.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Images/Fruits.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Fruits.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Images/Fruits@2x.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Fruits@2x.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Images/Fruits@2x.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Fruits@2x.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Images/Legumes.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Legumes.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Images/Legumes.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Legumes.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Images/Legumes@2x.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Legumes@2x.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Images/Legumes@2x.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Legumes@2x.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Images/Vegetables.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Vegetables.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Images/Vegetables.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Vegetables.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Images/Vegetables@2x.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Vegetables@2x.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Images/Vegetables@2x.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Images/Vegetables@2x.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Info.plist b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Info.plist
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Info.plist
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Info.plist

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/Intranet-icon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Intranet-icon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/Intranet-icon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Intranet-icon.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Main.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Main.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Main.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Main.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/PerformanceTrackerRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/PlatformSpecificCoreGalleryFactory.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/PlatformSpecificCoreGalleryFactory.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/PlatformSpecificCoreGalleryFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/PlatformSpecificCoreGalleryFactory.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/RegistrarValidationService.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/RegistrarValidationService.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/RegistrarValidationService.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/RegistrarValidationService.cs

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Default-568h@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default-568h@2x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Default-568h@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default-568h@2x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Default-Portrait.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default-Portrait.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Default-Portrait.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default-Portrait.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Default-Portrait@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default-Portrait@2x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Default-Portrait@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default-Portrait@2x.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Default.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Default.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default.png

diff --git a/PagesGallery/PagesGallery.iOS/Resources/Default@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default@2x.png
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/Resources/Default@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Default@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/FlowerBuds.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/FlowerBuds.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/FlowerBuds.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/FlowerBuds.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/fa-solid-900.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Fonts/fa-solid-900.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/Assets/Fonts/fa-solid-900.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Fonts/fa-solid-900.ttf

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Fruits.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Fruits.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/Fruits.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Fruits.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/LaunchScreen.storyboard b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/LaunchScreen.storyboard
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/LaunchScreen.storyboard
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/LaunchScreen.storyboard

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Legumes.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Legumes.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/Legumes.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Legumes.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/Vegetables.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Vegetables.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/Vegetables.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/Vegetables.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/about.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/about.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/about.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/about.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/about@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/about@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/about@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/about@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/bell.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/bell.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/bell.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/bell.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/bell@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/bell@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/bell@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/bell@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/blog.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/blog.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/blog.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/blog.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/blog@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/blog@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/blog@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/blog@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/books.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/books.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/books.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/books.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/books@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/books@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/books@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/books@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/booksflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/booksflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/booksflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/booksflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/booksflyout@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/booksflyout@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/booksflyout@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/booksflyout@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/button_add@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/button_add@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/button_add@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/button_add@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/card.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/card.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/card.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/card.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/card@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/card@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/card@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/card@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/cardBackground@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/cardBackground@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/cardBackground@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/cardBackground@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/facebook.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/facebook.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/facebook.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/facebook.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/facebook@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/facebook@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/facebook@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/facebook@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/favorite.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/favorite.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/favorite.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/favorite.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/film.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/film.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/film.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/film.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/film@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/film@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/film@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/film@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/filmflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/filmflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/filmflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/filmflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/filmflyout@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/filmflyout@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/filmflyout@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/filmflyout@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/games.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/games.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/games.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/games.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/games@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/games@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/games@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/games@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gamesflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/gamesflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gamesflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/gamesflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/gamesflyout@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/gamesflyout@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/gamesflyout@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/gamesflyout@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gear.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/gear.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/gear.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/gear.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/gear@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/gear@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/gear@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/gear@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/googleplus.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/googleplus.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/googleplus.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/googleplus.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/googleplus@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/googleplus@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/googleplus@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/googleplus@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/grid.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/grid.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/grid.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/grid.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/grid@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/grid@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/grid@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/grid@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphone.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/headphone.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphone.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/headphone.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/headphone@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/headphone@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/headphone@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/headphone@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphoneflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/headphoneflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/headphoneflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/headphoneflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/headphoneflyout@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/headphoneflyout@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/headphoneflyout@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/headphoneflyout@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/hm.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/hm.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/hm.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/hm.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/hm@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/hm@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/hm@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/hm@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/hm_full.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/hm_full.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/hm_full.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/hm_full.jpg

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/home.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/home.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/home.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/home.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/home@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/home@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/home@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/home@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/homeflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/homeflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/homeflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/homeflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/homeflyout@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/homeflyout@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/homeflyout@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/homeflyout@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/ic_pause.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_pause.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/ic_pause.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_pause.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ic_pause@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_pause@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ic_pause@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_pause@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/ic_play.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_play.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/ic_play.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_play.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ic_play@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_play@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ic_play@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_play@2x.png

diff --git a/Xamarin.Forms.ControlGallery.GTK/ic_share.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_share.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/ic_share.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_share.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ic_share@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_share@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ic_share@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_share@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/ic_stop.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_stop.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/ic_stop.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_stop.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ic_stop@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_stop@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ic_stop@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ic_stop@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/icon_bookmark@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/icon_bookmark@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/icon_bookmark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/icon_bookmark@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/icon_search@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/icon_search@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/icon_search@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/icon_search@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/instagram.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/instagram.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/instagram.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/instagram.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/instagram@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/instagram@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/instagram@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/instagram@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/invalidimage.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/invalidimage.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/invalidimage.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/invalidimage.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/jet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/jet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/jet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/jet.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/jet@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/jet@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/jet@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/jet@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/lists.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/lists.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/lists.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/lists.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/loop.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/loop.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/loop.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/loop.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/loop@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/loop@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/loop@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/loop@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/messages.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/messages.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/messages.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/messages.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/mic.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/mic.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/mic.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/mic.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaper.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/newspaper.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaper.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/newspaper.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/newspaper@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/newspaper@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/newspaper@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/newspaper@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaperflyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/newspaperflyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/newspaperflyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/newspaperflyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/newspaperflyout@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/newspaperflyout@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/newspaperflyout@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/newspaperflyout@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/notifications.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/notifications.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/notifications.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/notifications.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/person.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/person.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/person.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/person.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/person@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/person@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/person@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/person@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/photo.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/photo.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/photo.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/photo.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/profile.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/profile.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/profile.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/profile.png

diff --git a/Xamarin.Forms.ControlGallery.GTK/ratchet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/ratchet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/ratchet@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet@2x.png

diff --git a/Xamarin.Forms.ControlGallery.GTK/ratchet_full.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet_full.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/ratchet_full.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/ratchet_full.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/refresh.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/refresh.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/refresh.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/refresh.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/refresh@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/refresh@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/refresh@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/refresh@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/reply.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/reply.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/reply.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/reply.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/retweet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/retweet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/retweet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/retweet.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/rui.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/rui.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/rui.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/rui.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/scott.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/scott.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/scott.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/scott.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/scott159.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/scott159.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/scott159.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/scott159.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/search.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/search.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/search.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/search.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/slideout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/slideout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/slideout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/slideout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/slideout@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/slideout@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/slideout@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/slideout@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star-flyout.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/star-flyout.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star-flyout.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/star-flyout.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/star-flyout@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/star-flyout@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/star-flyout@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/star-flyout@2x.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/star.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/scale-100/star.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/star.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/star@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/star@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/star@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/star@2x.png

diff --git a/Xamarin.Forms.ControlGallery.GTK/tdl.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/tdl.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/tdl.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/tdl.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/tdl@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/tdl@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/tdl@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/tdl@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/tdl_full.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/tdl_full.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/tdl_full.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/tdl_full.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/tweet.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/tweet.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/tweet.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/tweet.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/twitter.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/twitter.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/twitter.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/twitter.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/twitter@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/twitter@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/twitter@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/twitter@2x.png

diff --git a/Xamarin.Forms.ControlGallery.GTK/twitternav.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/twitternav.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.GTK/twitternav.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/twitternav.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/twitternav@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/twitternav@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/twitternav@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/twitternav@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo@3x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo@3x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo@3x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarin_logo@3x.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/xamarinlogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarinlogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/xamarinlogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarinlogo.png

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/xamarinstore.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarinstore.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/xamarinstore.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Resources/xamarinstore.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/SampleNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/SampleNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/SampleNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/SampleNativeControl.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/SearchbarEffect.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/SearchbarEffect.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/SearchbarEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/SearchbarEffect.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Assets/WebImages/XamarinLogo.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/WebImages/XamarinLogo.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Assets/WebImages/XamarinLogo.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/WebImages/XamarinLogo.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj

diff --git a/Xamarin.Forms.ControlGallery.iOS/_2489CustomRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/_2489CustomRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/_2489CustomRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/_2489CustomRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/_57114Renderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/_57114Renderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/_57114Renderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/_57114Renderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/_58406EffectRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/_58406EffectRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/_58406EffectRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/_58406EffectRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.iOS/_60122ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/_60122ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/_60122ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/_60122ImageRenderer.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/bank.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/bank.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/bank.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/bank.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/bank@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/bank@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/bank@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/bank@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/calculator.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/calculator.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/calculator.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/calculator.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/calculator@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/calculator@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/calculator@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/calculator@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/caret_r.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/caret_r.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/caret_r.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/caret_r.png

diff --git a/Xamarin.Forms.ControlGallery.WindowsUniversal/coffee.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/coffee.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WindowsUniversal/coffee.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/coffee.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/coffee@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/coffee@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/coffee@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/coffee@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cover1.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/cover1.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/cover1.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/cover1.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/cover1small.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/cover1small.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/cover1small.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/cover1small.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/crimson.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/crimson.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/crimson.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/crimson.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/crimsonsmall.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/crimsonsmall.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/crimsonsmall.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/crimsonsmall.jpg

diff --git a/Xamarin.Forms.ControlGallery.iOS/default.css b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/default.css
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/default.css
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/default.css

diff --git a/Xamarin.Forms.ControlGallery.Android/Assets/fonts/ionicons.ttf b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/ionicons.ttf
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Assets/fonts/ionicons.ttf
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/ionicons.ttf

diff --git a/Xamarin.Forms.ControlGallery.iOS/local.html b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/local.html
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/local.html
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/local.html

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/menuIcon.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/menuIcon.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/menuIcon.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/menuIcon.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/menuIcon@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/menuIcon@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/menuIcon@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/menuIcon@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/move_slider_one_right_ios6_iphone.base64 b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/move_slider_one_right_ios6_iphone.base64
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/move_slider_one_right_ios6_iphone.base64
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/move_slider_one_right_ios6_iphone.base64

diff --git a/Xamarin.Forms.ControlGallery.iOS/move_slider_three_right_ios6_iphone.base64 b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/move_slider_three_right_ios6_iphone.base64
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/move_slider_three_right_ios6_iphone.base64
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/move_slider_three_right_ios6_iphone.base64

diff --git a/Xamarin.Forms.ControlGallery.iOS/move_slider_two_right_ios6_iphone.base64 b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/move_slider_two_right_ios6_iphone.base64
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/move_slider_two_right_ios6_iphone.base64
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/move_slider_two_right_ios6_iphone.base64

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/oasis.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/oasis.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/oasis.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/oasis.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/oasissmall.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/oasissmall.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/oasissmall.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/oasissmall.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/photo.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/photo.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/photo.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/photo.jpg

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/seth.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/seth.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/seth.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/seth.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/seth@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/seth@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/seth@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/seth@2x.png

diff --git a/Xamarin.Forms.ControlGallery.iOS/settings@2x.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/settings@2x.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.iOS/settings@2x.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/settings@2x.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Assets/test.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/test.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Assets/test.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/test.jpg

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/toolbar_close.png b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/toolbar_close.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/toolbar_close.png
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/toolbar_close.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/xamarinstore.jpg b/Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/xamarinstore.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/xamarinstore.jpg
rename to Xamarin.Forms/Xamarin.Forms.ControlGallery.iOS/xamarinstore.jpg

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/A11yTabIndex.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/A11yTabIndex.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/A11yTabIndex.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/A11yTabIndex.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/A11yTabIndex.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/A11yTabIndex.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/A11yTabIndex.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/A11yTabIndex.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AddingMultipleItemsListView.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AndroidHelpText.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AndroidHelpText.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AndroidHelpText.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AndroidHelpText.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AndroidStatusBarColor.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AndroidStatusBarColor.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AndroidStatusBarColor.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AndroidStatusBarColor.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AppBarIconColors.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AppBarIconColors.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AppBarIconColors.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/AppBarIconColors.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/BottomTabbedPageTests.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/BottomTabbedPageTests.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/BottomTabbedPageTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/BottomTabbedPageTests.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzila57749.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzila57749.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzila57749.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzila57749.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21177.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21177.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21177.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21177.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21368.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21368.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21368.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21368.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21501.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21501.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21501.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21501.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21780.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21780.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21780.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla21780.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22229.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22401.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22401.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22401.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla22401.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla23942.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla23942.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla23942.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla23942.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla23942.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla23942.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla23942.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla23942.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24574.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24574.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24574.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24574.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24769.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24769.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24769.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla24769.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25234.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25234.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25234.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25234.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25662.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25943.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25943.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25943.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25943.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla25979.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26032.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26171.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26171.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26171.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26171.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26233.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26501.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26501.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26501.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26501.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26868.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26868.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26868.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26868.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla26993.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27085.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27085.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27085.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27085.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27318.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27318.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27318.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27318.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27318.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27318.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27318.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27318.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27350.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27350.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27350.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27350.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27378.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27378.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27378.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27378.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417Xaml.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417Xaml.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417Xaml.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417Xaml.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417Xaml.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417Xaml.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417Xaml.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27417Xaml.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27581.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27581.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27581.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27581.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27642.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27698.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27698.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27698.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27698.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27731.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27731.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27731.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27731.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27779.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27779.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27779.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla27779.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28001.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28001.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28001.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28001.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28240.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28240.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28240.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28240.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28498.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28498.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28498.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28498.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28570.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28570.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28570.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28570.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28575.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28575.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28575.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28575.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28650.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28650.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28650.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28650.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28709.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28709.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28709.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28709.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28796.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28796.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28796.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28796.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28939.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28939.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28939.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28939.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28953.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28953.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28953.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla28953.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29017.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29017.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29017.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29017.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29107.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29107.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29107.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29107.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29107.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29107.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29107.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29107.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29110.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29110.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29110.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29110.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29128.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29128.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29128.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29128.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29158.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29158.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29158.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29158.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29229.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29229.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29229.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29229.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29247.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29247.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29247.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29247.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29257.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29257.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29257.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29257.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29363.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla29453.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30166.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30166.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30166.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30166.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30317.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30317.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30317.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30317.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30324.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30324.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30324.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30324.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30353.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30353.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30353.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30353.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30651.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30651.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30651.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30651.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30835.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30835.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30835.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30835.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30935.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30935.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30935.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla30935.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31029.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31029.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31029.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31029.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31114.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31141.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31141.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31141.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31141.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31145.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31145.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31145.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31145.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31255.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31255.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31255.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31255.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31330.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31330.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31330.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31330.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31333.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31333.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31333.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31333.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31366.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31366.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31366.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31366.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31395.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31395.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31395.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31395.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31602.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31688.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31688.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31688.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31688.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31806.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31806.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31806.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31806.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31964.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31964.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31964.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31964.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31967.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31967.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31967.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31967.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31967.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31967.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31967.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla31967.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32033.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32033.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32033.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32033.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32034.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32034.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32034.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32034.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32040.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32148.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32206.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32206.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32206.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32206.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32230.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32230.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32230.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32230.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32447.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32447.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32447.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32447.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32447.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32447.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32447.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32447.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32462.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32487.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32487.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32487.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32487.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32615.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32615.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32615.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32615.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32691.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32776.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32776.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32776.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32776.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32801.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32801.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32801.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32801.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32830.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32842.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32842.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32842.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32842.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32842.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32842.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32842.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32842.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32847.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32847.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32847.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32847.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32865.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32865.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32865.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32865.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32871.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32871.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32871.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32871.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32898.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32902.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32902.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32902.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32902.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32956.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32956.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32956.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla32956.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33248.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33248.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33248.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33248.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33268.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33268.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33268.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33268.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33450.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33450.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33450.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33450.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33561.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33561.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33561.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33561.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33578.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33578.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33578.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33578.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33612.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33612.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33612.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33612.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33714.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33714.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33714.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33714.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33870.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33870.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33870.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33870.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33890.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33890.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33890.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla33890.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34007.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34007.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34007.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34007.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34061.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34061.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34061.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34061.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34072.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34072.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34072.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34072.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34561.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34561.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34561.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34561.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34632.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34632.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34632.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34632.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34720.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34720.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34720.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34720.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34727.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34727.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34727.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34727.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla34912.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35078.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35078.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35078.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35078.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35127.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35127.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35127.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35127.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35132.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35132.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35132.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35132.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35157.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35157.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35157.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35157.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35294.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35294.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35294.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35294.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35472.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35472.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35472.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35472.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35477.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35477.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35477.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35477.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35490.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35490.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35490.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35490.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35733.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35733.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35733.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35733.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35736.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35736.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35736.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35736.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35738.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35738.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35738.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla35738.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36009.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36009.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36009.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36009.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36014.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36014.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36014.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36014.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36171.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36171.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36171.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36171.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36393.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36393.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36393.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36393.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36479.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36479.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36479.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36479.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36559.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36559.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36559.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36559.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36649.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36649.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36649.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36649.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36651.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36651.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36651.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36651.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36681.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36681.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36681.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36681.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36703.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36703.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36703.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36703.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36780.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36780.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36780.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36780.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36788.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36788.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36788.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36788.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36802.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36802.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36802.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36802.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36846.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36846.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36846.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36846.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36955.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36955.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36955.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla36955.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37285.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37285.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37285.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37285.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37290.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37290.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37290.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37290.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37431.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37431.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37431.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37431.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37462.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37462.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37462.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37462.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37601.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37601.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37601.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37601.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37625.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37625.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37625.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37625.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37841.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37841.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37841.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37841.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37863.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37863.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37863.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla37863.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38105.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38105.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38105.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38105.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38112.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38112.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38112.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38112.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38284.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38284.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38284.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38284.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38416.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38416.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38416.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38416.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38416.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38416.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38416.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38416.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38658.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38658.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38658.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38658.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38723.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38723.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38723.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38723.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38731.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38770.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38770.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38770.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38770.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38827.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38978.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38978.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38978.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38978.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38989.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38989.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38989.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla38989.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39331.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39378.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39395.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39395.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39395.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39395.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39407.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39407.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39407.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39407.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39458.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39458.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39458.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39458.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39461.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39461.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39461.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39461.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39463.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39463.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39463.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39463.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39463.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39463.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39463.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39463.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39483.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39483.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39483.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39483.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39483.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39483.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39483.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39483.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39486.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39486.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39486.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39486.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39489.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39489.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39489.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39489.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39530.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39530.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39530.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39530.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39624.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39624.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39624.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39624.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39636.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39668.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39702.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39702.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39702.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39702.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39768.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39768.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39768.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39768.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39802.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39802.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39802.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39802.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39821.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39821.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39821.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39821.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39829.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39853.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39908.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39908.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39908.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39908.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39963.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39963.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39963.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39963.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39987.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39987.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39987.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla39987.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40005.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40005.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40005.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40005.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40073.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40073.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40073.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40073.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40092.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40092.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40092.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40092.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40139.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40139.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40139.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40139.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40161.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40161.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40161.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40161.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40173.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40185.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40185.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40185.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40185.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40251.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40251.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40251.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40251.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40333.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40333.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40333.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40333.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40408.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40408.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40408.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40408.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40704.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40722.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40722.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40722.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40722.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40824.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40824.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40824.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40824.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40858.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40911.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40911.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40911.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40911.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40955.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40955.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40955.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40955.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40998.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40998.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40998.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla40998.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41029.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41029.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41029.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41029.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41038.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41038.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41038.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41038.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41054.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41054.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41054.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41054.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41078.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41078.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41078.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41078.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41153.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41153.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41153.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41153.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41205.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41205.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41205.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41205.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41271.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41271.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41271.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41271.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41415.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41415.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41415.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41415.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41418.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41418.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41418.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41418.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41424.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41600.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41600.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41600.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41600.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41619.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41619.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41619.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41619.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41778.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41778.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41778.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41778.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41842.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41842.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41842.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla41842.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42000.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42000.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42000.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42000.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069_Page.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069_Page.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069_Page.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069_Page.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069_Page.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069_Page.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069_Page.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42069_Page.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42075.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42075.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42075.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42075.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42277.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42277.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42277.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42277.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42329.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42364.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42519.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42519.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42519.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42519.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42599.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42599.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42599.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42599.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42602.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42620.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42620.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42620.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42620.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42832.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42956.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42956.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42956.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42956.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43161.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43214.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43313.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43313.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43313.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43313.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43469.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43469.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43469.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43469.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43516.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43516.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43516.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43516.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43519.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43519.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43519.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43519.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43527.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43527.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43527.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43527.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43663.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43663.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43663.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43663.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43735.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43735.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43735.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43735.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43783.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43783.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43783.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43783.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43867.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43867.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43867.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43867.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43941.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43941.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43941.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla43941.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44044.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44044.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44044.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44044.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44047.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44047.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44047.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44047.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44096.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44096.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44096.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44096.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44129.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44129.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44129.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44129.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44166.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44166.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44166.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44166.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44176.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44176.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44176.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44176.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44338.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44338.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44338.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44338.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44453.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44453.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44453.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44453.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44461.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44461.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44461.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44461.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44476.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44476.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44476.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44476.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44500.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44500.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44500.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44500.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44525.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44525.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44525.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44525.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44584.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44584.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44584.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44584.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44777.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44777.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44777.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44777.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44886.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44886.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44886.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44886.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44940.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44940.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44940.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44940.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44944.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44944.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44944.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44944.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44955.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44955.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44955.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44955.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44980.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44980.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44980.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla44980.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45027.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45027.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45027.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45027.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45067.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45067.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45067.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45067.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45125.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45125.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45125.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45125.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45215.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45215.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45215.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45215.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45277.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45277.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45277.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45277.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45284.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45284.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45284.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45284.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45284.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45284.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45284.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45284.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45330.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45330.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45330.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45330.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45702.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45702.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45702.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45702.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722Xaml0.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722Xaml0.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722Xaml0.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722Xaml0.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722Xaml0.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722Xaml0.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722Xaml0.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45722Xaml0.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45723.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45723.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45723.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45723.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45743.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45743.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45743.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45743.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45874.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45874.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45874.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45874.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla45926.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363_2.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363_2.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363_2.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46363_2.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46458.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46458.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46458.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46458.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46494.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46494.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46494.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46494.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46630.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46630.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46630.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla46630.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47548.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47548.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47548.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47548.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47923.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47923.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47923.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47923.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47971.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47971.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47971.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla47971.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla48158.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla48158.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla48158.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla48158.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla48236.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla48236.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla48236.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla48236.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla49069.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla49069.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla49069.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla49069.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla49304.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla49304.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla49304.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla49304.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla50787.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla50787.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla50787.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla50787.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51173.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51236.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51236.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51236.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51236.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51238.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51238.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51238.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51238.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51427.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51427.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51427.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51427.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51503.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51503.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51503.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51503.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51505.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51505.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51505.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51505.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51536.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51536.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51536.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51536.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51553.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51553.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51553.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51553.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51642.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51642.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51642.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51642.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51642.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51642.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51642.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51642.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51802.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51802.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51802.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51802.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51825.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51825.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51825.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla51825.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52299.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52299.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52299.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52299.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52318.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52318.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52318.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52318.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52419.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52419.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52419.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52419.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52533.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52533.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52533.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52533.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52700.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52700.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52700.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla52700.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179_1.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179_1.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179_1.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179_1.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179_2.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179_2.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179_2.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53179_2.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53362.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53362.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53362.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53362.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53445.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53445.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53445.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53445.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53834.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53834.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53834.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53834.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53909.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53909.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53909.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla53909.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54036.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54036.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54036.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54036.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54649.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54649.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54649.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54649.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54977.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54977.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54977.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54977.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54977.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54977.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54977.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla54977.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55365.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55365.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55365.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55365.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55674.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55674.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55674.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55674.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55714.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55714.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55714.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55714.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55745.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55745.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55745.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55745.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55912.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55912.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55912.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla55912.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56298.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56298.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56298.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56298.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56609.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56609.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56609.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56609.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56710.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56710.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56710.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56710.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56771.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56896.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56896.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56896.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla56896.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57114.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57114.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57114.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57114.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57317.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57515.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57515.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57515.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57515.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57674.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57674.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57674.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57674.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57758.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57758.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57758.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57758.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57910.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57910.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57910.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla57910.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58406.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58406.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58406.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58406.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58645.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58645.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58645.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58645.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58779.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58779.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58779.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58779.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58833.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58833.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58833.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58833.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58875.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58875.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58875.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla58875.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59097.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59097.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59097.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59097.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59172.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59172.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59172.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59172.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59248.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59248.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59248.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59248.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59457.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59457.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59457.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59457.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59580.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59580.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59580.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59580.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59718.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_0.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_0.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_0.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_0.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_1.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_1.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_1.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_1.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_2.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_2.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_2.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59863_2.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59896.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59896.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59896.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59896.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59925.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59925.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59925.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla59925.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60001.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60001.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60001.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60001.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60045.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60045.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60045.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60045.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60045.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60045.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60045.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60045.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60056.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60056.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60056.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60056.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60122.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60122.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60122.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60122.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60382.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60382.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60382.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60382.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60524.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60524.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60524.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60524.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60563.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60563.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60563.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60563.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60691.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60691.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60691.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60691.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60699.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60699.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60699.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60699.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774_1.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774_1.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774_1.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774_1.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774_2.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774_2.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774_2.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60774_2.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60787.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60787.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60787.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60787.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60787.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60787.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60787.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla60787.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonBackgroundColorTest.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonBackgroundColorTest.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonBackgroundColorTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonBackgroundColorTest.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonFastRendererTest.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonFastRendererTest.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonFastRendererTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ButtonFastRendererTest.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CarouselAsync.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CarouselAsync.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CarouselAsync.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CarouselAsync.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CascadeInputTransparent.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CascadeInputTransparent.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CascadeInputTransparent.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CascadeInputTransparent.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBoundMultiSelection.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBoundMultiSelection.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBoundMultiSelection.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBoundMultiSelection.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBoundSingleSelection.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBoundSingleSelection.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBoundSingleSelection.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBoundSingleSelection.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGroupTypeIssue.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGroupTypeIssue.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGroupTypeIssue.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGroupTypeIssue.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGrouping.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGrouping.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGrouping.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGrouping.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterString.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterString.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterString.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterString.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterTemplate.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterTemplate.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterTemplate.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterTemplate.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterView.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterView.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterView.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterView.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsSourceTypes.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsSourceTypes.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsSourceTypes.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsSourceTypes.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsUpdatingScrollMode.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsUpdatingScrollMode.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsUpdatingScrollMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsUpdatingScrollMode.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ComplexListView.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ComplexListView.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ComplexListView.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ComplexListView.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ApiLabel.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ApiLabel.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ApiLabel.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ApiLabel.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ContactsPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ContactsPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ContactsPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ContactsPage.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/DisposedSharedPages.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/DisposedSharedPages.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/DisposedSharedPages.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/DisposedSharedPages.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/FailImageSource.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/FailImageSource.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/FailImageSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/FailImageSource.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/GenericValueConverter.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/GenericValueConverter.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/GenericValueConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/GenericValueConverter.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/GridExtension.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/GridExtension.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/GridExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/GridExtension.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ICacheService.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ICacheService.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ICacheService.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ICacheService.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/PerformanceProvider.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/PerformanceProvider.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/PerformanceProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/PerformanceProvider.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ViewModelBase.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ViewModelBase.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ViewModelBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Controls/ViewModelBase.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CustomImageRendererErrorHandling.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CustomImageRendererErrorHandling.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CustomImageRendererErrorHandling.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CustomImageRendererErrorHandling.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DataTemplateGridImageTest.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DataTemplateGridImageTest.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DataTemplateGridImageTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DataTemplateGridImageTest.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DefaultColorToggleTest.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DefaultColorToggleTest.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DefaultColorToggleTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DefaultColorToggleTest.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DesktopSupportTestPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DesktopSupportTestPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DesktopSupportTestPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/DesktopSupportTestPage.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffect.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffect.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffect.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffectLabel.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffectLabel.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffectLabel.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffectLabel.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffectList.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffectList.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffectList.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Effects/AttachedStateEffectList.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/FlagTestHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/FlagTestHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/FlagTestHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/FlagTestHelpers.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GestureBubblingTests.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1331.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1331.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1331.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1331.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1331.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1331.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1331.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1331.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1355.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1355.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1355.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1355.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1567.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1567.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1567.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1567.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1648.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1648.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1648.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1648.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1650.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1650.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1650.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1650.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1700.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1700.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1700.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1700.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1702.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1702.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1702.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1702.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1776.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1776.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1776.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1776.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1878.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1878.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1878.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub1878.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub2598.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub2598.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub2598.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub2598.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub2642.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub2642.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub2642.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub2642.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub3216.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub3216.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub3216.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub3216.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub6926.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub6926.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub6926.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GitHub6926.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github1461.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github1461.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github1461.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github1461.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github1625.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github1625.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github1625.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github1625.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3847.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3847.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3847.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3847.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3847.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3847.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3847.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3847.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3856.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3856.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3856.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github3856.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github6021.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github6021.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github6021.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github6021.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GroupListViewHeaderIndexOutOfRange.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GroupListViewHeaderIndexOutOfRange.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GroupListViewHeaderIndexOutOfRange.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/GroupListViewHeaderIndexOutOfRange.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/GarbageCollectionHelper.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/GarbageCollectionHelper.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/GarbageCollectionHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/GarbageCollectionHelper.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/ISampleNativeControl.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/ISampleNativeControl.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/ISampleNativeControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/ISampleNativeControl.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/UITestHelper.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/UITestHelper.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/UITestHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/UITestHelper.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/ViewHelper.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/ViewHelper.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/ViewHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Helpers/ViewHelper.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/InputTransparentTests.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsInvokeRequiredRaceCondition.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsInvokeRequiredRaceCondition.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsInvokeRequiredRaceCondition.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsInvokeRequiredRaceCondition.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsPasswordToggleTest.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsPasswordToggleTest.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsPasswordToggleTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsPasswordToggleTest.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsShowingUserIssue.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsShowingUserIssue.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsShowingUserIssue.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/IsShowingUserIssue.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1023.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1023.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1023.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1023.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1024.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1024.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1024.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1024.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1025.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1025.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1025.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1025.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1026.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1028.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1028.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1028.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1028.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1075.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1097.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1097.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1097.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1097.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1146.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1146.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1146.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1146.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1219.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1219.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1219.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1219.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1228.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1228.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1228.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1228.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1236.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1236.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1236.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1236.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1259.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1259.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1259.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1259.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1267.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1267.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1267.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1267.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1305.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1305.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1305.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1305.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1323.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1323.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1323.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1323.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1326.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1326.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1326.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1326.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1329.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1329.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1329.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1329.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1332.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1332.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1332.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1332.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1342.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1342.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1342.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1342.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1347.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1347.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1347.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1347.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1355.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1355.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1355.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1355.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1356.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1356.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1356.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1356.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1384.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1384.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1384.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1384.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1386.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1386.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1386.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1386.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1396.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1399.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1399.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1399.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1399.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1400.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1400.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1400.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1400.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1414.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1414.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1414.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1414.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1415.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1415.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1415.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1415.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1426.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1426.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1426.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1426.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1436.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1436.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1436.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1436.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1439.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1439.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1439.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1439.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1455.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1455.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1455.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1455.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1455.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1455.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1455.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1455.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1461.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1461.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1461.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1461.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1469.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1469.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1469.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1469.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1480.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1480.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1480.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1480.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1483.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1483.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1483.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1483.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1497.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1497.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1497.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1497.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1497.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1497.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1497.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1497.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1538.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1538.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1538.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1538.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1544.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1544.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1544.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1544.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1545.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1545.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1545.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1545.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1545.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1545.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1545.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1545.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1546.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1546.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1546.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1546.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1554.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1554.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1554.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1554.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1554.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1554.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1554.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1554.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1556.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1556.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1556.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1556.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1557.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1557.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1557.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1557.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1566.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1566.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1566.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1566.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1567.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1567.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1567.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1567.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1568.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1568.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1568.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1568.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1568.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1568.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1568.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1568.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1583.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1583.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1583.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1583.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1583_1.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1583_1.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1583_1.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1583_1.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1588.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1588.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1588.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1588.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1588.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1588.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1588.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1588.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1590.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1590.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1590.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1590.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1593.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1593.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1593.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1593.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1598.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1598.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1598.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1598.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1601.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1601.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1601.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1601.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1613.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1614.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1614.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1614.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1614.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1618.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1618.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1618.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1618.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1641.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1641.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1641.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1641.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1641.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1641.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1641.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1641.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1644.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1644.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1644.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1644.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653v2.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653v2.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653v2.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653v2.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653v2.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653v2.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653v2.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1653v2.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1660.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1660.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1660.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1660.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1664.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1664.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1664.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1664.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1665.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1665.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1665.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1665.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1666.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1666.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1666.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1666.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1667.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1667.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1667.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1667.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1672.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1672.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1672.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1672.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1677.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1677.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1677.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1677.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1678.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1678.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1678.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1678.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1680.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1680.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1680.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1680.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1682.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1682.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1682.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1682.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1683.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1683.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1683.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1683.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1685.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1685.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1685.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1685.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1691_2.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1698.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1698.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1698.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1698.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1700.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1703.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1703.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1703.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1703.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1704.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1704.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1704.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1704.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1705_2.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1707.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1707.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1707.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1707.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1712.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1712.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1712.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1712.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1712.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1712.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1712.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1712.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1717.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1722.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1722.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1722.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1722.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1723.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1723.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1723.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1723.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1724.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1729.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1729.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1729.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1729.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1733.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1733.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1733.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1733.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1734.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1734.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1734.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1734.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1741.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1741.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1741.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1741.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1741.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1741.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1741.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1741.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1742.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1742.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1742.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1742.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1747.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1747.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1747.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1747.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1747.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1747.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1747.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1747.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1755.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1755.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1755.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1755.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1758.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1758.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1758.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1758.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760_1.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760_1.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760_1.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1760_1.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1763.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1763.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1763.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1763.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1766.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1766.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1766.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1766.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1766.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1766.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1766.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1766.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1769.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1769.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1769.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1769.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1777.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1777.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1777.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1777.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1799.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1799.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1799.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1799.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1801.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1801.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1801.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1801.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue181.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1851.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1851.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1851.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1851.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1864.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1864.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1864.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1864.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1875.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1875.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1875.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1875.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1888.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1888.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1888.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1888.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1891.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1891.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1891.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1891.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1895.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1895.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1895.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1895.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1898.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1900.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1900.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1900.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1900.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1905.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1905.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1905.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1905.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1908.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1908.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1908.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1908.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1909.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1909.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1909.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1909.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1914.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1914.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1914.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1914.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1931.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1937.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1937.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1937.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1937.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1939.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1939.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1939.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1939.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue194.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue194.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue194.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue194.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1942.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1942.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1942.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1942.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1975.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1975.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1975.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue1975.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue198.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue198.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue198.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue198.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2004.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2004.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2004.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2004.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2035.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2035.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2035.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2035.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue206.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue206.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue206.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue206.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2102.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2102.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2102.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2102.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2104.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2104.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2104.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2104.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue214.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue214.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue214.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue214.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2143.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2143.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2143.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2143.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2187.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2187.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2187.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2187.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2204.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2204.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2204.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2204.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2222.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2222.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2222.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2222.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2223.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2223.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2223.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2223.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue22246_BZ.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue22246_BZ.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue22246_BZ.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue22246_BZ.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2241.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2241.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2241.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2241.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2247.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2247.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2247.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2247.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2248.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2248.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2248.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2248.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2259.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2259.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2259.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2259.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2266.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2266.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2266.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2266.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2270.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2270.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2270.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2270.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2271.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2271.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2271.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2271.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2272.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2272.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2272.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2272.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2282.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2282.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2282.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2282.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2282.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2282.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2282.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2282.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2288.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2288.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2288.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2288.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2288.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2288.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2288.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2288.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2289.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2289.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2289.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2289.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2289.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2289.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2289.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2289.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue229.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue229.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue229.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue229.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2291.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2291.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2291.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2291.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2292.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2292.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2292.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2292.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2294.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2294.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2294.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2294.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2299.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2299.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2299.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2299.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2333.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2333.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2333.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2333.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2338.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2338.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2338.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2338.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2339.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2339.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2339.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2339.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2354.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2354.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2354.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2354.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2357.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2394.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2394.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2394.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2394.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2399.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2399.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2399.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2399.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2411.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2411.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2411.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2411.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2414.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2470.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2470.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2470.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2470.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2470.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2470.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2470.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2470.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2482.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2482.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2482.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2482.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2499.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2499.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2499.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2499.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2563.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2563.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2563.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2563.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2577.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2577.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2577.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2577.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2580.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2580.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2580.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2580.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2594.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2594.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2594.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2594.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2595.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2595.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2595.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2595.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2597.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2597.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2597.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2597.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue260.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue260.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue260.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue260.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2615.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2615.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2615.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2615.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2617.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2617.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2617.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2617.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2625.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2625.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2625.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2625.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2625.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2625.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2625.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2625.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2628.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2628.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2628.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2628.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2634.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2634.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2634.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2634.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue264.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue264.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue264.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue264.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2653.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2653.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2653.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2653.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2659.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2659.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2659.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2659.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2659.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2659.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2659.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2659.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2680ScrollView.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2680ScrollView.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2680ScrollView.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2680ScrollView.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2681.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2681.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2681.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2681.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2728.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2728.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2728.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2728.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2740.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2740.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2740.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2740.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2763.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2763.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2763.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2763.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2767.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2767.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2767.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2767.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2775.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2775.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2775.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2775.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2777.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2777.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2777.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2777.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2777.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2777.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2777.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2777.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2783.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2783.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2783.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2783.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2794.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2794.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2794.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2794.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2809.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2809.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2809.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2809.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2818.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2818.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2818.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2818.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2829.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2829.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2829.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2829.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2831.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2831.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2831.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2831.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2837.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2837.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2837.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2837.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2838.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2838.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2838.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2838.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2842.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2842.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2842.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2842.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2858.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2858.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2858.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2858.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2858.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2858.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2858.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2858.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2883.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2883.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2883.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2883.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2894.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2894.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2894.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2894.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2923.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2923.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2923.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2923.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2927.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2927.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2927.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2927.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2929.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2929.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2929.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2929.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2948.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2948.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2948.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2948.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2951.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2953.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2953.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2953.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2953.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2954.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2954.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2954.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2954.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2961.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2961.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2961.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2961.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2963.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2963.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2963.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2963.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2964.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2964.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2964.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2964.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2965.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2965.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2965.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2965.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2976.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2976.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2976.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2976.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2981.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2981.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2981.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2981.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2983.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2983.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2983.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2983.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2987.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2987.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2987.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2987.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2993.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2993.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2993.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue2993.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3000.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3000.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3000.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3000.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3001.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3001.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3001.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3001.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3008.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3008.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3008.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3008.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3012.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3012.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3012.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3012.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3019.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3019.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3019.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3019.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3049.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3049.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3049.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3049.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3053.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3053.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3053.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3053.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3086.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3086.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3086.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3086.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3086.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3086.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3086.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3086.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3087.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3087.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3087.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3087.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3089.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3089.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3089.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3089.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3139.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3139.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3139.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3139.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3150.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3150.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3150.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3150.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3271.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3271.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3271.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3271.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3273.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3273.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3273.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3273.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3275.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3275.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3275.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3275.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3276.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3276.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3276.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3276.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3292.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3292.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3292.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3292.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3306.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3306.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3306.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3306.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3308.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3308.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3308.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3308.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3318.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3318.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3318.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3318.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3319.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3319.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3319.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3319.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3319.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3319.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3319.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3319.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3333.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3333.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3333.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3333.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3342.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3342.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3342.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3342.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3343.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3343.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3343.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3343.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3367.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3367.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3367.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3367.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3385.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3385.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3385.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3385.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3390.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3390.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3390.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3390.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3398.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3398.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3398.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3398.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3408.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3408.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3408.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3408.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3413.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3413.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3413.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3413.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3415.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3415.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3415.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3415.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue342.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3454.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3454.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3454.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3454.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3475.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3475.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3475.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3475.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3507.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3507.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3507.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3507.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3509.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3509.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3509.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3509.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3524.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3524.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3524.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3524.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3525.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3525.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3525.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3525.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3541.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3541.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3541.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3541.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3548.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3548.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3548.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3548.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3555.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3555.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3555.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3555.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3558.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3558.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3558.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3558.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3622.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3622.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3622.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3622.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3624.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3624.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3624.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3624.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3652.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3652.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3652.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3652.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3788.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3788.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3788.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3788.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3809.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3809.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3809.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3809.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3840.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3840.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3840.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3840.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3843.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3843.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3843.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3843.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3872.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3872.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3872.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3872.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3884.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3884.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3884.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3884.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3913.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3913.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3913.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3913.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3979.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3979.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3979.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3979.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3979.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3979.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3979.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3979.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3988.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3988.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3988.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue3988.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4001.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4001.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4001.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4001.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4026.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4026.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4026.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4026.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4040.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4040.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4040.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4040.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4040.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4040.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4040.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4040.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4053.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4053.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4053.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4053.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4097.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4097.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4097.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4097.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4136.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4136.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4136.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4136.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4138.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4138.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4138.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4138.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue416.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue416.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue416.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue416.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue417.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue417.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue417.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue417.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4187.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4187.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4187.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4187.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4194.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4194.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4194.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4194.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4194.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4194.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4194.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4194.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4262.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4262.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4262.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4262.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4303.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4303.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4303.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4303.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4314.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4314.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4314.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4314.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4356.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4356.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4356.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4356.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4356.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4356.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4356.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4356.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4360.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4360.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4360.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4360.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4360.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4360.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4360.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4360.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4384.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4384.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4384.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4384.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4484.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4484.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4484.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4484.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4493.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4493.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4493.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4493.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4561.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4561.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4561.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4561.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4597.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4597.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4597.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4597.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4600.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4600.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4600.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4600.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4606.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4606.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4606.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4606.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4629.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4629.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4629.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4629.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue465.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue465.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue465.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue465.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4653.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4653.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4653.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4653.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4684.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4684.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4684.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4684.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4684.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4684.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4684.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4684.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4748.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4748.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4748.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4748.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4756.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4756.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4756.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4756.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4782.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4782.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4782.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4782.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4854.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4854.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4854.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4854.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4879.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4879.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4879.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4879.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue488.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4891.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4891.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4891.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4891.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4915.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4915.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4915.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4915.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4915.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4915.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4915.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4915.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4919.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4919.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4919.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4919.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4961.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4961.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4961.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4961.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4973.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4973.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4973.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4973.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4992.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4992.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4992.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4992.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4992.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4992.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4992.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue4992.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5003.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5003.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5003.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5003.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5003.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5003.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5003.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5003.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5030.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5030.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5030.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5030.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5046.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5046.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5046.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5046.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5046.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5046.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5046.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5046.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5057.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5108.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5108.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5108.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5108.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5108.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5108.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5108.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5108.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5131.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5131.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5131.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5131.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5132.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5132.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5132.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5132.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5159.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5159.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5159.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5159.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5172.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5172.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5172.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5172.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5184.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5184.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5184.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5184.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5204.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5204.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5204.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5204.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5239.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5239.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5239.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5239.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5252.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5252.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5252.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5252.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5268.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5268.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5268.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5268.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5268.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5268.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5268.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5268.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue530.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue530.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue530.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue530.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5367.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5367.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5367.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5367.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5376.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5376.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5376.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5376.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5395.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5395.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5395.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5395.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5412.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5412.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5412.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5412.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5461.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5461.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5461.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5461.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5470.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5470.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5470.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5470.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5500.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5500.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5500.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5500.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5503.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5503.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5503.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5503.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5518.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5518.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5518.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5518.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5535.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5535.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5535.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5535.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5555.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5555.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5555.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5555.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue55555.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue55555.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue55555.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue55555.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5680.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5680.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5680.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5680.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5680.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5680.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5680.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5680.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5695.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5695.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5695.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5695.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5724.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5724.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5724.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5724.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5728.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5728.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5728.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5728.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5749.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5749.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5749.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5749.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5749.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5749.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5749.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5749.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5765.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5765.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5765.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5765.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5766.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5766.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5766.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5766.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5793.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5793.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5793.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5793.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5801.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5801.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5801.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5801.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5801.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5801.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5801.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5801.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5830.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5830.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5830.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5830.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5831.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5831.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5831.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5831.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5868.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5868.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5868.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5868.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5886.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5886.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5886.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5886.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5888.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5888.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5888.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5888.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_1.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_1.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_1.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_1.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_1.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_1.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_1.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_1.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_2.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_2.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_2.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_2.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_2.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_2.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_2.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949_2.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5951.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5951.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5951.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5951.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6077.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6077.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6077.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6077.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6127.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6127.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6127.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6127.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6130.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6130.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6130.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6130.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6130.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6130.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6130.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6130.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6132.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6132.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6132.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6132.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6258.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6258.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6258.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6258.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6260.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6260.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6260.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6260.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6262.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6262.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6262.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6262.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6282.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6282.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6282.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6282.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6282.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6282.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6282.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6282.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6286.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6286.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6286.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6286.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6323.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6323.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6323.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6323.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6334.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6334.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6334.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6334.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6362.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6362.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6362.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6362.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6368.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6368.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6368.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6368.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6458.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6458.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6458.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6458.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6472.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6472.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6472.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6472.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6476.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6476.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6476.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6476.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6491.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6491.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6491.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6491.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6556.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6556.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6556.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6556.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6609.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6609.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6609.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6609.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6614.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6614.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6614.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6614.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6640.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6640.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6640.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6640.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6663.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6663.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6663.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6663.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6693.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6693.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6693.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6693.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6693.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6693.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6693.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6693.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6705.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6705.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6705.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6705.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6713.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6713.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6713.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6713.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6738.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6738.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6738.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6738.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6802.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6802.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6802.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6802.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6878.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6878.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6878.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6878.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6889.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6889.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6889.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6889.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6894.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6894.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6894.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6894.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6929.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6929.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6929.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6929.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6945.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6945.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6945.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6945.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6957.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6957.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6957.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6957.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6963.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6963.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6963.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6963.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6994.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6994.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6994.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6994.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7035.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7035.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7035.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7035.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7035.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7035.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7035.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7035.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7048.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7048.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7048.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7048.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7048.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7048.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7048.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7048.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7049.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7049.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7049.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7049.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7053.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7053.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7053.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7053.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7061.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7061.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7061.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7061.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7102.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7102.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7102.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7102.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7111.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7111.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7111.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7111.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7167.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7167.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7167.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7167.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7167.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7167.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7167.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7167.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7181.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7181.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7181.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7181.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7240.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7240.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7240.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7240.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7249.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7249.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7249.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7249.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7253.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7253.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7253.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7253.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7283.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7283.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7283.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7283.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7290.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7290.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7290.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7290.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7311.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7311.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7311.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7311.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7313.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7313.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7313.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7313.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7329.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7329.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7329.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7329.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7338.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7338.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7338.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7338.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7339.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7339.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7339.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7339.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7361.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7361.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7361.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7361.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7371.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7371.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7371.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7371.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7385.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7385.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7385.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7385.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7395.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7395.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7395.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7395.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7396.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7396.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7396.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7396.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7505.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7505.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7505.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7505.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7510.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7510.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7510.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7510.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519Xaml.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519Xaml.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519Xaml.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519Xaml.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519Xaml.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519Xaml.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519Xaml.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519Xaml.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7525.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7525.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7525.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7525.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7525.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7525.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7525.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7525.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7556.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7556.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7556.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7556.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7563.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7563.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7563.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7563.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7581.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7581.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7581.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7581.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7582.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7582.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7582.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7582.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue764.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7678.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7678.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7678.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7678.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7700.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7700.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7700.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7700.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7709.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7709.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7709.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7709.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue773.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue773.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue773.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue773.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue774.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue774.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue774.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue774.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7742.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7742.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7742.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7742.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7773.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7773.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7773.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7773.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7803.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7803.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7803.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7803.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7803.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7803.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7803.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7803.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7813.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7813.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7813.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7813.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7813.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7813.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7813.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7813.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7823.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7823.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7823.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7823.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7825.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7825.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7825.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7825.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7886.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7886.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7886.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7886.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7886.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7886.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7886.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7886.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7898.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7898.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7898.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7898.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7993.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7993.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7993.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7993.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7993.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7993.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7993.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7993.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8004.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8004.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8004.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8004.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8008.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8008.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8008.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8008.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8087.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8087.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8087.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8087.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8145.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8145.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8145.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8145.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8148.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8148.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8148.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8148.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8167.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8167.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8167.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8167.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8177.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8177.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8177.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8177.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8186.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8186.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8186.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8186.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8198.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8198.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8198.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8198.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8200.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8200.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8200.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8200.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8222.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8222.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8222.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8222.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8269.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8269.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8269.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8269.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8366.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8366.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8366.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8366.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8417.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8417.xaml
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8417.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8417.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8417.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8417.xaml.cs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8417.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8417.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8508.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8508.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8508.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8508.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8508.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8508.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8508.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8508.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue852.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue852.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue852.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue852.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529_1.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529_1.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529_1.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529_1.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529_1.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529_1.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529_1.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8529_1.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8638.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8638.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8638.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8638.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8638.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8638.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8638.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8638.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8647.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8647.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8647.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8647.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8672.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8672.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8672.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8672.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8682.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8682.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8682.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8682.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue886.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue886.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue886.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue886.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue889.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue889.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue889.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue889.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue892.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue892.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue892.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue892.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue935.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue935.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue935.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue935.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue968.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue968.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue968.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue968.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue973.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue973.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue973.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue973.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/LabelTextType.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/LabelTextType.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/LabelTextType.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/LabelTextType.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/LegacyComponents/NonAppCompatSwitch.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/LegacyComponents/NonAppCompatSwitch.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/LegacyComponents/NonAppCompatSwitch.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/LegacyComponents/NonAppCompatSwitch.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ListViewNRE.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ListViewNRE.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ListViewNRE.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ListViewNRE.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ListViewViewCellBinding.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ListViewViewCellBinding.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ListViewViewCellBinding.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ListViewViewCellBinding.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/MapsModalCrash.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/MapsModalCrash.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/MapsModalCrash.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/MapsModalCrash.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ModalActivityIndicatorTest.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ModalActivityIndicatorTest.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ModalActivityIndicatorTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ModalActivityIndicatorTest.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ModelContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ModelContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ModelContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ModelContentPage.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/MultipleClipToBounds.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/MultipleClipToBounds.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/MultipleClipToBounds.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/MultipleClipToBounds.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NavPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NavPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NavPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NavPage.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NavigationStackTests.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NavigationStackTests.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NavigationStackTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NavigationStackTests.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NestedCollectionViews.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NestedCollectionViews.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NestedCollectionViews.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NestedCollectionViews.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceDataManager.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceDataManager.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceDataManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceDataManager.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceGallery.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceScenario.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceScenario.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceScenario.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceScenario.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTracker.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTrackerTemplate.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTrackerTemplate.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTrackerTemplate.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTrackerTemplate.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTrackerWatcher.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTrackerWatcher.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTrackerWatcher.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceTrackerWatcher.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceViewModel.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceViewModel.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceViewModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/PerformanceViewModel.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ActivityIndicatorScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ActivityIndicatorScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ActivityIndicatorScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ActivityIndicatorScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/BoxViewScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/BoxViewScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/BoxViewScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/BoxViewScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ButtonScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ButtonScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ButtonScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ButtonScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/DatePickerScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/DatePickerScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/DatePickerScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/DatePickerScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/EditorScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/EditorScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/EditorScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/EditorScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/EntryScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/EntryScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/EntryScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/EntryScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ImageScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ImageScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ImageScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ImageScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/LabelScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/LabelScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/LabelScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/LabelScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ListViewScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ListViewScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ListViewScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ListViewScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/MapScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/MapScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/MapScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/MapScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/PickerScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/PickerScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/PickerScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/PickerScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ProgressBarScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ProgressBarScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ProgressBarScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/ProgressBarScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SearchBarScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SearchBarScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SearchBarScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SearchBarScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SliderScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SliderScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SliderScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SliderScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/StepperScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/StepperScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/StepperScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/StepperScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SwitchScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SwitchScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SwitchScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/SwitchScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/TableViewScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/TableViewScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/TableViewScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/TableViewScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/TimePickerScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/TimePickerScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/TimePickerScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/TimePickerScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/WebViewScenarios.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/WebViewScenarios.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/WebViewScenarios.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PerformanceGallery/Scenarios/WebViewScenarios.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/PlatformSpecifics_iOSTranslucentNavBarX.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RefreshViewTests.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RefreshViewTests.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RefreshViewTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RefreshViewTests.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RestartAppTest.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RestartAppTest.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RestartAppTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/RestartAppTest.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollToGroup.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollToGroup.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollToGroup.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollToGroup.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewIsEnabled.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewIsEnabled.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewIsEnabled.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewIsEnabled.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewObjectDisposed.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewObjectDisposed.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewObjectDisposed.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewObjectDisposed.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewOutOfBounds.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewOutOfBounds.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewOutOfBounds.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollViewOutOfBounds.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellAppearanceChange.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellAppearanceChange.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellAppearanceChange.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellAppearanceChange.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellBackButtonBehavior.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellBackButtonBehavior.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellBackButtonBehavior.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellBackButtonBehavior.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellFlyoutBehavior.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellFlyoutBehavior.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellFlyoutBehavior.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellFlyoutBehavior.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellGestures.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellGestures.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellGestures.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellGestures.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellInsets.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellInsets.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellInsets.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellInsets.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellTitleView.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellTitleView.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellTitleView.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ShellTitleView.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/StackLayoutIssue.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/StackLayoutIssue.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/StackLayoutIssue.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/StackLayoutIssue.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/SwipeBackNavCrash.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/SwipeBackNavCrash.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/SwipeBackNavCrash.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/SwipeBackNavCrash.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TabbedPageTests.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TabbedPageTests.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TabbedPageTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TabbedPageTests.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TabbedPageWithList.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TabbedPageWithList.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TabbedPageWithList.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TabbedPageWithList.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/QuickCollectNavigationPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/QuickCollectNavigationPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/QuickCollectNavigationPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/QuickCollectNavigationPage.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/ScreenshotConditionalApp.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/ScreenshotConditionalApp.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/ScreenshotConditionalApp.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/ScreenshotConditionalApp.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TransparentOverlayTests.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TransparentOverlayTests.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TransparentOverlayTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TransparentOverlayTests.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Unreported1.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Unreported1.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Unreported1.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Unreported1.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ViewClipBoundsShouldUpdate.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ViewClipBoundsShouldUpdate.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ViewClipBoundsShouldUpdate.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ViewClipBoundsShouldUpdate.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ViewModel.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ViewModel.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ViewModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ViewModel.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/VisualControlsPage.xaml.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.shproj b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.shproj
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.shproj
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.shproj

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_Template.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_TemplateMarkup.xaml b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_TemplateMarkup.xaml
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_TemplateMarkup.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_TemplateMarkup.xaml

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_TemplateMarkup.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_TemplateMarkup.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_TemplateMarkup.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/_TemplateMarkup.xaml.cs

diff --git a/Xamarin.Forms.Controls/App.cs b/Xamarin.Forms/Xamarin.Forms.Controls/App.cs
similarity index 100%
rename from Xamarin.Forms.Controls/App.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/App.cs

diff --git a/Xamarin.Forms.Controls/AppLifeCycle.cs b/Xamarin.Forms/Xamarin.Forms.Controls/AppLifeCycle.cs
similarity index 100%
rename from Xamarin.Forms.Controls/AppLifeCycle.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/AppLifeCycle.cs

diff --git a/Xamarin.Forms.Controls/Bugzilla44596SplashPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/Bugzilla44596SplashPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/Bugzilla44596SplashPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/Bugzilla44596SplashPage.cs

diff --git a/Xamarin.Forms.Controls/BuildNumber.txt b/Xamarin.Forms/Xamarin.Forms.Controls/BuildNumber.txt
similarity index 100%
rename from Xamarin.Forms.Controls/BuildNumber.txt
rename to Xamarin.Forms/Xamarin.Forms.Controls/BuildNumber.txt

diff --git a/Xamarin.Forms.Controls/CompressedLayout.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/CompressedLayout.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/CompressedLayout.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/CompressedLayout.xaml

diff --git a/Xamarin.Forms.Controls/CompressedLayout.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CompressedLayout.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CompressedLayout.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CompressedLayout.xaml.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/AppearingGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/AppearingGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/AppearingGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/AppearingGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/AutomationIDGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/AutomationIDGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/AutomationIDGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/AutomationIDGallery.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/AutomationPropertiesGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/AutomationPropertiesGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/AutomationPropertiesGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/AutomationPropertiesGallery.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/BehaviorsAndTriggers.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/BehaviorsAndTriggers.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/BehaviorsAndTriggers.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/BehaviorsAndTriggers.xaml

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/BehaviorsAndTriggers.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/BehaviorsAndTriggers.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/BehaviorsAndTriggers.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/BehaviorsAndTriggers.xaml.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/CellForceUpdateSizeGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/CellForceUpdateSizeGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/CellForceUpdateSizeGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/CellForceUpdateSizeGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/ClickGestureGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ClickGestureGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/ClickGestureGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ClickGestureGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/EntryReturnTypeGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/EntryReturnTypeGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/EntryReturnTypeGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/EntryReturnTypeGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/FlowDirectionGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/FlowDirectionGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/FlowDirectionGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/FlowDirectionGallery.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/LayoutAddPerformance.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/LayoutAddPerformance.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/LayoutAddPerformance.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/LayoutAddPerformance.xaml

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/LayoutAddPerformance.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/LayoutAddPerformance.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/LayoutAddPerformance.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/LayoutAddPerformance.xaml.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/ListRefresh.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ListRefresh.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/ListRefresh.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ListRefresh.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/ListScrollTo.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ListScrollTo.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/ListScrollTo.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ListScrollTo.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/ListViewSelectionColor.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ListViewSelectionColor.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/ListViewSelectionColor.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ListViewSelectionColor.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/NativeBindingGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/NativeBindingGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/NativeBindingGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/NativeBindingGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/NavBarTitleTestPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/NavBarTitleTestPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/NavBarTitleTestPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/NavBarTitleTestPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/NestedNativeControlGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/NestedNativeControlGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/NestedNativeControlGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/NestedNativeControlGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/PanGestureGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/PanGestureGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/PanGestureGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/PanGestureGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/PinchGestureTestPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/PinchGestureTestPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/PinchGestureTestPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/PinchGestureTestPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/SwipeGestureGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/SwipeGestureGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/SwipeGestureGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/SwipeGestureGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/ToolbarItems.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ToolbarItems.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/ToolbarItems.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/ToolbarItems.cs

diff --git a/Xamarin.Forms.Controls/ControlGalleryPages/VisualGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/VisualGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ControlGalleryPages/VisualGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ControlGalleryPages/VisualGallery.cs

diff --git a/Xamarin.Forms.Controls/Controls/ColorPicker.cs b/Xamarin.Forms/Xamarin.Forms.Controls/Controls/ColorPicker.cs
similarity index 100%
rename from Xamarin.Forms.Controls/Controls/ColorPicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/Controls/ColorPicker.cs

diff --git a/Xamarin.Forms.Controls/Controls/GH2691Controls.cs b/Xamarin.Forms/Xamarin.Forms.Controls/Controls/GH2691Controls.cs
similarity index 100%
rename from Xamarin.Forms.Controls/Controls/GH2691Controls.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/Controls/GH2691Controls.cs

diff --git a/Xamarin.Forms.Controls/Controls/Issue3076Button.cs b/Xamarin.Forms/Xamarin.Forms.Controls/Controls/Issue3076Button.cs
similarity index 100%
rename from Xamarin.Forms.Controls/Controls/Issue3076Button.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/Controls/Issue3076Button.cs

diff --git a/Xamarin.Forms.Controls/CoreGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGallery.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/ActivityIndicatorCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ActivityIndicatorCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/ActivityIndicatorCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ActivityIndicatorCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/ButtonCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ButtonCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/ButtonCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ButtonCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/CarouselViewCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CarouselViewCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/CarouselViewCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CarouselViewCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/CheckBoxCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CheckBoxCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/CheckBoxCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CheckBoxCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/CollectionViewCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CollectionViewCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/CollectionViewCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CollectionViewCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/CoreBoxViewGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CoreBoxViewGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/CoreBoxViewGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CoreBoxViewGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/CoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/CoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/CoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/DatePickerCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/DatePickerCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/DatePickerCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/DatePickerCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/EditorCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/EditorCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/EditorCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/EditorCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/EntryCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/EntryCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/EntryCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/EntryCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/FrameCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/FrameCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/FrameCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/FrameCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/ImageButtonCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ImageButtonCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/ImageButtonCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ImageButtonCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/ImageCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ImageCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/ImageCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ImageCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/KeyboardCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/KeyboardCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/KeyboardCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/KeyboardCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/LabelCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/LabelCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/LabelCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/LabelCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/ListViewCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ListViewCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/ListViewCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ListViewCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/OpenGLViewCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/OpenGLViewCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/OpenGLViewCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/OpenGLViewCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/PickerCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/PickerCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/PickerCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/PickerCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/ProgressBarCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ProgressBarCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/ProgressBarCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/ProgressBarCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/RefreshViewCoreGalleyPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/RefreshViewCoreGalleyPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/RefreshViewCoreGalleyPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/RefreshViewCoreGalleyPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/SearchBarCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/SearchBarCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/SearchBarCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/SearchBarCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/SliderCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/SliderCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/SliderCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/SliderCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/StepperCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/StepperCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/StepperCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/StepperCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/SwipeViewCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/SwipeViewCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/SwipeViewCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/SwipeViewCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/SwitchCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/SwitchCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/SwitchCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/SwitchCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/TableViewCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/TableViewCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/TableViewCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/TableViewCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/TimePickerCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/TimePickerCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/TimePickerCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/TimePickerCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/WebViewCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/WebViewCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/WebViewCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/WebViewCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/CoreGalleryPages/WkWebViewCoreGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/WkWebViewCoreGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/CoreGalleryPages/WkWebViewCoreGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/CoreGalleryPages/WkWebViewCoreGalleryPage.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Directory.Build.props b/Xamarin.Forms/Xamarin.Forms.Controls/Directory.Build.props
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Directory.Build.props
rename to Xamarin.Forms/Xamarin.Forms.Controls/Directory.Build.props

diff --git a/Xamarin.Forms.Controls/Directory.Build.targets b/Xamarin.Forms/Xamarin.Forms.Controls/Directory.Build.targets
similarity index 100%
rename from Xamarin.Forms.Controls/Directory.Build.targets
rename to Xamarin.Forms/Xamarin.Forms.Controls/Directory.Build.targets

diff --git a/Xamarin.Forms.Controls/GalleryPages/AbsoluteLayoutGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/AbsoluteLayoutGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/AbsoluteLayoutGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/AbsoluteLayoutGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ActionSheetGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ActionSheetGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ActionSheetGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ActionSheetGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/AlertGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/AlertGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/AlertGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/AlertGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/AppLinkPageGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/AppLinkPageGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/AppLinkPageGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/AppLinkPageGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/BackgroundImageGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/BackgroundImageGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/BackgroundImageGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/BackgroundImageGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/BindableLayoutGalleryPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/BindableLayoutGalleryPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/BindableLayoutGalleryPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/BindableLayoutGalleryPage.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/BindableLayoutGalleryPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/BindableLayoutGalleryPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/BindableLayoutGalleryPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/BindableLayoutGalleryPage.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/BoundContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/BoundContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/BoundContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/BoundContentPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonBorderBackgroundGalleryPage.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ButtonLayoutGalleryPage.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CarouselPageGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CarouselPageGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CarouselPageGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CarouselPageGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellTypeList.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellTypeList.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellTypeList.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellTypeList.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/EntryCellListPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/EntryCellListPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/EntryCellListPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/EntryCellListPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/EntryCellTablePage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/EntryCellTablePage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/EntryCellTablePage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/EntryCellTablePage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ImageCellListPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ImageCellListPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ImageCellListPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ImageCellListPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ImageCellTablePage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ImageCellTablePage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ImageCellTablePage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ImageCellTablePage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ProductViewCell.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ProductViewCell.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ProductViewCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ProductViewCell.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/SwitchCellListPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/SwitchCellListPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/SwitchCellListPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/SwitchCellListPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/SwitchCellTablePage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/SwitchCellTablePage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/SwitchCellTablePage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/SwitchCellTablePage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/TextCellListPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/TextCellListPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/TextCellListPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/TextCellListPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/TextCellTablePage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/TextCellTablePage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/TextCellTablePage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/TextCellTablePage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/UnEvenViewCellGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/UnEvenViewCellGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/UnEvenViewCellGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/UnEvenViewCellGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ViewCellGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ViewCellGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ViewCellGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CellsGalleries/ViewCellGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CharacterSpacingGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CharacterSpacingGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CharacterSpacingGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CharacterSpacingGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CharacterSpacingGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CharacterSpacingGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CharacterSpacingGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CharacterSpacingGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ClipToBoundsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ClipToBoundsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ClipToBoundsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ClipToBoundsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/AlternateLayoutGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/AlternateLayoutGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/AlternateLayoutGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/AlternateLayoutGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/StaggeredLayout.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/StaggeredLayout.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/StaggeredLayout.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/StaggeredLayout.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/StaggeredLayout.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/StaggeredLayout.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/StaggeredLayout.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/AlternateLayoutGalleries/StaggeredLayout.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselCodeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselCodeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselCodeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselCodeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselItemsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselItemsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselItemsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselItemsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselSnapGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselSnapGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselSnapGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselSnapGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselXamlGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselXamlGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselXamlGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselXamlGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselXamlGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselXamlGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselXamlGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselXamlGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CollectionCarouselViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CollectionCarouselViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CollectionCarouselViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CollectionCarouselViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/EmptyCarouselGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/EmptyCarouselGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/EmptyCarouselGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/EmptyCarouselGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/EmptyCarouselGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/EmptyCarouselGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/EmptyCarouselGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/EmptyCarouselGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/ExampleTemplateCarousel.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/ExampleTemplateCarousel.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/ExampleTemplateCarousel.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/ExampleTemplateCarousel.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/ExampleTemplateCarousel.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/ExampleTemplateCarousel.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/ExampleTemplateCarousel.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/ExampleTemplateCarousel.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/IndicatorCodeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/IndicatorCodeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/IndicatorCodeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/IndicatorCodeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionModifier.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionModifier.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionModifier.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionModifier.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGalleryTestItem.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGalleryTestItem.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGalleryTestItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGalleryTestItem.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateSelectorGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateSelectorGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateSelectorGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateSelectorGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateSelectorGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateSelectorGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateSelectorGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DataTemplateSelectorGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DefaultTextGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DefaultTextGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DefaultTextGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DefaultTextGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DemoFilteredItemSource.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DemoFilteredItemSource.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DemoFilteredItemSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/DemoFilteredItemSource.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewGalleryFilterInfo.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewGalleryFilterInfo.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewGalleryFilterInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewGalleryFilterInfo.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewLoadSimulateGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewLoadSimulateGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewLoadSimulateGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewLoadSimulateGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewLoadSimulateGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewLoadSimulateGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewLoadSimulateGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewLoadSimulateGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewNullGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewNullGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewNullGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewNullGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewNullGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewNullGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewNullGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewNullGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewStringGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewStringGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewStringGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewStringGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewStringGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewStringGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewStringGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewStringGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewSwapGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewSwapGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewSwapGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewSwapGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewSwapGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewSwapGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewSwapGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewSwapGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewTemplateGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewTemplateGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewTemplateGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewTemplateGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewTemplateGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewTemplateGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewTemplateGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewTemplateGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EmptyViewGalleries/EmptyViewViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EnumSelector.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EnumSelector.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EnumSelector.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/EnumSelector.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ExampleTemplates.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ExampleTemplates.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ExampleTemplates.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ExampleTemplates.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/FilterCollectionView.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/FilterCollectionView.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/FilterCollectionView.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/FilterCollectionView.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/FilterCollectionView.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/FilterCollectionView.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/FilterCollectionView.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/FilterCollectionView.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/BasicGrouping.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/BasicGrouping.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/BasicGrouping.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/BasicGrouping.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/BasicGrouping.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/BasicGrouping.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/BasicGrouping.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/BasicGrouping.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GridGrouping.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GridGrouping.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GridGrouping.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GridGrouping.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GridGrouping.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GridGrouping.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GridGrouping.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GridGrouping.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingNoTemplates.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingNoTemplates.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingNoTemplates.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingNoTemplates.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingNoTemplates.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingNoTemplates.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingNoTemplates.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingNoTemplates.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingPlusSelection.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingPlusSelection.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingPlusSelection.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingPlusSelection.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingPlusSelection.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingPlusSelection.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingPlusSelection.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/GroupingPlusSelection.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/MeasureFirstStrategy.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/MeasureFirstStrategy.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/MeasureFirstStrategy.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/MeasureFirstStrategy.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/MeasureFirstStrategy.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/MeasureFirstStrategy.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/MeasureFirstStrategy.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/MeasureFirstStrategy.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/ObservableGrouping.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/ObservableGrouping.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/ObservableGrouping.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/ObservableGrouping.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SomeEmptyGroups.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SomeEmptyGroups.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SomeEmptyGroups.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SomeEmptyGroups.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SomeEmptyGroups.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SomeEmptyGroups.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SomeEmptyGroups.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SomeEmptyGroups.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SwitchGrouping.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SwitchGrouping.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SwitchGrouping.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SwitchGrouping.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SwitchGrouping.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SwitchGrouping.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SwitchGrouping.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/SwitchGrouping.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/ViewModel.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/ViewModel.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/ViewModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/GroupingGalleries/ViewModel.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/FooterOnlyString.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/FooterOnlyString.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/FooterOnlyString.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/FooterOnlyString.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/FooterOnlyString.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/FooterOnlyString.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/FooterOnlyString.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/FooterOnlyString.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGrid.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGrid.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGrid.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGrid.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGrid.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGrid.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGrid.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGrid.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGridHorizontal.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGridHorizontal.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGridHorizontal.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGridHorizontal.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGridHorizontal.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGridHorizontal.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGridHorizontal.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterGridHorizontal.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterString.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterString.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterString.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterString.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterString.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterString.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterString.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterString.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterTemplate.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterTemplate.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterTemplate.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterTemplate.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterTemplate.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterTemplate.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterTemplate.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterTemplate.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterView.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterView.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterView.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterView.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterView.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterView.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterView.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/HeaderFooterGalleries/HeaderFooterView.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/IndexParser.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/IndexParser.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/IndexParser.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/IndexParser.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemAdder.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemAdder.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemAdder.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemAdder.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemInsert.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemInsert.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemInsert.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemInsert.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemMover.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemMover.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemMover.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemMover.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemRemover.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemRemover.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemRemover.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemRemover.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemReplacer.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemReplacer.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemReplacer.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemReplacer.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/DynamicItemSizeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/DynamicItemSizeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/DynamicItemSizeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/DynamicItemSizeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/ItemsSizeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/ItemsSizeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/ItemsSizeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/ItemsSizeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/VariableSizeTemplateGridGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/VariableSizeTemplateGridGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/VariableSizeTemplateGridGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemSizeGalleries/VariableSizeTemplateGridGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemsSourceGenerator.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemsSourceGenerator.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemsSourceGenerator.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ItemsSourceGenerator.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemAdder.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemAdder.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemAdder.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemAdder.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemMover.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemMover.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemMover.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemMover.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemRemover.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemRemover.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemRemover.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemRemover.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemReplacer.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemReplacer.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemReplacer.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiItemReplacer.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiTestObservableCollection.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiTestObservableCollection.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiTestObservableCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiTestObservableCollection.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiTestObservableCollectionModifier.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiTestObservableCollectionModifier.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiTestObservableCollectionModifier.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/MultiTestObservableCollectionModifier.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/NestedGalleries/NestedCollectionViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/NestedGalleries/NestedCollectionViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/NestedGalleries/NestedCollectionViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/NestedGalleries/NestedCollectionViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/NestedGalleries/NestedCollectionViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/NestedGalleries/NestedCollectionViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/NestedGalleries/NestedCollectionViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/NestedGalleries/NestedCollectionViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCodeCollectionViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCodeCollectionViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCodeCollectionViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCodeCollectionViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionModifier.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionModifier.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionModifier.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionModifier.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionResetGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionResetGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionResetGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableCollectionResetGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableMultiItemCollectionViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableMultiItemCollectionViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableMultiItemCollectionViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ObservableMultiItemCollectionViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PositionControl.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PositionControl.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PositionControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PositionControl.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PropagateCodeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PropagateCodeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PropagateCodeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PropagateCodeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PropagationGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PropagationGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PropagationGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/PropagationGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/Resetter.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/Resetter.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/Resetter.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/Resetter.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollModeGalleries/ScrollModeTestGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToCodeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToCodeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToCodeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToCodeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGalleries/ScrollToGroup.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGalleries/ScrollToGroup.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGalleries/ScrollToGroup.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGalleries/ScrollToGroup.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGalleries/ScrollToGroup.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGalleries/ScrollToGroup.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGalleries/ScrollToGroup.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGalleries/ScrollToGroup.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToIndexControl.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToIndexControl.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToIndexControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToIndexControl.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToItemControl.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToItemControl.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToItemControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/ScrollToItemControl.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/BoundSelectionModel.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/BoundSelectionModel.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/BoundSelectionModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/BoundSelectionModel.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/FilterSelection.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/FilterSelection.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/FilterSelection.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/FilterSelection.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/FilterSelection.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/FilterSelection.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/FilterSelection.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/FilterSelection.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/MultipleBoundSelection.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/MultipleBoundSelection.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/MultipleBoundSelection.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/MultipleBoundSelection.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/MultipleBoundSelection.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/MultipleBoundSelection.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/MultipleBoundSelection.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/MultipleBoundSelection.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemsGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemsGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemsGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemsGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemsGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemsGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemsGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/PreselectedItemsGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionChangedCommandParameter.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionChangedCommandParameter.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionChangedCommandParameter.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionChangedCommandParameter.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionChangedCommandParameter.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionChangedCommandParameter.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionChangedCommandParameter.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionChangedCommandParameter.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionHelpers.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionModeGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionModeGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionModeGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionModeGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionModeGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionModeGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionModeGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionModeGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionSynchronization.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionSynchronization.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionSynchronization.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionSynchronization.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionSynchronization.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionSynchronization.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionSynchronization.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SelectionSynchronization.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SingleBoundSelection.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SingleBoundSelection.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SingleBoundSelection.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SingleBoundSelection.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SingleBoundSelection.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SingleBoundSelection.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SingleBoundSelection.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SelectionGalleries/SingleBoundSelection.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SnapPointsCodeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SnapPointsCodeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SnapPointsCodeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SnapPointsCodeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SnapPointsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SnapPointsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SnapPointsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SnapPointsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/ItemsSpacingGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/ItemsSpacingGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/ItemsSpacingGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/ItemsSpacingGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/SpacingGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/SpacingGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/SpacingGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/SpacingGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/SpacingModifier.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/SpacingModifier.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/SpacingModifier.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpacingGalleries/SpacingModifier.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpanSetter.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpanSetter.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpanSetter.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/SpanSetter.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TemplateCodeCollectionViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TemplateCodeCollectionViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TemplateCodeCollectionViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TemplateCodeCollectionViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TemplateCodeCollectionViewGridGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TemplateCodeCollectionViewGridGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TemplateCodeCollectionViewGridGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TemplateCodeCollectionViewGridGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TextCodeCollectionViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TextCodeCollectionViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TextCodeCollectionViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TextCodeCollectionViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TextCodeCollectionViewGridGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TextCodeCollectionViewGridGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TextCodeCollectionViewGridGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/TextCodeCollectionViewGridGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ControlTemplatePage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ControlTemplatePage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ControlTemplatePage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ControlTemplatePage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ControlTemplateXamlPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ControlTemplateXamlPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ControlTemplateXamlPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ControlTemplateXamlPage.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/ControlTemplateXamlPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ControlTemplateXamlPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ControlTemplateXamlPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ControlTemplateXamlPage.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/DisposeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/DisposeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/DisposeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/DisposeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/DynamicViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/DynamicViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/DynamicViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/DynamicViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/EditableList.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/EditableList.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/EditableList.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/EditableList.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/EditorGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/EditorGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/EditorGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/EditorGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/EntryGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/EntryGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/EntryGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/EntryGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/FontImageSourceGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/FontImageSourceGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/FontImageSourceGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/FontImageSourceGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/FrameGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/FrameGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/FrameGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/FrameGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/GalleryBuilder.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GalleryBuilder.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/GalleryBuilder.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GalleryBuilder.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/GifGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GifGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/GifGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GifGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/GridGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GridGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/GridGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GridGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/GroupedListActionsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GroupedListActionsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/GroupedListActionsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GroupedListActionsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/GroupedListContactsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GroupedListContactsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/GroupedListContactsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/GroupedListContactsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ImageGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ImageGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ImageGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ImageGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ImageLoadingGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ImageLoadingGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ImageLoadingGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ImageLoadingGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ImageSourcesGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ImageSourcesGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ImageSourcesGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ImageSourcesGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/IndicatorViewGalleries/IndicatorsSample.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/IndicatorViewGalleries/IndicatorsSample.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/IndicatorViewGalleries/IndicatorsSample.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/IndicatorViewGalleries/IndicatorsSample.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/IndicatorViewGalleries/IndicatorsSample.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/IndicatorViewGalleries/IndicatorsSample.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/IndicatorViewGalleries/IndicatorsSample.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/IndicatorViewGalleries/IndicatorsSample.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/InputIntentGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/InputIntentGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/InputIntentGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/InputIntentGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/LabelGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/LabelGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/LabelGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/LabelGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/LayoutOptionsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/LayoutOptionsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/LayoutOptionsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/LayoutOptionsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/LayoutPerformanceGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/LayoutPerformanceGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/LayoutPerformanceGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/LayoutPerformanceGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/LineBreakModeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/LineBreakModeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/LineBreakModeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/LineBreakModeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ListPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ListPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ListPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ListPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ListViewDemoPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ListViewDemoPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ListViewDemoPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ListViewDemoPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MacOSTestGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MacOSTestGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MacOSTestGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MacOSTestGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MacTwitterDemo.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MacTwitterDemo.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MacTwitterDemo.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MacTwitterDemo.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/MacTwitterDemo.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MacTwitterDemo.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MacTwitterDemo.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MacTwitterDemo.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MapElementsGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapElementsGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MapElementsGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapElementsGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/MapElementsGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapElementsGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MapElementsGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapElementsGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MapGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MapGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/MapGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MapGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MapWithItemsSourceGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapWithItemsSourceGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MapWithItemsSourceGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapWithItemsSourceGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/MapWithItemsSourceGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapWithItemsSourceGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MapWithItemsSourceGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MapWithItemsSourceGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MasterDetailPageTabletPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MasterDetailPageTabletPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MasterDetailPageTabletPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MasterDetailPageTabletPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MaterialActivityIndicatorGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MaterialActivityIndicatorGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MaterialActivityIndicatorGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MaterialActivityIndicatorGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MaterialEntryGalleryPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MaterialEntryGalleryPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MaterialEntryGalleryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MaterialEntryGalleryPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MaterialProgressBarGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MaterialProgressBarGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MaterialProgressBarGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MaterialProgressBarGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MemoryLeakGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MemoryLeakGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MemoryLeakGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MemoryLeakGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MinimumSizeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MinimumSizeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MinimumSizeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MinimumSizeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/MultiGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MultiGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/MultiGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/MultiGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/NavigationBarGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/NavigationBarGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/NavigationBarGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/NavigationBarGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/NavigationPropertiesGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/NavigationPropertiesGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/NavigationPropertiesGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/NavigationPropertiesGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/OpenGLGalleries/AdvancedOpenGLGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/OpenGLGalleries/AdvancedOpenGLGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/OpenGLGalleries/AdvancedOpenGLGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/OpenGLGalleries/AdvancedOpenGLGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/OpenGLGalleries/BasicOpenGLGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/OpenGLGalleries/BasicOpenGLGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/OpenGLGalleries/BasicOpenGLGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/OpenGLGalleries/BasicOpenGLGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PickerGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PickerGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PickerGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PickerGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/ApplicationAndroid.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/ApplicationAndroid.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/ApplicationAndroid.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/ApplicationAndroid.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/EntryPageAndroid.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/EntryPageAndroid.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/EntryPageAndroid.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/EntryPageAndroid.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/EntryPageiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/EntryPageiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/EntryPageiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/EntryPageiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/HomeIndicatorPageiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/HomeIndicatorPageiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/HomeIndicatorPageiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/HomeIndicatorPageiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/LargeTitlesPageiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/LargeTitlesPageiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/LargeTitlesPageiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/LargeTitlesPageiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageWindows.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageWindows.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageWindows.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageWindows.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/MasterDetailPageiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/ModalFormSheetPageiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/ModalFormSheetPageiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/ModalFormSheetPageiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/ModalFormSheetPageiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/NavigationPageWindows.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/NavigationPageWindows.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/NavigationPageWindows.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/NavigationPageWindows.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/NavigationPageiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/NavigationPageiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/NavigationPageiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/NavigationPageiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/RefreshViewWindows.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/RefreshViewWindows.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/RefreshViewWindows.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/RefreshViewWindows.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/SafeAreaPageiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/SafeAreaPageiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/SafeAreaPageiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/SafeAreaPageiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageAndroid.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageAndroid.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageAndroid.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageAndroid.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageWindows.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageWindows.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageWindows.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageWindows.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/TabbedPageiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/VisualElementiOS.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/VisualElementiOS.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/VisualElementiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/VisualElementiOS.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/WindowsPlatformSpecificsGalleryHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/WindowsPlatformSpecificsGalleryHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/WindowsPlatformSpecificsGalleryHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGalleries/WindowsPlatformSpecificsGalleryHelpers.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/PlatformSpecificsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ProgressBarGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ProgressBarGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ProgressBarGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ProgressBarGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCarouselViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCarouselViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCarouselViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCarouselViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCarouselViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCarouselViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCarouselViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCarouselViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCollectionViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCollectionViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCollectionViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCollectionViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCollectionViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCollectionViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCollectionViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshCollectionViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshLayoutGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshLayoutGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshLayoutGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshLayoutGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshLayoutGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshLayoutGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshLayoutGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshLayoutGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshListViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshListViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshListViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshListViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshListViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshListViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshListViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshListViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshScrollViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshScrollViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshScrollViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshScrollViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshScrollViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshScrollViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshScrollViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshScrollViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshWebViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshWebViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshWebViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshWebViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshWebViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshWebViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshWebViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshWebViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/RelativeLayoutGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RelativeLayoutGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/RelativeLayoutGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/RelativeLayoutGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ScaleRotate.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ScaleRotate.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ScaleRotate.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ScaleRotate.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/ScrollGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ScrollGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/ScrollGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/ScrollGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SearchBarGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SearchBarGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SearchBarGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SearchBarGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SettingsPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SettingsPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SettingsPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SettingsPage.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SliderGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SliderGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SliderGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SliderGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/StackLayoutGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StackLayoutGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/StackLayoutGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StackLayoutGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/StepperGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StepperGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/StepperGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StepperGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/StyleGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StyleGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/StyleGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StyleGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/StyleXamlGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StyleXamlGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/StyleXamlGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StyleXamlGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/StyleXamlGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StyleXamlGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/StyleXamlGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/StyleXamlGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/AddRemoveSwipeItemsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/AddRemoveSwipeItemsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/AddRemoveSwipeItemsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/AddRemoveSwipeItemsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/BasicSwipeGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CloseSwipeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CloseSwipeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CloseSwipeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CloseSwipeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSizeSwipeViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSizeSwipeViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSizeSwipeViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSizeSwipeViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSizeSwipeViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSizeSwipeViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSizeSwipeViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSizeSwipeViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomSwipeItemViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomizeSwipeItemGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomizeSwipeItemGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomizeSwipeItemGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/CustomizeSwipeItemGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/ResourceSwipeItemsGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBehaviorOnInvokedGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBehaviorOnInvokedGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBehaviorOnInvokedGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBehaviorOnInvokedGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeBindableLayoutGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCarouselViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCollectionViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCollectionViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCollectionViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeCollectionViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeHorizontalCollectionViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeItemIconGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeItemIconGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeItemIconGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeItemIconGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeListViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeTransitionModeGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeTransitionModeGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeTransitionModeGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeTransitionModeGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeVerticalCollectionViewGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeViewEventsGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeViewEventsGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeViewEventsGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeViewEventsGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwipeViewGalleries/SwipeViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/SwitchGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwitchGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/SwitchGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/SwitchGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/TableViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TableViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/TableViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TableViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/TemplatedCarouselGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TemplatedCarouselGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/TemplatedCarouselGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TemplatedCarouselGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/TemplatedTabbedGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TemplatedTabbedGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/TemplatedTabbedGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TemplatedTabbedGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/TitleView.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TitleView.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/TitleView.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TitleView.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/TitleView.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TitleView.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/TitleView.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/TitleView.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/UnevenListGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/UnevenListGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/UnevenListGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/UnevenListGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ButtonDisabledStatesGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/CodeOnlyExample.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/CodeOnlyExample.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/CodeOnlyExample.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/CodeOnlyExample.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DatePickerDisabledStatesGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DisabledStatesGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DisabledStatesGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DisabledStatesGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/DisabledStatesGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EditorDisabledStatesGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/EntryDisabledStatesGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnIdiomExample.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnIdiomExample.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnIdiomExample.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnIdiomExample.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnIdiomExample.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnIdiomExample.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnIdiomExample.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnIdiomExample.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnPlatformExample.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnPlatformExample.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnPlatformExample.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnPlatformExample.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnPlatformExample.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnPlatformExample.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnPlatformExample.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/OnPlatformExample.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/PickerDisabledStatesGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/SearchBarDisabledStatesGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/TimePickerDisabledStatesGallery.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ValidationExample.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ValidationExample.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ValidationExample.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ValidationExample.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ValidationExample.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ValidationExample.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ValidationExample.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/ValidationExample.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateManagerGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateManagerGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateManagerGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateManagerGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateSetterTarget.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateSetterTarget.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateSetterTarget.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateSetterTarget.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateSetterTarget.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateSetterTarget.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateSetterTarget.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStateSetterTarget.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStatesDirectlyOnElements.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStatesDirectlyOnElements.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStatesDirectlyOnElements.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStatesDirectlyOnElements.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStatesDirectlyOnElements.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStatesDirectlyOnElements.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStatesDirectlyOnElements.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/VisualStateManagerGalleries/VisualStatesDirectlyOnElements.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/WebViewGallery.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/WebViewGallery.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/WebViewGallery.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/WebViewGallery.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/XamlNativeViews.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/XamlNativeViews.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/XamlNativeViews.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/XamlNativeViews.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/XamlNativeViews.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/XamlNativeViews.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/XamlNativeViews.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/XamlNativeViews.xaml.cs

diff --git a/Xamarin.Forms.Controls/GalleryPages/XamlPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/XamlPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/XamlPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/XamlPage.xaml

diff --git a/Xamarin.Forms.Controls/GalleryPages/XamlPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/XamlPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/XamlPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/XamlPage.xaml.cs

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/crimson.jpg b/Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/crimson.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/crimson.jpg
rename to Xamarin.Forms/Xamarin.Forms.Controls/GalleryPages/crimson.jpg

diff --git a/Xamarin.Forms.Controls/HanselForms/BaseView.cs b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/BaseView.cs
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/BaseView.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/BaseView.cs

diff --git a/Xamarin.Forms.Controls/HanselForms/BlogPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/BlogPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/BlogPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/BlogPage.xaml

diff --git a/Xamarin.Forms.Controls/HanselForms/BlogPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/BlogPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/BlogPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/BlogPage.xaml.cs

diff --git a/Xamarin.Forms.Controls/HanselForms/HBaseViewModel.cs b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/HBaseViewModel.cs
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/HBaseViewModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/HBaseViewModel.cs

diff --git a/Xamarin.Forms.Controls/HanselForms/MyAbout.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/MyAbout.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/MyAbout.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/MyAbout.xaml

diff --git a/Xamarin.Forms.Controls/HanselForms/MyAbout.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/MyAbout.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/MyAbout.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/MyAbout.xaml.cs

diff --git a/Xamarin.Forms.Controls/HanselForms/RootPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/RootPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/RootPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/RootPage.cs

diff --git a/Xamarin.Forms.Controls/HanselForms/TwitterPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/TwitterPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/TwitterPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/TwitterPage.xaml

diff --git a/Xamarin.Forms.Controls/HanselForms/TwitterPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/TwitterPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/TwitterPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/TwitterPage.xaml.cs

diff --git a/Xamarin.Forms.Controls/HanselForms/WebsiteView.cs b/Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/WebsiteView.cs
similarity index 100%
rename from Xamarin.Forms.Controls/HanselForms/WebsiteView.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/HanselForms/WebsiteView.cs

diff --git a/Xamarin.Forms.Controls/Helpers/ITestCloudService.cs b/Xamarin.Forms/Xamarin.Forms.Controls/Helpers/ITestCloudService.cs
similarity index 100%
rename from Xamarin.Forms.Controls/Helpers/ITestCloudService.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/Helpers/ITestCloudService.cs

diff --git a/Xamarin.Forms.Controls/Helpers/IWindowNavigation.cs b/Xamarin.Forms/Xamarin.Forms.Controls/Helpers/IWindowNavigation.cs
similarity index 100%
rename from Xamarin.Forms.Controls/Helpers/IWindowNavigation.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/Helpers/IWindowNavigation.cs

diff --git a/Xamarin.Forms.Controls/IRegistrarValidationService.cs b/Xamarin.Forms/Xamarin.Forms.Controls/IRegistrarValidationService.cs
similarity index 100%
rename from Xamarin.Forms.Controls/IRegistrarValidationService.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/IRegistrarValidationService.cs

diff --git a/Xamarin.Forms.Controls/ISecondaryWindowService.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ISecondaryWindowService.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ISecondaryWindowService.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ISecondaryWindowService.cs

diff --git a/Xamarin.Forms.Controls/LegacyRepro/Page1.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/LegacyRepro/Page1.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/LegacyRepro/Page1.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/LegacyRepro/Page1.xaml

diff --git a/Xamarin.Forms.Controls/LegacyRepro/Page1.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/LegacyRepro/Page1.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/LegacyRepro/Page1.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/LegacyRepro/Page1.xaml.cs

diff --git a/Xamarin.Forms.Controls/LegacyRepro/SampleViewCell.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/LegacyRepro/SampleViewCell.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/LegacyRepro/SampleViewCell.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/LegacyRepro/SampleViewCell.xaml

diff --git a/Xamarin.Forms.Controls/LegacyRepro/SampleViewCell.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/LegacyRepro/SampleViewCell.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/LegacyRepro/SampleViewCell.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/LegacyRepro/SampleViewCell.xaml.cs

diff --git a/Xamarin.Forms.Controls/MainPageLifeCycleTests.cs b/Xamarin.Forms/Xamarin.Forms.Controls/MainPageLifeCycleTests.cs
similarity index 100%
rename from Xamarin.Forms.Controls/MainPageLifeCycleTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/MainPageLifeCycleTests.cs

diff --git a/Xamarin.Forms.Controls/NavReproApp.cs b/Xamarin.Forms/Xamarin.Forms.Controls/NavReproApp.cs
similarity index 100%
rename from Xamarin.Forms.Controls/NavReproApp.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/NavReproApp.cs

diff --git a/Xamarin.Forms.Controls/NullableThicknessConverter.cs b/Xamarin.Forms/Xamarin.Forms.Controls/NullableThicknessConverter.cs
similarity index 100%
rename from Xamarin.Forms.Controls/NullableThicknessConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/NullableThicknessConverter.cs

diff --git a/Xamarin.Forms.Controls/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Controls/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Controls/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Controls/RootPages/CaseTenPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/CaseTenPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/CaseTenPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/CaseTenPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/Issue465Page.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/Issue465Page.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/Issue465Page.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/Issue465Page.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootMDPNavigationContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootMDPNavigationContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootMDPNavigationContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootMDPNavigationContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootMDPNavigationTabbedContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootMDPNavigationTabbedContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootMDPNavigationTabbedContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootMDPNavigationTabbedContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootNavigationContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootNavigationContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootNavigationContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootNavigationContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootNavigationManyTabbedPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootNavigationManyTabbedPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootNavigationManyTabbedPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootNavigationManyTabbedPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootNavigationTabbedContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootNavigationTabbedContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootNavigationTabbedContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootNavigationTabbedContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootTabbedContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootTabbedContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootTabbedContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootTabbedContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootTabbedMDPNavigationContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootTabbedMDPNavigationContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootTabbedMDPNavigationContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootTabbedMDPNavigationContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootTabbedManyNavigationContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootTabbedManyNavigationContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootTabbedManyNavigationContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootTabbedManyNavigationContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/RootTabbedNavigationContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootTabbedNavigationContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/RootTabbedNavigationContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/RootTabbedNavigationContentPage.cs

diff --git a/Xamarin.Forms.Controls/RootPages/SwapHierachyStackLayout.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/SwapHierachyStackLayout.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/SwapHierachyStackLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/SwapHierachyStackLayout.cs

diff --git a/Xamarin.Forms.Controls/RootPages/TabbedNavPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/RootPages/TabbedNavPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/RootPages/TabbedNavPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/RootPages/TabbedNavPage.cs

diff --git a/Xamarin.Forms.Controls/ShellContentTest.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/ShellContentTest.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/ShellContentTest.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/ShellContentTest.xaml

diff --git a/Xamarin.Forms.Controls/ShellContentTest.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ShellContentTest.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ShellContentTest.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ShellContentTest.xaml.cs

diff --git a/Xamarin.Forms.Controls/SimpleApp.cs b/Xamarin.Forms/Xamarin.Forms.Controls/SimpleApp.cs
similarity index 100%
rename from Xamarin.Forms.Controls/SimpleApp.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/SimpleApp.cs

diff --git a/Xamarin.Forms.Controls/TestCases.cs b/Xamarin.Forms/Xamarin.Forms.Controls/TestCases.cs
similarity index 100%
rename from Xamarin.Forms.Controls/TestCases.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/TestCases.cs

diff --git a/Xamarin.Forms.Controls/ViewContainers/EventViewContainer.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/EventViewContainer.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ViewContainers/EventViewContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/EventViewContainer.cs

diff --git a/Xamarin.Forms.Controls/ViewContainers/LayeredViewContainer.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/LayeredViewContainer.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ViewContainers/LayeredViewContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/LayeredViewContainer.cs

diff --git a/Xamarin.Forms.Controls/ViewContainers/MultiBindingHack.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/MultiBindingHack.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ViewContainers/MultiBindingHack.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/MultiBindingHack.cs

diff --git a/Xamarin.Forms.Controls/ViewContainers/StateViewContainer.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/StateViewContainer.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ViewContainers/StateViewContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/StateViewContainer.cs

diff --git a/Xamarin.Forms.Controls/ViewContainers/ValueViewContainer.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/ValueViewContainer.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ViewContainers/ValueViewContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/ValueViewContainer.cs

diff --git a/Xamarin.Forms.Controls/ViewContainers/ViewContainer.cs b/Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/ViewContainer.cs
similarity index 100%
rename from Xamarin.Forms.Controls/ViewContainers/ViewContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/ViewContainers/ViewContainer.cs

diff --git a/Xamarin.Forms.Controls/XamStore/Controls/FlyoutHeader.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Controls/FlyoutHeader.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Controls/FlyoutHeader.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Controls/FlyoutHeader.xaml

diff --git a/Xamarin.Forms.Controls/XamStore/Controls/FlyoutHeader.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Controls/FlyoutHeader.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Controls/FlyoutHeader.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Controls/FlyoutHeader.xaml.cs

diff --git a/Xamarin.Forms.Controls/XamStore/Icons.cs b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Icons.cs
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Icons.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Icons.cs

diff --git a/Xamarin.Forms.Controls/XamStore/StoreShell.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/StoreShell.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/StoreShell.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/StoreShell.xaml

diff --git a/Xamarin.Forms.Controls/XamStore/StoreShell.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/StoreShell.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/StoreShell.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/StoreShell.xaml.cs

diff --git a/Xamarin.Forms.Controls/XamStore/Styles/Global.css b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Styles/Global.css
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Styles/Global.css
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Styles/Global.css

diff --git a/Xamarin.Forms.Controls/XamStore/Styles/Global.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Styles/Global.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Styles/Global.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Styles/Global.xaml

diff --git a/Xamarin.Forms.Controls/XamStore/Styles/HomeView.css b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Styles/HomeView.css
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Styles/HomeView.css
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Styles/HomeView.css

diff --git a/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml

diff --git a/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Views/DemoShellPage.xaml.cs

diff --git a/Xamarin.Forms.Controls/XamStore/Views/SearchHandlerPage.cs b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Views/SearchHandlerPage.cs
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Views/SearchHandlerPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Views/SearchHandlerPage.cs

diff --git a/Xamarin.Forms.Controls/XamStore/Views/StorePages.cs b/Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Views/StorePages.cs
similarity index 100%
rename from Xamarin.Forms.Controls/XamStore/Views/StorePages.cs
rename to Xamarin.Forms/Xamarin.Forms.Controls/XamStore/Views/StorePages.cs

diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
similarity index 100%
rename from Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
rename to Xamarin.Forms/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj

diff --git a/Xamarin.Forms.Controls/blank.config b/Xamarin.Forms/Xamarin.Forms.Controls/blank.config
similarity index 100%
rename from Xamarin.Forms.Controls/blank.config
rename to Xamarin.Forms/Xamarin.Forms.Controls/blank.config

diff --git a/Xamarin.Forms.ControlGallery.Tizen/res/coffee.png b/Xamarin.Forms/Xamarin.Forms.Controls/coffee.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Tizen/res/coffee.png
rename to Xamarin.Forms/Xamarin.Forms.Controls/coffee.png

diff --git a/Xamarin.Forms.Controls/global.json b/Xamarin.Forms/Xamarin.Forms.Controls/global.json
similarity index 100%
rename from Xamarin.Forms.Controls/global.json
rename to Xamarin.Forms/Xamarin.Forms.Controls/global.json

diff --git a/Xamarin.Forms.Core.Android.UITests/BaseViewContainerRemoteAndroid.cs b/Xamarin.Forms/Xamarin.Forms.Core.Android.UITests/BaseViewContainerRemoteAndroid.cs
similarity index 100%
rename from Xamarin.Forms.Core.Android.UITests/BaseViewContainerRemoteAndroid.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Android.UITests/BaseViewContainerRemoteAndroid.cs

diff --git a/Xamarin.Forms.Core.Android.UITests/Makefile b/Xamarin.Forms/Xamarin.Forms.Core.Android.UITests/Makefile
similarity index 100%
rename from Xamarin.Forms.Core.Android.UITests/Makefile
rename to Xamarin.Forms/Xamarin.Forms.Core.Android.UITests/Makefile

diff --git a/Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs b/Xamarin.Forms/Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs
similarity index 100%
rename from Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Android.UITests/PlatformTests/DisplayAlertUITestsAndroid.cs

diff --git a/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj b/Xamarin.Forms/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
similarity index 100%
rename from Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
rename to Xamarin.Forms/Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj

diff --git a/Xamarin.Forms.Core.Design/AttributeTableBuilder.cs b/Xamarin.Forms/Xamarin.Forms.Core.Design/AttributeTableBuilder.cs
similarity index 100%
rename from Xamarin.Forms.Core.Design/AttributeTableBuilder.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/AttributeTableBuilder.cs

diff --git a/Xamarin.Forms.Core.Design/EnumConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core.Design/EnumConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core.Design/EnumConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/EnumConverter.cs

diff --git a/Xamarin.Forms.Core.Design/ItemsLayoutDesignTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core.Design/ItemsLayoutDesignTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core.Design/ItemsLayoutDesignTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/ItemsLayoutDesignTypeConverter.cs

diff --git a/Xamarin.Forms.Core.Design/KeyboardDesignTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core.Design/KeyboardDesignTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core.Design/KeyboardDesignTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/KeyboardDesignTypeConverter.cs

diff --git a/Xamarin.Forms.Core.Design/NonExclusiveEnumConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core.Design/NonExclusiveEnumConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core.Design/NonExclusiveEnumConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/NonExclusiveEnumConverter.cs

diff --git a/Xamarin.Forms.Core.Design/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Core.Design/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Core.Design/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Core.Design/RegisterMetadata.cs b/Xamarin.Forms/Xamarin.Forms.Core.Design/RegisterMetadata.cs
similarity index 100%
rename from Xamarin.Forms.Core.Design/RegisterMetadata.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/RegisterMetadata.cs

diff --git a/Xamarin.Forms.Core.Design/VisualDesignTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core.Design/VisualDesignTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core.Design/VisualDesignTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/VisualDesignTypeConverter.cs

diff --git a/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj b/Xamarin.Forms/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj
similarity index 100%
rename from Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/Xamarin.Forms.Core.Design.csproj

diff --git a/Xamarin.Forms.Core.Design/toolbox/Xamarin.Forms.toolbox.xml b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/Xamarin.Forms.toolbox.xml
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/Xamarin.Forms.toolbox.xml
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/Xamarin.Forms.toolbox.xml

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-EntryCell-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ImageCell-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-SwitchCell-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-TextCell-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/cell-ViewCell-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-AbsoluteLayout-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ContentView-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-FlexLayout-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Frame-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-Grid-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-RelativeLayout-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-ScrollView-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/layout-StackLayout-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ActivityIndicator-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-BoxView-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Button-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-DatePicker-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Editor-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Entry-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Image-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Label-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ListView-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Map-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Picker-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-ProgressBar-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-SearchBar-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Slider-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Stepper-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-Switch-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TableView-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-TimePicker-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~dark~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~sel.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~sel.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~sel.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~sel.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~sel@2x.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~sel@2x.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~sel@2x.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/mac/view-WebView-16~sel@2x.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-EntryCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-EntryCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/cell-EntryCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-EntryCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-ImageCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-ImageCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/cell-ImageCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-ImageCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-SwitchCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-SwitchCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/cell-SwitchCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-SwitchCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-TextCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-TextCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/cell-TextCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-TextCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-ViewCell-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-ViewCell-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/cell-ViewCell-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/cell-ViewCell-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-AbsoluteLayout-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-AbsoluteLayout-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/layout-AbsoluteLayout-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-AbsoluteLayout-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-ContentView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-ContentView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/layout-ContentView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-ContentView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-FlexLayout-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-FlexLayout-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/layout-FlexLayout-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-FlexLayout-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-Frame-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-Frame-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/layout-Frame-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-Frame-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-Grid-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-Grid-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/layout-Grid-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-Grid-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-RelativeLayout-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-RelativeLayout-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/layout-RelativeLayout-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-RelativeLayout-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-ScrollView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-ScrollView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/layout-ScrollView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-ScrollView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-StackLayout-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-StackLayout-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/layout-StackLayout-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/layout-StackLayout-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ActivityIndicator-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ActivityIndicator-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-ActivityIndicator-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ActivityIndicator-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-BoxView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-BoxView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-BoxView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-BoxView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Button-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Button-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Button-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Button-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-DatePicker-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-DatePicker-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-DatePicker-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-DatePicker-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Editor-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Editor-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Editor-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Editor-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Entry-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Entry-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Entry-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Entry-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Image-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Image-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Image-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Image-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Label-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Label-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Label-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Label-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ListView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ListView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-ListView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ListView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Map-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Map-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Map-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Map-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Picker-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Picker-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Picker-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Picker-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ProgressBar-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ProgressBar-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-ProgressBar-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-ProgressBar-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-SearchBar-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-SearchBar-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-SearchBar-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-SearchBar-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Slider-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Slider-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Slider-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Slider-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Stepper-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Stepper-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Stepper-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Stepper-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Switch-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Switch-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-Switch-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-Switch-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-TableView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-TableView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-TableView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-TableView-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-TimePicker-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-TimePicker-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-TimePicker-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-TimePicker-16.png

diff --git a/Xamarin.Forms.Core.Design/toolbox/icons/win/view-WebView-16.png b/Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-WebView-16.png
similarity index 100%
rename from Xamarin.Forms.Core.Design/toolbox/icons/win/view-WebView-16.png
rename to Xamarin.Forms/Xamarin.Forms.Core.Design/toolbox/icons/win/view-WebView-16.png

diff --git a/Xamarin.Forms.Core.UITests.Shared/BaseTestFixture.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/BaseTestFixture.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/BaseTestFixture.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/BaseTestFixture.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/PlatformQueries.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/PlatformQueries.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/PlatformQueries.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/PlatformQueries.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Queries.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Queries.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Queries.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Queries.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/BaseViewContainerRemote.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Remotes/EventViewContainerRemote.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/EventViewContainerRemote.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Remotes/EventViewContainerRemote.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/EventViewContainerRemote.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Remotes/LayeredViewContainerRemote.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/LayeredViewContainerRemote.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Remotes/LayeredViewContainerRemote.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/LayeredViewContainerRemote.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Remotes/StateViewContainerRemote.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/StateViewContainerRemote.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Remotes/StateViewContainerRemote.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/StateViewContainerRemote.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Remotes/ViewContainerRemote.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/ViewContainerRemote.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Remotes/ViewContainerRemote.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Remotes/ViewContainerRemote.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ActionSheetUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ActionSheetUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ActionSheetUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ActionSheetUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ActivityIndicatorUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ActivityIndicatorUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ActivityIndicatorUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ActivityIndicatorUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/AppearingUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/AppearingUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/AppearingUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/AppearingUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/AutomationIDUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/AutomationIDUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/AutomationIDUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/AutomationIDUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/BoxViewUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/BoxViewUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/BoxViewUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/BoxViewUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ButtonUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ButtonUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ButtonUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ButtonUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/CarouselViewUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/CarouselViewUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/CarouselViewUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/CarouselViewUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/CheckBoxUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/CheckBoxUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/CheckBoxUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/CheckBoxUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/CollectionViewUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/CollectionViewUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/CollectionViewUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/CollectionViewUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ContextActionsUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ContextActionsUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ContextActionsUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ContextActionsUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/DatePickerUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/DatePickerUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/DatePickerUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/DatePickerUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/DisplayAlertUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/DisplayAlertUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/DisplayAlertUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/DisplayAlertUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/EditorUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/EditorUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/EditorUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/EditorUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/EntryUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/EntryUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/EntryUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/EntryUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/FrameUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/FrameUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/FrameUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/FrameUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ImageButtonUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ImageButtonUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ImageButtonUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ImageButtonUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ImageUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ImageUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ImageUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ImageUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/LabelUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/LabelUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/LabelUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/LabelUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/Legacy-CellsUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/Legacy-CellsUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/Legacy-CellsUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/Legacy-CellsUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/Legacy-UnevenListTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/Legacy-UnevenListTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/Legacy-UnevenListTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/Legacy-UnevenListTests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/MapUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/MapUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/MapUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/MapUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/MaterialEntryUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/MaterialEntryUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/MaterialEntryUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/MaterialEntryUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/PickerUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/PickerUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/PickerUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/PickerUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ProgressBarUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ProgressBarUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ProgressBarUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ProgressBarUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/RootGalleryUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/RootGalleryUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/RootGalleryUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/RootGalleryUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ScrollViewUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ScrollViewUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ScrollViewUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ScrollViewUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/SearchBarUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/SearchBarUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/SearchBarUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/SearchBarUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/SliderUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/SliderUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/SliderUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/SliderUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/StepperUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/StepperUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/StepperUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/StepperUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/SwitchUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/SwitchUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/SwitchUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/SwitchUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/TimePickerUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/TimePickerUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/TimePickerUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/TimePickerUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ToolbarItemTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ToolbarItemTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ToolbarItemTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ToolbarItemTests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/ViewUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ViewUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/ViewUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/ViewUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/WebViewUITests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/WebViewUITests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Tests/WebViewUITests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Tests/WebViewUITests.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/UITestCategories.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/UITestCategories.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/UITestCategories.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/UITestCategories.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/AppExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/AppExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Utilities/AppExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/AppExtensions.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/Drag.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/Drag.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Utilities/Drag.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/Drag.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/Gestures.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/Logger.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/Logger.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Utilities/Logger.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/Logger.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/NumericExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/NumericExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Utilities/NumericExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/NumericExtensions.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/ParsingUtils.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/ParsingUtils.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Utilities/ParsingUtils.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/ParsingUtils.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/UITestCustomExceptions.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/UITestCustomExceptions.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Utilities/UITestCustomExceptions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/UITestCustomExceptions.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Utilities/ViewInspector.cs b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/ViewInspector.cs
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Utilities/ViewInspector.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Utilities/ViewInspector.cs

diff --git a/Xamarin.Forms.Core.UITests.Shared/Xamarin.Forms.Core.UITests.Shared.shproj b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Xamarin.Forms.Core.UITests.Shared.shproj
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Xamarin.Forms.Core.UITests.Shared.shproj
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Xamarin.Forms.Core.UITests.Shared.shproj

diff --git a/Xamarin.Forms.Core.UITests.Shared/Xamarin.Forms.Core.UITests.projitems b/Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Xamarin.Forms.Core.UITests.projitems
similarity index 100%
rename from Xamarin.Forms.Core.UITests.Shared/Xamarin.Forms.Core.UITests.projitems
rename to Xamarin.Forms/Xamarin.Forms.Core.UITests.Shared/Xamarin.Forms.Core.UITests.projitems

diff --git a/Xamarin.Forms.Core.UnitTests/AbsoluteLayoutTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AbsoluteLayoutTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/AbsoluteLayoutTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AbsoluteLayoutTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/AcceleratorTypeConverterUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AcceleratorTypeConverterUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/AcceleratorTypeConverterUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AcceleratorTypeConverterUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/AcceleratorUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AcceleratorUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/AcceleratorUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AcceleratorUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/AnimatableKeyTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AnimatableKeyTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/AnimatableKeyTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AnimatableKeyTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/AnimationTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AnimationTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/AnimationTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AnimationTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/AppLinkEntryTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AppLinkEntryTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/AppLinkEntryTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/AppLinkEntryTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BaseTestFixture.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BaseTestFixture.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BaseTestFixture.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BaseTestFixture.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BehaviorTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BehaviorTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BehaviorTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BehaviorTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindableLayoutTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindableLayoutTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindableLayoutTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindableLayoutTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindableObjectExtensionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindableObjectExtensionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindableObjectExtensionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindableObjectExtensionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindableObjectUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindablePropertyUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindablePropertyUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindablePropertyUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindablePropertyUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingBaseUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindingExpressionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingExpressionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindingExpressionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingExpressionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindingTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindingTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindingTypeConverterTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingTypeConverterTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindingTypeConverterTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingTypeConverterTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BindingUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BindingUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BindingUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/BoxViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BoxViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/BoxViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/BoxViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ButtonUnitTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ButtonUnitTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ButtonUnitTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ButtonUnitTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/CarouselPageTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CarouselPageTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/CarouselPageTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CarouselPageTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/CarouselViewTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CarouselViewTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/CarouselViewTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CarouselViewTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/CellTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CellTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/CellTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CellTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/CheckBoxUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CheckBoxUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/CheckBoxUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CheckBoxUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ColorUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ColorUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ColorUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ColorUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/CommandSourceTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CommandSourceTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/CommandSourceTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CommandSourceTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/CommandTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CommandTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/CommandTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/CommandTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ContentFormUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ContentFormUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ContentFormUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ContentFormUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ContentViewUnitTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ContentViewUnitTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ContentViewUnitTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ContentViewUnitTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ContraintTypeConverterTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ContraintTypeConverterTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ContraintTypeConverterTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ContraintTypeConverterTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ControlTemplateTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ControlTemplateTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ControlTemplateTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ControlTemplateTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DataTemplateSelectorTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DataTemplateSelectorTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DataTemplateSelectorTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DataTemplateSelectorTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DataTemplateTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DataTemplateTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DataTemplateTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DataTemplateTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DataTriggerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DataTriggerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DataTriggerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DataTriggerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DatePickerUnitTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DatePickerUnitTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DatePickerUnitTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DatePickerUnitTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DependencyResolutionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DependencyResolutionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DependencyResolutionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DependencyResolutionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DependencyServiceTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DependencyServiceTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DependencyServiceTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DependencyServiceTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DeviceUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DeviceUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DeviceUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DeviceUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DistanceTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DistanceTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DistanceTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DistanceTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DynamicBindingContextTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DynamicBindingContextTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DynamicBindingContextTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DynamicBindingContextTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/DynamicResourceTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DynamicResourceTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/DynamicResourceTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/DynamicResourceTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/EasingTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EasingTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/EasingTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EasingTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/EditorTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EditorTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/EditorTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EditorTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/EffectTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EffectTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/EffectTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EffectTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/EffectiveFlowDirectionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EffectiveFlowDirectionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/EffectiveFlowDirectionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EffectiveFlowDirectionExtensions.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ElementTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ElementTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ElementTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ElementTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/EntryCellTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EntryCellTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/EntryCellTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EntryCellTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/EntryUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EntryUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/EntryUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EntryUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/EventTriggerTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EventTriggerTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/EventTriggerTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/EventTriggerTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignContentTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignContentTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FlexLayoutAlignContentTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignContentTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignItemsTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignItemsTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FlexLayoutAlignItemsTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignItemsTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignSelfTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignSelfTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FlexLayoutAlignSelfTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutAlignSelfTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FlexLayoutFlexDirectionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutFlexDirectionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FlexLayoutFlexDirectionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutFlexDirectionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FlexLayoutMarginTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutMarginTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FlexLayoutMarginTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutMarginTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FlexLayoutTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FlexLayoutTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexLayoutTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FlexOrderTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexOrderTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FlexOrderTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlexOrderTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FlowDirectionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlowDirectionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FlowDirectionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FlowDirectionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FluentTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FluentTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FluentTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FluentTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FontAttributeConverterUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FontAttributeConverterUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FontAttributeConverterUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FontAttributeConverterUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FontUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FontUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FontUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FontUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FormattedStringTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FormattedStringTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FormattedStringTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FormattedStringTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/FrameUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FrameUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/FrameUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/FrameUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/GeocoderUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/GeocoderUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/GeocoderUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/GeocoderUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/GridLengthTypeConverterTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/GridLengthTypeConverterTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/GridLengthTypeConverterTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/GridLengthTypeConverterTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/GridTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/GridTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/GridTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/GridTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/GroupViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/GroupViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/GroupViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/GroupViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ImageButtonUnitTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ImageButtonUnitTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ImageButtonUnitTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ImageButtonUnitTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ImageSourceTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ImageSourceTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ImageSourceTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ImageSourceTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ImageTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ImageTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ImageTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ImageTests.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/crimson.jpg b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/Images/crimson.jpg
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/crimson.jpg
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/Images/crimson.jpg

diff --git a/Xamarin.Forms.Core.UnitTests/ItemsViewTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ItemsViewTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ItemsViewTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ItemsViewTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/KeyboardTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/KeyboardTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/KeyboardTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/KeyboardTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/LabelTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/LabelTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/LabelTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/LabelTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/LayoutChildIntoBoundingRegionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/LayoutChildIntoBoundingRegionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/LayoutChildIntoBoundingRegionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/LayoutChildIntoBoundingRegionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/LayoutOptionsUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/LayoutOptionsUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/LayoutOptionsUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/LayoutOptionsUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ListProxyTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ListProxyTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ListProxyTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ListProxyTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ListViewTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ListViewTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ListViewTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ListViewTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MapSpanTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MapSpanTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MapSpanTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MapSpanTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MapTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MapTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MapTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MapTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MarginTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MarginTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MarginTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MarginTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MasterDetailFormUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MasterDetailFormUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MasterDetailFormUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MasterDetailFormUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MenuItemTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MenuItemTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MenuItemTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MenuItemTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MenuUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MenuUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MenuUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MenuUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MessagingCenterTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MessagingCenterTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MessagingCenterTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MessagingCenterTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MockDispatcher.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MockDispatcher.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MockDispatcher.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MockDispatcher.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MockDispatcherProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MockDispatcherProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MockDispatcherProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MockDispatcherProvider.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MockPlatformServices.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MockPlatformServices.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MockPlatformServices.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MockPlatformServices.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MockViewModel.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MockViewModel.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MockViewModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MockViewModel.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MotionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MotionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MotionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MotionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MultiPageTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MultiPageTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MultiPageTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MultiPageTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/MultiTriggerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MultiTriggerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/MultiTriggerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/MultiTriggerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/NativeBindingTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NativeBindingTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/NativeBindingTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NativeBindingTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/NavigationModelTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NavigationModelTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/NavigationModelTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NavigationModelTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/NavigationProxyTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NavigationProxyTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/NavigationProxyTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NavigationProxyTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/NavigationUnitTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NavigationUnitTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/NavigationUnitTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NavigationUnitTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/NotifiedPropertiesTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NotifiedPropertiesTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/NotifiedPropertiesTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NotifiedPropertiesTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/NotifyCollectionChangedEventArgsExtensionsTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NotifyCollectionChangedEventArgsExtensionsTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/NotifyCollectionChangedEventArgsExtensionsTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/NotifyCollectionChangedEventArgsExtensionsTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ObservableWrapperTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ObservableWrapperTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ObservableWrapperTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ObservableWrapperTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/OpenGLViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/OpenGLViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/OpenGLViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/OpenGLViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PageTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PageTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PageTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PageTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PanGestureRecognizerUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PanGestureRecognizerUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PanGestureRecognizerUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PanGestureRecognizerUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PickerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PickerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PickerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PickerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PinTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PinTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PinTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PinTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PinchGestureRecognizerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PinchGestureRecognizerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PinchGestureRecognizerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PinchGestureRecognizerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PlatformSpecificsTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PlatformSpecificsTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PlatformSpecificsTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PlatformSpecificsTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PointTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PointTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PointTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PointTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PositionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PositionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PositionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PositionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/PreviewerReflectionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PreviewerReflectionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/PreviewerReflectionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/PreviewerReflectionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ProgressBarTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ProgressBarTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ProgressBarTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ProgressBarTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/RectangleUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RectangleUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/RectangleUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RectangleUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/RefreshViewTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RefreshViewTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/RefreshViewTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RefreshViewTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/RegionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RegionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/RegionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RegionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/RegistrarUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RegistrarUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/RegistrarUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RegistrarUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/RelativeLayoutTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RelativeLayoutTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/RelativeLayoutTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RelativeLayoutTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/RelativeSourceBindingTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RelativeSourceBindingTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/RelativeSourceBindingTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/RelativeSourceBindingTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ResourceDictionaryTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ScrollViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ScrollViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ScrollViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ScrollViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/SearchBarUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SearchBarUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/SearchBarUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SearchBarUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ShellLifeCycleTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ShellLifeCycleTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ShellLifeCycleTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ShellLifeCycleTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ShellTestBase.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ShellTestBase.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ShellTestBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ShellTestBase.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ShellTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ShellTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ShellTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ShellTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ShellUriHandlerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ShellUriHandlerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ShellUriHandlerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ShellUriHandlerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/SizeTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SizeTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/SizeTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SizeTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/SliderUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SliderUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/SliderUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SliderUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/SpanTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SpanTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/SpanTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SpanTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/StackLayoutUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StackLayoutUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/StackLayoutUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StackLayoutUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/StepperUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StepperUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/StepperUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StepperUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/StyleSheets/IStylableTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleSheets/IStylableTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/StyleSheets/IStylableTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleSheets/IStylableTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/StyleSheets/MockStylable.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleSheets/MockStylable.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/StyleSheets/MockStylable.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleSheets/MockStylable.cs

diff --git a/Xamarin.Forms.Core.UnitTests/StyleSheets/SelectorTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleSheets/SelectorTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/StyleSheets/SelectorTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleSheets/SelectorTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/StyleSheets/StyleTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleSheets/StyleTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/StyleSheets/StyleTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleSheets/StyleTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/StyleTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/StyleTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/StyleTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/SwipeGestureRecognizerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SwipeGestureRecognizerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/SwipeGestureRecognizerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SwipeGestureRecognizerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/SwitchCellTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SwitchCellTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/SwitchCellTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SwitchCellTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/SwitchUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SwitchUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/SwitchUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/SwitchUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TabIndexTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TabIndexTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TabIndexTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TabIndexTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TabbedFormUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TabbedFormUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TabbedFormUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TabbedFormUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TableModelTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TableModelTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TableModelTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TableModelTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TableRootUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TableRootUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TableRootUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TableRootUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TableSectionTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TableSectionTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TableSectionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TableSectionTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TableViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TableViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TableViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TableViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TapGestureRecognizerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TapGestureRecognizerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TapGestureRecognizerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TapGestureRecognizerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TemplatedItemsListTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TemplatedItemsListTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TemplatedItemsListTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TemplatedItemsListTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TemplatedPageUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TemplatedPageUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TemplatedPageUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TemplatedPageUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TemplatedViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TemplatedViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TemplatedViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TemplatedViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TextCellTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TextCellTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TextCellTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TextCellTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TextDecorationUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TextDecorationUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TextDecorationUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TextDecorationUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ThicknessTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ThicknessTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ThicknessTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ThicknessTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TimePickerUnitTest.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TimePickerUnitTest.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TimePickerUnitTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TimePickerUnitTest.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TitleViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TitleViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TitleViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TitleViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ToStringValueConverterTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ToStringValueConverterTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ToStringValueConverterTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ToStringValueConverterTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ToolbarItemTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ToolbarItemTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ToolbarItemTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ToolbarItemTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ToolbarTrackerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ToolbarTrackerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ToolbarTrackerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ToolbarTrackerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TriggerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TriggerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TriggerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TriggerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TypeUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TypeUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TypeUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TypeUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/TypedBindingUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TypedBindingUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/TypedBindingUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/TypedBindingUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/UriImageSourceTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/UriImageSourceTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/UriImageSourceTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/UriImageSourceTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ViewCellTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ViewCellTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ViewCellTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ViewCellTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/ViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/VisualStateManagerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/VisualStateManagerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/VisualStateManagerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/VisualStateManagerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/VisualTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/VisualTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/VisualTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/VisualTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/WeakEventManagerTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/WeakEventManagerTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/WeakEventManagerTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/WeakEventManagerTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/WebViewUnitTests.cs b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/WebViewUnitTests.cs
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/WebViewUnitTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/WebViewUnitTests.cs

diff --git a/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj b/Xamarin.Forms/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj
similarity index 100%
rename from Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj
rename to Xamarin.Forms/Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj

diff --git a/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs b/Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs
similarity index 100%
rename from Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/WinDriverApp.cs

diff --git a/Xamarin.Forms.Core.Windows.UITests/WinQuery.cs b/Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/WinQuery.cs
similarity index 100%
rename from Xamarin.Forms.Core.Windows.UITests/WinQuery.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/WinQuery.cs

diff --git a/Xamarin.Forms.Core.Windows.UITests/WindowsTestBase.cs b/Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/WindowsTestBase.cs
similarity index 100%
rename from Xamarin.Forms.Core.Windows.UITests/WindowsTestBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/WindowsTestBase.cs

diff --git a/Xamarin.Forms.Core.Windows.UITests/WindowsTestServer.cs b/Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/WindowsTestServer.cs
similarity index 100%
rename from Xamarin.Forms.Core.Windows.UITests/WindowsTestServer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/WindowsTestServer.cs

diff --git a/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj b/Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
similarity index 100%
rename from Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
rename to Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj

diff --git a/PagesGallery/PagesGallery.iOS/app.config b/Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/app.config
similarity index 100%
rename from PagesGallery/PagesGallery.iOS/app.config
rename to Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/app.config

diff --git a/Xamarin.Forms.Core.Windows.UITests/readme.md b/Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/readme.md
similarity index 100%
rename from Xamarin.Forms.Core.Windows.UITests/readme.md
rename to Xamarin.Forms/Xamarin.Forms.Core.Windows.UITests/readme.md

diff --git a/Xamarin.Forms.Core.iOS.UITests/BaseViewContainerRemoteiOS.cs b/Xamarin.Forms/Xamarin.Forms.Core.iOS.UITests/BaseViewContainerRemoteiOS.cs
similarity index 100%
rename from Xamarin.Forms.Core.iOS.UITests/BaseViewContainerRemoteiOS.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.iOS.UITests/BaseViewContainerRemoteiOS.cs

diff --git a/Xamarin.Forms.Core.iOS.UITests/Makefile b/Xamarin.Forms/Xamarin.Forms.Core.iOS.UITests/Makefile
similarity index 100%
rename from Xamarin.Forms.Core.iOS.UITests/Makefile
rename to Xamarin.Forms/Xamarin.Forms.Core.iOS.UITests/Makefile

diff --git a/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj b/Xamarin.Forms/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
similarity index 100%
rename from Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
rename to Xamarin.Forms/Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj

diff --git a/Xamarin.Forms.Core.macOS.UITests/BaseViewContainerRemoteMac.cs b/Xamarin.Forms/Xamarin.Forms.Core.macOS.UITests/BaseViewContainerRemoteMac.cs
similarity index 100%
rename from Xamarin.Forms.Core.macOS.UITests/BaseViewContainerRemoteMac.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.macOS.UITests/BaseViewContainerRemoteMac.cs

diff --git a/Xamarin.Forms.Core.macOS.UITests/MacOSApp.cs b/Xamarin.Forms/Xamarin.Forms.Core.macOS.UITests/MacOSApp.cs
similarity index 100%
rename from Xamarin.Forms.Core.macOS.UITests/MacOSApp.cs
rename to Xamarin.Forms/Xamarin.Forms.Core.macOS.UITests/MacOSApp.cs

diff --git a/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj b/Xamarin.Forms/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
similarity index 100%
rename from Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
rename to Xamarin.Forms/Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj

diff --git a/PagesGallery/PagesGallery.Droid/app.config b/Xamarin.Forms/Xamarin.Forms.Core.macOS.UITests/app.config
similarity index 100%
rename from PagesGallery/PagesGallery.Droid/app.config
rename to Xamarin.Forms/Xamarin.Forms.Core.macOS.UITests/app.config

diff --git a/Xamarin.Forms.Core/AbsoluteLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/AbsoluteLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/AbsoluteLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/AbsoluteLayout.cs

diff --git a/Xamarin.Forms.Core/AbsoluteLayoutFlags.cs b/Xamarin.Forms/Xamarin.Forms.Core/AbsoluteLayoutFlags.cs
similarity index 100%
rename from Xamarin.Forms.Core/AbsoluteLayoutFlags.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/AbsoluteLayoutFlags.cs

diff --git a/Xamarin.Forms.Core/Accelerator.cs b/Xamarin.Forms/Xamarin.Forms.Core/Accelerator.cs
similarity index 100%
rename from Xamarin.Forms.Core/Accelerator.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Accelerator.cs

diff --git a/Xamarin.Forms.Core/AcceleratorTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/AcceleratorTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/AcceleratorTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/AcceleratorTypeConverter.cs

diff --git a/Xamarin.Forms.Core/ActionSheetArguments.cs b/Xamarin.Forms/Xamarin.Forms.Core/ActionSheetArguments.cs
similarity index 100%
rename from Xamarin.Forms.Core/ActionSheetArguments.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ActionSheetArguments.cs

diff --git a/Xamarin.Forms.Core/ActivityIndicator.cs b/Xamarin.Forms/Xamarin.Forms.Core/ActivityIndicator.cs
similarity index 100%
rename from Xamarin.Forms.Core/ActivityIndicator.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ActivityIndicator.cs

diff --git a/Xamarin.Forms.Core/AlertArguments.cs b/Xamarin.Forms/Xamarin.Forms.Core/AlertArguments.cs
similarity index 100%
rename from Xamarin.Forms.Core/AlertArguments.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/AlertArguments.cs

diff --git a/Xamarin.Forms.Core/AnimatableKey.cs b/Xamarin.Forms/Xamarin.Forms.Core/AnimatableKey.cs
similarity index 100%
rename from Xamarin.Forms.Core/AnimatableKey.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/AnimatableKey.cs

diff --git a/Xamarin.Forms.Core/Animation.cs b/Xamarin.Forms/Xamarin.Forms.Core/Animation.cs
similarity index 100%
rename from Xamarin.Forms.Core/Animation.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Animation.cs

diff --git a/Xamarin.Forms.Core/AnimationExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/AnimationExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/AnimationExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/AnimationExtensions.cs

diff --git a/Xamarin.Forms.Core/AppLinkEntry.cs b/Xamarin.Forms/Xamarin.Forms.Core/AppLinkEntry.cs
similarity index 100%
rename from Xamarin.Forms.Core/AppLinkEntry.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/AppLinkEntry.cs

diff --git a/Xamarin.Forms.Core/Application.cs b/Xamarin.Forms/Xamarin.Forms.Core/Application.cs
similarity index 100%
rename from Xamarin.Forms.Core/Application.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Application.cs

diff --git a/Xamarin.Forms.Core/Aspect.cs b/Xamarin.Forms/Xamarin.Forms.Core/Aspect.cs
similarity index 100%
rename from Xamarin.Forms.Core/Aspect.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Aspect.cs

diff --git a/Xamarin.Forms.Core/AutomationProperties.cs b/Xamarin.Forms/Xamarin.Forms.Core/AutomationProperties.cs
similarity index 100%
rename from Xamarin.Forms.Core/AutomationProperties.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/AutomationProperties.cs

diff --git a/Xamarin.Forms.Core/BackButtonPressedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/BackButtonPressedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/BackButtonPressedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BackButtonPressedEventArgs.cs

diff --git a/Xamarin.Forms.Core/BarElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/BarElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/BarElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BarElement.cs

diff --git a/Xamarin.Forms.Core/BaseMenuItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/BaseMenuItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/BaseMenuItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BaseMenuItem.cs

diff --git a/Xamarin.Forms.Core/BindableLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindableLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindableLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindableLayout.cs

diff --git a/Xamarin.Forms.Core/BindableObject.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindableObject.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindableObject.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindableObject.cs

diff --git a/Xamarin.Forms.Core/BindableObjectExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindableObjectExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindableObjectExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindableObjectExtensions.cs

diff --git a/Xamarin.Forms.Core/BindableProperty.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindableProperty.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindableProperty.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindableProperty.cs

diff --git a/Xamarin.Forms.Core/BindablePropertyConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindablePropertyConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindablePropertyConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindablePropertyConverter.cs

diff --git a/Xamarin.Forms.Core/BindablePropertyKey.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindablePropertyKey.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindablePropertyKey.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindablePropertyKey.cs

diff --git a/Xamarin.Forms.Core/Binding.cs b/Xamarin.Forms/Xamarin.Forms.Core/Binding.cs
similarity index 100%
rename from Xamarin.Forms.Core/Binding.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Binding.cs

diff --git a/Xamarin.Forms.Core/BindingBase.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindingBase.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindingBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindingBase.cs

diff --git a/Xamarin.Forms.Core/BindingBaseExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindingBaseExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindingBaseExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindingBaseExtensions.cs

diff --git a/Xamarin.Forms.Core/BindingExpression.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindingExpression.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindingExpression.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindingExpression.cs

diff --git a/Xamarin.Forms.Core/BindingMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindingMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindingMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindingMode.cs

diff --git a/Xamarin.Forms.Core/BindingTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/BindingTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/BindingTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BindingTypeConverter.cs

diff --git a/Xamarin.Forms.Core/BorderElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/BorderElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/BorderElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BorderElement.cs

diff --git a/Xamarin.Forms.Core/BoundsConstraint.cs b/Xamarin.Forms/Xamarin.Forms.Core/BoundsConstraint.cs
similarity index 100%
rename from Xamarin.Forms.Core/BoundsConstraint.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BoundsConstraint.cs

diff --git a/Xamarin.Forms.Core/BoundsTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/BoundsTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/BoundsTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BoundsTypeConverter.cs

diff --git a/Xamarin.Forms.Core/BoxView.cs b/Xamarin.Forms/Xamarin.Forms.Core/BoxView.cs
similarity index 100%
rename from Xamarin.Forms.Core/BoxView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/BoxView.cs

diff --git a/Xamarin.Forms.Core/Button.cs b/Xamarin.Forms/Xamarin.Forms.Core/Button.cs
similarity index 100%
rename from Xamarin.Forms.Core/Button.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Button.cs

diff --git a/Xamarin.Forms.Core/ButtonElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/ButtonElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/ButtonElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ButtonElement.cs

diff --git a/Xamarin.Forms.Core/CarouselPage.cs b/Xamarin.Forms/Xamarin.Forms.Core/CarouselPage.cs
similarity index 100%
rename from Xamarin.Forms.Core/CarouselPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CarouselPage.cs

diff --git a/Xamarin.Forms.Core/CastingEnumerator.cs b/Xamarin.Forms/Xamarin.Forms.Core/CastingEnumerator.cs
similarity index 100%
rename from Xamarin.Forms.Core/CastingEnumerator.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CastingEnumerator.cs

diff --git a/Xamarin.Forms.Core/Cells/Cell.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/Cell.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/Cell.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/Cell.cs

diff --git a/Xamarin.Forms.Core/Cells/EntryCell.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/EntryCell.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/EntryCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/EntryCell.cs

diff --git a/Xamarin.Forms.Core/Cells/ICellController.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/ICellController.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/ICellController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/ICellController.cs

diff --git a/Xamarin.Forms.Core/Cells/IEntryCellController.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/IEntryCellController.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/IEntryCellController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/IEntryCellController.cs

diff --git a/Xamarin.Forms.Core/Cells/INativeElementView.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/INativeElementView.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/INativeElementView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/INativeElementView.cs

diff --git a/Xamarin.Forms.Core/Cells/ImageCell.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/ImageCell.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/ImageCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/ImageCell.cs

diff --git a/Xamarin.Forms.Core/Cells/SwitchCell.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/SwitchCell.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/SwitchCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/SwitchCell.cs

diff --git a/Xamarin.Forms.Core/Cells/TextCell.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/TextCell.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/TextCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/TextCell.cs

diff --git a/Xamarin.Forms.Core/Cells/ViewCell.cs b/Xamarin.Forms/Xamarin.Forms.Core/Cells/ViewCell.cs
similarity index 100%
rename from Xamarin.Forms.Core/Cells/ViewCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Cells/ViewCell.cs

diff --git a/Xamarin.Forms.Core/ChatKeyboard.cs b/Xamarin.Forms/Xamarin.Forms.Core/ChatKeyboard.cs
similarity index 100%
rename from Xamarin.Forms.Core/ChatKeyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ChatKeyboard.cs

diff --git a/Xamarin.Forms.Core/CheckedChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/CheckedChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/CheckedChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CheckedChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ChildCollectionChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ChildCollectionChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ChildCollectionChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ChildCollectionChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ChildGestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Core/ChildGestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Core/ChildGestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ChildGestureRecognizer.cs

diff --git a/Xamarin.Forms.Core/ClickGestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Core/ClickGestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Core/ClickGestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ClickGestureRecognizer.cs

diff --git a/Xamarin.Forms.Core/ClickedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ClickedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ClickedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ClickedEventArgs.cs

diff --git a/Xamarin.Forms.Core/CollectionSynchronizationCallback.cs b/Xamarin.Forms/Xamarin.Forms.Core/CollectionSynchronizationCallback.cs
similarity index 100%
rename from Xamarin.Forms.Core/CollectionSynchronizationCallback.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CollectionSynchronizationCallback.cs

diff --git a/Xamarin.Forms.Core/CollectionSynchronizationContext.cs b/Xamarin.Forms/Xamarin.Forms.Core/CollectionSynchronizationContext.cs
similarity index 100%
rename from Xamarin.Forms.Core/CollectionSynchronizationContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CollectionSynchronizationContext.cs

diff --git a/Xamarin.Forms.Core/Color.cs b/Xamarin.Forms/Xamarin.Forms.Core/Color.cs
similarity index 100%
rename from Xamarin.Forms.Core/Color.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Color.cs

diff --git a/Xamarin.Forms.Core/ColorElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/ColorElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/ColorElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ColorElement.cs

diff --git a/Xamarin.Forms.Core/ColorTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ColorTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ColorTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ColorTypeConverter.cs

diff --git a/Xamarin.Forms.Core/ColumnDefinition.cs b/Xamarin.Forms/Xamarin.Forms.Core/ColumnDefinition.cs
similarity index 100%
rename from Xamarin.Forms.Core/ColumnDefinition.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ColumnDefinition.cs

diff --git a/Xamarin.Forms.Core/ColumnDefinitionCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/ColumnDefinitionCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/ColumnDefinitionCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ColumnDefinitionCollection.cs

diff --git a/Xamarin.Forms.Core/Command.cs b/Xamarin.Forms/Xamarin.Forms.Core/Command.cs
similarity index 100%
rename from Xamarin.Forms.Core/Command.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Command.cs

diff --git a/Xamarin.Forms.Core/CompressedLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/CompressedLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/CompressedLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CompressedLayout.cs

diff --git a/Xamarin.Forms.Core/Configuration.cs b/Xamarin.Forms/Xamarin.Forms.Core/Configuration.cs
similarity index 100%
rename from Xamarin.Forms.Core/Configuration.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Configuration.cs

diff --git a/Xamarin.Forms.Core/Constraint.cs b/Xamarin.Forms/Xamarin.Forms.Core/Constraint.cs
similarity index 100%
rename from Xamarin.Forms.Core/Constraint.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Constraint.cs

diff --git a/Xamarin.Forms.Core/ConstraintExpression.cs b/Xamarin.Forms/Xamarin.Forms.Core/ConstraintExpression.cs
similarity index 100%
rename from Xamarin.Forms.Core/ConstraintExpression.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ConstraintExpression.cs

diff --git a/Xamarin.Forms.Core/ConstraintType.cs b/Xamarin.Forms/Xamarin.Forms.Core/ConstraintType.cs
similarity index 100%
rename from Xamarin.Forms.Core/ConstraintType.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ConstraintType.cs

diff --git a/Xamarin.Forms.Core/ConstraintTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ConstraintTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ConstraintTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ConstraintTypeConverter.cs

diff --git a/Xamarin.Forms.Core/ContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Core/ContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Core/ContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ContentPage.cs

diff --git a/Xamarin.Forms.Core/ContentPresenter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ContentPresenter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ContentPresenter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ContentPresenter.cs

diff --git a/Xamarin.Forms.Core/ContentPropertyAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/ContentPropertyAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/ContentPropertyAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ContentPropertyAttribute.cs

diff --git a/Xamarin.Forms.Core/ContentView.cs b/Xamarin.Forms/Xamarin.Forms.Core/ContentView.cs
similarity index 100%
rename from Xamarin.Forms.Core/ContentView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ContentView.cs

diff --git a/Xamarin.Forms.Core/ControlTemplate.cs b/Xamarin.Forms/Xamarin.Forms.Core/ControlTemplate.cs
similarity index 100%
rename from Xamarin.Forms.Core/ControlTemplate.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ControlTemplate.cs

diff --git a/Xamarin.Forms.Core/CornerElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/CornerElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/CornerElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CornerElement.cs

diff --git a/Xamarin.Forms.Core/CornerRadius.cs b/Xamarin.Forms/Xamarin.Forms.Core/CornerRadius.cs
similarity index 100%
rename from Xamarin.Forms.Core/CornerRadius.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CornerRadius.cs

diff --git a/Xamarin.Forms.Core/CornerRadiusTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/CornerRadiusTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/CornerRadiusTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CornerRadiusTypeConverter.cs

diff --git a/Xamarin.Forms.Core/CustomKeyboard.cs b/Xamarin.Forms/Xamarin.Forms.Core/CustomKeyboard.cs
similarity index 100%
rename from Xamarin.Forms.Core/CustomKeyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/CustomKeyboard.cs

diff --git a/Xamarin.Forms.Core/DataTemplate.cs b/Xamarin.Forms/Xamarin.Forms.Core/DataTemplate.cs
similarity index 100%
rename from Xamarin.Forms.Core/DataTemplate.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DataTemplate.cs

diff --git a/Xamarin.Forms.Core/DataTemplateExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/DataTemplateExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/DataTemplateExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DataTemplateExtensions.cs

diff --git a/Xamarin.Forms.Core/DataTemplateSelector.cs b/Xamarin.Forms/Xamarin.Forms.Core/DataTemplateSelector.cs
similarity index 100%
rename from Xamarin.Forms.Core/DataTemplateSelector.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DataTemplateSelector.cs

diff --git a/Xamarin.Forms.Core/DateChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/DateChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/DateChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DateChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/DatePicker.cs b/Xamarin.Forms/Xamarin.Forms.Core/DatePicker.cs
similarity index 100%
rename from Xamarin.Forms.Core/DatePicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DatePicker.cs

diff --git a/Xamarin.Forms.Core/DecorableTextElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/DecorableTextElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/DecorableTextElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DecorableTextElement.cs

diff --git a/Xamarin.Forms.Core/DefinitionCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/DefinitionCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/DefinitionCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DefinitionCollection.cs

diff --git a/Xamarin.Forms.Core/DelegateLogListener.cs b/Xamarin.Forms/Xamarin.Forms.Core/DelegateLogListener.cs
similarity index 100%
rename from Xamarin.Forms.Core/DelegateLogListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DelegateLogListener.cs

diff --git a/Xamarin.Forms.Core/DependencyAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/DependencyAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/DependencyAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DependencyAttribute.cs

diff --git a/Xamarin.Forms.Core/DependencyFetchTarget.cs b/Xamarin.Forms/Xamarin.Forms.Core/DependencyFetchTarget.cs
similarity index 100%
rename from Xamarin.Forms.Core/DependencyFetchTarget.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DependencyFetchTarget.cs

diff --git a/Xamarin.Forms.Core/DependencyResolver.cs b/Xamarin.Forms/Xamarin.Forms.Core/DependencyResolver.cs
similarity index 100%
rename from Xamarin.Forms.Core/DependencyResolver.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DependencyResolver.cs

diff --git a/Xamarin.Forms.Core/DependencyService.cs b/Xamarin.Forms/Xamarin.Forms.Core/DependencyService.cs
similarity index 100%
rename from Xamarin.Forms.Core/DependencyService.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DependencyService.cs

diff --git a/Xamarin.Forms.Core/DesignMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/DesignMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/DesignMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DesignMode.cs

diff --git a/Xamarin.Forms.Core/Device.cs b/Xamarin.Forms/Xamarin.Forms.Core/Device.cs
similarity index 100%
rename from Xamarin.Forms.Core/Device.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Device.cs

diff --git a/Xamarin.Forms.Core/DeviceInfo.cs b/Xamarin.Forms/Xamarin.Forms.Core/DeviceInfo.cs
similarity index 100%
rename from Xamarin.Forms.Core/DeviceInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DeviceInfo.cs

diff --git a/Xamarin.Forms.Core/DeviceOrientation.cs b/Xamarin.Forms/Xamarin.Forms.Core/DeviceOrientation.cs
similarity index 100%
rename from Xamarin.Forms.Core/DeviceOrientation.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DeviceOrientation.cs

diff --git a/Xamarin.Forms.Core/DeviceOrientationExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/DeviceOrientationExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/DeviceOrientationExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DeviceOrientationExtensions.cs

diff --git a/Xamarin.Forms.Core/DispatcherExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/DispatcherExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/DispatcherExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/DispatcherExtensions.cs

diff --git a/Xamarin.Forms.Core/Easing.cs b/Xamarin.Forms/Xamarin.Forms.Core/Easing.cs
similarity index 100%
rename from Xamarin.Forms.Core/Easing.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Easing.cs

diff --git a/Xamarin.Forms.Core/Editor.cs b/Xamarin.Forms/Xamarin.Forms.Core/Editor.cs
similarity index 100%
rename from Xamarin.Forms.Core/Editor.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Editor.cs

diff --git a/Xamarin.Forms.Core/EditorAutoSizeOption.cs b/Xamarin.Forms/Xamarin.Forms.Core/EditorAutoSizeOption.cs
similarity index 100%
rename from Xamarin.Forms.Core/EditorAutoSizeOption.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/EditorAutoSizeOption.cs

diff --git a/Xamarin.Forms.Core/Effect.cs b/Xamarin.Forms/Xamarin.Forms.Core/Effect.cs
similarity index 100%
rename from Xamarin.Forms.Core/Effect.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Effect.cs

diff --git a/Xamarin.Forms.Core/EffectiveFlowDirection.cs b/Xamarin.Forms/Xamarin.Forms.Core/EffectiveFlowDirection.cs
similarity index 100%
rename from Xamarin.Forms.Core/EffectiveFlowDirection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/EffectiveFlowDirection.cs

diff --git a/Xamarin.Forms.Core/EffectiveFlowDirectionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/EffectiveFlowDirectionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/EffectiveFlowDirectionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/EffectiveFlowDirectionExtensions.cs

diff --git a/Xamarin.Forms.Core/EffectiveVisualExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/EffectiveVisualExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/EffectiveVisualExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/EffectiveVisualExtensions.cs

diff --git a/Xamarin.Forms.Core/Element.cs b/Xamarin.Forms/Xamarin.Forms.Core/Element.cs
similarity index 100%
rename from Xamarin.Forms.Core/Element.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Element.cs

diff --git a/Xamarin.Forms.Core/ElementCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/ElementCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/ElementCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ElementCollection.cs

diff --git a/Xamarin.Forms.Core/ElementEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ElementEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ElementEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ElementEventArgs.cs

diff --git a/Xamarin.Forms.Core/ElementTemplate.cs b/Xamarin.Forms/Xamarin.Forms.Core/ElementTemplate.cs
similarity index 100%
rename from Xamarin.Forms.Core/ElementTemplate.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ElementTemplate.cs

diff --git a/Xamarin.Forms.Core/Element_StyleSheets.cs b/Xamarin.Forms/Xamarin.Forms.Core/Element_StyleSheets.cs
similarity index 100%
rename from Xamarin.Forms.Core/Element_StyleSheets.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Element_StyleSheets.cs

diff --git a/Xamarin.Forms.Core/EmailKeyboard.cs b/Xamarin.Forms/Xamarin.Forms.Core/EmailKeyboard.cs
similarity index 100%
rename from Xamarin.Forms.Core/EmailKeyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/EmailKeyboard.cs

diff --git a/Xamarin.Forms.Core/Entry.cs b/Xamarin.Forms/Xamarin.Forms.Core/Entry.cs
similarity index 100%
rename from Xamarin.Forms.Core/Entry.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Entry.cs

diff --git a/Xamarin.Forms.Core/EnumerableExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/EnumerableExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/EnumerableExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/EnumerableExtensions.cs

diff --git a/Xamarin.Forms.Core/EventArg.cs b/Xamarin.Forms/Xamarin.Forms.Core/EventArg.cs
similarity index 100%
rename from Xamarin.Forms.Core/EventArg.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/EventArg.cs

diff --git a/Xamarin.Forms.Core/ExperimentalFlags.cs b/Xamarin.Forms/Xamarin.Forms.Core/ExperimentalFlags.cs
similarity index 100%
rename from Xamarin.Forms.Core/ExperimentalFlags.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ExperimentalFlags.cs

diff --git a/Xamarin.Forms.Core/ExportEffectAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/ExportEffectAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/ExportEffectAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ExportEffectAttribute.cs

diff --git a/Xamarin.Forms.Core/ExpressionSearch.cs b/Xamarin.Forms/Xamarin.Forms.Core/ExpressionSearch.cs
similarity index 100%
rename from Xamarin.Forms.Core/ExpressionSearch.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ExpressionSearch.cs

diff --git a/Xamarin.Forms.Core/FileImageSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/FileImageSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/FileImageSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FileImageSource.cs

diff --git a/Xamarin.Forms.Core/FileImageSourceConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/FileImageSourceConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/FileImageSourceConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FileImageSourceConverter.cs

diff --git a/Xamarin.Forms.Core/FlexEnums.cs b/Xamarin.Forms/Xamarin.Forms.Core/FlexEnums.cs
similarity index 100%
rename from Xamarin.Forms.Core/FlexEnums.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FlexEnums.cs

diff --git a/Xamarin.Forms.Core/FlexLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/FlexLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/FlexLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FlexLayout.cs

diff --git a/Xamarin.Forms.Core/FlowDirection.cs b/Xamarin.Forms/Xamarin.Forms.Core/FlowDirection.cs
similarity index 100%
rename from Xamarin.Forms.Core/FlowDirection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FlowDirection.cs

diff --git a/Xamarin.Forms.Core/FlyoutBehavior.cs b/Xamarin.Forms/Xamarin.Forms.Core/FlyoutBehavior.cs
similarity index 100%
rename from Xamarin.Forms.Core/FlyoutBehavior.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FlyoutBehavior.cs

diff --git a/Xamarin.Forms.Core/FlyoutHeaderBehavior.cs b/Xamarin.Forms/Xamarin.Forms.Core/FlyoutHeaderBehavior.cs
similarity index 100%
rename from Xamarin.Forms.Core/FlyoutHeaderBehavior.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FlyoutHeaderBehavior.cs

diff --git a/Xamarin.Forms.Core/FocusEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/FocusEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/FocusEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FocusEventArgs.cs

diff --git a/Xamarin.Forms.Core/Font.cs b/Xamarin.Forms/Xamarin.Forms.Core/Font.cs
similarity index 100%
rename from Xamarin.Forms.Core/Font.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Font.cs

diff --git a/Xamarin.Forms.Core/FontAttributes.cs b/Xamarin.Forms/Xamarin.Forms.Core/FontAttributes.cs
similarity index 100%
rename from Xamarin.Forms.Core/FontAttributes.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FontAttributes.cs

diff --git a/Xamarin.Forms.Core/FontElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/FontElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/FontElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FontElement.cs

diff --git a/Xamarin.Forms.Core/FontImageSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/FontImageSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/FontImageSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FontImageSource.cs

diff --git a/Xamarin.Forms.Core/FontSizeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/FontSizeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/FontSizeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FontSizeConverter.cs

diff --git a/Xamarin.Forms.Core/FontTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/FontTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/FontTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FontTypeConverter.cs

diff --git a/Xamarin.Forms.Core/FormattedString.cs b/Xamarin.Forms/Xamarin.Forms.Core/FormattedString.cs
similarity index 100%
rename from Xamarin.Forms.Core/FormattedString.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/FormattedString.cs

diff --git a/Xamarin.Forms.Core/Frame.cs b/Xamarin.Forms/Xamarin.Forms.Core/Frame.cs
similarity index 100%
rename from Xamarin.Forms.Core/Frame.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Frame.cs

diff --git a/Xamarin.Forms.Core/GestureElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/GestureElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/GestureElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/GestureElement.cs

diff --git a/Xamarin.Forms.Core/GestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Core/GestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Core/GestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/GestureRecognizer.cs

diff --git a/Xamarin.Forms.Core/GestureState.cs b/Xamarin.Forms/Xamarin.Forms.Core/GestureState.cs
similarity index 100%
rename from Xamarin.Forms.Core/GestureState.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/GestureState.cs

diff --git a/Xamarin.Forms.Core/GestureStatus.cs b/Xamarin.Forms/Xamarin.Forms.Core/GestureStatus.cs
similarity index 100%
rename from Xamarin.Forms.Core/GestureStatus.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/GestureStatus.cs

diff --git a/Xamarin.Forms.Core/Grid.cs b/Xamarin.Forms/Xamarin.Forms.Core/Grid.cs
similarity index 100%
rename from Xamarin.Forms.Core/Grid.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Grid.cs

diff --git a/Xamarin.Forms.Core/GridCalc.cs b/Xamarin.Forms/Xamarin.Forms.Core/GridCalc.cs
similarity index 100%
rename from Xamarin.Forms.Core/GridCalc.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/GridCalc.cs

diff --git a/Xamarin.Forms.Core/GridLength.cs b/Xamarin.Forms/Xamarin.Forms.Core/GridLength.cs
similarity index 100%
rename from Xamarin.Forms.Core/GridLength.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/GridLength.cs

diff --git a/Xamarin.Forms.Core/GridLengthTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/GridLengthTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/GridLengthTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/GridLengthTypeConverter.cs

diff --git a/Xamarin.Forms.Core/GridUnitType.cs b/Xamarin.Forms/Xamarin.Forms.Core/GridUnitType.cs
similarity index 100%
rename from Xamarin.Forms.Core/GridUnitType.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/GridUnitType.cs

diff --git a/Xamarin.Forms.Core/HandlerAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/HandlerAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/HandlerAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/HandlerAttribute.cs

diff --git a/Xamarin.Forms.Core/HtmlWebViewSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/HtmlWebViewSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/HtmlWebViewSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/HtmlWebViewSource.cs

diff --git a/Xamarin.Forms.Core/IAnimatable.cs b/Xamarin.Forms/Xamarin.Forms.Core/IAnimatable.cs
similarity index 100%
rename from Xamarin.Forms.Core/IAnimatable.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IAnimatable.cs

diff --git a/Xamarin.Forms.Core/IAppIndexingProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/IAppIndexingProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/IAppIndexingProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IAppIndexingProvider.cs

diff --git a/Xamarin.Forms.Core/IAppLinkEntry.cs b/Xamarin.Forms/Xamarin.Forms.Core/IAppLinkEntry.cs
similarity index 100%
rename from Xamarin.Forms.Core/IAppLinkEntry.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IAppLinkEntry.cs

diff --git a/Xamarin.Forms.Core/IAppLinks.cs b/Xamarin.Forms/Xamarin.Forms.Core/IAppLinks.cs
similarity index 100%
rename from Xamarin.Forms.Core/IAppLinks.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IAppLinks.cs

diff --git a/Xamarin.Forms.Core/IApplicationController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IApplicationController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IApplicationController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IApplicationController.cs

diff --git a/Xamarin.Forms.Core/IBarElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IBarElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IBarElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IBarElement.cs

diff --git a/Xamarin.Forms.Core/IBorderElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IBorderElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IBorderElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IBorderElement.cs

diff --git a/Xamarin.Forms.Core/IButtonController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IButtonController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IButtonController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IButtonController.cs

diff --git a/Xamarin.Forms.Core/IButtonElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IButtonElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IButtonElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IButtonElement.cs

diff --git a/Xamarin.Forms.Core/IColorElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IColorElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IColorElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IColorElement.cs

diff --git a/Xamarin.Forms.Core/IConfigElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IConfigElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IConfigElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IConfigElement.cs

diff --git a/Xamarin.Forms.Core/IConfigPlatform.cs b/Xamarin.Forms/Xamarin.Forms.Core/IConfigPlatform.cs
similarity index 100%
rename from Xamarin.Forms.Core/IConfigPlatform.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IConfigPlatform.cs

diff --git a/Xamarin.Forms.Core/IControlTemplated.cs b/Xamarin.Forms/Xamarin.Forms.Core/IControlTemplated.cs
similarity index 100%
rename from Xamarin.Forms.Core/IControlTemplated.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IControlTemplated.cs

diff --git a/Xamarin.Forms.Core/IConverterOptions.cs b/Xamarin.Forms/Xamarin.Forms.Core/IConverterOptions.cs
similarity index 100%
rename from Xamarin.Forms.Core/IConverterOptions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IConverterOptions.cs

diff --git a/Xamarin.Forms.Core/ICornerElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/ICornerElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/ICornerElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ICornerElement.cs

diff --git a/Xamarin.Forms.Core/IDataTemplateController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IDataTemplateController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IDataTemplateController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IDataTemplateController.cs

diff --git a/Xamarin.Forms.Core/IDecorableTextElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IDecorableTextElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IDecorableTextElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IDecorableTextElement.cs

diff --git a/Xamarin.Forms.Core/IDefinition.cs b/Xamarin.Forms/Xamarin.Forms.Core/IDefinition.cs
similarity index 100%
rename from Xamarin.Forms.Core/IDefinition.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IDefinition.cs

diff --git a/Xamarin.Forms.Core/IDeserializer.cs b/Xamarin.Forms/Xamarin.Forms.Core/IDeserializer.cs
similarity index 100%
rename from Xamarin.Forms.Core/IDeserializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IDeserializer.cs

diff --git a/Xamarin.Forms.Core/IDispatcher.cs b/Xamarin.Forms/Xamarin.Forms.Core/IDispatcher.cs
similarity index 100%
rename from Xamarin.Forms.Core/IDispatcher.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IDispatcher.cs

diff --git a/Xamarin.Forms.Core/IDispatcherProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/IDispatcherProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/IDispatcherProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IDispatcherProvider.cs

diff --git a/Xamarin.Forms.Core/IEditorController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IEditorController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IEditorController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IEditorController.cs

diff --git a/Xamarin.Forms.Core/IEffectControlProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/IEffectControlProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/IEffectControlProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IEffectControlProvider.cs

diff --git a/Xamarin.Forms.Core/IElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IElement.cs

diff --git a/Xamarin.Forms.Core/IElementConfiguration.cs b/Xamarin.Forms/Xamarin.Forms.Core/IElementConfiguration.cs
similarity index 100%
rename from Xamarin.Forms.Core/IElementConfiguration.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IElementConfiguration.cs

diff --git a/Xamarin.Forms.Core/IElementController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IElementController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IElementController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IElementController.cs

diff --git a/Xamarin.Forms.Core/IEntryController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IEntryController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IEntryController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IEntryController.cs

diff --git a/Xamarin.Forms.Core/IExpressionSearch.cs b/Xamarin.Forms/Xamarin.Forms.Core/IExpressionSearch.cs
similarity index 100%
rename from Xamarin.Forms.Core/IExpressionSearch.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IExpressionSearch.cs

diff --git a/Xamarin.Forms.Core/IExtendedTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/IExtendedTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/IExtendedTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IExtendedTypeConverter.cs

diff --git a/Xamarin.Forms.Core/IFlowDirectionController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IFlowDirectionController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IFlowDirectionController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IFlowDirectionController.cs

diff --git a/Xamarin.Forms.Core/IFontElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IFontElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IFontElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IFontElement.cs

diff --git a/Xamarin.Forms.Core/IGestureController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IGestureController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IGestureController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IGestureController.cs

diff --git a/Xamarin.Forms.Core/IGestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Core/IGestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Core/IGestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IGestureRecognizer.cs

diff --git a/Xamarin.Forms.Core/IGridController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IGridController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IGridController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IGridController.cs

diff --git a/Xamarin.Forms.Core/IImageController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IImageController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IImageController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IImageController.cs

diff --git a/Xamarin.Forms.Core/IImageElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IImageElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IImageElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IImageElement.cs

diff --git a/Xamarin.Forms.Core/IIsolatedStorageFile.cs b/Xamarin.Forms/Xamarin.Forms.Core/IIsolatedStorageFile.cs
similarity index 100%
rename from Xamarin.Forms.Core/IIsolatedStorageFile.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IIsolatedStorageFile.cs

diff --git a/Xamarin.Forms.Core/IItemViewController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IItemViewController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IItemViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IItemViewController.cs

diff --git a/Xamarin.Forms.Core/IItemsView.cs b/Xamarin.Forms/Xamarin.Forms.Core/IItemsView.cs
similarity index 100%
rename from Xamarin.Forms.Core/IItemsView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IItemsView.cs

diff --git a/Xamarin.Forms.Core/ILayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/ILayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/ILayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ILayout.cs

diff --git a/Xamarin.Forms.Core/ILayoutController.cs b/Xamarin.Forms/Xamarin.Forms.Core/ILayoutController.cs
similarity index 100%
rename from Xamarin.Forms.Core/ILayoutController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ILayoutController.cs

diff --git a/Xamarin.Forms.Core/ILineHeightElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/ILineHeightElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/ILineHeightElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ILineHeightElement.cs

diff --git a/Xamarin.Forms.Core/IListProxy.cs b/Xamarin.Forms/Xamarin.Forms.Core/IListProxy.cs
similarity index 100%
rename from Xamarin.Forms.Core/IListProxy.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IListProxy.cs

diff --git a/Xamarin.Forms.Core/IListViewController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IListViewController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IListViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IListViewController.cs

diff --git a/Xamarin.Forms.Core/IMarkupExtension.cs b/Xamarin.Forms/Xamarin.Forms.Core/IMarkupExtension.cs
similarity index 100%
rename from Xamarin.Forms.Core/IMarkupExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IMarkupExtension.cs

diff --git a/Xamarin.Forms.Core/IMasterDetailPageController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IMasterDetailPageController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IMasterDetailPageController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IMasterDetailPageController.cs

diff --git a/Xamarin.Forms.Core/IMenuItemController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IMenuItemController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IMenuItemController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IMenuItemController.cs

diff --git a/Xamarin.Forms.Core/IMultiPageController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IMultiPageController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IMultiPageController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IMultiPageController.cs

diff --git a/Xamarin.Forms.Core/INativeBindingService.cs b/Xamarin.Forms/Xamarin.Forms.Core/INativeBindingService.cs
similarity index 100%
rename from Xamarin.Forms.Core/INativeBindingService.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/INativeBindingService.cs

diff --git a/Xamarin.Forms.Core/INativeValueConverterService.cs b/Xamarin.Forms/Xamarin.Forms.Core/INativeValueConverterService.cs
similarity index 100%
rename from Xamarin.Forms.Core/INativeValueConverterService.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/INativeValueConverterService.cs

diff --git a/Xamarin.Forms.Core/INavigation.cs b/Xamarin.Forms/Xamarin.Forms.Core/INavigation.cs
similarity index 100%
rename from Xamarin.Forms.Core/INavigation.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/INavigation.cs

diff --git a/Xamarin.Forms.Core/INavigationPageController.cs b/Xamarin.Forms/Xamarin.Forms.Core/INavigationPageController.cs
similarity index 100%
rename from Xamarin.Forms.Core/INavigationPageController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/INavigationPageController.cs

diff --git a/Xamarin.Forms.Core/IOpenGlViewController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IOpenGlViewController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IOpenGlViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IOpenGlViewController.cs

diff --git a/Xamarin.Forms.Core/IPaddingElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPaddingElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPaddingElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPaddingElement.cs

diff --git a/Xamarin.Forms.Core/IPageContainer.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPageContainer.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPageContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPageContainer.cs

diff --git a/Xamarin.Forms.Core/IPageController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPageController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPageController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPageController.cs

diff --git a/Xamarin.Forms.Core/IPanGestureController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPanGestureController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPanGestureController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPanGestureController.cs

diff --git a/Xamarin.Forms.Core/IPinchGestureController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPinchGestureController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPinchGestureController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPinchGestureController.cs

diff --git a/Xamarin.Forms.Core/IPlaceholderElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPlaceholderElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPlaceholderElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPlaceholderElement.cs

diff --git a/Xamarin.Forms.Core/IPlatformElementConfiguration.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPlatformElementConfiguration.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPlatformElementConfiguration.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPlatformElementConfiguration.cs

diff --git a/Xamarin.Forms.Core/IPlatformServices.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPlatformServices.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPlatformServices.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPlatformServices.cs

diff --git a/Xamarin.Forms.Core/IPropertyPropagationController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IPropertyPropagationController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IPropertyPropagationController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IPropertyPropagationController.cs

diff --git a/Xamarin.Forms.Core/IProvideParentValues.cs b/Xamarin.Forms/Xamarin.Forms.Core/IProvideParentValues.cs
similarity index 100%
rename from Xamarin.Forms.Core/IProvideParentValues.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IProvideParentValues.cs

diff --git a/Xamarin.Forms.Core/IProvideValueTarget.cs b/Xamarin.Forms/Xamarin.Forms.Core/IProvideValueTarget.cs
similarity index 100%
rename from Xamarin.Forms.Core/IProvideValueTarget.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IProvideValueTarget.cs

diff --git a/Xamarin.Forms.Core/IRegisterable.cs b/Xamarin.Forms/Xamarin.Forms.Core/IRegisterable.cs
similarity index 100%
rename from Xamarin.Forms.Core/IRegisterable.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IRegisterable.cs

diff --git a/Xamarin.Forms.Core/IResourceDictionary.cs b/Xamarin.Forms/Xamarin.Forms.Core/IResourceDictionary.cs
similarity index 100%
rename from Xamarin.Forms.Core/IResourceDictionary.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IResourceDictionary.cs

diff --git a/Xamarin.Forms.Core/IResourcesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/IResourcesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/IResourcesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IResourcesProvider.cs

diff --git a/Xamarin.Forms.Core/IRootObjectProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/IRootObjectProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/IRootObjectProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IRootObjectProvider.cs

diff --git a/Xamarin.Forms.Core/IScrollViewController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IScrollViewController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IScrollViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IScrollViewController.cs

diff --git a/Xamarin.Forms.Core/ISearchBarController.cs b/Xamarin.Forms/Xamarin.Forms.Core/ISearchBarController.cs
similarity index 100%
rename from Xamarin.Forms.Core/ISearchBarController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ISearchBarController.cs

diff --git a/Xamarin.Forms.Core/IServiceProviderExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/IServiceProviderExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/IServiceProviderExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IServiceProviderExtensions.cs

diff --git a/Xamarin.Forms.Core/ISliderController.cs b/Xamarin.Forms/Xamarin.Forms.Core/ISliderController.cs
similarity index 100%
rename from Xamarin.Forms.Core/ISliderController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ISliderController.cs

diff --git a/Xamarin.Forms.Core/ISpatialElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/ISpatialElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/ISpatialElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ISpatialElement.cs

diff --git a/Xamarin.Forms.Core/IStreamImageSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/IStreamImageSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/IStreamImageSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IStreamImageSource.cs

diff --git a/Xamarin.Forms.Core/IStyle.cs b/Xamarin.Forms/Xamarin.Forms.Core/IStyle.cs
similarity index 100%
rename from Xamarin.Forms.Core/IStyle.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IStyle.cs

diff --git a/Xamarin.Forms.Core/IStyleElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/IStyleElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/IStyleElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IStyleElement.cs

diff --git a/Xamarin.Forms.Core/ISwipeGestureController.cs b/Xamarin.Forms/Xamarin.Forms.Core/ISwipeGestureController.cs
similarity index 100%
rename from Xamarin.Forms.Core/ISwipeGestureController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ISwipeGestureController.cs

diff --git a/Xamarin.Forms.Core/ISwipeItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/ISwipeItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/ISwipeItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ISwipeItem.cs

diff --git a/Xamarin.Forms.Core/ISwipeViewController.cs b/Xamarin.Forms/Xamarin.Forms.Core/ISwipeViewController.cs
similarity index 100%
rename from Xamarin.Forms.Core/ISwipeViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ISwipeViewController.cs

diff --git a/Xamarin.Forms.Core/ISystemResourcesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/ISystemResourcesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/ISystemResourcesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ISystemResourcesProvider.cs

diff --git a/Xamarin.Forms.Core/ITableModel.cs b/Xamarin.Forms/Xamarin.Forms.Core/ITableModel.cs
similarity index 100%
rename from Xamarin.Forms.Core/ITableModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ITableModel.cs

diff --git a/Xamarin.Forms.Core/ITableViewController.cs b/Xamarin.Forms/Xamarin.Forms.Core/ITableViewController.cs
similarity index 100%
rename from Xamarin.Forms.Core/ITableViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ITableViewController.cs

diff --git a/Xamarin.Forms.Core/ITemplatedItemsList.cs b/Xamarin.Forms/Xamarin.Forms.Core/ITemplatedItemsList.cs
similarity index 100%
rename from Xamarin.Forms.Core/ITemplatedItemsList.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ITemplatedItemsList.cs

diff --git a/Xamarin.Forms.Core/ITemplatedItemsListScrollToRequestedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ITemplatedItemsListScrollToRequestedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ITemplatedItemsListScrollToRequestedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ITemplatedItemsListScrollToRequestedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ITemplatedItemsView.cs b/Xamarin.Forms/Xamarin.Forms.Core/ITemplatedItemsView.cs
similarity index 100%
rename from Xamarin.Forms.Core/ITemplatedItemsView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ITemplatedItemsView.cs

diff --git a/Xamarin.Forms.Core/ITextAlignmentElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/ITextAlignmentElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/ITextAlignmentElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ITextAlignmentElement.cs

diff --git a/Xamarin.Forms.Core/ITextElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/ITextElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/ITextElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ITextElement.cs

diff --git a/Xamarin.Forms.Core/IValueConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/IValueConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/IValueConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IValueConverter.cs

diff --git a/Xamarin.Forms.Core/IValueConverterProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/IValueConverterProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/IValueConverterProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IValueConverterProvider.cs

diff --git a/Xamarin.Forms.Core/IValueProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/IValueProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/IValueProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IValueProvider.cs

diff --git a/Xamarin.Forms.Core/IViewContainer.cs b/Xamarin.Forms/Xamarin.Forms.Core/IViewContainer.cs
similarity index 100%
rename from Xamarin.Forms.Core/IViewContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IViewContainer.cs

diff --git a/Xamarin.Forms.Core/IViewController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IViewController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IViewController.cs

diff --git a/Xamarin.Forms.Core/IVisualController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IVisualController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IVisualController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IVisualController.cs

diff --git a/Xamarin.Forms.Core/IVisualElementController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IVisualElementController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IVisualElementController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IVisualElementController.cs

diff --git a/Xamarin.Forms.Core/IWebViewController.cs b/Xamarin.Forms/Xamarin.Forms.Core/IWebViewController.cs
similarity index 100%
rename from Xamarin.Forms.Core/IWebViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IWebViewController.cs

diff --git a/Xamarin.Forms.Core/IWebViewDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Core/IWebViewDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Core/IWebViewDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IWebViewDelegate.cs

diff --git a/Xamarin.Forms.Core/IXamlTypeResolver.cs b/Xamarin.Forms/Xamarin.Forms.Core/IXamlTypeResolver.cs
similarity index 100%
rename from Xamarin.Forms.Core/IXamlTypeResolver.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IXamlTypeResolver.cs

diff --git a/Xamarin.Forms.Core/IXmlLineInfoProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/IXmlLineInfoProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/IXmlLineInfoProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IXmlLineInfoProvider.cs

diff --git a/Xamarin.Forms.Core/Image.cs b/Xamarin.Forms/Xamarin.Forms.Core/Image.cs
similarity index 100%
rename from Xamarin.Forms.Core/Image.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Image.cs

diff --git a/Xamarin.Forms.Core/ImageButton.cs b/Xamarin.Forms/Xamarin.Forms.Core/ImageButton.cs
similarity index 100%
rename from Xamarin.Forms.Core/ImageButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ImageButton.cs

diff --git a/Xamarin.Forms.Core/ImageElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/ImageElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/ImageElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ImageElement.cs

diff --git a/Xamarin.Forms.Core/ImageSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/ImageSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/ImageSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ImageSource.cs

diff --git a/Xamarin.Forms.Core/ImageSourceConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ImageSourceConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ImageSourceConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ImageSourceConverter.cs

diff --git a/Xamarin.Forms.Core/IndicatorShape.cs b/Xamarin.Forms/Xamarin.Forms.Core/IndicatorShape.cs
similarity index 100%
rename from Xamarin.Forms.Core/IndicatorShape.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IndicatorShape.cs

diff --git a/Xamarin.Forms.Core/IndicatorStackLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/IndicatorStackLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/IndicatorStackLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IndicatorStackLayout.cs

diff --git a/Xamarin.Forms.Core/IndicatorView.cs b/Xamarin.Forms/Xamarin.Forms.Core/IndicatorView.cs
similarity index 100%
rename from Xamarin.Forms.Core/IndicatorView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/IndicatorView.cs

diff --git a/Xamarin.Forms.Core/InputView.cs b/Xamarin.Forms/Xamarin.Forms.Core/InputView.cs
similarity index 100%
rename from Xamarin.Forms.Core/InputView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/InputView.cs

diff --git a/Xamarin.Forms.Core/Interactivity/AttachedCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/AttachedCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/AttachedCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/AttachedCollection.cs

diff --git a/Xamarin.Forms.Core/Interactivity/Behavior.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/Behavior.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/Behavior.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/Behavior.cs

diff --git a/Xamarin.Forms.Core/Interactivity/BindingCondition.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/BindingCondition.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/BindingCondition.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/BindingCondition.cs

diff --git a/Xamarin.Forms.Core/Interactivity/Condition.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/Condition.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/Condition.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/Condition.cs

diff --git a/Xamarin.Forms.Core/Interactivity/DataTrigger.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/DataTrigger.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/DataTrigger.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/DataTrigger.cs

diff --git a/Xamarin.Forms.Core/Interactivity/EventTrigger.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/EventTrigger.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/EventTrigger.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/EventTrigger.cs

diff --git a/Xamarin.Forms.Core/Interactivity/IAttachedObject.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/IAttachedObject.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/IAttachedObject.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/IAttachedObject.cs

diff --git a/Xamarin.Forms.Core/Interactivity/MultiCondition.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/MultiCondition.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/MultiCondition.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/MultiCondition.cs

diff --git a/Xamarin.Forms.Core/Interactivity/MultiTrigger.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/MultiTrigger.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/MultiTrigger.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/MultiTrigger.cs

diff --git a/Xamarin.Forms.Core/Interactivity/PropertyCondition.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/PropertyCondition.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/PropertyCondition.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/PropertyCondition.cs

diff --git a/Xamarin.Forms.Core/Interactivity/Trigger.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/Trigger.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/Trigger.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/Trigger.cs

diff --git a/Xamarin.Forms.Core/Interactivity/TriggerAction.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/TriggerAction.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/TriggerAction.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/TriggerAction.cs

diff --git a/Xamarin.Forms.Core/Interactivity/TriggerBase.cs b/Xamarin.Forms/Xamarin.Forms.Core/Interactivity/TriggerBase.cs
similarity index 100%
rename from Xamarin.Forms.Core/Interactivity/TriggerBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Interactivity/TriggerBase.cs

diff --git a/Xamarin.Forms.Core/Internals/AsyncValue.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/AsyncValue.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/AsyncValue.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/AsyncValue.cs

diff --git a/Xamarin.Forms.Core/Internals/CellExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/CellExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/CellExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/CellExtensions.cs

diff --git a/Xamarin.Forms.Core/Internals/DynamicResource.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/DynamicResource.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/DynamicResource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/DynamicResource.cs

diff --git a/Xamarin.Forms.Core/Internals/EffectUtilities.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/EffectUtilities.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/EffectUtilities.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/EffectUtilities.cs

diff --git a/Xamarin.Forms.Core/Internals/EvalRequested.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/EvalRequested.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/EvalRequested.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/EvalRequested.cs

diff --git a/Xamarin.Forms.Core/Internals/IDataTemplate.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/IDataTemplate.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/IDataTemplate.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/IDataTemplate.cs

diff --git a/Xamarin.Forms.Core/Internals/IDynamicResourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/IDynamicResourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/IDynamicResourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/IDynamicResourceHandler.cs

diff --git a/Xamarin.Forms.Core/Internals/INameScope.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/INameScope.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/INameScope.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/INameScope.cs

diff --git a/Xamarin.Forms.Core/Internals/INamescopeProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/INamescopeProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/INamescopeProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/INamescopeProvider.cs

diff --git a/Xamarin.Forms.Core/Internals/IPlatform.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/IPlatform.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/IPlatform.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/IPlatform.cs

diff --git a/Xamarin.Forms.Core/Internals/ImageParser.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/ImageParser.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/ImageParser.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/ImageParser.cs

diff --git a/Xamarin.Forms.Core/Internals/InvalidationTrigger.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/InvalidationTrigger.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/InvalidationTrigger.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/InvalidationTrigger.cs

diff --git a/Xamarin.Forms.Core/Internals/Legacy/FileAccess.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/Legacy/FileAccess.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/Legacy/FileAccess.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/Legacy/FileAccess.cs

diff --git a/Xamarin.Forms.Core/Internals/Legacy/FileMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/Legacy/FileMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/Legacy/FileMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/Legacy/FileMode.cs

diff --git a/Xamarin.Forms.Core/Internals/Legacy/FileShare.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/Legacy/FileShare.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/Legacy/FileShare.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/Legacy/FileShare.cs

diff --git a/Xamarin.Forms.Core/Internals/NameScope.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/NameScope.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/NameScope.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/NameScope.cs

diff --git a/Xamarin.Forms.Core/Internals/NavigationRequestType.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/NavigationRequestType.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/NavigationRequestType.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/NavigationRequestType.cs

diff --git a/Xamarin.Forms.Core/Internals/NavigationRequestedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/NavigationRequestedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/NavigationRequestedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/NavigationRequestedEventArgs.cs

diff --git a/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsEx.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsEx.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsEx.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsEx.cs

diff --git a/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/NotifyCollectionChangedEventArgsExtensions.cs

diff --git a/Xamarin.Forms.Core/Internals/PageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/PageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/PageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/PageExtensions.cs

diff --git a/Xamarin.Forms.Core/Internals/PreserveAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/PreserveAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/PreserveAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/PreserveAttribute.cs

diff --git a/Xamarin.Forms.Core/Internals/ProfilePage.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/ProfilePage.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/ProfilePage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/ProfilePage.cs

diff --git a/Xamarin.Forms.Core/Internals/PropertyPropagationExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/PropertyPropagationExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/PropertyPropagationExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/PropertyPropagationExtensions.cs

diff --git a/Xamarin.Forms.Core/Internals/ResourceLoader.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/ResourceLoader.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/ResourceLoader.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/ResourceLoader.cs

diff --git a/Xamarin.Forms.Core/Internals/Ticker.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/Ticker.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/Ticker.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/Ticker.cs

diff --git a/Xamarin.Forms.Core/Internals/ToolbarTracker.cs b/Xamarin.Forms/Xamarin.Forms.Core/Internals/ToolbarTracker.cs
similarity index 100%
rename from Xamarin.Forms.Core/Internals/ToolbarTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Internals/ToolbarTracker.cs

diff --git a/Xamarin.Forms.Core/InvalidNavigationException.cs b/Xamarin.Forms/Xamarin.Forms.Core/InvalidNavigationException.cs
similarity index 100%
rename from Xamarin.Forms.Core/InvalidNavigationException.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/InvalidNavigationException.cs

diff --git a/Xamarin.Forms.Core/InvalidationEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/InvalidationEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/InvalidationEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/InvalidationEventArgs.cs

diff --git a/Xamarin.Forms.Core/ItemTappedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ItemTappedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ItemTappedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ItemTappedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ItemVisibilityEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ItemVisibilityEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ItemVisibilityEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ItemVisibilityEventArgs.cs

diff --git a/Xamarin.Forms.Core/Items/CarouselLayoutTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/CarouselLayoutTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/CarouselLayoutTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/CarouselLayoutTypeConverter.cs

diff --git a/Xamarin.Forms.Core/Items/CarouselView.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/CarouselView.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/CarouselView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/CarouselView.cs

diff --git a/Xamarin.Forms.Core/Items/CollectionView.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/CollectionView.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/CollectionView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/CollectionView.cs

diff --git a/Xamarin.Forms.Core/Items/CurrentItemChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/CurrentItemChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/CurrentItemChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/CurrentItemChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/Items/GridItemsLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/GridItemsLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/GridItemsLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/GridItemsLayout.cs

diff --git a/Xamarin.Forms.Core/Items/GroupableItemsView.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/GroupableItemsView.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/GroupableItemsView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/GroupableItemsView.cs

diff --git a/Xamarin.Forms.Core/Items/IItemsLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/IItemsLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/IItemsLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/IItemsLayout.cs

diff --git a/Xamarin.Forms.Core/Items/ItemSizingStrategy.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/ItemSizingStrategy.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/ItemSizingStrategy.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/ItemSizingStrategy.cs

diff --git a/Xamarin.Forms.Core/Items/ItemsLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/ItemsLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsLayout.cs

diff --git a/Xamarin.Forms.Core/Items/ItemsLayoutOrientation.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsLayoutOrientation.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/ItemsLayoutOrientation.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsLayoutOrientation.cs

diff --git a/Xamarin.Forms.Core/Items/ItemsLayoutTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsLayoutTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/ItemsLayoutTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsLayoutTypeConverter.cs

diff --git a/Xamarin.Forms.Core/Items/ItemsUpdatingScrollMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsUpdatingScrollMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/ItemsUpdatingScrollMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsUpdatingScrollMode.cs

diff --git a/Xamarin.Forms.Core/Items/ItemsView.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsView.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/ItemsView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsView.cs

diff --git a/Xamarin.Forms.Core/Items/ItemsViewScrolledEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsViewScrolledEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/ItemsViewScrolledEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/ItemsViewScrolledEventArgs.cs

diff --git a/Xamarin.Forms.Core/Items/LinearItemsLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/LinearItemsLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/LinearItemsLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/LinearItemsLayout.cs

diff --git a/Xamarin.Forms.Core/Items/PositionChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/PositionChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/PositionChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/PositionChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/Items/ScrollToRequestEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/ScrollToRequestEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/ScrollToRequestEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/ScrollToRequestEventArgs.cs

diff --git a/Xamarin.Forms.Core/Items/SelectableItemsView.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/SelectableItemsView.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/SelectableItemsView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/SelectableItemsView.cs

diff --git a/Xamarin.Forms.Core/Items/SelectionChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/SelectionChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/SelectionChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/SelectionChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/Items/SelectionList.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/SelectionList.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/SelectionList.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/SelectionList.cs

diff --git a/Xamarin.Forms.Core/Items/SelectionMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/SelectionMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/SelectionMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/SelectionMode.cs

diff --git a/Xamarin.Forms.Core/Items/SnapPointsAlignment.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/SnapPointsAlignment.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/SnapPointsAlignment.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/SnapPointsAlignment.cs

diff --git a/Xamarin.Forms.Core/Items/SnapPointsType.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/SnapPointsType.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/SnapPointsType.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/SnapPointsType.cs

diff --git a/Xamarin.Forms.Core/Items/StructuredItemsView.cs b/Xamarin.Forms/Xamarin.Forms.Core/Items/StructuredItemsView.cs
similarity index 100%
rename from Xamarin.Forms.Core/Items/StructuredItemsView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Items/StructuredItemsView.cs

diff --git a/Xamarin.Forms.Core/ItemsView.cs b/Xamarin.Forms/Xamarin.Forms.Core/ItemsView.cs
similarity index 100%
rename from Xamarin.Forms.Core/ItemsView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ItemsView.cs

diff --git a/Xamarin.Forms.Core/Keyboard.cs b/Xamarin.Forms/Xamarin.Forms.Core/Keyboard.cs
similarity index 100%
rename from Xamarin.Forms.Core/Keyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Keyboard.cs

diff --git a/Xamarin.Forms.Core/KeyboardFlags.cs b/Xamarin.Forms/Xamarin.Forms.Core/KeyboardFlags.cs
similarity index 100%
rename from Xamarin.Forms.Core/KeyboardFlags.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/KeyboardFlags.cs

diff --git a/Xamarin.Forms.Core/KeyboardTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/KeyboardTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/KeyboardTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/KeyboardTypeConverter.cs

diff --git a/Xamarin.Forms.Core/Label.cs b/Xamarin.Forms/Xamarin.Forms.Core/Label.cs
similarity index 100%
rename from Xamarin.Forms.Core/Label.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Label.cs

diff --git a/Xamarin.Forms.Core/Layout.cs b/Xamarin.Forms/Xamarin.Forms.Core/Layout.cs
similarity index 100%
rename from Xamarin.Forms.Core/Layout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Layout.cs

diff --git a/Xamarin.Forms.Core/LayoutAlignment.cs b/Xamarin.Forms/Xamarin.Forms.Core/LayoutAlignment.cs
similarity index 100%
rename from Xamarin.Forms.Core/LayoutAlignment.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LayoutAlignment.cs

diff --git a/Xamarin.Forms.Core/LayoutAlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/LayoutAlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/LayoutAlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LayoutAlignmentExtensions.cs

diff --git a/Xamarin.Forms.Core/LayoutConstraint.cs b/Xamarin.Forms/Xamarin.Forms.Core/LayoutConstraint.cs
similarity index 100%
rename from Xamarin.Forms.Core/LayoutConstraint.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LayoutConstraint.cs

diff --git a/Xamarin.Forms.Core/LayoutExpandFlag.cs b/Xamarin.Forms/Xamarin.Forms.Core/LayoutExpandFlag.cs
similarity index 100%
rename from Xamarin.Forms.Core/LayoutExpandFlag.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LayoutExpandFlag.cs

diff --git a/Xamarin.Forms.Core/LayoutOptions.cs b/Xamarin.Forms/Xamarin.Forms.Core/LayoutOptions.cs
similarity index 100%
rename from Xamarin.Forms.Core/LayoutOptions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LayoutOptions.cs

diff --git a/Xamarin.Forms.Core/LayoutOptionsConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/LayoutOptionsConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/LayoutOptionsConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LayoutOptionsConverter.cs

diff --git a/Xamarin.Forms.Core/LineBreakMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/LineBreakMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/LineBreakMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LineBreakMode.cs

diff --git a/Xamarin.Forms.Core/LineHeightElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/LineHeightElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/LineHeightElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LineHeightElement.cs

diff --git a/Xamarin.Forms.Core/ListProxy.cs b/Xamarin.Forms/Xamarin.Forms.Core/ListProxy.cs
similarity index 100%
rename from Xamarin.Forms.Core/ListProxy.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ListProxy.cs

diff --git a/Xamarin.Forms.Core/ListProxyChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ListProxyChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ListProxyChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ListProxyChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ListStringTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ListStringTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ListStringTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ListStringTypeConverter.cs

diff --git a/Xamarin.Forms.Core/ListView.cs b/Xamarin.Forms/Xamarin.Forms.Core/ListView.cs
similarity index 100%
rename from Xamarin.Forms.Core/ListView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ListView.cs

diff --git a/Xamarin.Forms.Core/ListViewCachingStrategy.cs b/Xamarin.Forms/Xamarin.Forms.Core/ListViewCachingStrategy.cs
similarity index 100%
rename from Xamarin.Forms.Core/ListViewCachingStrategy.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ListViewCachingStrategy.cs

diff --git a/Xamarin.Forms.Core/ListViewSelectionMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/ListViewSelectionMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/ListViewSelectionMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ListViewSelectionMode.cs

diff --git a/Xamarin.Forms.Core/LockableObservableListWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Core/LockableObservableListWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Core/LockableObservableListWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LockableObservableListWrapper.cs

diff --git a/Xamarin.Forms.Core/LockingSemaphore.cs b/Xamarin.Forms/Xamarin.Forms.Core/LockingSemaphore.cs
similarity index 100%
rename from Xamarin.Forms.Core/LockingSemaphore.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LockingSemaphore.cs

diff --git a/Xamarin.Forms.Core/Log.cs b/Xamarin.Forms/Xamarin.Forms.Core/Log.cs
similarity index 100%
rename from Xamarin.Forms.Core/Log.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Log.cs

diff --git a/Xamarin.Forms.Core/LogListener.cs b/Xamarin.Forms/Xamarin.Forms.Core/LogListener.cs
similarity index 100%
rename from Xamarin.Forms.Core/LogListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/LogListener.cs

diff --git a/Xamarin.Forms.Core/MasterBehavior.cs b/Xamarin.Forms/Xamarin.Forms.Core/MasterBehavior.cs
similarity index 100%
rename from Xamarin.Forms.Core/MasterBehavior.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/MasterBehavior.cs

diff --git a/Xamarin.Forms.Core/MasterDetailPage.cs b/Xamarin.Forms/Xamarin.Forms.Core/MasterDetailPage.cs
similarity index 100%
rename from Xamarin.Forms.Core/MasterDetailPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/MasterDetailPage.cs

diff --git a/Xamarin.Forms.Core/MeasureFlags.cs b/Xamarin.Forms/Xamarin.Forms.Core/MeasureFlags.cs
similarity index 100%
rename from Xamarin.Forms.Core/MeasureFlags.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/MeasureFlags.cs

diff --git a/Xamarin.Forms.Core/Menu.cs b/Xamarin.Forms/Xamarin.Forms.Core/Menu.cs
similarity index 100%
rename from Xamarin.Forms.Core/Menu.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Menu.cs

diff --git a/Xamarin.Forms.Core/MenuItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/MenuItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/MenuItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/MenuItem.cs

diff --git a/Xamarin.Forms.Core/MergedStyle.cs b/Xamarin.Forms/Xamarin.Forms.Core/MergedStyle.cs
similarity index 100%
rename from Xamarin.Forms.Core/MergedStyle.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/MergedStyle.cs

diff --git a/Xamarin.Forms.Core/MessagingCenter.cs b/Xamarin.Forms/Xamarin.Forms.Core/MessagingCenter.cs
similarity index 100%
rename from Xamarin.Forms.Core/MessagingCenter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/MessagingCenter.cs

diff --git a/Xamarin.Forms.Core/ModalEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ModalEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ModalEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ModalEventArgs.cs

diff --git a/Xamarin.Forms.Core/ModalPoppedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ModalPoppedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ModalPoppedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ModalPoppedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ModalPoppingEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ModalPoppingEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ModalPoppingEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ModalPoppingEventArgs.cs

diff --git a/Xamarin.Forms.Core/ModalPushedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ModalPushedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ModalPushedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ModalPushedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ModalPushingEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ModalPushingEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ModalPushingEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ModalPushingEventArgs.cs

diff --git a/Xamarin.Forms.Core/MultiPage.cs b/Xamarin.Forms/Xamarin.Forms.Core/MultiPage.cs
similarity index 100%
rename from Xamarin.Forms.Core/MultiPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/MultiPage.cs

diff --git a/Xamarin.Forms.Core/NameScopeExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/NameScopeExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/NameScopeExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NameScopeExtensions.cs

diff --git a/Xamarin.Forms.Core/NamedSize.cs b/Xamarin.Forms/Xamarin.Forms.Core/NamedSize.cs
similarity index 100%
rename from Xamarin.Forms.Core/NamedSize.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NamedSize.cs

diff --git a/Xamarin.Forms.Core/NativeBindingHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Core/NativeBindingHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Core/NativeBindingHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NativeBindingHelpers.cs

diff --git a/Xamarin.Forms.Core/NavigationEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/NavigationEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/NavigationEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NavigationEventArgs.cs

diff --git a/Xamarin.Forms.Core/NavigationModel.cs b/Xamarin.Forms/Xamarin.Forms.Core/NavigationModel.cs
similarity index 100%
rename from Xamarin.Forms.Core/NavigationModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NavigationModel.cs

diff --git a/Xamarin.Forms.Core/NavigationPage.cs b/Xamarin.Forms/Xamarin.Forms.Core/NavigationPage.cs
similarity index 100%
rename from Xamarin.Forms.Core/NavigationPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NavigationPage.cs

diff --git a/Xamarin.Forms.Core/NavigationProxy.cs b/Xamarin.Forms/Xamarin.Forms.Core/NavigationProxy.cs
similarity index 100%
rename from Xamarin.Forms.Core/NavigationProxy.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NavigationProxy.cs

diff --git a/Xamarin.Forms.Core/NullEffect.cs b/Xamarin.Forms/Xamarin.Forms.Core/NullEffect.cs
similarity index 100%
rename from Xamarin.Forms.Core/NullEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NullEffect.cs

diff --git a/Xamarin.Forms.Core/NumericExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/NumericExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/NumericExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NumericExtensions.cs

diff --git a/Xamarin.Forms.Core/NumericKeyboard.cs b/Xamarin.Forms/Xamarin.Forms.Core/NumericKeyboard.cs
similarity index 100%
rename from Xamarin.Forms.Core/NumericKeyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/NumericKeyboard.cs

diff --git a/Xamarin.Forms.Core/ObservableList.cs b/Xamarin.Forms/Xamarin.Forms.Core/ObservableList.cs
similarity index 100%
rename from Xamarin.Forms.Core/ObservableList.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ObservableList.cs

diff --git a/Xamarin.Forms.Core/ObservableWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Core/ObservableWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Core/ObservableWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ObservableWrapper.cs

diff --git a/Xamarin.Forms.Core/OnIdiom.cs b/Xamarin.Forms/Xamarin.Forms.Core/OnIdiom.cs
similarity index 100%
rename from Xamarin.Forms.Core/OnIdiom.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/OnIdiom.cs

diff --git a/Xamarin.Forms.Core/OnPlatform.cs b/Xamarin.Forms/Xamarin.Forms.Core/OnPlatform.cs
similarity index 100%
rename from Xamarin.Forms.Core/OnPlatform.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/OnPlatform.cs

diff --git a/Xamarin.Forms.Core/OpenGLView.cs b/Xamarin.Forms/Xamarin.Forms.Core/OpenGLView.cs
similarity index 100%
rename from Xamarin.Forms.Core/OpenGLView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/OpenGLView.cs

diff --git a/Xamarin.Forms.Core/OrderedDictionary.cs b/Xamarin.Forms/Xamarin.Forms.Core/OrderedDictionary.cs
similarity index 100%
rename from Xamarin.Forms.Core/OrderedDictionary.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/OrderedDictionary.cs

diff --git a/Xamarin.Forms.Core/PaddingElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/PaddingElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/PaddingElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PaddingElement.cs

diff --git a/Xamarin.Forms.Core/Page.cs b/Xamarin.Forms/Xamarin.Forms.Core/Page.cs
similarity index 100%
rename from Xamarin.Forms.Core/Page.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Page.cs

diff --git a/Xamarin.Forms.Core/PanGestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Core/PanGestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Core/PanGestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PanGestureRecognizer.cs

diff --git a/Xamarin.Forms.Core/PanUpdatedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/PanUpdatedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/PanUpdatedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PanUpdatedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ParameterAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/ParameterAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/ParameterAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ParameterAttribute.cs

diff --git a/Xamarin.Forms.Core/Performance.cs b/Xamarin.Forms/Xamarin.Forms.Core/Performance.cs
similarity index 100%
rename from Xamarin.Forms.Core/Performance.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Performance.cs

diff --git a/Xamarin.Forms.Core/Picker.cs b/Xamarin.Forms/Xamarin.Forms.Core/Picker.cs
similarity index 100%
rename from Xamarin.Forms.Core/Picker.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Picker.cs

diff --git a/Xamarin.Forms.Core/PinchGestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Core/PinchGestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Core/PinchGestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PinchGestureRecognizer.cs

diff --git a/Xamarin.Forms.Core/PinchGestureUpdatedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/PinchGestureUpdatedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/PinchGestureUpdatedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PinchGestureUpdatedEventArgs.cs

diff --git a/Xamarin.Forms.Core/PlaceholderElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlaceholderElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlaceholderElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlaceholderElement.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/ExtensionPoints.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/ExtensionPoints.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/ExtensionPoints.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/ExtensionPoints.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Entry.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Entry.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Entry.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Entry.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/FocusDirection.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/FocusDirection.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/FocusDirection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/FocusDirection.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/FontWeight.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/FontWeight.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/FontWeight.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/FontWeight.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Image.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Image.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Image.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Image.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Label.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Label.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Label.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Label.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/NavigationPage.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/NavigationPage.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/NavigationPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/NavigationPage.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/OptionalFeatureValues.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/OptionalFeatureValues.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/OptionalFeatureValues.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/OptionalFeatureValues.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Page.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Page.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Page.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/Page.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/ProgressBar.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/ProgressBar.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/ProgressBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/ProgressBar.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/StyleValues.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/StyleValues.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/StyleValues.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/StyleValues.cs

diff --git a/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfiguration/TizenSpecific/VisualElement.cs

diff --git a/Xamarin.Forms.Core/PlatformConfigurationRegistry.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformConfigurationRegistry.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformConfigurationRegistry.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformConfigurationRegistry.cs

diff --git a/Xamarin.Forms.Core/PlatformEffect.cs b/Xamarin.Forms/Xamarin.Forms.Core/PlatformEffect.cs
similarity index 100%
rename from Xamarin.Forms.Core/PlatformEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PlatformEffect.cs

diff --git a/Xamarin.Forms.Core/Point.cs b/Xamarin.Forms/Xamarin.Forms.Core/Point.cs
similarity index 100%
rename from Xamarin.Forms.Core/Point.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Point.cs

diff --git a/Xamarin.Forms.Core/PointTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/PointTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/PointTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PointTypeConverter.cs

diff --git a/Xamarin.Forms.Core/PoppedToRootEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/PoppedToRootEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/PoppedToRootEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PoppedToRootEventArgs.cs

diff --git a/Xamarin.Forms.Core/Profiler.cs b/Xamarin.Forms/Xamarin.Forms.Core/Profiler.cs
similarity index 100%
rename from Xamarin.Forms.Core/Profiler.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Profiler.cs

diff --git a/Xamarin.Forms.Core/ProgressBar.cs b/Xamarin.Forms/Xamarin.Forms.Core/ProgressBar.cs
similarity index 100%
rename from Xamarin.Forms.Core/ProgressBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ProgressBar.cs

diff --git a/Xamarin.Forms.Core/PromptArguments.cs b/Xamarin.Forms/Xamarin.Forms.Core/PromptArguments.cs
similarity index 100%
rename from Xamarin.Forms.Core/PromptArguments.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PromptArguments.cs

diff --git a/Xamarin.Forms.Core/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Core/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Core/PropertyChangingEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/PropertyChangingEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/PropertyChangingEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PropertyChangingEventArgs.cs

diff --git a/Xamarin.Forms.Core/PropertyChangingEventHandler.cs b/Xamarin.Forms/Xamarin.Forms.Core/PropertyChangingEventHandler.cs
similarity index 100%
rename from Xamarin.Forms.Core/PropertyChangingEventHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/PropertyChangingEventHandler.cs

diff --git a/Xamarin.Forms.Core/ProvideCompiledAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/ProvideCompiledAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/ProvideCompiledAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ProvideCompiledAttribute.cs

diff --git a/Xamarin.Forms.Core/ReadOnlyCastingList.cs b/Xamarin.Forms/Xamarin.Forms.Core/ReadOnlyCastingList.cs
similarity index 100%
rename from Xamarin.Forms.Core/ReadOnlyCastingList.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ReadOnlyCastingList.cs

diff --git a/Xamarin.Forms.Core/ReadOnlyListAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ReadOnlyListAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ReadOnlyListAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ReadOnlyListAdapter.cs

diff --git a/Xamarin.Forms.Core/Rectangle.cs b/Xamarin.Forms/Xamarin.Forms.Core/Rectangle.cs
similarity index 100%
rename from Xamarin.Forms.Core/Rectangle.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Rectangle.cs

diff --git a/Xamarin.Forms.Core/RectangleTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/RectangleTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/RectangleTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RectangleTypeConverter.cs

diff --git a/Xamarin.Forms.Core/ReferenceTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ReferenceTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ReferenceTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ReferenceTypeConverter.cs

diff --git a/Xamarin.Forms.Core/ReflectionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/ReflectionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/ReflectionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ReflectionExtensions.cs

diff --git a/Xamarin.Forms.Core/RefreshView.cs b/Xamarin.Forms/Xamarin.Forms.Core/RefreshView.cs
similarity index 100%
rename from Xamarin.Forms.Core/RefreshView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RefreshView.cs

diff --git a/Xamarin.Forms.Core/Region.cs b/Xamarin.Forms/Xamarin.Forms.Core/Region.cs
similarity index 100%
rename from Xamarin.Forms.Core/Region.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Region.cs

diff --git a/Xamarin.Forms.Core/Registrar.cs b/Xamarin.Forms/Xamarin.Forms.Core/Registrar.cs
similarity index 100%
rename from Xamarin.Forms.Core/Registrar.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Registrar.cs

diff --git a/Xamarin.Forms.Core/RelativeBindingSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/RelativeBindingSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/RelativeBindingSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RelativeBindingSource.cs

diff --git a/Xamarin.Forms.Core/RelativeBindingSourceMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/RelativeBindingSourceMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/RelativeBindingSourceMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RelativeBindingSourceMode.cs

diff --git a/Xamarin.Forms.Core/RelativeLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/RelativeLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/RelativeLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RelativeLayout.cs

diff --git a/Xamarin.Forms.Core/RenderWithAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/RenderWithAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/RenderWithAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RenderWithAttribute.cs

diff --git a/Xamarin.Forms.Core/ResolutionGroupNameAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/ResolutionGroupNameAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/ResolutionGroupNameAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ResolutionGroupNameAttribute.cs

diff --git a/Xamarin.Forms.Core/ResourceDictionary.cs b/Xamarin.Forms/Xamarin.Forms.Core/ResourceDictionary.cs
similarity index 100%
rename from Xamarin.Forms.Core/ResourceDictionary.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ResourceDictionary.cs

diff --git a/Xamarin.Forms.Core/ResourcesChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ResourcesChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ResourcesChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ResourcesChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ResourcesExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/ResourcesExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/ResourcesExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ResourcesExtensions.cs

diff --git a/Xamarin.Forms.Core/ReturnType.cs b/Xamarin.Forms/Xamarin.Forms.Core/ReturnType.cs
similarity index 100%
rename from Xamarin.Forms.Core/ReturnType.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ReturnType.cs

diff --git a/Xamarin.Forms.Core/RouteFactory.cs b/Xamarin.Forms/Xamarin.Forms.Core/RouteFactory.cs
similarity index 100%
rename from Xamarin.Forms.Core/RouteFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RouteFactory.cs

diff --git a/Xamarin.Forms.Core/Routing.cs b/Xamarin.Forms/Xamarin.Forms.Core/Routing.cs
similarity index 100%
rename from Xamarin.Forms.Core/Routing.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Routing.cs

diff --git a/Xamarin.Forms.Core/RoutingEffect.cs b/Xamarin.Forms/Xamarin.Forms.Core/RoutingEffect.cs
similarity index 100%
rename from Xamarin.Forms.Core/RoutingEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RoutingEffect.cs

diff --git a/Xamarin.Forms.Core/RowDefinition.cs b/Xamarin.Forms/Xamarin.Forms.Core/RowDefinition.cs
similarity index 100%
rename from Xamarin.Forms.Core/RowDefinition.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RowDefinition.cs

diff --git a/Xamarin.Forms.Core/RowDefinitionCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/RowDefinitionCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/RowDefinitionCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RowDefinitionCollection.cs

diff --git a/Xamarin.Forms.Core/RuntimeNamePropertyAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/RuntimeNamePropertyAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/RuntimeNamePropertyAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/RuntimeNamePropertyAttribute.cs

diff --git a/Xamarin.Forms.Core/ScrollBarVisibility.cs b/Xamarin.Forms/Xamarin.Forms.Core/ScrollBarVisibility.cs
similarity index 100%
rename from Xamarin.Forms.Core/ScrollBarVisibility.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ScrollBarVisibility.cs

diff --git a/Xamarin.Forms.Core/ScrollMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/ScrollMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/ScrollMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ScrollMode.cs

diff --git a/Xamarin.Forms.Core/ScrollOrientation.cs b/Xamarin.Forms/Xamarin.Forms.Core/ScrollOrientation.cs
similarity index 100%
rename from Xamarin.Forms.Core/ScrollOrientation.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ScrollOrientation.cs

diff --git a/Xamarin.Forms.Core/ScrollToMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/ScrollToMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/ScrollToMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ScrollToMode.cs

diff --git a/Xamarin.Forms.Core/ScrollToPosition.cs b/Xamarin.Forms/Xamarin.Forms.Core/ScrollToPosition.cs
similarity index 100%
rename from Xamarin.Forms.Core/ScrollToPosition.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ScrollToPosition.cs

diff --git a/Xamarin.Forms.Core/ScrollToRequestedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ScrollToRequestedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ScrollToRequestedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ScrollToRequestedEventArgs.cs

diff --git a/Xamarin.Forms.Core/ScrollView.cs b/Xamarin.Forms/Xamarin.Forms.Core/ScrollView.cs
similarity index 100%
rename from Xamarin.Forms.Core/ScrollView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ScrollView.cs

diff --git a/Xamarin.Forms.Core/ScrolledEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ScrolledEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ScrolledEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ScrolledEventArgs.cs

diff --git a/Xamarin.Forms.Core/SearchBar.cs b/Xamarin.Forms/Xamarin.Forms.Core/SearchBar.cs
similarity index 100%
rename from Xamarin.Forms.Core/SearchBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SearchBar.cs

diff --git a/Xamarin.Forms.Core/SearchBoxVisibility.cs b/Xamarin.Forms/Xamarin.Forms.Core/SearchBoxVisibility.cs
similarity index 100%
rename from Xamarin.Forms.Core/SearchBoxVisibility.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SearchBoxVisibility.cs

diff --git a/Xamarin.Forms.Core/SelectedItemChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/SelectedItemChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/SelectedItemChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SelectedItemChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/SelectedPositionChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/SelectedPositionChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/SelectedPositionChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SelectedPositionChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/SeparatorMenuItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/SeparatorMenuItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/SeparatorMenuItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SeparatorMenuItem.cs

diff --git a/Xamarin.Forms.Core/SeparatorVisibility.cs b/Xamarin.Forms/Xamarin.Forms.Core/SeparatorVisibility.cs
similarity index 100%
rename from Xamarin.Forms.Core/SeparatorVisibility.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SeparatorVisibility.cs

diff --git a/Xamarin.Forms.Core/Setter.cs b/Xamarin.Forms/Xamarin.Forms.Core/Setter.cs
similarity index 100%
rename from Xamarin.Forms.Core/Setter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Setter.cs

diff --git a/Xamarin.Forms.Core/SettersExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/SettersExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/SettersExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SettersExtensions.cs

diff --git a/Xamarin.Forms.Core/Shell/BackButtonBehavior.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/BackButtonBehavior.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/BackButtonBehavior.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/BackButtonBehavior.cs

diff --git a/Xamarin.Forms.Core/Shell/BaseShellItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/BaseShellItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/BaseShellItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/BaseShellItem.cs

diff --git a/Xamarin.Forms.Core/Shell/FlyoutDisplayOptions.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/FlyoutDisplayOptions.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/FlyoutDisplayOptions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/FlyoutDisplayOptions.cs

diff --git a/Xamarin.Forms.Core/Shell/ISearchHandlerController.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ISearchHandlerController.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ISearchHandlerController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ISearchHandlerController.cs

diff --git a/Xamarin.Forms.Core/Shell/IShellAppearanceElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellAppearanceElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/IShellAppearanceElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellAppearanceElement.cs

diff --git a/Xamarin.Forms.Core/Shell/IShellContentController.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellContentController.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/IShellContentController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellContentController.cs

diff --git a/Xamarin.Forms.Core/Shell/IShellContentInsetObserver.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellContentInsetObserver.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/IShellContentInsetObserver.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellContentInsetObserver.cs

diff --git a/Xamarin.Forms.Core/Shell/IShellController.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellController.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/IShellController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellController.cs

diff --git a/Xamarin.Forms.Core/Shell/IShellItemController.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellItemController.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/IShellItemController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellItemController.cs

diff --git a/Xamarin.Forms.Core/Shell/IShellSectionController.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellSectionController.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/IShellSectionController.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/IShellSectionController.cs

diff --git a/Xamarin.Forms.Core/Shell/ITabStopElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ITabStopElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ITabStopElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ITabStopElement.cs

diff --git a/Xamarin.Forms.Core/Shell/MenuItemCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/MenuItemCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/MenuItemCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/MenuItemCollection.cs

diff --git a/Xamarin.Forms.Core/Shell/MenuShellItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/MenuShellItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/MenuShellItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/MenuShellItem.cs

diff --git a/Xamarin.Forms.Core/Shell/NavigableElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/NavigableElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/NavigableElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/NavigableElement.cs

diff --git a/Xamarin.Forms.Core/Shell/QueryPropertyAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/QueryPropertyAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/QueryPropertyAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/QueryPropertyAttribute.cs

diff --git a/Xamarin.Forms.Core/Shell/SearchHandler.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/SearchHandler.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/SearchHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/SearchHandler.cs

diff --git a/Xamarin.Forms.Core/Shell/Shell.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/Shell.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/Shell.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/Shell.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellAppearance.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellAppearance.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellAppearance.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellAppearance.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellContent.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellContent.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellContent.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellContent.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellContentCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellContentCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellContentCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellContentCollection.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellExtensions.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellGroupItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellGroupItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellGroupItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellGroupItem.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellItem.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellItemCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellItemCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellItemCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellItemCollection.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellNavigatedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellNavigatedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellNavigatedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellNavigatedEventArgs.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellNavigatingEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellNavigatingEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellNavigatingEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellNavigatingEventArgs.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellNavigationSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellNavigationSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellNavigationSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellNavigationSource.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellNavigationState.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellNavigationState.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellNavigationState.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellNavigationState.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellSection.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellSection.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellSection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellSection.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellSectionCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellSectionCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellSectionCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellSectionCollection.cs

diff --git a/Xamarin.Forms.Core/Shell/ShellUriHandler.cs b/Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellUriHandler.cs
similarity index 100%
rename from Xamarin.Forms.Core/Shell/ShellUriHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Shell/ShellUriHandler.cs

diff --git a/Xamarin.Forms.Core/Size.cs b/Xamarin.Forms/Xamarin.Forms.Core/Size.cs
similarity index 100%
rename from Xamarin.Forms.Core/Size.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Size.cs

diff --git a/Xamarin.Forms.Core/SizeRequest.cs b/Xamarin.Forms/Xamarin.Forms.Core/SizeRequest.cs
similarity index 100%
rename from Xamarin.Forms.Core/SizeRequest.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SizeRequest.cs

diff --git a/Xamarin.Forms.Core/SizeTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/SizeTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/SizeTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SizeTypeConverter.cs

diff --git a/Xamarin.Forms.Core/Slider.cs b/Xamarin.Forms/Xamarin.Forms.Core/Slider.cs
similarity index 100%
rename from Xamarin.Forms.Core/Slider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Slider.cs

diff --git a/Xamarin.Forms.Core/Span.cs b/Xamarin.Forms/Xamarin.Forms.Core/Span.cs
similarity index 100%
rename from Xamarin.Forms.Core/Span.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Span.cs

diff --git a/Xamarin.Forms.Core/StackLayout.cs b/Xamarin.Forms/Xamarin.Forms.Core/StackLayout.cs
similarity index 100%
rename from Xamarin.Forms.Core/StackLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StackLayout.cs

diff --git a/Xamarin.Forms.Core/StackOrientation.cs b/Xamarin.Forms/Xamarin.Forms.Core/StackOrientation.cs
similarity index 100%
rename from Xamarin.Forms.Core/StackOrientation.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StackOrientation.cs

diff --git a/Xamarin.Forms.Core/Stepper.cs b/Xamarin.Forms/Xamarin.Forms.Core/Stepper.cs
similarity index 100%
rename from Xamarin.Forms.Core/Stepper.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Stepper.cs

diff --git a/Xamarin.Forms.Core/StreamImageSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/StreamImageSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/StreamImageSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StreamImageSource.cs

diff --git a/Xamarin.Forms.Core/StreamWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Core/StreamWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Core/StreamWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StreamWrapper.cs

diff --git a/Xamarin.Forms.Core/Style.cs b/Xamarin.Forms/Xamarin.Forms.Core/Style.cs
similarity index 100%
rename from Xamarin.Forms.Core/Style.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Style.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/CharExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/CharExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/CharExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/CharExtensions.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/CssReader.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/CssReader.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/CssReader.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/CssReader.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/IStyleSelectable.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/IStyleSelectable.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/IStyleSelectable.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/IStyleSelectable.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/Selector.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/Selector.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/Selector.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/Selector.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/Style.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/Style.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/Style.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/Style.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/StylePropertyAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/StylePropertyAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/StylePropertyAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/StylePropertyAttribute.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/StyleSheet.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/StyleSheet.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/StyleSheet.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/StyleSheet.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/StyleSheetExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/StyleSheetExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/StyleSheetExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/StyleSheetExtensions.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/StyleSheetServiceProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/StyleSheetServiceProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/StyleSheetServiceProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/StyleSheetServiceProvider.cs

diff --git a/Xamarin.Forms.Core/StyleSheets/TextReaderExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/TextReaderExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/StyleSheets/TextReaderExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/StyleSheets/TextReaderExtensions.cs

diff --git a/Xamarin.Forms.Core/SwipeBehaviorOnInvoked.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeBehaviorOnInvoked.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeBehaviorOnInvoked.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeBehaviorOnInvoked.cs

diff --git a/Xamarin.Forms.Core/SwipeDirection.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeDirection.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeDirection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeDirection.cs

diff --git a/Xamarin.Forms.Core/SwipeEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeEventArgs.cs

diff --git a/Xamarin.Forms.Core/SwipeGestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeGestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeGestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeGestureRecognizer.cs

diff --git a/Xamarin.Forms.Core/SwipeItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeItem.cs

diff --git a/Xamarin.Forms.Core/SwipeItemView.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeItemView.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeItemView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeItemView.cs

diff --git a/Xamarin.Forms.Core/SwipeItems.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeItems.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeItems.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeItems.cs

diff --git a/Xamarin.Forms.Core/SwipeMode.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeMode.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeMode.cs

diff --git a/Xamarin.Forms.Core/SwipeView.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipeView.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipeView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipeView.cs

diff --git a/Xamarin.Forms.Core/SwipedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/SwipedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/SwipedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SwipedEventArgs.cs

diff --git a/Xamarin.Forms.Core/Switch.cs b/Xamarin.Forms/Xamarin.Forms.Core/Switch.cs
similarity index 100%
rename from Xamarin.Forms.Core/Switch.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Switch.cs

diff --git a/Xamarin.Forms.Core/SynchronizedList.cs b/Xamarin.Forms/Xamarin.Forms.Core/SynchronizedList.cs
similarity index 100%
rename from Xamarin.Forms.Core/SynchronizedList.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/SynchronizedList.cs

diff --git a/Xamarin.Forms.Core/TabIndexExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/TabIndexExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/TabIndexExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TabIndexExtensions.cs

diff --git a/Xamarin.Forms.Core/TabbedPage.cs b/Xamarin.Forms/Xamarin.Forms.Core/TabbedPage.cs
similarity index 100%
rename from Xamarin.Forms.Core/TabbedPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TabbedPage.cs

diff --git a/Xamarin.Forms.Core/TableIntent.cs b/Xamarin.Forms/Xamarin.Forms.Core/TableIntent.cs
similarity index 100%
rename from Xamarin.Forms.Core/TableIntent.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TableIntent.cs

diff --git a/Xamarin.Forms.Core/TableModel.cs b/Xamarin.Forms/Xamarin.Forms.Core/TableModel.cs
similarity index 100%
rename from Xamarin.Forms.Core/TableModel.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TableModel.cs

diff --git a/Xamarin.Forms.Core/TableRoot.cs b/Xamarin.Forms/Xamarin.Forms.Core/TableRoot.cs
similarity index 100%
rename from Xamarin.Forms.Core/TableRoot.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TableRoot.cs

diff --git a/Xamarin.Forms.Core/TableSection.cs b/Xamarin.Forms/Xamarin.Forms.Core/TableSection.cs
similarity index 100%
rename from Xamarin.Forms.Core/TableSection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TableSection.cs

diff --git a/Xamarin.Forms.Core/TableSectionBase.cs b/Xamarin.Forms/Xamarin.Forms.Core/TableSectionBase.cs
similarity index 100%
rename from Xamarin.Forms.Core/TableSectionBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TableSectionBase.cs

diff --git a/Xamarin.Forms.Core/TableView.cs b/Xamarin.Forms/Xamarin.Forms.Core/TableView.cs
similarity index 100%
rename from Xamarin.Forms.Core/TableView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TableView.cs

diff --git a/Xamarin.Forms.Core/TapGestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Core/TapGestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Core/TapGestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TapGestureRecognizer.cs

diff --git a/Xamarin.Forms.Core/TappedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/TappedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/TappedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TappedEventArgs.cs

diff --git a/Xamarin.Forms.Core/TargetIdiom.cs b/Xamarin.Forms/Xamarin.Forms.Core/TargetIdiom.cs
similarity index 100%
rename from Xamarin.Forms.Core/TargetIdiom.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TargetIdiom.cs

diff --git a/Xamarin.Forms.Core/TargetPlatform.cs b/Xamarin.Forms/Xamarin.Forms.Core/TargetPlatform.cs
similarity index 100%
rename from Xamarin.Forms.Core/TargetPlatform.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TargetPlatform.cs

diff --git a/Xamarin.Forms.Core/TelephoneKeyboard.cs b/Xamarin.Forms/Xamarin.Forms.Core/TelephoneKeyboard.cs
similarity index 100%
rename from Xamarin.Forms.Core/TelephoneKeyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TelephoneKeyboard.cs

diff --git a/Xamarin.Forms.Core/TemplateBinding.cs b/Xamarin.Forms/Xamarin.Forms.Core/TemplateBinding.cs
similarity index 100%
rename from Xamarin.Forms.Core/TemplateBinding.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TemplateBinding.cs

diff --git a/Xamarin.Forms.Core/TemplateExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/TemplateExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/TemplateExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TemplateExtensions.cs

diff --git a/Xamarin.Forms.Core/TemplateUtilities.cs b/Xamarin.Forms/Xamarin.Forms.Core/TemplateUtilities.cs
similarity index 100%
rename from Xamarin.Forms.Core/TemplateUtilities.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TemplateUtilities.cs

diff --git a/Xamarin.Forms.Core/TemplatedItemsList.cs b/Xamarin.Forms/Xamarin.Forms.Core/TemplatedItemsList.cs
similarity index 100%
rename from Xamarin.Forms.Core/TemplatedItemsList.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TemplatedItemsList.cs

diff --git a/Xamarin.Forms.Core/TemplatedPage.cs b/Xamarin.Forms/Xamarin.Forms.Core/TemplatedPage.cs
similarity index 100%
rename from Xamarin.Forms.Core/TemplatedPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TemplatedPage.cs

diff --git a/Xamarin.Forms.Core/TemplatedView.cs b/Xamarin.Forms/Xamarin.Forms.Core/TemplatedView.cs
similarity index 100%
rename from Xamarin.Forms.Core/TemplatedView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TemplatedView.cs

diff --git a/Xamarin.Forms.Core/TextAlignment.cs b/Xamarin.Forms/Xamarin.Forms.Core/TextAlignment.cs
similarity index 100%
rename from Xamarin.Forms.Core/TextAlignment.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TextAlignment.cs

diff --git a/Xamarin.Forms.Core/TextAlignmentElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/TextAlignmentElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/TextAlignmentElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TextAlignmentElement.cs

diff --git a/Xamarin.Forms.Core/TextChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/TextChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/TextChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TextChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/TextElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/TextElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/TextElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TextElement.cs

diff --git a/Xamarin.Forms.Core/TextKeyboard.cs b/Xamarin.Forms/Xamarin.Forms.Core/TextKeyboard.cs
similarity index 100%
rename from Xamarin.Forms.Core/TextKeyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TextKeyboard.cs

diff --git a/Xamarin.Forms.Core/TextType.cs b/Xamarin.Forms/Xamarin.Forms.Core/TextType.cs
similarity index 100%
rename from Xamarin.Forms.Core/TextType.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TextType.cs

diff --git a/Xamarin.Forms.Core/Thickness.cs b/Xamarin.Forms/Xamarin.Forms.Core/Thickness.cs
similarity index 100%
rename from Xamarin.Forms.Core/Thickness.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Thickness.cs

diff --git a/Xamarin.Forms.Core/ThicknessTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ThicknessTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ThicknessTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ThicknessTypeConverter.cs

diff --git a/Xamarin.Forms.Core/TimePicker.cs b/Xamarin.Forms/Xamarin.Forms.Core/TimePicker.cs
similarity index 100%
rename from Xamarin.Forms.Core/TimePicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TimePicker.cs

diff --git a/Xamarin.Forms.Core/ToStringValueConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/ToStringValueConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/ToStringValueConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ToStringValueConverter.cs

diff --git a/Xamarin.Forms.Core/ToggledEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ToggledEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ToggledEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ToggledEventArgs.cs

diff --git a/Xamarin.Forms.Core/ToolbarItem.cs b/Xamarin.Forms/Xamarin.Forms.Core/ToolbarItem.cs
similarity index 100%
rename from Xamarin.Forms.Core/ToolbarItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ToolbarItem.cs

diff --git a/Xamarin.Forms.Core/ToolbarItemEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ToolbarItemEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ToolbarItemEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ToolbarItemEventArgs.cs

diff --git a/Xamarin.Forms.Core/ToolbarItemOrder.cs b/Xamarin.Forms/Xamarin.Forms.Core/ToolbarItemOrder.cs
similarity index 100%
rename from Xamarin.Forms.Core/ToolbarItemOrder.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ToolbarItemOrder.cs

diff --git a/Xamarin.Forms.Core/TrackableCollection.cs b/Xamarin.Forms/Xamarin.Forms.Core/TrackableCollection.cs
similarity index 100%
rename from Xamarin.Forms.Core/TrackableCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TrackableCollection.cs

diff --git a/Xamarin.Forms.Core/Tweener.cs b/Xamarin.Forms/Xamarin.Forms.Core/Tweener.cs
similarity index 100%
rename from Xamarin.Forms.Core/Tweener.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Tweener.cs

diff --git a/Xamarin.Forms.Core/TypeConversionAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/TypeConversionAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/TypeConversionAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TypeConversionAttribute.cs

diff --git a/Xamarin.Forms.Core/TypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/TypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/TypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TypeConverter.cs

diff --git a/Xamarin.Forms.Core/TypeConverterAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/TypeConverterAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/TypeConverterAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TypeConverterAttribute.cs

diff --git a/Xamarin.Forms.Core/TypeTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/TypeTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/TypeTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TypeTypeConverter.cs

diff --git a/Xamarin.Forms.Core/TypedBinding.cs b/Xamarin.Forms/Xamarin.Forms.Core/TypedBinding.cs
similarity index 100%
rename from Xamarin.Forms.Core/TypedBinding.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/TypedBinding.cs

diff --git a/Xamarin.Forms.Core/UnsolvableConstraintsException.cs b/Xamarin.Forms/Xamarin.Forms.Core/UnsolvableConstraintsException.cs
similarity index 100%
rename from Xamarin.Forms.Core/UnsolvableConstraintsException.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/UnsolvableConstraintsException.cs

diff --git a/Xamarin.Forms.Core/UriImageSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/UriImageSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/UriImageSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/UriImageSource.cs

diff --git a/Xamarin.Forms.Core/UriTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/UriTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/UriTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/UriTypeConverter.cs

diff --git a/Xamarin.Forms.Core/UrlKeyboard.cs b/Xamarin.Forms/Xamarin.Forms.Core/UrlKeyboard.cs
similarity index 100%
rename from Xamarin.Forms.Core/UrlKeyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/UrlKeyboard.cs

diff --git a/Xamarin.Forms.Core/UrlWebViewSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/UrlWebViewSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/UrlWebViewSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/UrlWebViewSource.cs

diff --git a/Xamarin.Forms.Core/ValueChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/ValueChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/ValueChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ValueChangedEventArgs.cs

diff --git a/Xamarin.Forms.Core/Vec2.cs b/Xamarin.Forms/Xamarin.Forms.Core/Vec2.cs
similarity index 100%
rename from Xamarin.Forms.Core/Vec2.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Vec2.cs

diff --git a/Xamarin.Forms.Core/View.cs b/Xamarin.Forms/Xamarin.Forms.Core/View.cs
similarity index 100%
rename from Xamarin.Forms.Core/View.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/View.cs

diff --git a/Xamarin.Forms.Core/ViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/ViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/ViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ViewExtensions.cs

diff --git a/Xamarin.Forms.Core/ViewState.cs b/Xamarin.Forms/Xamarin.Forms.Core/ViewState.cs
similarity index 100%
rename from Xamarin.Forms.Core/ViewState.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/ViewState.cs

diff --git a/Xamarin.Forms.Core/VisualElement.cs b/Xamarin.Forms/Xamarin.Forms.Core/VisualElement.cs
similarity index 100%
rename from Xamarin.Forms.Core/VisualElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/VisualElement.cs

diff --git a/Xamarin.Forms.Core/VisualElement_StyleSheet.cs b/Xamarin.Forms/Xamarin.Forms.Core/VisualElement_StyleSheet.cs
similarity index 100%
rename from Xamarin.Forms.Core/VisualElement_StyleSheet.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/VisualElement_StyleSheet.cs

diff --git a/Xamarin.Forms.Core/VisualStateManager.cs b/Xamarin.Forms/Xamarin.Forms.Core/VisualStateManager.cs
similarity index 100%
rename from Xamarin.Forms.Core/VisualStateManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/VisualStateManager.cs

diff --git a/Xamarin.Forms.Core/Visuals/IVisual.cs b/Xamarin.Forms/Xamarin.Forms.Core/Visuals/IVisual.cs
similarity index 100%
rename from Xamarin.Forms.Core/Visuals/IVisual.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Visuals/IVisual.cs

diff --git a/Xamarin.Forms.Core/Visuals/VisualAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/Visuals/VisualAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/Visuals/VisualAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Visuals/VisualAttribute.cs

diff --git a/Xamarin.Forms.Core/Visuals/VisualMarker.cs b/Xamarin.Forms/Xamarin.Forms.Core/Visuals/VisualMarker.cs
similarity index 100%
rename from Xamarin.Forms.Core/Visuals/VisualMarker.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Visuals/VisualMarker.cs

diff --git a/Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Visuals/VisualTypeConverter.cs

diff --git a/Xamarin.Forms.Core/WeakEventManager.cs b/Xamarin.Forms/Xamarin.Forms.Core/WeakEventManager.cs
similarity index 100%
rename from Xamarin.Forms.Core/WeakEventManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WeakEventManager.cs

diff --git a/Xamarin.Forms.Core/WeakReferenceExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/WeakReferenceExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/WeakReferenceExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WeakReferenceExtensions.cs

diff --git a/Xamarin.Forms.Core/WebNavigatedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/WebNavigatedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/WebNavigatedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WebNavigatedEventArgs.cs

diff --git a/Xamarin.Forms.Core/WebNavigatingEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/WebNavigatingEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/WebNavigatingEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WebNavigatingEventArgs.cs

diff --git a/Xamarin.Forms.Core/WebNavigationEvent.cs b/Xamarin.Forms/Xamarin.Forms.Core/WebNavigationEvent.cs
similarity index 100%
rename from Xamarin.Forms.Core/WebNavigationEvent.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WebNavigationEvent.cs

diff --git a/Xamarin.Forms.Core/WebNavigationEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/WebNavigationEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/WebNavigationEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WebNavigationEventArgs.cs

diff --git a/Xamarin.Forms.Core/WebNavigationResult.cs b/Xamarin.Forms/Xamarin.Forms.Core/WebNavigationResult.cs
similarity index 100%
rename from Xamarin.Forms.Core/WebNavigationResult.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WebNavigationResult.cs

diff --git a/Xamarin.Forms.Core/WebView.cs b/Xamarin.Forms/Xamarin.Forms.Core/WebView.cs
similarity index 100%
rename from Xamarin.Forms.Core/WebView.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WebView.cs

diff --git a/Xamarin.Forms.Core/WebViewSource.cs b/Xamarin.Forms/Xamarin.Forms.Core/WebViewSource.cs
similarity index 100%
rename from Xamarin.Forms.Core/WebViewSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WebViewSource.cs

diff --git a/Xamarin.Forms.Core/WebViewSourceTypeConverter.cs b/Xamarin.Forms/Xamarin.Forms.Core/WebViewSourceTypeConverter.cs
similarity index 100%
rename from Xamarin.Forms.Core/WebViewSourceTypeConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/WebViewSourceTypeConverter.cs

diff --git a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj b/Xamarin.Forms/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj
similarity index 100%
rename from Xamarin.Forms.Core/Xamarin.Forms.Core.csproj
rename to Xamarin.Forms/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj

diff --git a/Xamarin.Forms.Core/Xaml/Diagnostics/DebuggerHelper.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/Diagnostics/DebuggerHelper.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/Diagnostics/DebuggerHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/Diagnostics/DebuggerHelper.cs

diff --git a/Xamarin.Forms.Core/Xaml/Diagnostics/VisualDiagnostics.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/Diagnostics/VisualDiagnostics.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/Diagnostics/VisualDiagnostics.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/Diagnostics/VisualDiagnostics.cs

diff --git a/Xamarin.Forms.Core/Xaml/Diagnostics/VisualTreeChangeEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/Diagnostics/VisualTreeChangeEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/Diagnostics/VisualTreeChangeEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/Diagnostics/VisualTreeChangeEventArgs.cs

diff --git a/Xamarin.Forms.Core/Xaml/Diagnostics/XamlSourceInfo.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/Diagnostics/XamlSourceInfo.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/Diagnostics/XamlSourceInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/Diagnostics/XamlSourceInfo.cs

diff --git a/Xamarin.Forms.Core/Xaml/IReferenceProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/IReferenceProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/IReferenceProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/IReferenceProvider.cs

diff --git a/Xamarin.Forms.Core/Xaml/IResourcesLoader.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/IResourcesLoader.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/IResourcesLoader.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/IResourcesLoader.cs

diff --git a/Xamarin.Forms.Core/Xaml/TypeConversionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/TypeConversionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/TypeConversionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/TypeConversionExtensions.cs

diff --git a/Xamarin.Forms.Core/Xaml/ValueConverterProvider.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/ValueConverterProvider.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/ValueConverterProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/ValueConverterProvider.cs

diff --git a/Xamarin.Forms.Core/Xaml/XamlResourceIdAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/Xaml/XamlResourceIdAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/Xaml/XamlResourceIdAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/Xaml/XamlResourceIdAttribute.cs

diff --git a/Xamarin.Forms.Core/XamlParseException.cs b/Xamarin.Forms/Xamarin.Forms.Core/XamlParseException.cs
similarity index 100%
rename from Xamarin.Forms.Core/XamlParseException.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/XamlParseException.cs

diff --git a/Xamarin.Forms.Core/XmlLineInfo.cs b/Xamarin.Forms/Xamarin.Forms.Core/XmlLineInfo.cs
similarity index 100%
rename from Xamarin.Forms.Core/XmlLineInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/XmlLineInfo.cs

diff --git a/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/XmlnsDefinitionAttribute.cs

diff --git a/Xamarin.Forms.Core/XmlnsPrefixAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Core/XmlnsPrefixAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Core/XmlnsPrefixAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Core/XmlnsPrefixAttribute.cs

diff --git a/Xamarin.Forms.CustomAttributes/TestAttributes.cs b/Xamarin.Forms/Xamarin.Forms.CustomAttributes/TestAttributes.cs
similarity index 100%
rename from Xamarin.Forms.CustomAttributes/TestAttributes.cs
rename to Xamarin.Forms/Xamarin.Forms.CustomAttributes/TestAttributes.cs

diff --git a/Xamarin.Forms.CustomAttributes/UiTestAttribute.cs b/Xamarin.Forms/Xamarin.Forms.CustomAttributes/UiTestAttribute.cs
similarity index 100%
rename from Xamarin.Forms.CustomAttributes/UiTestAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.CustomAttributes/UiTestAttribute.cs

diff --git a/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj b/Xamarin.Forms/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
similarity index 100%
rename from Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj
rename to Xamarin.Forms/Xamarin.Forms.CustomAttributes/Xamarin.Forms.CustomAttributes.csproj

diff --git a/Xamarin.Forms.Maps.Android/FormsMaps.cs b/Xamarin.Forms/Xamarin.Forms.Maps.Android/FormsMaps.cs
similarity index 100%
rename from Xamarin.Forms.Maps.Android/FormsMaps.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.Android/FormsMaps.cs

diff --git a/Xamarin.Forms.Maps.Android/GeocoderBackend.cs b/Xamarin.Forms/Xamarin.Forms.Maps.Android/GeocoderBackend.cs
similarity index 100%
rename from Xamarin.Forms.Maps.Android/GeocoderBackend.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.Android/GeocoderBackend.cs

diff --git a/Xamarin.Forms.Maps.Android/MapRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Maps.Android/MapRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Maps.Android/MapRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.Android/MapRenderer.cs

diff --git a/Xamarin.Forms.Maps.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Maps.Android/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Maps.Android/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.Android/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj b/Xamarin.Forms/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
similarity index 100%
rename from Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
rename to Xamarin.Forms/Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj

diff --git a/Xamarin.Forms.Maps.GTK/FormsMaps.cs b/Xamarin.Forms/Xamarin.Forms.Maps.GTK/FormsMaps.cs
similarity index 100%
rename from Xamarin.Forms.Maps.GTK/FormsMaps.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.GTK/FormsMaps.cs

diff --git a/Xamarin.Forms.Maps.GTK/GeocoderBackend.cs b/Xamarin.Forms/Xamarin.Forms.Maps.GTK/GeocoderBackend.cs
similarity index 100%
rename from Xamarin.Forms.Maps.GTK/GeocoderBackend.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.GTK/GeocoderBackend.cs

diff --git a/Xamarin.Forms.Maps.GTK/Location.cs b/Xamarin.Forms/Xamarin.Forms.Maps.GTK/Location.cs
similarity index 100%
rename from Xamarin.Forms.Maps.GTK/Location.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.GTK/Location.cs

diff --git a/Xamarin.Forms.Maps.GTK/MapRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Maps.GTK/MapRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Maps.GTK/MapRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.GTK/MapRenderer.cs

diff --git a/Xamarin.Forms.Maps.GTK/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Maps.GTK/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Maps.GTK/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.GTK/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj b/Xamarin.Forms/Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj
similarity index 100%
rename from Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj
rename to Xamarin.Forms/Xamarin.Forms.Maps.GTK/Xamarin.Forms.Maps.GTK.csproj

diff --git a/Xamarin.Forms.Platform.GTK/app.config b/Xamarin.Forms/Xamarin.Forms.Maps.GTK/app.config
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/app.config
rename to Xamarin.Forms/Xamarin.Forms.Maps.GTK/app.config

diff --git a/Xamarin.Forms.Maps.MacOS/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Maps.MacOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Maps.MacOS/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.MacOS/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Maps.MacOS/Xamarin.Forms.Maps.macOS.csproj b/Xamarin.Forms/Xamarin.Forms.Maps.MacOS/Xamarin.Forms.Maps.macOS.csproj
similarity index 100%
rename from Xamarin.Forms.Maps.MacOS/Xamarin.Forms.Maps.macOS.csproj
rename to Xamarin.Forms/Xamarin.Forms.Maps.MacOS/Xamarin.Forms.Maps.macOS.csproj

diff --git a/Xamarin.Forms.Maps.Tizen/FormsMaps.cs b/Xamarin.Forms/Xamarin.Forms.Maps.Tizen/FormsMaps.cs
similarity index 100%
rename from Xamarin.Forms.Maps.Tizen/FormsMaps.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.Tizen/FormsMaps.cs

diff --git a/Xamarin.Forms.Maps.Tizen/GeocoderBackend.cs b/Xamarin.Forms/Xamarin.Forms.Maps.Tizen/GeocoderBackend.cs
similarity index 100%
rename from Xamarin.Forms.Maps.Tizen/GeocoderBackend.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.Tizen/GeocoderBackend.cs

diff --git a/Xamarin.Forms.Maps.Tizen/MapRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Maps.Tizen/MapRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Maps.Tizen/MapRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.Tizen/MapRenderer.cs

diff --git a/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.Tizen/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj b/Xamarin.Forms/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj
similarity index 100%
rename from Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj
rename to Xamarin.Forms/Xamarin.Forms.Maps.Tizen/Xamarin.Forms.Maps.Tizen.csproj

diff --git a/Xamarin.Forms.Maps.UWP/FormsMaps.cs b/Xamarin.Forms/Xamarin.Forms.Maps.UWP/FormsMaps.cs
similarity index 100%
rename from Xamarin.Forms.Maps.UWP/FormsMaps.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.UWP/FormsMaps.cs

diff --git a/Xamarin.Forms.Maps.UWP/GeocoderBackend.cs b/Xamarin.Forms/Xamarin.Forms.Maps.UWP/GeocoderBackend.cs
similarity index 100%
rename from Xamarin.Forms.Maps.UWP/GeocoderBackend.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.UWP/GeocoderBackend.cs

diff --git a/Xamarin.Forms.Maps.UWP/MapRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Maps.UWP/MapRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Maps.UWP/MapRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.UWP/MapRenderer.cs

diff --git a/Xamarin.Forms.Maps.UWP/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Maps.UWP/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Maps.UWP/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.UWP/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Maps.UWP/Properties/Xamarin.Forms.Maps.UWP.rd.xml b/Xamarin.Forms/Xamarin.Forms.Maps.UWP/Properties/Xamarin.Forms.Maps.UWP.rd.xml
similarity index 100%
rename from Xamarin.Forms.Maps.UWP/Properties/Xamarin.Forms.Maps.UWP.rd.xml
rename to Xamarin.Forms/Xamarin.Forms.Maps.UWP/Properties/Xamarin.Forms.Maps.UWP.rd.xml

diff --git a/Xamarin.Forms.Maps.UWP/PushPin.cs b/Xamarin.Forms/Xamarin.Forms.Maps.UWP/PushPin.cs
similarity index 100%
rename from Xamarin.Forms.Maps.UWP/PushPin.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.UWP/PushPin.cs

diff --git a/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj b/Xamarin.Forms/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
similarity index 100%
rename from Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj
rename to Xamarin.Forms/Xamarin.Forms.Maps.UWP/Xamarin.Forms.Maps.UWP.csproj

diff --git a/Xamarin.Forms.Maps.WPF/FormsMaps.cs b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/FormsMaps.cs
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/FormsMaps.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/FormsMaps.cs

diff --git a/Xamarin.Forms.Maps.WPF/FormsPushPin.cs b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/FormsPushPin.cs
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/FormsPushPin.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/FormsPushPin.cs

diff --git a/Xamarin.Forms.Maps.WPF/GeocoderBackend.cs b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/GeocoderBackend.cs
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/GeocoderBackend.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/GeocoderBackend.cs

diff --git a/Xamarin.Forms.Maps.WPF/MapRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/MapRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/MapRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/MapRenderer.cs

diff --git a/Xamarin.Forms.Maps.WPF/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Maps.WPF/Properties/Resources.Designer.cs b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/Resources.Designer.cs
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/Properties/Resources.Designer.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/Resources.Designer.cs

diff --git a/Xamarin.Forms.Maps.WPF/Properties/Resources.resx b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/Resources.resx
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/Properties/Resources.resx
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/Resources.resx

diff --git a/Xamarin.Forms.Maps.WPF/Properties/Settings.Designer.cs b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/Settings.Designer.cs
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/Properties/Settings.Designer.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/Settings.Designer.cs

diff --git a/Xamarin.Forms.Maps.WPF/Properties/Settings.settings b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/Settings.settings
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/Properties/Settings.settings
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/Properties/Settings.settings

diff --git a/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj b/Xamarin.Forms/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
similarity index 100%
rename from Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj
rename to Xamarin.Forms/Xamarin.Forms.Maps.WPF/Xamarin.Forms.Maps.WPF.csproj

diff --git a/Xamarin.Forms.Maps.iOS/FormsMaps.cs b/Xamarin.Forms/Xamarin.Forms.Maps.iOS/FormsMaps.cs
similarity index 100%
rename from Xamarin.Forms.Maps.iOS/FormsMaps.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.iOS/FormsMaps.cs

diff --git a/Xamarin.Forms.Maps.iOS/GeocoderBackend.cs b/Xamarin.Forms/Xamarin.Forms.Maps.iOS/GeocoderBackend.cs
similarity index 100%
rename from Xamarin.Forms.Maps.iOS/GeocoderBackend.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.iOS/GeocoderBackend.cs

diff --git a/Xamarin.Forms.Maps.iOS/MapPool.cs b/Xamarin.Forms/Xamarin.Forms.Maps.iOS/MapPool.cs
similarity index 100%
rename from Xamarin.Forms.Maps.iOS/MapPool.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.iOS/MapPool.cs

diff --git a/Xamarin.Forms.Maps.iOS/MapRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Maps.iOS/MapRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Maps.iOS/MapRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.iOS/MapRenderer.cs

diff --git a/Xamarin.Forms.Maps.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Maps.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Maps.iOS/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps.iOS/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj b/Xamarin.Forms/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
similarity index 100%
rename from Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
rename to Xamarin.Forms/Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj

diff --git a/Xamarin.Forms.Maps/Distance.cs b/Xamarin.Forms/Xamarin.Forms.Maps/Distance.cs
similarity index 100%
rename from Xamarin.Forms.Maps/Distance.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/Distance.cs

diff --git a/Xamarin.Forms.Maps/Geocoder.cs b/Xamarin.Forms/Xamarin.Forms.Maps/Geocoder.cs
similarity index 100%
rename from Xamarin.Forms.Maps/Geocoder.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/Geocoder.cs

diff --git a/Xamarin.Forms.Maps/Map.cs b/Xamarin.Forms/Xamarin.Forms.Maps/Map.cs
similarity index 100%
rename from Xamarin.Forms.Maps/Map.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/Map.cs

diff --git a/Xamarin.Forms.Maps/MapClickedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Maps/MapClickedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Maps/MapClickedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/MapClickedEventArgs.cs

diff --git a/Xamarin.Forms.Maps/MapElement.cs b/Xamarin.Forms/Xamarin.Forms.Maps/MapElement.cs
similarity index 100%
rename from Xamarin.Forms.Maps/MapElement.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/MapElement.cs

diff --git a/Xamarin.Forms.Maps/MapSpan.cs b/Xamarin.Forms/Xamarin.Forms.Maps/MapSpan.cs
similarity index 100%
rename from Xamarin.Forms.Maps/MapSpan.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/MapSpan.cs

diff --git a/Xamarin.Forms.Maps/MapType.cs b/Xamarin.Forms/Xamarin.Forms.Maps/MapType.cs
similarity index 100%
rename from Xamarin.Forms.Maps/MapType.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/MapType.cs

diff --git a/Xamarin.Forms.Maps/Pin.cs b/Xamarin.Forms/Xamarin.Forms.Maps/Pin.cs
similarity index 100%
rename from Xamarin.Forms.Maps/Pin.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/Pin.cs

diff --git a/Xamarin.Forms.Maps/PinClickedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Maps/PinClickedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Maps/PinClickedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/PinClickedEventArgs.cs

diff --git a/Xamarin.Forms.Maps/PinType.cs b/Xamarin.Forms/Xamarin.Forms.Maps/PinType.cs
similarity index 100%
rename from Xamarin.Forms.Maps/PinType.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/PinType.cs

diff --git a/Xamarin.Forms.Maps/Polygon.cs b/Xamarin.Forms/Xamarin.Forms.Maps/Polygon.cs
similarity index 100%
rename from Xamarin.Forms.Maps/Polygon.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/Polygon.cs

diff --git a/Xamarin.Forms.Maps/Polyline.cs b/Xamarin.Forms/Xamarin.Forms.Maps/Polyline.cs
similarity index 100%
rename from Xamarin.Forms.Maps/Polyline.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/Polyline.cs

diff --git a/Xamarin.Forms.Maps/Position.cs b/Xamarin.Forms/Xamarin.Forms.Maps/Position.cs
similarity index 100%
rename from Xamarin.Forms.Maps/Position.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/Position.cs

diff --git a/Xamarin.Forms.Maps/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Maps/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Maps/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Maps/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Maps/Xamarin.Forms.Maps.csproj b/Xamarin.Forms/Xamarin.Forms.Maps/Xamarin.Forms.Maps.csproj
similarity index 100%
rename from Xamarin.Forms.Maps/Xamarin.Forms.Maps.csproj
rename to Xamarin.Forms/Xamarin.Forms.Maps/Xamarin.Forms.Maps.csproj

diff --git a/Xamarin.Forms.Material.Android/FormsMaterial.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/FormsMaterial.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/FormsMaterial.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/FormsMaterial.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialButtonRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialCheckBoxRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialColors.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialColors.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialColors.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialColors.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialContextThemeWrapper.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialDatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialDatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialDatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialDatePickerRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialEditorRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialEntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialEntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialEntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialEntryRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialFormsEditText.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsEditText.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialFormsEditText.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsEditText.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsEditTextBase.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsEditTextManager.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayout.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayout.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialFormsTextInputLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayout.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFormsTextInputLayoutBase.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialFrameRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialPickerEditText.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialPickerEditText.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialPickerEditText.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialPickerEditText.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialPickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialPickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialPickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialPickerRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialPickerTextInputLayout.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialPickerTextInputLayout.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialPickerTextInputLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialPickerTextInputLayout.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialSliderRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialStepperRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/MaterialTimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialTimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/MaterialTimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/MaterialTimePickerRenderer.cs

diff --git a/Xamarin.Forms.Material.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Material.Android/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Material.Android/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Material.Android/Resources/Layout/MaterialPickerTextInput.axml b/Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/Layout/MaterialPickerTextInput.axml
similarity index 100%
rename from Xamarin.Forms.Material.Android/Resources/Layout/MaterialPickerTextInput.axml
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/Layout/MaterialPickerTextInput.axml

diff --git a/Xamarin.Forms.Material.Android/Resources/Layout/TextInputLayoutFilledBox.axml b/Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/Layout/TextInputLayoutFilledBox.axml
similarity index 100%
rename from Xamarin.Forms.Material.Android/Resources/Layout/TextInputLayoutFilledBox.axml
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/Layout/TextInputLayoutFilledBox.axml

diff --git a/Xamarin.Forms.Material.Android/Resources/color/white_disabled_material.xml b/Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/color/white_disabled_material.xml
similarity index 100%
rename from Xamarin.Forms.Material.Android/Resources/color/white_disabled_material.xml
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/color/white_disabled_material.xml

diff --git a/Xamarin.Forms.Material.Android/Resources/drawable-v24/MaterialActivityIndicatorBackground.xml b/Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/drawable-v24/MaterialActivityIndicatorBackground.xml
similarity index 100%
rename from Xamarin.Forms.Material.Android/Resources/drawable-v24/MaterialActivityIndicatorBackground.xml
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/drawable-v24/MaterialActivityIndicatorBackground.xml

diff --git a/Xamarin.Forms.Material.Android/Resources/drawable/MaterialActivityIndicatorBackground.xml b/Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/drawable/MaterialActivityIndicatorBackground.xml
similarity index 100%
rename from Xamarin.Forms.Material.Android/Resources/drawable/MaterialActivityIndicatorBackground.xml
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/drawable/MaterialActivityIndicatorBackground.xml

diff --git a/Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml b/Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml
similarity index 100%
rename from Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/drawable/MaterialProgressBar.xml

diff --git a/Xamarin.Forms.Material.Android/Resources/values-v21/styles.xml b/Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/values-v21/styles.xml
similarity index 100%
rename from Xamarin.Forms.Material.Android/Resources/values-v21/styles.xml
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/values-v21/styles.xml

diff --git a/Xamarin.Forms.Material.Android/Resources/values/styles.xml b/Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/values/styles.xml
similarity index 100%
rename from Xamarin.Forms.Material.Android/Resources/values/styles.xml
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Resources/values/styles.xml

diff --git a/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj b/Xamarin.Forms/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
similarity index 100%
rename from Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
rename to Xamarin.Forms/Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj

diff --git a/Xamarin.Forms.Material.Tizen/FormsMaterial.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/FormsMaterial.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/FormsMaterial.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/FormsMaterial.cs

diff --git a/Xamarin.Forms.Material.Tizen/MaterialActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/MaterialActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/MaterialButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/MaterialButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialButtonRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/MaterialCheckBoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialCheckBoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/MaterialCheckBoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialCheckBoxRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/MaterialEntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialEntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/MaterialEntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialEntryRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/MaterialFrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialFrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/MaterialFrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialFrameRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/MaterialProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/MaterialProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/MaterialStepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialStepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/MaterialStepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/MaterialStepperRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/Native/MCanvas.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Native/MCanvas.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Native/MCanvas.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Native/MCanvas.cs

diff --git a/Xamarin.Forms.Material.Tizen/Shell/MaterialNavigationDrawer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialNavigationDrawer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Shell/MaterialNavigationDrawer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialNavigationDrawer.cs

diff --git a/Xamarin.Forms.Material.Tizen/Shell/MaterialNavigationView.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialNavigationView.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Shell/MaterialNavigationView.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialNavigationView.cs

diff --git a/Xamarin.Forms.Material.Tizen/Shell/MaterialShellItemRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellItemRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Shell/MaterialShellItemRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellItemRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/Shell/MaterialShellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Shell/MaterialShellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/Shell/MaterialShellSectionNavigation.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellSectionNavigation.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Shell/MaterialShellSectionNavigation.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellSectionNavigation.cs

diff --git a/Xamarin.Forms.Material.Tizen/Shell/MaterialShellSectionRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellSectionRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Shell/MaterialShellSectionRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellSectionRenderer.cs

diff --git a/Xamarin.Forms.Material.Tizen/Shell/MaterialShellTabs.cs b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellTabs.cs
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Shell/MaterialShellTabs.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Shell/MaterialShellTabs.cs

diff --git a/Xamarin.Forms.Material.Tizen/Xamarin.Forms.Material.Tizen.csproj b/Xamarin.Forms/Xamarin.Forms.Material.Tizen/Xamarin.Forms.Material.Tizen.csproj
similarity index 100%
rename from Xamarin.Forms.Material.Tizen/Xamarin.Forms.Material.Tizen.csproj
rename to Xamarin.Forms/Xamarin.Forms.Material.Tizen/Xamarin.Forms.Material.Tizen.csproj

diff --git a/Xamarin.Forms.Material.iOS/FormsMaterial.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/FormsMaterial.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/FormsMaterial.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/FormsMaterial.cs

diff --git a/Xamarin.Forms.Material.iOS/IMaterialEntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/IMaterialEntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/IMaterialEntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/IMaterialEntryRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/IMaterialTextField.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/IMaterialTextField.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/IMaterialTextField.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/IMaterialTextField.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialButtonRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialCheckboxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialCheckboxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialCheckboxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialCheckboxRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialDatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialDatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialDatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialDatePickerRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialEditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialEditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialEditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialEditorRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialEntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialEntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialEntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialEntryRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialFormsCheckBox.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialFormsCheckBox.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialFormsCheckBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialFormsCheckBox.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialFrameRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialMultiLineTextField.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialMultiLineTextField.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialMultiLineTextField.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialMultiLineTextField.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialPickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialPickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialPickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialPickerRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialSliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialSliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialSliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialSliderRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialStepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialStepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialStepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialStepperRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialTextField.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialTextField.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialTextField.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialTextField.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialTextManager.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialTextManager.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialTextManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialTextManager.cs

diff --git a/Xamarin.Forms.Material.iOS/MaterialTimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialTimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/MaterialTimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/MaterialTimePickerRenderer.cs

diff --git a/Xamarin.Forms.Material.iOS/NoCaretMaterialTextField.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/NoCaretMaterialTextField.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/NoCaretMaterialTextField.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/NoCaretMaterialTextField.cs

diff --git a/Xamarin.Forms.Material.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Material.iOS/ReadOnlyMaterialTextField.cs b/Xamarin.Forms/Xamarin.Forms.Material.iOS/ReadOnlyMaterialTextField.cs
similarity index 100%
rename from Xamarin.Forms.Material.iOS/ReadOnlyMaterialTextField.cs
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/ReadOnlyMaterialTextField.cs

diff --git a/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj b/Xamarin.Forms/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
similarity index 100%
rename from Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
rename to Xamarin.Forms/Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj

diff --git a/Xamarin.Forms.Pages.Azure/AzureDataSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages.Azure/AzureDataSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages.Azure/AzureDataSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages.Azure/AzureDataSource.cs

diff --git a/Xamarin.Forms.Pages.Azure/AzureEasyTableSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages.Azure/AzureEasyTableSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages.Azure/AzureEasyTableSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages.Azure/AzureEasyTableSource.cs

diff --git a/Xamarin.Forms.Pages.Azure/AzureSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages.Azure/AzureSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages.Azure/AzureSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages.Azure/AzureSource.cs

diff --git a/Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj b/Xamarin.Forms/Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj
similarity index 100%
rename from Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj
rename to Xamarin.Forms/Xamarin.Forms.Pages.Azure/Xamarin.Forms.Pages.Azure.csproj

diff --git a/Xamarin.Forms.Pages.UnitTests/DataPageTests.cs b/Xamarin.Forms/Xamarin.Forms.Pages.UnitTests/DataPageTests.cs
similarity index 100%
rename from Xamarin.Forms.Pages.UnitTests/DataPageTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages.UnitTests/DataPageTests.cs

diff --git a/Xamarin.Forms.Pages.UnitTests/DataSourceListTests.cs b/Xamarin.Forms/Xamarin.Forms.Pages.UnitTests/DataSourceListTests.cs
similarity index 100%
rename from Xamarin.Forms.Pages.UnitTests/DataSourceListTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages.UnitTests/DataSourceListTests.cs

diff --git a/Xamarin.Forms.Pages.UnitTests/IntegrationTests.cs b/Xamarin.Forms/Xamarin.Forms.Pages.UnitTests/IntegrationTests.cs
similarity index 100%
rename from Xamarin.Forms.Pages.UnitTests/IntegrationTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages.UnitTests/IntegrationTests.cs

diff --git a/Xamarin.Forms.Pages.UnitTests/Xamarin.Forms.Pages.UnitTests.csproj b/Xamarin.Forms/Xamarin.Forms.Pages.UnitTests/Xamarin.Forms.Pages.UnitTests.csproj
similarity index 100%
rename from Xamarin.Forms.Pages.UnitTests/Xamarin.Forms.Pages.UnitTests.csproj
rename to Xamarin.Forms/Xamarin.Forms.Pages.UnitTests/Xamarin.Forms.Pages.UnitTests.csproj

diff --git a/Xamarin.Forms.Pages/BaseDataSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages/BaseDataSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages/BaseDataSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/BaseDataSource.cs

diff --git a/Xamarin.Forms.Pages/CardView.cs b/Xamarin.Forms/Xamarin.Forms.Pages/CardView.cs
similarity index 100%
rename from Xamarin.Forms.Pages/CardView.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/CardView.cs

diff --git a/Xamarin.Forms.Pages/CompoundCollection.cs b/Xamarin.Forms/Xamarin.Forms.Pages/CompoundCollection.cs
similarity index 100%
rename from Xamarin.Forms.Pages/CompoundCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/CompoundCollection.cs

diff --git a/Xamarin.Forms.Pages/DataItem.cs b/Xamarin.Forms/Xamarin.Forms.Pages/DataItem.cs
similarity index 100%
rename from Xamarin.Forms.Pages/DataItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/DataItem.cs

diff --git a/Xamarin.Forms.Pages/DataPage.cs b/Xamarin.Forms/Xamarin.Forms.Pages/DataPage.cs
similarity index 100%
rename from Xamarin.Forms.Pages/DataPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/DataPage.cs

diff --git a/Xamarin.Forms.Pages/DataSourceBinding.cs b/Xamarin.Forms/Xamarin.Forms.Pages/DataSourceBinding.cs
similarity index 100%
rename from Xamarin.Forms.Pages/DataSourceBinding.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/DataSourceBinding.cs

diff --git a/Xamarin.Forms.Pages/DataSourceBindingExtension.cs b/Xamarin.Forms/Xamarin.Forms.Pages/DataSourceBindingExtension.cs
similarity index 100%
rename from Xamarin.Forms.Pages/DataSourceBindingExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/DataSourceBindingExtension.cs

diff --git a/Xamarin.Forms.Pages/DataSourceList.cs b/Xamarin.Forms/Xamarin.Forms.Pages/DataSourceList.cs
similarity index 100%
rename from Xamarin.Forms.Pages/DataSourceList.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/DataSourceList.cs

diff --git a/Xamarin.Forms.Pages/DataView.cs b/Xamarin.Forms/Xamarin.Forms.Pages/DataView.cs
similarity index 100%
rename from Xamarin.Forms.Pages/DataView.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/DataView.cs

diff --git a/Xamarin.Forms.Pages/DirectoryPage.cs b/Xamarin.Forms/Xamarin.Forms.Pages/DirectoryPage.cs
similarity index 100%
rename from Xamarin.Forms.Pages/DirectoryPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/DirectoryPage.cs

diff --git a/Xamarin.Forms.Pages/HeroImage.cs b/Xamarin.Forms/Xamarin.Forms.Pages/HeroImage.cs
similarity index 100%
rename from Xamarin.Forms.Pages/HeroImage.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/HeroImage.cs

diff --git a/Xamarin.Forms.Pages/IDataItem.cs b/Xamarin.Forms/Xamarin.Forms.Pages/IDataItem.cs
similarity index 100%
rename from Xamarin.Forms.Pages/IDataItem.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/IDataItem.cs

diff --git a/Xamarin.Forms.Pages/IDataSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages/IDataSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages/IDataSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/IDataSource.cs

diff --git a/Xamarin.Forms.Pages/IDataSourceProvider.cs b/Xamarin.Forms/Xamarin.Forms.Pages/IDataSourceProvider.cs
similarity index 100%
rename from Xamarin.Forms.Pages/IDataSourceProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/IDataSourceProvider.cs

diff --git a/Xamarin.Forms.Pages/JsonDataSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages/JsonDataSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages/JsonDataSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/JsonDataSource.cs

diff --git a/Xamarin.Forms.Pages/JsonSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages/JsonSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages/JsonSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/JsonSource.cs

diff --git a/Xamarin.Forms.Pages/JsonSourceConverter.cs b/Xamarin.Forms/Xamarin.Forms.Pages/JsonSourceConverter.cs
similarity index 100%
rename from Xamarin.Forms.Pages/JsonSourceConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/JsonSourceConverter.cs

diff --git a/Xamarin.Forms.Pages/ListDataPage.cs b/Xamarin.Forms/Xamarin.Forms.Pages/ListDataPage.cs
similarity index 100%
rename from Xamarin.Forms.Pages/ListDataPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/ListDataPage.cs

diff --git a/Xamarin.Forms.Pages/ListItemControl.cs b/Xamarin.Forms/Xamarin.Forms.Pages/ListItemControl.cs
similarity index 100%
rename from Xamarin.Forms.Pages/ListItemControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/ListItemControl.cs

diff --git a/Xamarin.Forms.Pages/PersonDetailPage.cs b/Xamarin.Forms/Xamarin.Forms.Pages/PersonDetailPage.cs
similarity index 100%
rename from Xamarin.Forms.Pages/PersonDetailPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/PersonDetailPage.cs

diff --git a/Xamarin.Forms.Pages/StringJsonSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages/StringJsonSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages/StringJsonSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/StringJsonSource.cs

diff --git a/Xamarin.Forms.Pages/UriJsonSource.cs b/Xamarin.Forms/Xamarin.Forms.Pages/UriJsonSource.cs
similarity index 100%
rename from Xamarin.Forms.Pages/UriJsonSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Pages/UriJsonSource.cs

diff --git a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj b/Xamarin.Forms/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj
similarity index 100%
rename from Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj
rename to Xamarin.Forms/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj

diff --git a/Xamarin.Forms.Platform.Android.AppLinks/AndroidAppLinks.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/AndroidAppLinks.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android.AppLinks/AndroidAppLinks.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/AndroidAppLinks.cs

diff --git a/Xamarin.Forms.Platform.Android.AppLinks/ContextExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/ContextExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android.AppLinks/ContextExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/ContextExtensions.cs

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/AboutResources.txt b/Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/Resources/AboutResources.txt
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/AboutResources.txt
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/Resources/AboutResources.txt

diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Resources/values/Strings.xml b/Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/Resources/values/Strings.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android.AppLinks/Resources/values/Strings.xml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/Resources/values/Strings.xml

diff --git a/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj

diff --git a/Xamarin.Forms.Platform.Android.FormsViewGroup/Jars/formsviewgroup.jar b/Xamarin.Forms/Xamarin.Forms.Platform.Android.FormsViewGroup/Jars/formsviewgroup.jar
similarity index 100%
rename from Xamarin.Forms.Platform.Android.FormsViewGroup/Jars/formsviewgroup.jar
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.FormsViewGroup/Jars/formsviewgroup.jar

diff --git a/Xamarin.Forms.Platform.Android.FormsViewGroup/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android.FormsViewGroup/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android.FormsViewGroup/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.FormsViewGroup/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Platform.Android.FormsViewGroup/Transforms/Metadata.xml b/Xamarin.Forms/Xamarin.Forms.Platform.Android.FormsViewGroup/Transforms/Metadata.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android.FormsViewGroup/Transforms/Metadata.xml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.FormsViewGroup/Transforms/Metadata.xml

diff --git a/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android.FormsViewGroup/Xamarin.Forms.Platform.Android.FormsViewGroup.csproj

diff --git a/Xamarin.Forms.Platform.Android/ActivityResultCallbackRegistry.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ActivityResultCallbackRegistry.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ActivityResultCallbackRegistry.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ActivityResultCallbackRegistry.cs

diff --git a/Xamarin.Forms.Platform.Android/AndroidActivity.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidActivity.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AndroidActivity.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidActivity.cs

diff --git a/Xamarin.Forms.Platform.Android/AndroidAppIndexProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidAppIndexProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AndroidAppIndexProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidAppIndexProvider.cs

diff --git a/Xamarin.Forms.Platform.Android/AndroidApplicationLifecycleState.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidApplicationLifecycleState.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AndroidApplicationLifecycleState.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidApplicationLifecycleState.cs

diff --git a/Xamarin.Forms.Platform.Android/AndroidTicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidTicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AndroidTicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidTicker.cs

diff --git a/Xamarin.Forms.Platform.Android/AndroidTitleBarVisibility.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidTitleBarVisibility.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AndroidTitleBarVisibility.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AndroidTitleBarVisibility.cs

diff --git a/Xamarin.Forms.Platform.Android/Anticipator.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Anticipator.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Anticipator.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Anticipator.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/CarouselPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxDesignerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/CheckBoxRendererBase.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FormsFragmentPagerAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FormsViewPager.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FragmentContainer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ILifeCycleState.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ILifeCycleState.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/ILifeCycleState.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ILifeCycleState.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/IManageFragments.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ImageButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailContainer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/MasterDetailPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/PageExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/PickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/PickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/PickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/PickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/Platform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/Platform.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/Resource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/Resource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/Resource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/Resource.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ShellFragmentContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ShellFragmentContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/ShellFragmentContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ShellFragmentContainer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/SwitchRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/TabbedPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/AppCompat/ViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/AppCompat/ViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/AppCompat/ViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/BackgroundManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/BackgroundManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/BackgroundManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/BackgroundManager.cs

diff --git a/Xamarin.Forms.Platform.Android/BorderBackgroundManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/BorderBackgroundManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/BorderBackgroundManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/BorderBackgroundManager.cs

diff --git a/Xamarin.Forms.Platform.Android/ButtonElementManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ButtonElementManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ButtonElementManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ButtonElementManager.cs

diff --git a/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ButtonLayoutManager.cs

diff --git a/Xamarin.Forms.Platform.Android/CellAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CellAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CellAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CellAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/BaseCellView.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/CellFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/CellFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/CellFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/CellFactory.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/CellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/CellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/CellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/CellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/EntryCellEditText.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/EntryCellEditText.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/EntryCellEditText.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/EntryCellEditText.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/EntryCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/EntryCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/EntryCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/EntryCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/EntryCellView.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/ImageCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/ImageCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/ImageCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/ImageCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/SwitchCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/SwitchCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/SwitchCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/SwitchCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/SwitchCellView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/SwitchCellView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/SwitchCellView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/SwitchCellView.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/TextCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/TextCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/TextCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/TextCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Cells/ViewCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/AdapterNotifier.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/CarouselSpacingItemDecoration.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/CenterSnapHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/CollectionViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/CollectionViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/CollectionViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/CollectionViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/DataChangeObserver.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EdgeSnapHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EmptySource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EmptySource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/EmptySource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EmptySource.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EndSingleSnapHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/EndSnapHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/GridLayoutSpanSizeLookup.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/GroupableItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ICollectionChangedNotifier.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ICollectionChangedNotifier.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ICollectionChangedNotifier.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ICollectionChangedNotifier.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/IItemsViewSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/IItemsViewSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/IItemsViewSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/IItemsViewSource.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/IndicatorViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/IndicatorViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/IndicatorViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/IndicatorViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemContentView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemContentView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ItemContentView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemContentView.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemViewType.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemViewType.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ItemViewType.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemViewType.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemsSourceFactory.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ListSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ListSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ListSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ListSource.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/NongreedySnapHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ObservableGroupedSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ObservableGroupedSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ObservableGroupedSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ObservableGroupedSource.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ObservableItemsSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ObservableItemsSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ObservableItemsSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ObservableItemsSource.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/PropertyChangedEventArgsExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/PropertyChangedEventArgsExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/PropertyChangedEventArgsExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/PropertyChangedEventArgsExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/RecyclerViewScrollListener.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/ScrollHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SelectableItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SelectableViewHolder.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SimpleViewHolder.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SimpleViewHolder.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/SimpleViewHolder.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SimpleViewHolder.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SingleSnapHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SingleSnapHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/SingleSnapHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SingleSnapHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SizedItemContentView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SizedItemContentView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/SizedItemContentView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SizedItemContentView.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SpacingItemDecoration.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SpacingItemDecoration.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/SpacingItemDecoration.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/SpacingItemDecoration.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/StartSingleSnapHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/StartSingleSnapHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/StartSingleSnapHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/StartSingleSnapHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/StartSnapHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/StartSnapHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/StartSnapHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/StartSnapHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/StructuredItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/TemplatedItemViewHolder.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/TemplatedItemViewHolder.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/TemplatedItemViewHolder.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/TemplatedItemViewHolder.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/TextViewHolder.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/TextViewHolder.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/TextViewHolder.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/TextViewHolder.cs

diff --git a/Xamarin.Forms.Platform.Android/CollectionView/UngroupedItemsSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/UngroupedItemsSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/CollectionView/UngroupedItemsSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/CollectionView/UngroupedItemsSource.cs

diff --git a/Xamarin.Forms.Platform.Android/ColorExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ColorExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ColorExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ColorExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/ContextExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ContextExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ContextExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ContextExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Deserializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Deserializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Deserializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Deserializer.cs

diff --git a/Xamarin.Forms.Platform.Android/ElementChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ElementChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ElementChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ElementChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Android/Elevation.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Elevation.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Elevation.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Elevation.cs

diff --git a/Xamarin.Forms.Platform.Android/EntryAccessibilityDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/EntryAccessibilityDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/EntryAccessibilityDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/EntryAccessibilityDelegate.cs

diff --git a/Xamarin.Forms.Platform.iOS/ExportCellAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ExportCellAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ExportCellAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ExportCellAttribute.cs

diff --git a/Xamarin.Forms.Platform.iOS/ExportImageSourceHandlerAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ExportImageSourceHandlerAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ExportImageSourceHandlerAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ExportImageSourceHandlerAttribute.cs

diff --git a/Xamarin.Forms.Platform.Android/ExportRendererAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ExportRendererAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ExportRendererAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ExportRendererAttribute.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/AccessibilityExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/AccessibilityExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/AccessibilityExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/AccessibilityExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/DrawableExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/DrawableExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/DrawableExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/DrawableExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/EntryRendererExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/EntryRendererExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/EntryRendererExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/EntryRendererExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/FlowDirectionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/FlowDirectionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/FlowDirectionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/FlowDirectionExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/FragmentManagerExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/FragmentManagerExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/FragmentManagerExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/FragmentManagerExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/ImageViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/ImageViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/ImageViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/ImageViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/JavaObjectExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/JavaObjectExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/JavaObjectExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/JavaObjectExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/NativeBindingExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/NativeBindingExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/NativeBindingExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/NativeBindingExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/ScrollViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/ScrollViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/ScrollViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/ScrollViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/TextAlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/TextAlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/TextAlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/TextAlignmentExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Extensions/TextViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/TextViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Extensions/TextViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Extensions/TextViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/AutomationPropertiesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/AutomationPropertiesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FastRenderers/AutomationPropertiesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/AutomationPropertiesProvider.cs

diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/EffectControlProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/EffectControlProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FastRenderers/EffectControlProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/EffectControlProvider.cs

diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ImageElementManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/ImageElementManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FastRenderers/ImageElementManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/ImageElementManager.cs

diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/ImageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/VisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/VisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FastRenderers/VisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FastRenderers/VisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Flags.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Flags.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Flags.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Flags.cs

diff --git a/Xamarin.Forms.Platform.Android/Forms.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Forms.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Forms.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Forms.cs

diff --git a/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/FormsApplicationActivity.cs

diff --git a/Xamarin.Forms.Platform.Android/GenericGlobalLayoutListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/GenericGlobalLayoutListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/GenericGlobalLayoutListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/GenericGlobalLayoutListener.cs

diff --git a/Xamarin.Forms.Platform.Android/GenericMenuClickListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/GenericMenuClickListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/GenericMenuClickListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/GenericMenuClickListener.cs

diff --git a/Xamarin.Forms.Platform.Android/GestureManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/GestureManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/GestureManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/GestureManager.cs

diff --git a/Xamarin.Forms.Platform.Android/GetDesiredSizeDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/GetDesiredSizeDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/GetDesiredSizeDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/GetDesiredSizeDelegate.cs

diff --git a/Xamarin.Forms.Platform.Android/IBorderVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IBorderVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IBorderVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IBorderVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IButtonLayoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/IDeviceInfoProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IDeviceInfoProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IDeviceInfoProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IDeviceInfoProvider.cs

diff --git a/Xamarin.Forms.Platform.Android/IDisposedState.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IDisposedState.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IDisposedState.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IDisposedState.cs

diff --git a/Xamarin.Forms.Platform.Android/ILayoutChanges.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ILayoutChanges.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ILayoutChanges.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ILayoutChanges.cs

diff --git a/Xamarin.Forms.Platform.Android/IPickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IPickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IPickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IPickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/IPlatformLayout.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IPlatformLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IPlatformLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IPlatformLayout.cs

diff --git a/Xamarin.Forms.Platform.Android/IScrollView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IScrollView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IScrollView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IScrollView.cs

diff --git a/Xamarin.Forms.Platform.Android/IStepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IStepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IStepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IStepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/ITabStop.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ITabStop.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ITabStop.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ITabStop.cs

diff --git a/Xamarin.Forms.Platform.Android/IVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/IVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/IVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/IVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/ImageCache.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ImageCache.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ImageCache.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ImageCache.cs

diff --git a/Xamarin.Forms.Platform.Android/InnerGestureListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/InnerGestureListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/InnerGestureListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/InnerGestureListener.cs

diff --git a/Xamarin.Forms.Platform.Android/InnerScaleListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/InnerScaleListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/InnerScaleListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/InnerScaleListener.cs

diff --git a/Xamarin.Forms.Platform.Android/KeyboardManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/KeyboardManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/KeyboardManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/KeyboardManager.cs

diff --git a/Xamarin.Forms.Platform.Android/LayoutExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/LayoutExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/LayoutExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/LayoutExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/MeasureSpecFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/MeasureSpecFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/MeasureSpecFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/MeasureSpecFactory.cs

diff --git a/Xamarin.Forms.Platform.Android/NativeBindingservice.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/NativeBindingservice.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/NativeBindingservice.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/NativeBindingservice.cs

diff --git a/Xamarin.Forms.Platform.Android/NativeValueConverterService.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/NativeValueConverterService.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/NativeValueConverterService.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/NativeValueConverterService.cs

diff --git a/Xamarin.Forms.Platform.Android/NativeViewWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/NativeViewWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/NativeViewWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/NativeViewWrapper.cs

diff --git a/Xamarin.Forms.Platform.Android/NativeViewWrapperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/NativeViewWrapperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/NativeViewWrapperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/NativeViewWrapperRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/OnLayoutDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/OnLayoutDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/OnLayoutDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/OnLayoutDelegate.cs

diff --git a/Xamarin.Forms.Platform.Android/OnMeasureDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/OnMeasureDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/OnMeasureDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/OnMeasureDelegate.cs

diff --git a/Xamarin.Forms.Platform.Android/PanGestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/PanGestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/PanGestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/PanGestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/PickerManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/PickerManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/PickerManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/PickerManager.cs

diff --git a/Xamarin.Forms.Platform.Android/PinchGestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/PinchGestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/PinchGestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/PinchGestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Platform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Platform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Platform.cs

diff --git a/Xamarin.Forms.Platform.Android/PlatformConfigurationExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/PlatformConfigurationExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/PlatformConfigurationExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/PlatformConfigurationExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/PlatformEffect.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/PlatformEffect.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/PlatformEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/PlatformEffect.cs

diff --git a/Xamarin.Forms.Platform.Android/PlatformRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/PlatformRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/PlatformRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/PlatformRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/PopupManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/PopupManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/PopupManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/PopupManager.cs

diff --git a/Xamarin.Forms.Platform.Android/PowerSaveModeBroadcastReceiver.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/PowerSaveModeBroadcastReceiver.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/PowerSaveModeBroadcastReceiver.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/PowerSaveModeBroadcastReceiver.cs

diff --git a/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Platform.Android/RendererFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/RendererFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/RendererFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/RendererFactory.cs

diff --git a/Xamarin.Forms.Platform.Android/RendererPool.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/RendererPool.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/RendererPool.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/RendererPool.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/AHorizontalScrollView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/AHorizontalScrollView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/AHorizontalScrollView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/AHorizontalScrollView.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ActionSheetRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ActionSheetRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ActionSheetRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ActionSheetRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/AlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/AlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/AlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/AlignmentExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/AndroidGIFImageParser.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/AndroidGIFImageParser.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/AndroidGIFImageParser.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/AndroidGIFImageParser.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/BorderDrawable.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/BorderDrawable.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/BorderDrawable.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/BorderDrawable.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/BoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/BoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/BoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/BoxRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/CarouselPageAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/CarouselPageAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/CarouselPageAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/CarouselPageAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/CarouselPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/CircularProgress.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/CircularProgress.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/CircularProgress.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/CircularProgress.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ColorChangeRevealDrawable.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ColorChangeRevealDrawable.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ColorChangeRevealDrawable.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ColorChangeRevealDrawable.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ConditionalFocusLayout.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ConditionalFocusLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ConditionalFocusLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ConditionalFocusLayout.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ContainerView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ContainerView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ContainerView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ContainerView.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/CustomFrameLayout.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/CustomFrameLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/CustomFrameLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/CustomFrameLayout.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/DatePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/DescendantFocusToggler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/DescendantFocusToggler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/DescendantFocusToggler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/DescendantFocusToggler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ElementSelectedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ElementSelectedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ElementSelectedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ElementSelectedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FileImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FileImageSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FileImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FileImageSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FontExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FontExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FontExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FontExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FontImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FontImageSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FontImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FontImageSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormattedStringExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormattedStringExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FormattedStringExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormattedStringExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormsEditText.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsEditText.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FormsEditText.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsEditText.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormsImageView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsImageView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FormsImageView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsImageView.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormsSeekBar.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsSeekBar.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FormsSeekBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsSeekBar.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormsTextView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsTextView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FormsTextView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsTextView.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormsWebChromeClient.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsWebChromeClient.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FormsWebChromeClient.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsWebChromeClient.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FormsWebViewClient.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/GenericAnimatorListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/GenericAnimatorListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/GenericAnimatorListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/GenericAnimatorListener.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/GroupedListViewAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/GroupedListViewAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/GroupedListViewAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/GroupedListViewAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IAnimationSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IAnimationSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IAnimationSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IAnimationSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IDescendantFocusToggler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IDescendantFocusToggler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IDescendantFocusToggler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IDescendantFocusToggler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IFormsEditText.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IFormsEditText.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IFormsEditText.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IFormsEditText.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IImageSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IImageSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IImageViewHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IImageViewHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IImageViewHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IImageViewHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IOrderedTraversalController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IOrderedTraversalController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IOrderedTraversalController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IOrderedTraversalController.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IPopupTrigger.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IPopupTrigger.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IPopupTrigger.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IPopupTrigger.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellBottomNavigationViewAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellBottomNavigationViewAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellBottomNavigationViewAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellBottomNavigationViewAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellContext.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellContext.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellContext.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellFlyoutContentRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellFlyoutContentRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellFlyoutContentRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellFlyoutContentRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellFlyoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellFlyoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellFlyoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellFlyoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellItemRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellItemRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellItemRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellItemRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellObservableFragment.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellObservableFragment.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellObservableFragment.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellObservableFragment.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellSearchView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellSearchView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellSearchView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellSearchView.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellSectionRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellSectionRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellSectionRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellSectionRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellTabLayoutAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellTabLayoutAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellTabLayoutAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellTabLayoutAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellToolbarAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/IShellToolbarTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/IShellToolbarTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ImageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ImageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ImageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ImageExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ImageLoaderSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ImageLoaderSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ImageLoaderSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ImageLoaderSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ImageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/KeyboardExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/KeyboardExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/KeyboardExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/KeyboardExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/LabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/LabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/LabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/LabelRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ListViewAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ListViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/LocalizedDigitsKeyListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/LocalizedDigitsKeyListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/LocalizedDigitsKeyListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/LocalizedDigitsKeyListener.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/MasterDetailContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/MasterDetailContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/MasterDetailContainer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/MasterDetailRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/MotionEventHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/MotionEventHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/MotionEventHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/MotionEventHelper.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/NavigationRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ObjectJavaBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ObjectJavaBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ObjectJavaBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ObjectJavaBox.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/OpenGLViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/OpenGLViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/OpenGLViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/OpenGLViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/PageContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/PageContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/PageContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/PageContainer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/PageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/PickerEditText.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/PickerEditText.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/PickerEditText.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/PickerEditText.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/PickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/RefreshViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/RefreshViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/RefreshViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/RefreshViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ScrollViewContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ScrollViewContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ScrollViewContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ScrollViewContainer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ScrollViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ScrollViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ScrollViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/SearchBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SearchBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/SearchBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SearchBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/SearchHandlerAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SearchHandlerAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/SearchHandlerAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SearchHandlerAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellBottomNavViewAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellBottomNavViewAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellBottomNavViewAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellBottomNavViewAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellContentFragment.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellContentFragment.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellContentFragment.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellContentFragment.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRecyclerAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRecyclerAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRecyclerAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRecyclerAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellFlyoutTemplatedContentRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellFragmentPagerAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellFragmentPagerAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellFragmentPagerAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellFragmentPagerAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellItemRendererBase.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellItemRendererBase.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellItemRendererBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellItemRendererBase.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellPageContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellPageContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellPageContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellPageContainer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellSearchView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellSearchView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellSearchView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellSearchView.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellSearchViewAdapter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellSearchViewAdapter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellSearchViewAdapter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellSearchViewAdapter.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellSectionRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellTabLayoutAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellTabLayoutAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellTabLayoutAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellTabLayoutAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellToolbarAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ShellToolbarTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/SliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/SliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SliderRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/StepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/StepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/StepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/StepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/StreamImagesourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/StreamImagesourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/StreamImagesourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/StreamImagesourceHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SwipeViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/SwitchRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/TabbedRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/TabbedRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/TabbedRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/TabbedRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/TableViewModelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/TableViewModelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/TableViewModelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/TableViewModelRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/TableViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/TableViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/TableViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/TableViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/TimePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ViewCellExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ViewCellExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ViewCellExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ViewCellExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/ViewGroupExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ViewGroupExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/ViewGroupExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/ViewGroupExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Renderers/WebViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/ResourceManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ResourceManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ResourceManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ResourceManager.cs

diff --git a/Xamarin.Forms.Platform.Android/Resources/Layout/BottomTabLayout.axml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/Layout/BottomTabLayout.axml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/Layout/BottomTabLayout.axml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/Layout/BottomTabLayout.axml

diff --git a/Xamarin.Forms.Platform.Android/Resources/Layout/FlyoutContent.axml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/Layout/FlyoutContent.axml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/Layout/FlyoutContent.axml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/Layout/FlyoutContent.axml

diff --git a/Xamarin.Forms.Platform.Android/Resources/Layout/RootLayout.axml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/Layout/RootLayout.axml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/Layout/RootLayout.axml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/Layout/RootLayout.axml

diff --git a/Xamarin.Forms.Platform.Android/Resources/Layout/ShellContent.axml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/Layout/ShellContent.axml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/Layout/ShellContent.axml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/Layout/ShellContent.axml

diff --git a/Xamarin.Forms.Platform.Android/Resources/anim/EnterFromLeft.xml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/anim/EnterFromLeft.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/anim/EnterFromLeft.xml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/anim/EnterFromLeft.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/anim/EnterFromRight.xml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/anim/EnterFromRight.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/anim/EnterFromRight.xml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/anim/EnterFromRight.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/anim/ExitToLeft.xml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/anim/ExitToLeft.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/anim/ExitToLeft.xml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/anim/ExitToLeft.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/anim/ExitToRight.xml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/anim/ExitToRight.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/anim/ExitToRight.xml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/anim/ExitToRight.xml

diff --git a/Xamarin.Forms.Platform.Android/Resources/values/styles.xml b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/values/styles.xml
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Resources/values/styles.xml
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Resources/values/styles.xml

diff --git a/Xamarin.Forms.Platform.Android/ResourcesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ResourcesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ResourcesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ResourcesProvider.cs

diff --git a/Xamarin.Forms.Platform.Android/StepperRendererManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/StepperRendererManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/StepperRendererManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/StepperRendererManager.cs

diff --git a/Xamarin.Forms.Platform.Android/StreamWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/StreamWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/StreamWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/StreamWrapper.cs

diff --git a/Xamarin.Forms.Platform.Android/SwipeGestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/SwipeGestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/SwipeGestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/SwipeGestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/TapGestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/TapGestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/TapGestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/TapGestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Android/TextColorSwitcher.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/TextColorSwitcher.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/TextColorSwitcher.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/TextColorSwitcher.cs

diff --git a/Xamarin.Forms.Platform.Android/TextViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/TextViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/TextViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/TextViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/ViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/ViewInitializedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ViewInitializedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ViewInitializedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ViewInitializedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Android/ViewPool.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ViewPool.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ViewPool.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ViewPool.cs

diff --git a/Xamarin.Forms.Platform.Android/ViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/ViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/ViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/VisualElementChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/VisualElementChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Android/VisualElementExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/VisualElementExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementExtensions.cs

diff --git a/Xamarin.Forms.Platform.Android/VisualElementPackager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementPackager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/VisualElementPackager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementPackager.cs

diff --git a/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/VisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.Android/VisualElementRendererFlags.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementRendererFlags.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/VisualElementRendererFlags.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementRendererFlags.cs

diff --git a/Xamarin.Forms.Platform.Android/VisualElementTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/VisualElementTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/VisualElementTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj

diff --git a/Xamarin.Forms.Platform.GTK/Animations/BaseAnimation.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Animations/BaseAnimation.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Animations/BaseAnimation.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Animations/BaseAnimation.cs

diff --git a/Xamarin.Forms.Platform.GTK/Animations/FloatAnimation.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Animations/FloatAnimation.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Animations/FloatAnimation.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Animations/FloatAnimation.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/CellBase.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/CellBase.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/CellBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/CellBase.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/CellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/CellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/CellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/CellRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/EntryCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/EntryCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/EntryCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/EntryCell.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/EntryCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/EntryCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/EntryCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/EntryCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/ImageCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/ImageCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/ImageCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/ImageCell.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/ImageCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/ImageCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/ImageCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/ImageCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/SwitchCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/SwitchCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/SwitchCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/SwitchCell.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/SwitchCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/SwitchCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/SwitchCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/SwitchCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/TextCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/TextCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/TextCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/TextCell.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/TextCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/TextCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/TextCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/TextCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/ViewCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/ViewCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/ViewCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/ViewCell.cs

diff --git a/Xamarin.Forms.Platform.GTK/Cells/ViewCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/ViewCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Cells/ViewCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Cells/ViewCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/ActivityIndicator.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ActivityIndicator.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/ActivityIndicator.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ActivityIndicator.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/BoxView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/BoxView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/BoxView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/BoxView.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/Carousel.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/Carousel.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/Carousel.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/Carousel.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/CustomComboBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/CustomComboBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/CustomComboBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/CustomComboBox.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/CustomFrame.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/CustomFrame.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/CustomFrame.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/CustomFrame.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/DatePicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/DatePicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/DatePicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/DatePicker.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/EntryWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/EntryWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/EntryWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/EntryWrapper.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/GLWidget/GLWidget.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/GLWidget/GLWidget.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/GLWidget/GLWidget.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/GLWidget/GLWidget.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/GLWidget/OSX/OSXWindowInfoInitializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/GLWidget/OSX/OSXWindowInfoInitializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/GLWidget/OSX/OSXWindowInfoInitializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/GLWidget/OSX/OSXWindowInfoInitializer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/GLWidget/Win/WinWindowsInfoInitializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/GLWidget/Win/WinWindowsInfoInitializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/GLWidget/Win/WinWindowsInfoInitializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/GLWidget/Win/WinWindowsInfoInitializer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/GLWidget/X11/XWindowInfoInitializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/GLWidget/X11/XWindowInfoInitializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/GLWidget/X11/XWindowInfoInitializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/GLWidget/X11/XWindowInfoInitializer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/ImageButton.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ImageButton.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/ImageButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ImageButton.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/ImageControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ImageControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/ImageControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ImageControl.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/ListView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ListView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/ListView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ListView.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/MasterDetailPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/MasterDetailPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/MasterDetailPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/MasterDetailPage.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/NavigationChildPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/NavigationChildPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/NavigationChildPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/NavigationChildPage.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/NotebookWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/NotebookWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/NotebookWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/NotebookWrapper.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/OpenGLView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/OpenGLView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/OpenGLView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/OpenGLView.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/Page.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/Page.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/Page.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/Page.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/PageContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/PageContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/PageContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/PageContainer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/ScrolledTextView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ScrolledTextView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/ScrolledTextView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/ScrolledTextView.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/SearchEntry.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/SearchEntry.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/SearchEntry.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/SearchEntry.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/TabbedPageHeader.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/TabbedPageHeader.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/TabbedPageHeader.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/TabbedPageHeader.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/TableView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/TableView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/TableView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/TableView.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/TimePicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/TimePicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/TimePicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/TimePicker.cs

diff --git a/Xamarin.Forms.Platform.GTK/Controls/WebView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/WebView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Controls/WebView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Controls/WebView.cs

diff --git a/Xamarin.Forms.Platform.GTK/ElementChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/ElementChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/ElementChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/ElementChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.GTK/ExportCellAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/ExportCellAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/ExportCellAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/ExportCellAttribute.cs

diff --git a/Xamarin.Forms.Platform.GTK/ExportImageSourceHandlerAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/ExportImageSourceHandlerAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/ExportImageSourceHandlerAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/ExportImageSourceHandlerAttribute.cs

diff --git a/Xamarin.Forms.Platform.GTK/ExportRendererAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/ExportRendererAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/ExportRendererAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/ExportRendererAttribute.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/AlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/AlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/AlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/AlignmentExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/ButtonContentLayoutExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/ButtonContentLayoutExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/ButtonContentLayoutExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/ButtonContentLayoutExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/ColorExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/ColorExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/ColorExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/ColorExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/GtkRectangleExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/GtkRectangleExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/GtkRectangleExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/GtkRectangleExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/ImageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/ImageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/ImageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/ImageExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/LabelExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/LabelExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/LabelExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/LabelExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/PageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/PageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/PageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/PageExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/VisualElementExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/VisualElementExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/VisualElementExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/VisualElementExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Extensions/WidgetExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/WidgetExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Extensions/WidgetExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Extensions/WidgetExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/Forms.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Forms.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Forms.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Forms.cs

diff --git a/Xamarin.Forms.Platform.GTK/FormsWindow.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/FormsWindow.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/FormsWindow.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/FormsWindow.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkDeviceInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkDeviceInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkDeviceInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkDeviceInfo.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkExpressionSearch.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkExpressionSearch.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkExpressionSearch.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkExpressionSearch.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkFormsContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkFormsContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkFormsContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkFormsContainer.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkIsolatedStorageFile.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkIsolatedStorageFile.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkIsolatedStorageFile.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkIsolatedStorageFile.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkOpenGL.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkOpenGL.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkOpenGL.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkOpenGL.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkPlatformServices.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkPlatformServices.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkPlatformServices.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkPlatformServices.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkSerializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkSerializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkSerializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkSerializer.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkSynchronizationContext.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkSynchronizationContext.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkSynchronizationContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkSynchronizationContext.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkThemes.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkThemes.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkThemes.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkThemes.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkTicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkTicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkTicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkTicker.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkToolbarConstants.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkToolbarConstants.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkToolbarConstants.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkToolbarConstants.cs

diff --git a/Xamarin.Forms.Platform.GTK/GtkToolbarTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkToolbarTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/GtkToolbarTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/GtkToolbarTracker.cs

diff --git a/Xamarin.Forms.Platform.GTK/Helpers/DialogHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Helpers/DialogHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Helpers/DialogHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Helpers/DialogHelper.cs

diff --git a/Xamarin.Forms.Platform.GTK/Helpers/FontDescriptionHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Helpers/FontDescriptionHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Helpers/FontDescriptionHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Helpers/FontDescriptionHelper.cs

diff --git a/Xamarin.Forms.Platform.GTK/Helpers/GrabHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Helpers/GrabHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Helpers/GrabHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Helpers/GrabHelper.cs

diff --git a/Xamarin.Forms.Platform.GTK/Helpers/PlatformHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Helpers/PlatformHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Helpers/PlatformHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Helpers/PlatformHelper.cs

diff --git a/Xamarin.Forms.Platform.GTK/IDesiredSizeProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/IDesiredSizeProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/IDesiredSizeProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/IDesiredSizeProvider.cs

diff --git a/Xamarin.Forms.Platform.GTK/IVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/IVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/IVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/IVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/IVisualNativeElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/IVisualNativeElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/IVisualNativeElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/IVisualNativeElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/README.txt b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/README.txt
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/README.txt
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Libs/gtk-sharp/README.txt

diff --git a/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/README.txt b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/README.txt
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/README.txt
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/README.txt

diff --git a/Xamarin.Forms.Platform.GTK/webkit-sharp.dll.config b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/webkit-sharp.dll.config
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/webkit-sharp.dll.config
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/webkit-sharp.dll.config

diff --git a/Xamarin.Forms.Platform.GTK/Packagers/LayoutElementPackager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Packagers/LayoutElementPackager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Packagers/LayoutElementPackager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Packagers/LayoutElementPackager.cs

diff --git a/Xamarin.Forms.Platform.GTK/Packagers/PageElementPackager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Packagers/PageElementPackager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Packagers/PageElementPackager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Packagers/PageElementPackager.cs

diff --git a/Xamarin.Forms.Platform.GTK/Packagers/VisualElementPackager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Packagers/VisualElementPackager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Packagers/VisualElementPackager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Packagers/VisualElementPackager.cs

diff --git a/Xamarin.Forms.Platform.GTK/Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Platform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Platform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Platform.cs

diff --git a/Xamarin.Forms.Platform.GTK/PlatformConfigurationExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/PlatformConfigurationExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/PlatformConfigurationExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/PlatformConfigurationExtensions.cs

diff --git a/Xamarin.Forms.Platform.GTK/PlatformEffect.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/PlatformEffect.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/PlatformEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/PlatformEffect.cs

diff --git a/Xamarin.Forms.Platform.GTK/PlatformRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/PlatformRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/PlatformRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/PlatformRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Platform.GTK/RendererFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/RendererFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/RendererFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/RendererFactory.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/AbstractPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/AbstractPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/AbstractPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/AbstractPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/ActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/BoxViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/BoxViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/BoxViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/BoxViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/CarouselPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/CarouselPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/CarouselPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/DatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/DatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/DatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/DatePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/EditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/EditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/EditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/EditorRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/EntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/EntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/EntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/EntryRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/IPageControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/IPageControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/IPageControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/IPageControl.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/IToolbarTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/IToolbarTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/IToolbarTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/IToolbarTracker.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ImageRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/LabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/LabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/LabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/LabelRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/LayoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/LayoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/LayoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/LayoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/ListViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ListViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/ListViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ListViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/MasterDetailPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/MasterDetailPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/MasterDetailPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/MasterDetailPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/NavigationPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/NavigationPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/NavigationPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/OpenGLViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/OpenGLViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/OpenGLViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/OpenGLViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/PageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/PageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/PageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/PageRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/PickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/PickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/PickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/PickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/ProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ScrollViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/ScrollViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/ScrollViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/SearchBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/SearchBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/SearchBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/SearchBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/SliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/SliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/SliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/SliderRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/StepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/StepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/StepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/StepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/SwitchRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/TabbedPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/TabbedPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/TabbedPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/TabbedPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/TableViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/TableViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/TableViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/TableViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/TimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/TimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/TimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/TimePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Renderers/WebViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/WebViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Renderers/WebViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Renderers/WebViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/Resources/hamburger.png b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Resources/hamburger.png
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Resources/hamburger.png
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Resources/hamburger.png

diff --git a/Xamarin.Forms.Platform.GTK/ResourcesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/ResourcesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/ResourcesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/ResourcesProvider.cs

diff --git a/Xamarin.Forms.Platform.GTK/ViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/ViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/ViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/ViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/VisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/VisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/VisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/VisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.GTK/VisualElementTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/VisualElementTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/VisualElementTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/VisualElementTracker.cs

diff --git a/Xamarin.Forms.Platform.GTK/Xamarin.Forms.Platform.GTK.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/Xamarin.Forms.Platform.GTK.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Xamarin.Forms.Platform.GTK.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/Xamarin.Forms.Platform.GTK.csproj

diff --git a/Xamarin.Forms.Maps.GTK/app.config b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/app.config
similarity index 100%
rename from Xamarin.Forms.Maps.GTK/app.config
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/app.config

diff --git a/Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/webkit-sharp.dll.config b/Xamarin.Forms/Xamarin.Forms.Platform.GTK/webkit-sharp.dll.config
similarity index 100%
rename from Xamarin.Forms.Platform.GTK/Libs/webkit-sharp/webkit-sharp.dll.config
rename to Xamarin.Forms/Xamarin.Forms.Platform.GTK/webkit-sharp.dll.config

diff --git a/Xamarin.Forms.Platform.MacOS/CADisplayLinkTicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/CADisplayLinkTicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/CADisplayLinkTicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/CADisplayLinkTicker.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/CellNSView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/CellNSView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/CellNSView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/CellNSView.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/CellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/CellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/CellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/CellRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/EntryCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/EntryCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/EntryCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/EntryCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/ImageCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/ImageCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/ImageCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/ImageCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/NSTableViewCellStyle.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/NSTableViewCellStyle.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/NSTableViewCellStyle.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/NSTableViewCellStyle.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/SwitchCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/SwitchCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/SwitchCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/SwitchCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/TextCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/TextCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/TextCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/TextCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/ViewCellNSView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/ViewCellNSView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/ViewCellNSView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/ViewCellNSView.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Cells/ViewCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/ViewCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Cells/ViewCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Cells/ViewCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/FormsBoxView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsBoxView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/FormsBoxView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsBoxView.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/FormsImageView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsImageView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/FormsImageView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsImageView.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/FormsNSDatePicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsNSDatePicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/FormsNSDatePicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsNSDatePicker.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/FormsNSSlider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsNSSlider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/FormsNSSlider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsNSSlider.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/FormsPageControllerDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsPageControllerDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/FormsPageControllerDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/FormsPageControllerDelegate.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/MacOSOpenGLView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/MacOSOpenGLView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/MacOSOpenGLView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/MacOSOpenGLView.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/NavigationChildPageWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/NavigationChildPageWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/NavigationChildPageWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/NavigationChildPageWrapper.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/ScrollViewScrollChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/ScrollViewScrollChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/ScrollViewScrollChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/ScrollViewScrollChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Controls/VerticallyCenteredTextFieldCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/VerticallyCenteredTextFieldCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Controls/VerticallyCenteredTextFieldCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Controls/VerticallyCenteredTextFieldCell.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/AlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/AlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/AlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/AlignmentExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/ButtonExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/ButtonExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/ButtonExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/ButtonExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/FlowDirectionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/FlowDirectionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/FlowDirectionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/FlowDirectionExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/FontExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/FontExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/FontExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/FontExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/ImageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/ImageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/ImageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/ImageExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/NSAttributedStringExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSAttributedStringExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/NSAttributedStringExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSAttributedStringExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/NSButtonExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSButtonExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/NSButtonExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSButtonExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/NSImageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSImageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/NSImageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSImageExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/NSMenuExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSMenuExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/NSMenuExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSMenuExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/NSScrollViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSScrollViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/NSScrollViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSScrollViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/NSTableViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSTableViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/NSTableViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSTableViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/NSTextFieldExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSTextFieldExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/NSTextFieldExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSTextFieldExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/NSViewControllerExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSViewControllerExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/NSViewControllerExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/NSViewControllerExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Extensions/PageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/PageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Extensions/PageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Extensions/PageExtensions.cs

diff --git a/Xamarin.Forms.Platform.MacOS/FormsApplicationDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/FormsApplicationDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/FormsApplicationDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/FormsApplicationDelegate.cs

diff --git a/Xamarin.Forms.Platform.MacOS/ImageSourceHandlers.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/ImageSourceHandlers.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/ImageSourceHandlers.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/ImageSourceHandlers.cs

diff --git a/Xamarin.Forms.Platform.MacOS/MacDeviceInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/MacDeviceInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/MacDeviceInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/MacDeviceInfo.cs

diff --git a/Xamarin.Forms.Platform.MacOS/ModalPageTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/ModalPageTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/ModalPageTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/ModalPageTracker.cs

diff --git a/Xamarin.Forms.Platform.MacOS/NativeToolbarTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/NativeToolbarTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/NativeToolbarTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/NativeToolbarTracker.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Platform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Platform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Platform.cs

diff --git a/Xamarin.Forms.Platform.MacOS/PlatformNavigation.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/PlatformNavigation.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/PlatformNavigation.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/PlatformNavigation.cs

diff --git a/Xamarin.Forms.Platform.MacOS/PlatformRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/PlatformRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/PlatformRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/PlatformRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/ActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/BoxViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/BoxViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/BoxViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/BoxViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/CarouselPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/CarouselPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/CarouselPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/CheckBoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/CheckBoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/CheckBoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/CheckBoxRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/CustomNSTableHeaderView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/CustomNSTableHeaderView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/CustomNSTableHeaderView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/CustomNSTableHeaderView.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/DatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/DatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/DatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/DatePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/DefaultRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/DefaultRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/DefaultRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/DefaultRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/EditorRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/EntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/EntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/EntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/EntryRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/FlippedClipView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/FlippedClipView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/FlippedClipView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/FlippedClipView.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ImageRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/LayoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/LayoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/LayoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/LayoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ListViewDataSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ListViewDataSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/ListViewDataSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ListViewDataSource.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ListViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/MasterDetailPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/NSPageContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/NSPageContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/NSPageContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/NSPageContainer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/NavigationPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/OpenGLViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/OpenGLViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/OpenGLViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/OpenGLViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/PageControllerDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/PageControllerDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/PageControllerDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/PageControllerDelegate.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/PageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/PageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/PageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/PageRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/PickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/PickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/PickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/PickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/ProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ScrollViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/ScrollViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/ScrollViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/SearchBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/SearchBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/SearchBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/SearchBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/SliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/SliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/SliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/SliderRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/StepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/StepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/StepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/StepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/SwitchRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/TabbedPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/TableViewDataSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/TableViewDataSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/TableViewDataSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/TableViewDataSource.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/TableViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/TableViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/TableViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/TableViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/TimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/TimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/TimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/TimePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Renderers/WebViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj

diff --git a/Xamarin.Forms.Platform.Tizen/AdaptedFormsApplication.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/AdaptedFormsApplication.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/AdaptedFormsApplication.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/AdaptedFormsApplication.cs

diff --git a/Xamarin.Forms.Platform.Tizen/ApplicationLifecycle.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ApplicationLifecycle.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ApplicationLifecycle.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ApplicationLifecycle.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Cells/CellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/CellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Cells/CellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/CellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Cells/EntryCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/EntryCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Cells/EntryCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/EntryCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/ImageCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Cells/SwitchCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/SwitchCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Cells/SwitchCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/SwitchCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Cells/TextCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/TextCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Cells/TextCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/TextCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Cells/ViewCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/ViewCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Cells/ViewCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Cells/ViewCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Deserializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Deserializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Deserializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Deserializer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/ElementChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ElementChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ElementChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ElementChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Tizen/ExportCellAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ExportCellAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ExportCellAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ExportCellAttribute.cs

diff --git a/Xamarin.Forms.Platform.Tizen/ExportHandlerAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ExportHandlerAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ExportHandlerAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ExportHandlerAttribute.cs

diff --git a/Xamarin.Forms.Platform.Tizen/ExportImageSourceHandlerAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ExportImageSourceHandlerAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ExportImageSourceHandlerAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ExportImageSourceHandlerAttribute.cs

diff --git a/Xamarin.Forms.Platform.Tizen/ExportRendererAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ExportRendererAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ExportRendererAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ExportRendererAttribute.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/AccessibilityExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/AccessibilityExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/AccessibilityExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/AccessibilityExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/ColorExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/ColorExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/ColorExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/ColorExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/DensityIndependentPixelExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/DensityIndependentPixelExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/DensityIndependentPixelExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/DensityIndependentPixelExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/EntryExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/EntryExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/EntryExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/EntryExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/ImageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/ImageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/ImageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/ImageExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/KeyboardExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/LayoutExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/LayoutExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/LayoutExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/LayoutExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/NativeBindingExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/NativeBindingExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/NativeBindingExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/NativeBindingExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/PageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/PageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/PageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/PageExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/PlatformConfigurationExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/PlatformConfigurationExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/PlatformConfigurationExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/PlatformConfigurationExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/ScrollToPositionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/ScrollToPositionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/ScrollToPositionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/ScrollToPositionExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Extensions/TextAlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/TextAlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Extensions/TextAlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Extensions/TextAlignmentExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Flags.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Flags.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Flags.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Flags.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Forms.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Forms.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Forms.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Forms.cs

diff --git a/Xamarin.Forms.Platform.Tizen/FormsApplication.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/FormsApplication.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/FormsApplication.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/FormsApplication.cs

diff --git a/Xamarin.Forms.Platform.Tizen/GestureDetector.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/GestureDetector.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/GestureDetector.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/GestureDetector.cs

diff --git a/Xamarin.Forms.Platform.Tizen/GestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/GestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/GestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/GestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Tizen/IGestureController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/IGestureController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/IGestureController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/IGestureController.cs

diff --git a/Xamarin.Forms.Platform.Tizen/IMEApplication.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/IMEApplication.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/IMEApplication.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/IMEApplication.cs

diff --git a/Xamarin.Forms.Platform.Tizen/LightweightPlatform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/LightweightPlatform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/LightweightPlatform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/LightweightPlatform.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Log/ConsoleLogger.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/ConsoleLogger.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Log/ConsoleLogger.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/ConsoleLogger.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Log/DlogLogger.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/DlogLogger.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Log/DlogLogger.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/DlogLogger.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Log/ILogger.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/ILogger.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Log/ILogger.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/ILogger.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Log/Log.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/Log.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Log/Log.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/Log.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Log/XamarinLogListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/XamarinLogListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Log/XamarinLogListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Log/XamarinLogListener.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/BatchableExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/BatchableExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/BatchableExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/BatchableExtensions.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/BorderRectangle.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/BorderRectangle.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/BorderRectangle.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/BorderRectangle.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Box.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Box.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Box.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Box.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Button.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Button.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Button.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Button.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Canvas.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Canvas.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Canvas.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Canvas.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/CarouselView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/CarouselView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/CarouselView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/CarouselView.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/CollectionView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/CollectionView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/CollectionView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/CollectionView.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/EmptyItemAdaptor.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/EmptyItemAdaptor.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/EmptyItemAdaptor.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/EmptyItemAdaptor.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/GridLayoutManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/GridLayoutManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/GridLayoutManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/GridLayoutManager.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ICollectionViewLayoutManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ICollectionViewLayoutManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/ICollectionViewLayoutManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ICollectionViewLayoutManager.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ItemAdaptor.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ItemAdaptor.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/ItemAdaptor.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ItemAdaptor.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ItemTemplateAdaptor.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ItemTemplateAdaptor.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/ItemTemplateAdaptor.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ItemTemplateAdaptor.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/LinearLayoutManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/LinearLayoutManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/LinearLayoutManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/LinearLayoutManager.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/RecyclerPool.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/RecyclerPool.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/RecyclerPool.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/RecyclerPool.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ViewHolder.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ViewHolder.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/CollectionView/ViewHolder.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/CollectionView/ViewHolder.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/DateChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/DateChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/DateChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/DateChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/DateTimePicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/DateTimePicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/DateTimePicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/DateTimePicker.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/DateTimePickerDialog.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/DateTimePickerDialog.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/DateTimePickerDialog.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/DateTimePickerDialog.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Dialog.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Dialog.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Dialog.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Dialog.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/EditfieldEntry.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/EditfieldEntry.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/EditfieldEntry.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/EditfieldEntry.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Entry.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Entry.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Entry.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Entry.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/FormattedString.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/FormattedString.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/FormattedString.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/FormattedString.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/IBatchable.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IBatchable.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/IBatchable.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IBatchable.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/IButton.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IButton.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/IButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IButton.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/IContainable.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IContainable.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/IContainable.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IContainable.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/IDateTimeDialog.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IDateTimeDialog.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/IDateTimeDialog.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IDateTimeDialog.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/IEntry.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IEntry.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/IEntry.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IEntry.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/IMeasurable.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IMeasurable.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/IMeasurable.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/IMeasurable.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/ITextable.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/ITextable.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/ITextable.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/ITextable.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Image.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Image.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Image.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Image.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Keyboard.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Label.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Label.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Label.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Label.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/LayoutEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/LayoutEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/LayoutEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/LayoutEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/LineBreakMode.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/LineBreakMode.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/LineBreakMode.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/LineBreakMode.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/ListView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/ListView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/ListView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/ListView.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/MasterDetailPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/MasterDetailPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/MasterDetailPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/MasterDetailPage.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/ObservableCollection.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/ObservableCollection.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/ObservableCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/ObservableCollection.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Page.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Page.cs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Page.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Page.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/RoundRectangle.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/RoundRectangle.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/RoundRectangle.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/RoundRectangle.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Scroller.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Scroller.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Scroller.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Scroller.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/SearchBar.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/SearchBar.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/SearchBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/SearchBar.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Span.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Span.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Span.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Span.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/TableView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/TableView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/TableView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/TableView.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/TextAlignment.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/TextAlignment.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/TextAlignment.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/TextAlignment.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/TextHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/TextHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/TextHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/TextHelper.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/TitleViewPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/TitleViewPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/TitleViewPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/TitleViewPage.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/ToolbarItemButton.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/ToolbarItemButton.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/ToolbarItemButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/ToolbarItemButton.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchButton.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchButton.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Watch/WatchButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchButton.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDataTimePickerDialog.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDataTimePickerDialog.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDataTimePickerDialog.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDataTimePickerDialog.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDateTimePicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDateTimePicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDateTimePicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDateTimePicker.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDialog.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDialog.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDialog.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/Watch/WatchDialog.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Native/WebViewContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/WebViewContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Native/WebViewContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Native/WebViewContainer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/NativeBindingService.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/NativeBindingService.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/NativeBindingService.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/NativeBindingService.cs

diff --git a/Xamarin.Forms.Platform.Tizen/NativeValueConverterService.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/NativeValueConverterService.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/NativeValueConverterService.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/NativeValueConverterService.cs

diff --git a/Xamarin.Forms.Platform.Tizen/NativeViewWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/NativeViewWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/NativeViewWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/NativeViewWrapper.cs

diff --git a/Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/PanGestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/PinchGestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Platform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Platform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Platform.cs

diff --git a/Xamarin.Forms.Platform.Tizen/PlatformEffect.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/PlatformEffect.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/PlatformEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/PlatformEffect.cs

diff --git a/Xamarin.Forms.Platform.Tizen/PreloadedWindow.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/PreloadedWindow.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/PreloadedWindow.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/PreloadedWindow.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/BoxViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/CarouselPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/CarouselPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/CarouselPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/CarouselViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/CarouselViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/CarouselViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/CarouselViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/CustomFocusManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/CustomFocusManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/CustomFocusManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/CustomFocusManager.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/DefaultRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/DefaultRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/DefaultRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/DefaultRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/IVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/IVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/IVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/IVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ImageButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ImageButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ImageButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ImageButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ImageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/LayoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/LayoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/LayoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/LayoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ListViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ListViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ListViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ListViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/MasterDetailContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/MasterDetailContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/MasterDetailContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/MasterDetailContainer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/MasterDetailPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/MasterDetailPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/MasterDetailPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/MasterDetailPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/NativeViewWrapperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/NativeViewWrapperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/NativeViewWrapperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/NativeViewWrapperRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/NavigationPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/PageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/PageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/PageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/PageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/RefreshViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/RefreshViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/RefreshViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/RefreshViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ScrollViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ScrollViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ScrollViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/SearchBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/SearchBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/SearchBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/SearchBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/SliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/SliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/SliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/SliderRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/StepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/StepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/StepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/StepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/StructuredItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/StructuredItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/StructuredItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/StructuredItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/SwipeViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/SwipeViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/SwipeViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/SwipeViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/SwitchRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/TabbedPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/TableViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/TableViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/TableViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/TableViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/ViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/VisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/WebViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/WebViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Renderers/WebViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Renderers/WebViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Resource/arrow_left.png b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Resource/arrow_left.png
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Resource/arrow_left.png
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Resource/arrow_left.png

diff --git a/Xamarin.Forms.Platform.Tizen/Resource/dots_horizontal.png b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Resource/dots_horizontal.png
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Resource/dots_horizontal.png
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Resource/dots_horizontal.png

diff --git a/Xamarin.Forms.Platform.Tizen/Resource/menu.png b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Resource/menu.png
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Resource/menu.png
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Resource/menu.png

diff --git a/Xamarin.Forms.Platform.Tizen/Resource/refresh_48dp.png b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Resource/refresh_48dp.png
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Resource/refresh_48dp.png
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Resource/refresh_48dp.png

diff --git a/Xamarin.Forms.Platform.Tizen/ResourcePath.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ResourcePath.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ResourcePath.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ResourcePath.cs

diff --git a/Xamarin.Forms.Platform.Tizen/ResourcesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ResourcesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ResourcesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ResourcesProvider.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/IFlyoutController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/IFlyoutController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/IFlyoutController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/IFlyoutController.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/INavigationDrawer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/INavigationDrawer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/INavigationDrawer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/INavigationDrawer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/INavigationView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/INavigationView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/INavigationView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/INavigationView.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/IShellTabs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/IShellTabs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/IShellTabs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/IShellTabs.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/NavigationDrawer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/NavigationDrawer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/NavigationDrawer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/NavigationDrawer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/NavigationView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/NavigationView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/NavigationView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/NavigationView.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/ShellItemRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellItemRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/ShellItemRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellItemRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/ShellMoreToolbar.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellMoreToolbar.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/ShellMoreToolbar.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellMoreToolbar.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/ShellNavBar.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellNavBar.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/ShellNavBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellNavBar.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/ShellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/ShellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/ShellSectionNavigation.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellSectionNavigation.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/ShellSectionNavigation.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellSectionNavigation.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/ShellSectionRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellSectionRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/ShellSectionRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellSectionRenderer.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Shell/ShellTabs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellTabs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Shell/ShellTabs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Shell/ShellTabs.cs

diff --git a/Xamarin.Forms.Platform.Tizen/StaticRegistrar.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/StaticRegistrar.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/StaticRegistrar.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/StaticRegistrar.cs

diff --git a/Xamarin.Forms.Platform.Tizen/SwipeGestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/SwipeGestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/SwipeGestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/SwipeGestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/TapGestureHandler.cs

diff --git a/Xamarin.Forms.Platform.Tizen/TizenIsolatedStorageFile.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/TizenIsolatedStorageFile.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/TizenIsolatedStorageFile.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/TizenIsolatedStorageFile.cs

diff --git a/Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs

diff --git a/Xamarin.Forms.Platform.Tizen/TizenTitleBarVisibility.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/TizenTitleBarVisibility.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/TizenTitleBarVisibility.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/TizenTitleBarVisibility.cs

diff --git a/Xamarin.Forms.Platform.Tizen/ViewInitializedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ViewInitializedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/ViewInitializedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/ViewInitializedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Tizen/VisualElementChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/VisualElementChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/VisualElementChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/VisualElementChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.Tizen/VisualElementRendererFlags.cs b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/VisualElementRendererFlags.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/VisualElementRendererFlags.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/VisualElementRendererFlags.cs

diff --git a/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.Tizen/Xamarin.Forms.Platform.Tizen.csproj

diff --git a/Xamarin.Forms.Platform.UAP/AccessKeyHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/AccessKeyHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/AccessKeyHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/AccessKeyHelper.cs

diff --git a/Xamarin.Forms.Platform.UAP/AccessibilityExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/AccessibilityExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/AccessibilityExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/AccessibilityExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/ActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/AlertDialog.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/AlertDialog.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/AlertDialog.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/AlertDialog.cs

diff --git a/Xamarin.Forms.Platform.UAP/AlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/AlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/AlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/AlignmentExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/AutoSuggestStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/AutoSuggestStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/AutoSuggestStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/AutoSuggestStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/BackgroundTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/BackgroundTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/BackgroundTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/BackgroundTracker.cs

diff --git a/Xamarin.Forms.Platform.UAP/BoolToVisibilityConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/BoolToVisibilityConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/BoolToVisibilityConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/BoolToVisibilityConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/BoxViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/BoxViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/BoxViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/BoxViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/BrushHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/BrushHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/BrushHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/BrushHelpers.cs

diff --git a/Xamarin.Forms.Platform.UAP/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CarouselPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CarouselPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CarouselPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CarouselPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CaseConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CaseConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CaseConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CaseConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/CellControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CellControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CellControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CellControl.cs

diff --git a/Xamarin.Forms.Platform.UAP/CheckBoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CheckBoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CheckBoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CheckBoxRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollapseWhenEmptyConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollapseWhenEmptyConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollapseWhenEmptyConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollapseWhenEmptyConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/CollectionViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/CollectionViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/CollectionViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/CollectionViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/FormsGridView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/FormsGridView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/FormsGridView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/FormsGridView.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/FormsListView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/FormsListView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/FormsListView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/FormsListView.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/GroupFooterItemTemplateContext.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupFooterItemTemplateContext.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/GroupFooterItemTemplateContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupFooterItemTemplateContext.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/GroupHeaderStyleSelector.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupHeaderStyleSelector.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/GroupHeaderStyleSelector.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupHeaderStyleSelector.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/GroupTemplateContext.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupTemplateContext.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/GroupTemplateContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupTemplateContext.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/GroupableItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupableItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/GroupableItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupableItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/GroupedItemTemplateCollection.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupedItemTemplateCollection.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/GroupedItemTemplateCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/GroupedItemTemplateCollection.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/IEmptyView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/IEmptyView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/IEmptyView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/IEmptyView.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContext.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContext.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContext.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContextEnumerable.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContextEnumerable.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContextEnumerable.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContextEnumerable.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContextList.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContextList.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContextList.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemTemplateContextList.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewStyles.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewStyles.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewStyles.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ItemsViewStyles.xaml

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ObservableItemTemplateCollection.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ObservableItemTemplateCollection.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/ObservableItemTemplateCollection.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ObservableItemTemplateCollection.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ScrollHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ScrollHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/ScrollHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/ScrollHelpers.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/SelectableItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/SelectableItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/SelectableItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/SelectableItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/StructuredItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/TemplatedItemSourceFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/TemplatedItemSourceFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/CollectionView/TemplatedItemSourceFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/CollectionView/TemplatedItemSourceFactory.cs

diff --git a/Xamarin.Forms.Platform.UAP/ColorConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ColorConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ColorConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ColorConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/ColorExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ColorExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ColorExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ColorExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/DatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/DatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/DatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/DatePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/DefaultRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/DefaultRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/DefaultRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/DefaultRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/Dispatcher.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Dispatcher.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Dispatcher.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Dispatcher.cs

diff --git a/Xamarin.Forms.Platform.UAP/DispatcherProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/DispatcherProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/DispatcherProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/DispatcherProvider.cs

diff --git a/Xamarin.Forms.Platform.UAP/EditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/EditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/EditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/EditorRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/EntryCellTextBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/EntryCellTextBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/EntryCellTextBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/EntryCellTextBox.cs

diff --git a/Xamarin.Forms.Platform.UAP/EntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/EntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/EntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/EntryRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/ExportRendererAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ExportRendererAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ExportRendererAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ExportRendererAttribute.cs

diff --git a/Xamarin.Forms.Platform.UAP/Extensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Extensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Extensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Extensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/Extensions/ImageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Extensions/ImageExtensions.cs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Extensions/ImageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Extensions/ImageExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/FileImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FileImageSourceHandler.cs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FileImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FileImageSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.iOS/Flags.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Flags.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Flags.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Flags.cs

diff --git a/Xamarin.Forms.Platform.UAP/FlowDirectionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FlowDirectionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FlowDirectionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FlowDirectionExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/FontExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FontExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FontExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FontExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/FontImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FontImageSourceHandler.cs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FontImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FontImageSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.UAP/Forms.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Forms.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Forms.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Forms.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsButton.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsButton.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsButton.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsCancelButton.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCancelButton.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsCancelButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCancelButton.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsCheckBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCheckBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsCheckBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCheckBox.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsCheckBoxStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCheckBoxStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsCheckBoxStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCheckBoxStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/FormsComboBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsComboBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsComboBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsComboBox.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsCommandBar.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCommandBar.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsCommandBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCommandBar.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsCommandBarStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCommandBarStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsCommandBarStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsCommandBarStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/FormsEmbeddedPageWrapper.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsEmbeddedPageWrapper.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsEmbeddedPageWrapper.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsEmbeddedPageWrapper.xaml

diff --git a/Xamarin.Forms.Platform.UAP/FormsFlyout.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsFlyout.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsFlyout.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsFlyout.xaml

diff --git a/Xamarin.Forms.Platform.UAP/FormsFlyout.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsFlyout.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsFlyout.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsFlyout.xaml.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsPivot.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsPivot.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsPivot.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsPivot.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsPresenter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsPresenter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsPresenter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsPresenter.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsProgressBar.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsProgressBar.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsProgressBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsProgressBar.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsProgressBarStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsProgressBarStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsProgressBarStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsProgressBarStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/FormsSlider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsSlider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsSlider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsSlider.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsTextBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsTextBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsTextBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsTextBox.cs

diff --git a/Xamarin.Forms.Platform.UAP/FormsTextBoxStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsTextBoxStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsTextBoxStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsTextBoxStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/FormsUWP.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsUWP.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FormsUWP.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FormsUWP.cs

diff --git a/Xamarin.Forms.Platform.UAP/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/FrameworkElementExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/FrameworkElementExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/FrameworkElementExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/FrameworkElementExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/HeightConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/HeightConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/HeightConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/HeightConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/HorizontalTextAlignmentConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/HorizontalTextAlignmentConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/HorizontalTextAlignmentConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/HorizontalTextAlignmentConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/ICellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ICellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ICellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ICellRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/IDontGetFocus.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/IDontGetFocus.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/IDontGetFocus.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/IDontGetFocus.cs

diff --git a/Xamarin.Forms.Platform.UAP/IIconElementHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/IIconElementHandler.cs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/IIconElementHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/IIconElementHandler.cs

diff --git a/Xamarin.Forms.Platform.UAP/IImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/IImageSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/IImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/IImageSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.UAP/IImageVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/IImageVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/IImageVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/IImageVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/ITabStopOnDescendants.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITabStopOnDescendants.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ITabStopOnDescendants.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITabStopOnDescendants.cs

diff --git a/Xamarin.Forms.Platform.UAP/ITitleIconProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITitleIconProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ITitleIconProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITitleIconProvider.cs

diff --git a/Xamarin.Forms.Platform.UAP/ITitleProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITitleProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ITitleProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITitleProvider.cs

diff --git a/Xamarin.Forms.Platform.UAP/ITitleViewProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITitleViewProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ITitleViewProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITitleViewProvider.cs

diff --git a/Xamarin.Forms.Platform.UAP/ITitleViewRendererController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITitleViewRendererController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ITitleViewRendererController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ITitleViewRendererController.cs

diff --git a/Xamarin.Forms.Platform.UAP/IToolBarForegroundBinder.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/IToolBarForegroundBinder.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/IToolBarForegroundBinder.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/IToolBarForegroundBinder.cs

diff --git a/Xamarin.Forms.Platform.UAP/IToolbarProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/IToolbarProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/IToolbarProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/IToolbarProvider.cs

diff --git a/Xamarin.Forms.Platform.UAP/IVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/IVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/IVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/IVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/IVisualNativeElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/IVisualNativeElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/IVisualNativeElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/IVisualNativeElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/ImageButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ImageButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/ImageConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ImageConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/ImageElementManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageElementManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ImageElementManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageElementManager.cs

diff --git a/Xamarin.Forms.Platform.UAP/ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/ImageSourceIconElementConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageSourceIconElementConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ImageSourceIconElementConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ImageSourceIconElementConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/InterceptVisualStateManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/InterceptVisualStateManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/InterceptVisualStateManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/InterceptVisualStateManager.cs

diff --git a/Xamarin.Forms.Platform.UAP/KeyboardConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/KeyboardConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/KeyboardConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/KeyboardConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/KeyboardExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/KeyboardExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/KeyboardExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/KeyboardExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/LabelHtmlHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/LabelHtmlHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/LabelHtmlHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/LabelHtmlHelper.cs

diff --git a/Xamarin.Forms.Platform.UAP/LabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/LabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/LabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/LabelRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/LayoutExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/LayoutExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/LayoutExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/LayoutExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/LayoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/LayoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/LayoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/LayoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/ListGroupHeaderPresenter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ListGroupHeaderPresenter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ListGroupHeaderPresenter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ListGroupHeaderPresenter.cs

diff --git a/Xamarin.Forms.Platform.UAP/ListViewGroupStyleSelector.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ListViewGroupStyleSelector.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ListViewGroupStyleSelector.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ListViewGroupStyleSelector.cs

diff --git a/Xamarin.Forms.Platform.UAP/ListViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ListViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ListViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ListViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/MasterBackgroundConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/MasterBackgroundConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/MasterBackgroundConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/MasterBackgroundConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/MasterDetailControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/MasterDetailControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/MasterDetailControl.cs

diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/MenuItemCommand.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/MenuItemCommand.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/MenuItemCommand.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/MenuItemCommand.cs

diff --git a/Xamarin.Forms.Platform.UAP/NativeBindingExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeBindingExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/NativeBindingExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeBindingExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/NativeBindingService.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeBindingService.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/NativeBindingService.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeBindingService.cs

diff --git a/Xamarin.Forms.Platform.UAP/NativeEventWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeEventWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/NativeEventWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeEventWrapper.cs

diff --git a/Xamarin.Forms.Platform.UAP/NativePropertyListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativePropertyListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/NativePropertyListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativePropertyListener.cs

diff --git a/Xamarin.Forms.Platform.UAP/NativeValueConverterService.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeValueConverterService.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/NativeValueConverterService.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeValueConverterService.cs

diff --git a/Xamarin.Forms.Platform.UAP/NativeViewWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeViewWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/NativeViewWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeViewWrapper.cs

diff --git a/Xamarin.Forms.Platform.UAP/NativeViewWrapperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeViewWrapperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/NativeViewWrapperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/NativeViewWrapperRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/NavigationPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/NavigationPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/NavigationPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/NavigationPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/PageControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PageControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageControl.cs

diff --git a/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PageControlStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/PageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/PageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/PageToRenderedElementConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageToRenderedElementConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PageToRenderedElementConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PageToRenderedElementConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/PickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/PickerStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PickerStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PickerStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PickerStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Platform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Platform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Platform.cs

diff --git a/Xamarin.Forms.Platform.UAP/PlatformConfigurationExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PlatformConfigurationExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PlatformConfigurationExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PlatformConfigurationExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/PlatformEffect.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PlatformEffect.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PlatformEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PlatformEffect.cs

diff --git a/Xamarin.Forms.Platform.UAP/ProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Platform.UAP/Properties/Xamarin.Forms.Platform.UAP.rd.xml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Properties/Xamarin.Forms.Platform.UAP.rd.xml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Properties/Xamarin.Forms.Platform.UAP.rd.xml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Properties/Xamarin.Forms.Platform.UAP.rd.xml

diff --git a/Xamarin.Forms.Platform.UAP/PropertyChangedEventArgsExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/PropertyChangedEventArgsExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/PropertyChangedEventArgsExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/PropertyChangedEventArgsExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/RefreshViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/RefreshViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/RefreshViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/RefreshViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/RendererFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/RendererFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/RendererFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/RendererFactory.cs

diff --git a/Xamarin.Forms.Platform.UAP/Resources.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Resources.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Resources.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Resources.xaml

diff --git a/Xamarin.Forms.Platform.UAP/ScrollViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ScrollViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ScrollViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ScrollViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/SearchBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/Shell/ShellFlyoutTemplateSelector.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellFlyoutTemplateSelector.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Shell/ShellFlyoutTemplateSelector.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellFlyoutTemplateSelector.cs

diff --git a/Xamarin.Forms.Platform.UAP/Shell/ShellHeaderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellHeaderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Shell/ShellHeaderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellHeaderRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/Shell/ShellItemRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellItemRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Shell/ShellItemRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellItemRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/Shell/ShellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Shell/ShellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/Shell/ShellSectionRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellSectionRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Shell/ShellSectionRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellSectionRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/Shell/ShellStyles.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellStyles.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Shell/ShellStyles.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellStyles.xaml

diff --git a/Xamarin.Forms.Platform.UAP/Shell/ShellToolbarItemRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellToolbarItemRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Shell/ShellToolbarItemRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Shell/ShellToolbarItemRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/SliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/SliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/SliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/SliderRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/SliderStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/SliderStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/SliderStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/SliderStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/StepperControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/StepperControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/StepperControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/StepperControl.cs

diff --git a/Xamarin.Forms.Platform.UAP/StepperControl.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/StepperControl.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/StepperControl.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/StepperControl.xaml

diff --git a/Xamarin.Forms.Platform.UAP/StepperControl.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/StepperControl.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/StepperControl.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/StepperControl.xaml.cs

diff --git a/Xamarin.Forms.Platform.UAP/StepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/StepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/StepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/StepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/StreamImagesourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/StreamImagesourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/StreamImagesourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/StreamImagesourceHandler.cs

diff --git a/Xamarin.Forms.Platform.UAP/SwipeViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/SwipeViewRenderer.cs
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/SwipeViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/SwipeViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/SwitchRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TabbedPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml

diff --git a/Xamarin.Forms.Platform.UAP/TableViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TableViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TableViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TableViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/TaskExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TaskExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TaskExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TaskExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/TextAlignmentToHorizontalAlignmentConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TextAlignmentToHorizontalAlignmentConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TextAlignmentToHorizontalAlignmentConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TextAlignmentToHorizontalAlignmentConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/TextBlockExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TextBlockExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TextBlockExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TextBlockExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/TextCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TextCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TextCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TextCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/TimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TimePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/TitleViewManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/TitleViewManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/TitleViewManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/TitleViewManager.cs

diff --git a/Xamarin.Forms.Platform.UAP/ToolbarPlacementHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ToolbarPlacementHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ToolbarPlacementHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ToolbarPlacementHelper.cs

diff --git a/Xamarin.Forms.Platform.UAP/UriImageSourceHandler.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/UriImageSourceHandler.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/UriImageSourceHandler.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/UriImageSourceHandler.cs

diff --git a/Xamarin.Forms.Platform.UAP/ViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/ViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/ViewToRendererConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/ViewToRendererConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/ViewToRendererConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/ViewToRendererConverter.cs

diff --git a/Xamarin.Forms.Platform.UAP/VisualElementChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/VisualElementChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.UAP/VisualElementExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/VisualElementExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/VisualElementPackager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementPackager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/VisualElementPackager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementPackager.cs

diff --git a/Xamarin.Forms.Platform.UAP/VisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/VisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/VisualElementTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/VisualElementTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/VisualElementTracker.cs

diff --git a/Xamarin.Forms.Platform.UAP/WebViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WebViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WebViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WebViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsBasePage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsBasePage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsBasePage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsBasePage.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsBasePlatformServices.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsBasePlatformServices.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsBasePlatformServices.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsBasePlatformServices.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsDeviceInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsDeviceInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsDeviceInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsDeviceInfo.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsExpressionSearch.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsExpressionSearch.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsExpressionSearch.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsExpressionSearch.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsIsolatedStorage.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsPage.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsPlatform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsPlatform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsPlatform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsPlatform.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsPlatformServices.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsPlatformServices.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsPlatformServices.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsPlatformServices.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsResourcesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsResourcesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsResourcesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsResourcesProvider.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsSerializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsSerializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsSerializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsSerializer.cs

diff --git a/Xamarin.Forms.Platform.UAP/WindowsTicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsTicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/WindowsTicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/WindowsTicker.cs

diff --git a/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj

diff --git a/Xamarin.Forms.Platform.WPF/Animatable.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Animatable.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Animatable.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Animatable.cs

diff --git a/Xamarin.Forms.Platform.WPF/Assets/Button.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Assets/Button.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Assets/Button.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Assets/Button.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Assets/CheckBox.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Assets/CheckBox.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Assets/CheckBox.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Assets/CheckBox.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Assets/Converters.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Assets/Converters.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Assets/Converters.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Assets/Converters.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Assets/Default.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Assets/Default.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Assets/Default.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Assets/Default.xaml

diff --git a/Xamarin.Forms.Platform.WPF/CellControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/CellControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/CellControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/CellControl.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormWindow.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormWindow.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormWindow.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormWindow.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsAppBar.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsAppBar.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsAppBar.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsAppBar.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsAppBarButton.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsAppBarButton.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsAppBarButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsAppBarButton.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsBitmapIcon.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsBitmapIcon.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsBitmapIcon.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsBitmapIcon.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsButton.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsButton.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsButton.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsButton.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsCarouselPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsCarouselPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsCarouselPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsCarouselPage.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsContentControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsContentControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsContentControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsContentControl.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsContentDialog.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsContentDialog.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsContentDialog.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsContentDialog.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsContentPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsContentPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsContentPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsContentPage.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsElementIcon.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsElementIcon.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsElementIcon.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsElementIcon.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsMasterDetailPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsMasterDetailPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsMasterDetailPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsMasterDetailPage.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsMultiPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsMultiPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsMultiPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsMultiPage.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsNavigationPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsNavigationPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsNavigationPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsNavigationPage.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsPage.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsPathIcon.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsPathIcon.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsPathIcon.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsPathIcon.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsSymbolIcon.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsSymbolIcon.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsSymbolIcon.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsSymbolIcon.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsTabbedPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsTabbedPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsTabbedPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsTabbedPage.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsTransitioningContentControl.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsTransitioningContentControl.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsTransitioningContentControl.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsTransitioningContentControl.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/FormsWindowButtonCommands.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsWindowButtonCommands.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/FormsWindowButtonCommands.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/FormsWindowButtonCommands.cs

diff --git a/Xamarin.Forms.Platform.WPF/Controls/VisualStates.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/VisualStates.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Controls/VisualStates.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Controls/VisualStates.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/CaseConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/CaseConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/CaseConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/CaseConverter.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/CollapseWhenEmptyConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/CollapseWhenEmptyConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/CollapseWhenEmptyConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/CollapseWhenEmptyConverter.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/ColorConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/ColorConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/ColorConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/ColorConverter.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/HeightConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/HeightConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/HeightConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/HeightConverter.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/IconConveter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/IconConveter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/IconConveter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/IconConveter.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/ImageConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/ImageConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/ImageConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/ImageConverter.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/SymbolToValueConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/SymbolToValueConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/SymbolToValueConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/SymbolToValueConverter.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/ToUpperConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/ToUpperConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/ToUpperConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/ToUpperConverter.cs

diff --git a/Xamarin.Forms.Platform.WPF/Converters/ViewToRendererConverter.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/ViewToRendererConverter.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Converters/ViewToRendererConverter.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Converters/ViewToRendererConverter.cs

diff --git a/Xamarin.Forms.Platform.WPF/CustomContextMenu.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/CustomContextMenu.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/CustomContextMenu.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/CustomContextMenu.cs

diff --git a/Xamarin.Forms.Platform.WPF/Deserializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Deserializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Deserializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Deserializer.cs

diff --git a/Xamarin.Forms.Platform.WPF/ElementChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/ElementChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/ElementChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/ElementChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.WPF/Enums/Symbol.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Enums/Symbol.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Enums/Symbol.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Enums/Symbol.cs

diff --git a/Xamarin.Forms.Platform.WPF/ExportRendererAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/ExportRendererAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/ExportRendererAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/ExportRendererAttribute.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/AlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/AlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/AlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/AlignmentExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/ColorExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/ColorExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/ColorExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/ColorExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/DeviceExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/DeviceExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/DeviceExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/DeviceExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/FontExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/FontExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/FontExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/FontExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/FormattedStringExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/FormattedStringExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/FormattedStringExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/FormattedStringExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/FrameworkElementAttached.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/FrameworkElementAttached.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/FrameworkElementAttached.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/FrameworkElementAttached.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/FrameworkElementExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/FrameworkElementExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/FrameworkElementExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/FrameworkElementExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/ImageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/ImageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/ImageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/ImageExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/KeyboardExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/KeyboardExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/KeyboardExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/KeyboardExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/ObjectExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/ObjectExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/ObjectExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/ObjectExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/PageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/PageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/PageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/PageExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/ScrollBarVisibilityExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/ScrollBarVisibilityExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/ScrollBarVisibilityExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/ScrollBarVisibilityExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Extensions/VisualElementExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/VisualElementExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Extensions/VisualElementExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Extensions/VisualElementExtensions.cs

diff --git a/Xamarin.Forms.Platform.WPF/Forms.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Forms.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Forms.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Forms.cs

diff --git a/Xamarin.Forms.Platform.WPF/FormsApplicationPage.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsApplicationPage.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/FormsApplicationPage.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsApplicationPage.cs

diff --git a/Xamarin.Forms.Platform.WPF/FormsContentLoader.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsContentLoader.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/FormsContentLoader.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsContentLoader.cs

diff --git a/Xamarin.Forms.Platform.WPF/FormsPanel.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsPanel.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/FormsPanel.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsPanel.cs

diff --git a/Xamarin.Forms.Platform.WPF/FormsTextBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsTextBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/FormsTextBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsTextBox.cs

diff --git a/Xamarin.Forms.Platform.WPF/FormsTimePicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsTimePicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/FormsTimePicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/FormsTimePicker.cs

diff --git a/Xamarin.Forms.Platform.WPF/Helpers/TreeHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Helpers/TreeHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Helpers/TreeHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Helpers/TreeHelper.cs

diff --git a/Xamarin.Forms.Platform.WPF/Helpers/UiHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Helpers/UiHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Helpers/UiHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Helpers/UiHelper.cs

diff --git a/Xamarin.Forms.Platform.WPF/ICellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/ICellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/ICellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/ICellRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/IVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/IVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/IVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/IVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Interfaces/IContentLoader.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Interfaces/IContentLoader.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Interfaces/IContentLoader.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Interfaces/IContentLoader.cs

diff --git a/Xamarin.Forms.Platform.WPF/Interfaces/IFormsNavigation.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Interfaces/IFormsNavigation.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Interfaces/IFormsNavigation.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Interfaces/IFormsNavigation.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ComGuids.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ComGuids.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ComGuids.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ComGuids.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Debug.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Debug.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Debug.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Debug.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/DoubleUtil.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/DoubleUtil.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/DoubleUtil.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/DoubleUtil.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/DpiHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/DpiHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/DpiHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/DpiHelper.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ErrorCodes.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ErrorCodes.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ErrorCodes.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ErrorCodes.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/MessageWindow.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/MessageWindow.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/MessageWindow.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/MessageWindow.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/NativeMethods.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/NativeMethods.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/NativeMethods.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/NativeMethods.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/NtDll.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/NtDll.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/NtDll.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/NtDll.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ShellProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ShellProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ShellProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/ShellProvider.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/StreamHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/StreamHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/StreamHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/StreamHelper.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.Windows.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.Windows.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.Windows.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.Windows.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.Wpf.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.Wpf.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.Wpf.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.Wpf.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Utilities.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Verify.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Verify.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Verify.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/Standard/Verify.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/SystemCommands.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/SystemCommands.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/SystemCommands.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/SystemCommands.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/SystemParameters2.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/SystemParameters2.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/SystemParameters2.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/SystemParameters2.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/WindowChrome.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/WindowChrome.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/WindowChrome.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/WindowChrome.cs

diff --git a/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/WindowChromeWorker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/WindowChromeWorker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/WindowChromeWorker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Microsoft.Windows.Shell/WindowChromeWorker.cs

diff --git a/Xamarin.Forms.Platform.WPF/Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Platform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Platform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Platform.cs

diff --git a/Xamarin.Forms.Platform.WPF/PlatformEffect.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/PlatformEffect.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/PlatformEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/PlatformEffect.cs

diff --git a/Xamarin.Forms.Platform.WPF/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Platform.WPF/Properties/Resources.Designer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/Resources.Designer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Properties/Resources.Designer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/Resources.Designer.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/Properties/Resources.resx b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/Resources.resx
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Properties/Resources.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/Resources.resx

diff --git a/Xamarin.Forms.Platform.WPF/Properties/Settings.Designer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/Settings.Designer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Properties/Settings.Designer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/Settings.Designer.cs

diff --git a/Xamarin.Forms.ControlGallery.WPF/Properties/Settings.settings b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/Settings.settings
similarity index 100%
rename from Xamarin.Forms.ControlGallery.WPF/Properties/Settings.settings
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Properties/Settings.settings

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/ActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/BoxViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/BoxViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/BoxViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/BoxViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/CarouselPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/CarouselPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/CarouselPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/CellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/CellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/CellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/CellRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/CheckBoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/CheckBoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/CheckBoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/CheckBoxRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/DatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/DatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/DatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/DatePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/EditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/EditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/EditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/EditorRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/EntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/EntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/EntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/EntryRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/FormsCheckBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/FormsCheckBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/FormsCheckBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/FormsCheckBox.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/ImageButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ImageButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/ImageButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ImageButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ImageRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/LabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/LabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/LabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/LabelRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/LayoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/LayoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/LayoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/LayoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/ListViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ListViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/ListViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ListViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/MasterDetailPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/MasterDetailPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/MasterDetailPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/MasterDetailPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/NavigationPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/NavigationPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/NavigationPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/NavigationPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/OpenGLViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/OpenGLViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/OpenGLViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/OpenGLViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/PageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/PageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/PageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/PageRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/PickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/PickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/PickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/PickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/ProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ScrollViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/ScrollViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ScrollViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/SearchBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/SearchBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/SearchBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/SearchBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/SliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/SliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/SliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/SliderRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/StepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/StepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/StepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/StepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/SwitchRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/TabbedPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/TabbedPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/TabbedPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/TabbedPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/TableViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/TableViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/TableViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/TableViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/TimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/TimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/TimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/TimePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/ViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/ViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/ViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/VisualMultiPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/VisualMultiPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/VisualMultiPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/VisualMultiPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/VisualPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/VisualPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/VisualPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/VisualPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/Renderers/WebViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/WebViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Renderers/WebViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Renderers/WebViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.WPF/ResourcesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/ResourcesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/ResourcesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/ResourcesProvider.cs

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsAppBar.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsAppBar.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsAppBar.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsAppBar.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsAppBarButton.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsAppBarButton.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsAppBarButton.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsAppBarButton.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsBitmapIcon.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsBitmapIcon.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsBitmapIcon.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsBitmapIcon.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsCarouselPage.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsCarouselPage.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsCarouselPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsCarouselPage.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsContentControl.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsContentControl.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsContentControl.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsContentControl.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsContentDialog.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsContentDialog.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsContentDialog.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsContentDialog.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsContentPage.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsContentPage.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsContentPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsContentPage.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsMasterDetailPage.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsMasterDetailPage.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsMasterDetailPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsMasterDetailPage.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsNavigationPage.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsNavigationPage.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsNavigationPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsNavigationPage.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsPathIcon.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsPathIcon.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsPathIcon.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsPathIcon.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsSymbolIcon.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsSymbolIcon.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsSymbolIcon.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsSymbolIcon.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsTabbedPage.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsTabbedPage.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsTabbedPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsTabbedPage.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsTransitioningContentControl.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsTransitioningContentControl.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsTransitioningContentControl.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsTransitioningContentControl.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsWindow.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsWindow.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsWindow.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsWindow.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/FormsWindowButtonCommands.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsWindowButtonCommands.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/FormsWindowButtonCommands.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/FormsWindowButtonCommands.xaml

diff --git a/Xamarin.Forms.Platform.WPF/Themes/Generic.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/Generic.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Themes/Generic.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Themes/Generic.xaml

diff --git a/Xamarin.Forms.Platform.WPF/VisualElementTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/VisualElementTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/VisualElementTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/VisualElementTracker.cs

diff --git a/Xamarin.Forms.Platform.WPF/WPFDeviceInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFDeviceInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/WPFDeviceInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFDeviceInfo.cs

diff --git a/Xamarin.Forms.Platform.WPF/WPFExpressionSearch.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFExpressionSearch.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/WPFExpressionSearch.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFExpressionSearch.cs

diff --git a/Xamarin.Forms.Platform.WPF/WPFIsolatedStorageFile.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFIsolatedStorageFile.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/WPFIsolatedStorageFile.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFIsolatedStorageFile.cs

diff --git a/Xamarin.Forms.Platform.WPF/WPFPlatformServices.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFPlatformServices.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/WPFPlatformServices.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFPlatformServices.cs

diff --git a/Xamarin.Forms.Platform.WPF/WPFResources.xaml b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFResources.xaml
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/WPFResources.xaml
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFResources.xaml

diff --git a/Xamarin.Forms.Platform.WPF/WPFTicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFTicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/WPFTicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/WPFTicker.cs

diff --git a/Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/Xamarin.Forms.Platform.WPF.csproj

diff --git a/Xamarin.Forms.Platform.WPF/app.config b/Xamarin.Forms/Xamarin.Forms.Platform.WPF/app.config
similarity index 100%
rename from Xamarin.Forms.Platform.WPF/app.config
rename to Xamarin.Forms/Xamarin.Forms.Platform.WPF/app.config

diff --git a/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CADisplayLinkTicker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/CellRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/CellTableViewCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/EntryCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/ImageCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/SwitchCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/TextCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Cells/ViewCellRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/CarouselTemplatedCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselTemplatedCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/CarouselTemplatedCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselTemplatedCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewController.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewDelegator.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewDelegator.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewDelegator.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewDelegator.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewLayout.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewLayout.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/CollectionViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CollectionViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/CollectionViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/CollectionViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/DefaultCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/DefaultCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/DefaultCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/DefaultCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/EmptySource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/EmptySource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/EmptySource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/EmptySource.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/GridViewLayout.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/GridViewLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/GridViewLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/GridViewLayout.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewController.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewDelegator.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewDelegator.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewDelegator.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewDelegator.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/GroupableItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/HeightConstrainedTemplatedCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HeightConstrainedTemplatedCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/HeightConstrainedTemplatedCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HeightConstrainedTemplatedCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/HorizontalCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalDefaultCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalDefaultCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/HorizontalDefaultCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalDefaultCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalDefaultSupplementalView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalDefaultSupplementalView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/HorizontalDefaultSupplementalView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalDefaultSupplementalView.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalTemplatedHeaderView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalTemplatedHeaderView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/HorizontalTemplatedHeaderView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/HorizontalTemplatedHeaderView.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/IItemsViewSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/IItemsViewSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/IItemsViewSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/IItemsViewSource.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/IndexPathExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/IndexPathExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/IndexPathExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/IndexPathExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsSourceFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsSourceFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ItemsSourceFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsSourceFactory.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewController.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewDelegator.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewDelegator.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewDelegator.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewDelegator.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewLayout.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewLayout.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ListSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ListSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ListSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ListSource.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ListViewLayout.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ListViewLayout.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ListViewLayout.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ListViewLayout.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ObservableGroupedSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ObservableGroupedSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ObservableGroupedSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ObservableGroupedSource.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ObservableItemsSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ObservableItemsSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ObservableItemsSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ObservableItemsSource.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/PropertyChangedEventArgsExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/PropertyChangedEventArgsExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/PropertyChangedEventArgsExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/PropertyChangedEventArgsExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ScrollToPositionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ScrollToPositionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/ScrollToPositionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/ScrollToPositionExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewController.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewDelegator.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewDelegator.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewDelegator.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewDelegator.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/SelectableItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/SnapHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/SnapHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/SnapHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/SnapHelpers.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewController.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/StructuredItemsViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/TemplateHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/TemplateHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/TemplateHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/TemplateHelpers.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/TemplatedCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/TemplatedCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/TemplatedCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/TemplatedCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/VerticalCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/VerticalCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/VerticalCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/VerticalCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/VerticalDefaultCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/VerticalDefaultCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/VerticalDefaultCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/VerticalDefaultCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/VerticalDefaultSupplementalView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/VerticalDefaultSupplementalView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/VerticalDefaultSupplementalView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/VerticalDefaultSupplementalView.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/VerticalSupplementaryView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/VerticalSupplementaryView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/VerticalSupplementaryView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/VerticalSupplementaryView.cs

diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/WidthConstrainedTemplatedCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/WidthConstrainedTemplatedCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/CollectionView/WidthConstrainedTemplatedCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/CollectionView/WidthConstrainedTemplatedCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/ContextActionCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ContextActionCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ContextActionCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ContextActionCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ContextScrollViewDelegate.cs

diff --git a/Xamarin.Forms.Platform.iOS/Deserializer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Deserializer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Deserializer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Deserializer.cs

diff --git a/Xamarin.Forms.Platform.iOS/DisposeHelpers.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/DisposeHelpers.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/DisposeHelpers.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/DisposeHelpers.cs

diff --git a/Xamarin.Forms.Platform.iOS/EffectUtilities.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/EffectUtilities.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/EffectUtilities.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/EffectUtilities.cs

diff --git a/Xamarin.Forms.Platform.iOS/ElementChangedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ElementChangedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ElementChangedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ElementChangedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.iOS/EventTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/EventTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/EventTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/EventTracker.cs

diff --git a/Xamarin.Forms.Platform.Android/ExportCellAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ExportCellAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ExportCellAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ExportCellAttribute.cs

diff --git a/Xamarin.Forms.Platform.Android/ExportImageSourceHandlerAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ExportImageSourceHandlerAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.Android/ExportImageSourceHandlerAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ExportImageSourceHandlerAttribute.cs

diff --git a/Xamarin.Forms.Platform.iOS/ExportRendererAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ExportRendererAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ExportRendererAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ExportRendererAttribute.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/AccessibilityExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/AccessibilityExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/AccessibilityExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/AccessibilityExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ArrayExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/ArrayExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/ArrayExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/ArrayExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/CellExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/ColorExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/DateExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/FlowDirectionExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/FlowDirectionExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/FlowDirectionExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/FlowDirectionExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/FontExtensions.Shared.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/FontExtensions.Shared.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/FontExtensions.Shared.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/FontExtensions.Shared.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/FontExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/FontExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/FontExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/FontExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/LabelExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/LabelExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/LabelExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/LabelExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/LayoutExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/NSObjectExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/NSObjectExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/NSObjectExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/NSObjectExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/PlatformConfigurationExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/PlatformConfigurationExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/PlatformConfigurationExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/PlatformConfigurationExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/ToolbarItemExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/ViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/ViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/ViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/ViewExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Extensions/VisualElementExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/VisualElementExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Extensions/VisualElementExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Extensions/VisualElementExtensions.cs

diff --git a/Xamarin.Forms.Platform.UAP/Flags.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Flags.cs
similarity index 100%
rename from Xamarin.Forms.Platform.UAP/Flags.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Flags.cs

diff --git a/Xamarin.Forms.Platform.iOS/Forms.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Forms.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Forms.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Forms.cs

diff --git a/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/FormsApplicationDelegate.cs

diff --git a/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/GlobalCloseContextGestureRecognizer.cs

diff --git a/Xamarin.Forms.Platform.iOS/IOSDeviceInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/IOSDeviceInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/IOSDeviceInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/IOSDeviceInfo.cs

diff --git a/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/IVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/IVisualNativeElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/IVisualNativeElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/IVisualNativeElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/IVisualNativeElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/LinkerSafeAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/LinkerSafeAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/LinkerSafeAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/LinkerSafeAttribute.cs

diff --git a/Xamarin.Forms.Platform.iOS/ModalWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ModalWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ModalWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ModalWrapper.cs

diff --git a/Xamarin.Forms.Platform.iOS/NativeBindingService.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeBindingService.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/NativeBindingService.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeBindingService.cs

diff --git a/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeValueConverterService.cs

diff --git a/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeViewPropertyListener.cs

diff --git a/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeViewWrapper.cs

diff --git a/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/NativeViewWrapperRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/PageExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/PageExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/PageExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/PageExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Platform.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Platform.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Platform.cs

diff --git a/Xamarin.Forms.Platform.iOS/PlatformEffect.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/PlatformEffect.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/PlatformEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/PlatformEffect.cs

diff --git a/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/PlatformRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/PlatformRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Platform.iOS/RendererFactory.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/RendererFactory.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/RendererFactory.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/RendererFactory.cs

diff --git a/Xamarin.Forms.Platform.iOS/RendererPool.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/RendererPool.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/RendererPool.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/RendererPool.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ActivityIndicatorRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/AlignmentExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/BorderElementManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/BorderElementManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/BorderElementManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/BorderElementManager.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/BoxRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonElementManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ButtonElementManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ButtonElementManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ButtonElementManager.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonLayoutManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ButtonLayoutManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ButtonLayoutManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ButtonLayoutManager.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/CarouselPageRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/CheckBoxRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/CheckBoxRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/CheckBoxRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/CheckBoxRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/CheckBoxRendererBase.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/CheckBoxRendererBase.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/CheckBoxRendererBase.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/CheckBoxRendererBase.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/DatePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/EditorRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ElementSelectedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ElementSelectedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ElementSelectedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ElementSelectedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/EntryRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ExportCellAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ExportCellAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ExportCellAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ExportCellAttribute.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ExportImageSourceHandlerAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ExportImageSourceHandlerAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ExportImageSourceHandlerAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ExportImageSourceHandlerAttribute.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ExportRendererAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ExportRendererAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ExportRendererAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ExportRendererAttribute.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FormattedStringExtensions.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormsCAKeyFrameAnimation.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FormsCAKeyFrameAnimation.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/FormsCAKeyFrameAnimation.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FormsCAKeyFrameAnimation.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormsCheckBox.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FormsCheckBox.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/FormsCheckBox.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FormsCheckBox.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FormsUIImageView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FormsUIImageView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/FormsUIImageView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FormsUIImageView.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IAccessibilityElementsController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IAccessibilityElementsController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IAccessibilityElementsController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IAccessibilityElementsController.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IButtonLayoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IButtonLayoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IButtonLayoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IButtonLayoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IImageVisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IImageVisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IImageVisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IImageVisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellContext.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellContext.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellContext.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutContentRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutContentRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutContentRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutContentRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutTransition.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutTransition.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutTransition.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellFlyoutTransition.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellItemController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellItemController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellItemController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellItemController.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellItemTransition.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellItemTransition.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellItemTransition.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellItemTransition.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellNavBarAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellNavBarAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellNavBarAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellNavBarAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellPageRendererTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellPageRendererTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellPageRendererTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellPageRendererTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellSearchResultsRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellSearchResultsRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellSearchResultsRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellSearchResultsRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRootHeader.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRootHeader.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRootHeader.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRootHeader.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRootRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRootRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRootRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellSectionRootRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IShellTabBarAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellTabBarAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IShellTabBarAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IShellTabBarAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ImageAnimationHelper.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ImageAnimationHelper.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ImageAnimationHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ImageAnimationHelper.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ImageButtonRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ImageButtonRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ImageButtonRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ImageButtonRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ImageElementManager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ImageElementManager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ImageElementManager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ImageElementManager.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ImageRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/IndicatorViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IndicatorViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/IndicatorViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/IndicatorViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/KeyboardInsetTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/KeyboardObserver.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ListViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/NavigationRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/OpenGLViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PageContainer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/PageContainer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/PageContainer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/PageContainer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/PageRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/PhoneMasterDetailRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/PickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ProgressBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/RefreshViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/RefreshViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/RefreshViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/RefreshViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SafeShellNavBarAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SafeShellNavBarAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/SafeShellNavBarAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SafeShellNavBarAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SafeShellTabBarAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SafeShellTabBarAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/SafeShellTabBarAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SafeShellTabBarAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ScrollViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SearchBarRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SearchHandlerAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SearchHandlerAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/SearchHandlerAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SearchHandlerAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellFlyoutContentRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellFlyoutContentRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellFlyoutContentRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellFlyoutContentRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellFlyoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellFlyoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellFlyoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellFlyoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellItemRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellItemRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellItemRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellItemRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellItemTransition.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellItemTransition.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellItemTransition.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellItemTransition.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellNavBarAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellNavBarAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellNavBarAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellNavBarAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellPageRendererTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellScrollViewTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellScrollViewTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellScrollViewTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellScrollViewTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellSearchResultsRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellSearchResultsRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellSearchResultsRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellSearchResultsRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootHeader.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootHeader.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootHeader.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootHeader.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellSectionRootRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellTabBarAppearanceTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellTabBarAppearanceTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellTabBarAppearanceTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellTabBarAppearanceTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellTableViewController.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellTableViewController.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellTableViewController.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellTableViewController.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/ShellTableViewSource.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellTableViewSource.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/ShellTableViewSource.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/ShellTableViewSource.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SlideFlyoutTransition.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SlideFlyoutTransition.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/SlideFlyoutTransition.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SlideFlyoutTransition.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SliderRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/StepperRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SwipeViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/SwitchRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TabbedRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TableViewModelRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TableViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TabletMasterDetailRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TabletShellFlyoutRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TabletShellFlyoutRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/TabletShellFlyoutRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TabletShellFlyoutRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/TimePickerRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/UIContainerCell.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/UIContainerCell.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/UIContainerCell.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/UIContainerCell.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/UIContainerView.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/UIContainerView.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/UIContainerView.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/UIContainerView.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/WebViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/WkWebViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/WkWebViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Renderers/WkWebViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Renderers/WkWebViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.Designer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.Designer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.Designer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.Designer.cs

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.ar.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ar.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.ar.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ar.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.ca.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ca.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.ca.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ca.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.cs.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.cs.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.cs.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.cs.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.da.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.da.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.da.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.da.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.de.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.de.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.de.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.de.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.el.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.el.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.el.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.el.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.es.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.es.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.es.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.es.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.fi.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.fi.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.fi.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.fi.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.fr.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.fr.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.fr.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.fr.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.he.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.he.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.he.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.he.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.hi.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.hi.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.hi.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.hi.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.hr.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.hr.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.hr.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.hr.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.hu.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.hu.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.hu.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.hu.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.id.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.id.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.id.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.id.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.it.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.it.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.it.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.it.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.ja.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ja.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.ja.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ja.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.ko.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ko.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.ko.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ko.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.ms.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ms.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.ms.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ms.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.nb.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.nb.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.nb.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.nb.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.nl.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.nl.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.nl.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.nl.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.pl.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.pl.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.pl.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.pl.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.pt-BR.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.pt-BR.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.pt-BR.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.pt-BR.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.pt.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.pt.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.pt.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.pt.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.ro.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ro.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.ro.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ro.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.ru.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ru.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.ru.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.ru.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.sk.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.sk.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.sk.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.sk.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.sv.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.sv.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.sv.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.sv.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.th.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.th.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.th.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.th.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.tr.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.tr.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.tr.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.tr.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.uk.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.uk.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.uk.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.uk.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.vi.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.vi.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.vi.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.vi.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-HK.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-HK.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-HK.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-HK.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-Hans.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-Hans.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-Hans.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-Hans.resx

diff --git a/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-Hant.resx b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-Hant.resx
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-Hant.resx
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Resources/StringResources.zh-Hant.resx

diff --git a/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ResourcesProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ResourcesProvider.cs

diff --git a/Xamarin.Forms.Platform.iOS/ShadowEffect.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ShadowEffect.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ShadowEffect.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ShadowEffect.cs

diff --git a/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ViewInitializedEventArgs.cs

diff --git a/Xamarin.Forms.Platform.iOS/ViewRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/ViewRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/ViewRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/ViewRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/VisualElementPackager.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/VisualElementPackager.cs

diff --git a/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/VisualElementRenderer.cs

diff --git a/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/VisualElementTracker.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/VisualElementTracker.cs

diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj

diff --git a/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.nuspec b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.nuspec
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.nuspec
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.nuspec

diff --git a/Xamarin.Forms.Platform.iOS/iOSAppIndexingProvider.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/iOSAppIndexingProvider.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/iOSAppIndexingProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/iOSAppIndexingProvider.cs

diff --git a/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs b/Xamarin.Forms/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs
similarity index 100%
rename from Xamarin.Forms.Platform.iOS/iOSAppLinks.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform.iOS/iOSAppLinks.cs

diff --git a/Xamarin.Forms.Platform/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Platform/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Platform/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Platform/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs b/Xamarin.Forms/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs
new file mode 100644 (file)
index 0000000..711e53e
--- /dev/null
+++ b/Xamarin.Forms/Xamarin.Forms.Platform/Xamarin.Forms.Platform.cs
@@ -0,0 +1,137 @@
+namespace Xamarin.Forms.Platform
+{
+       internal static class Loader
+       {
+               internal static void Load()
+               {
+               }
+       }
+
+       internal class _BoxViewRenderer
+       {
+       }
+
+       internal class _EntryRenderer
+       {
+       }
+
+       internal class _EditorRenderer
+       {
+       }
+
+       internal class _LabelRenderer
+       {
+       }
+
+       internal class _ImageRenderer
+       {
+       }
+
+       internal class _ImageButtonRenderer
+       {
+       }
+
+       internal class _ButtonRenderer
+       {
+       }
+
+       internal class _TableViewRenderer
+       {
+       }
+
+       internal class _ListViewRenderer
+       {
+       }
+
+       internal class _CollectionViewRenderer
+       {
+       }
+
+       internal class _CarouselViewRenderer
+       {
+       }
+
+       internal class _SliderRenderer
+       {
+       }
+
+       internal class _WebViewRenderer
+       {
+       }
+
+       internal class _SearchBarRenderer
+       {
+       }
+
+       internal class _SwitchRenderer
+       {
+       }
+
+       internal class _DatePickerRenderer
+       {
+       }
+
+       internal class _TimePickerRenderer
+       {
+       }
+
+       internal class _PickerRenderer
+       {
+       }
+
+       internal class _StepperRenderer
+       {
+       }
+
+       internal class _ProgressBarRenderer
+       {
+       }
+
+       internal class _RefreshViewRenderer
+       {
+       }
+
+       internal class _ScrollViewRenderer
+       {
+       }
+
+       internal class _ActivityIndicatorRenderer
+       {
+       }
+
+       internal class _FrameRenderer
+       {
+       }
+
+       internal class _IndicatorViewRenderer
+       {
+       }
+
+       internal class _OpenGLViewRenderer
+       {
+       }
+
+       internal class _TabbedPageRenderer
+       {
+       }
+
+       internal class _NavigationPageRenderer
+       {
+       }
+
+       internal class _CarouselPageRenderer
+       {
+       }
+
+       internal class _PageRenderer
+       {
+       }
+
+       internal class _MasterDetailPageRenderer
+       {
+       }
+
+       internal class _SwipeViewRenderer
+       {
+       }
+}
\ No newline at end of file

diff --git a/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj b/Xamarin.Forms/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj
similarity index 100%
rename from Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj
rename to Xamarin.Forms/Xamarin.Forms.Platform/Xamarin.Forms.Platform.csproj

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/bank.png b/Xamarin.Forms/Xamarin.Forms.Sandbox.Android/Resources/drawable/bank.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/bank.png
rename to Xamarin.Forms/Xamarin.Forms.Sandbox.Android/Resources/drawable/bank.png

diff --git a/Xamarin.Forms.ControlGallery.Android/Resources/drawable/coffee.png b/Xamarin.Forms/Xamarin.Forms.Sandbox.Android/Resources/drawable/coffee.png
similarity index 100%
rename from Xamarin.Forms.ControlGallery.Android/Resources/drawable/coffee.png
rename to Xamarin.Forms/Xamarin.Forms.Sandbox.Android/Resources/drawable/coffee.png

diff --git a/Xamarin.Forms.Xaml.Design/AttributeTableBuilder.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.Design/AttributeTableBuilder.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.Design/AttributeTableBuilder.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.Design/AttributeTableBuilder.cs

diff --git a/Xamarin.Forms.Xaml.Design/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.Design/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.Design/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.Design/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Xaml.Design/RegisterMetadata.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.Design/RegisterMetadata.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.Design/RegisterMetadata.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.Design/RegisterMetadata.cs

diff --git a/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj b/Xamarin.Forms/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
similarity index 100%
rename from Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj
rename to Xamarin.Forms/Xamarin.Forms.Xaml.Design/Xamarin.Forms.Xaml.Design.csproj

diff --git a/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AcceptEmptyServiceProvider.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/AppResources/Colors.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AppResources/Colors.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AppResources/Colors.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AppResources/Colors.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/AppResources/CompiledColors.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AppResources/CompiledColors.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AppResources/CompiledColors.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AppResources/CompiledColors.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/ApplyPropertiesVisitorTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ApplyPropertiesVisitorTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ApplyPropertiesVisitorTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ApplyPropertiesVisitorTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/AssemblyInfoTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AssemblyInfoTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AssemblyInfoTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AssemblyInfoTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/AutoMergedResourceDictionaries.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AutoMergedResourceDictionaries.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AutoMergedResourceDictionaries.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AutoMergedResourceDictionaries.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/AutoMergedResourceDictionaries.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AutoMergedResourceDictionaries.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AutoMergedResourceDictionaries.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AutoMergedResourceDictionaries.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/AutomationProperties.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AutomationProperties.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AutomationProperties.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AutomationProperties.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/AutomationProperties.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AutomationProperties.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/AutomationProperties.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/AutomationProperties.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/BindablePropertiesAccessModifiers.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BindablePropertiesAccessModifiers.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/BindablePropertiesAccessModifiers.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BindablePropertiesAccessModifiers.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/BindablePropertiesAccessModifiers.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BindablePropertiesAccessModifiers.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/BindablePropertiesAccessModifiers.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BindablePropertiesAccessModifiers.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BindingsCompiler.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/BuiltInConversions.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BuiltInConversions.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/BuiltInConversions.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BuiltInConversions.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/BuiltInConversions.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BuiltInConversions.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/BuiltInConversions.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/BuiltInConversions.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/ButtonCornerRadius.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ButtonCornerRadius.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ButtonCornerRadius.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ButtonCornerRadius.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/ButtonCornerRadius.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ButtonCornerRadius.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ButtonCornerRadius.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ButtonCornerRadius.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/CompiledTypeConverter.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/CompiledTypeConverter.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/CompiledTypeConverter.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/CompiledTypeConverter.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/CompiledTypeConverter.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/CompiledTypeConverter.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/CompiledTypeConverter.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/CompiledTypeConverter.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/ConstraintExpression.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ConstraintExpression.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ConstraintExpression.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ConstraintExpression.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/ConstraintExpression.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ConstraintExpression.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ConstraintExpression.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ConstraintExpression.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/CustomXamlView.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/CustomXamlView.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/CustomXamlView.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/CustomXamlView.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/CustomXamlView.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/CustomXamlView.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/CustomXamlView.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/CustomXamlView.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/DataTemplate.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DataTemplate.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DataTemplate.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DataTemplate.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/DataTemplate.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DataTemplate.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DataTemplate.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DataTemplate.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/DataTemplateExtension.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DataTemplateExtension.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DataTemplateExtension.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DataTemplateExtension.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/DataTemplateExtension.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DataTemplateExtension.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DataTemplateExtension.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DataTemplateExtension.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting2.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting2.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting2.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting2.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting2.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting2.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting2.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DefaultCtorRouting2.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/DesignPropertiesTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DesignPropertiesTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DesignPropertiesTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DesignPropertiesTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/DesignTimeLoaderTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DesignTimeLoaderTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DesignTimeLoaderTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DesignTimeLoaderTests.cs

diff --git a/Xamarin.Forms.Controls/Directory.Build.props b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Directory.Build.props
similarity index 100%
rename from Xamarin.Forms.Controls/Directory.Build.props
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Directory.Build.props

diff --git a/Xamarin.Forms.Xaml.UnitTests/Directory.Build.targets b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Directory.Build.targets
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Directory.Build.targets
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Directory.Build.targets

diff --git a/Xamarin.Forms.Xaml.UnitTests/DuplicatePropertyElements.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DuplicatePropertyElements.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DuplicatePropertyElements.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DuplicatePropertyElements.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/DuplicatePropertyElements.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DuplicatePropertyElements.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DuplicatePropertyElements.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DuplicatePropertyElements.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/DuplicateXArgumentsElements.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DuplicateXArgumentsElements.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DuplicateXArgumentsElements.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DuplicateXArgumentsElements.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/DuplicateXArgumentsElements.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DuplicateXArgumentsElements.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DuplicateXArgumentsElements.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DuplicateXArgumentsElements.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/DynamicResource.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DynamicResource.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DynamicResource.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DynamicResource.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/DynamicResource.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DynamicResource.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/DynamicResource.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/DynamicResource.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/EventsConnection.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/EventsConnection.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/EventsConnection.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/EventsConnection.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/EventsConnection.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/EventsConnection.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/EventsConnection.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/EventsConnection.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingCtor.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingCtor.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingCtor.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingCtor.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingCtor.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingCtor.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingCtor.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingCtor.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingMethod.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingMethod.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingMethod.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingMethod.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingMethod.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingMethod.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingMethod.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethodMissingMethod.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FactoryMethods.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/FieldModifier.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FieldModifier.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FieldModifier.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FieldModifier.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/FieldModifier.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FieldModifier.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FieldModifier.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FieldModifier.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/FindByName.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FindByName.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FindByName.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FindByName.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/FindByName.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FindByName.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FindByName.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FindByName.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/FontConverterTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FontConverterTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FontConverterTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FontConverterTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/FontImageExtension.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FontImageExtension.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FontImageExtension.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FontImageExtension.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/FontImageExtension.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FontImageExtension.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/FontImageExtension.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/FontImageExtension.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/GenericCollections.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/GenericCollections.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/GenericCollections.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/GenericCollections.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/GenericCollections.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/GenericCollections.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/GenericCollections.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/GenericCollections.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/GenericsTests.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/HRTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/HRTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/HRTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/HRTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/I8.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/I8.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/I8.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/I8.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/I8.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/I8.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/I8.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/I8.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/ImplicitResourceDictionaries.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ImplicitResourceDictionaries.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ImplicitResourceDictionaries.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ImplicitResourceDictionaries.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/ImplicitResourceDictionaries.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ImplicitResourceDictionaries.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ImplicitResourceDictionaries.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ImplicitResourceDictionaries.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/InlineCSS.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/InlineCSS.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/InlineCSS.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/InlineCSS.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/InlineCSS.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/InlineCSS.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/InlineCSS.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/InlineCSS.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/IsCompiledDefault.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/IsCompiledDefault.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/IsCompiledDefault.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/IsCompiledDefault.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/IsCompiledDefault.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/IsCompiledDefault.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/IsCompiledDefault.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/IsCompiledDefault.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/IsCompiledSkip.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/IsCompiledSkip.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/IsCompiledSkip.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/IsCompiledSkip.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/IsCompiledSkip.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/IsCompiledSkip.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/IsCompiledSkip.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/IsCompiledSkip.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/AB946693.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/AB946693.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/AB946693.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/AB946693.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/AB946693.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/AB946693.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/AB946693.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/AB946693.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/BPNotResolvedOnSubClass.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/BPNotResolvedOnSubClass.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/BPNotResolvedOnSubClass.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/BPNotResolvedOnSubClass.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/BPNotResolvedOnSubClass.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/BPNotResolvedOnSubClass.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/BPNotResolvedOnSubClass.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/BPNotResolvedOnSubClass.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24485.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24485.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz24485.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24485.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24485.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24485.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz24485.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24485.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24910.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24910.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz24910.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24910.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24910.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24910.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz24910.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz24910.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27299.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27299.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz27299.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27299.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27299.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27299.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz27299.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27299.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27863.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27863.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz27863.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27863.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27863.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27863.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz27863.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27863.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27968.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27968.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz27968.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27968.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27968.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27968.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz27968.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz27968.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28545.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28545.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz28545.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28545.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28545.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28545.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz28545.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28545.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28556.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28556.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz28556.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28556.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28556.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28556.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz28556.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28556.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28689.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28689.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz28689.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28689.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28689.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28689.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz28689.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28689.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28719.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28719.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz28719.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28719.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28719.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28719.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz28719.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz28719.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz29300.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz29300.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz29300.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz29300.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz29300.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz29300.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz29300.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz29300.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30074.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30074.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz30074.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30074.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30074.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30074.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz30074.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30074.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30684.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30684.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz30684.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30684.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30684.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30684.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz30684.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz30684.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/A/Bz31234.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/A/Bz31234.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/A/Bz31234.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/A/Bz31234.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/A/Bz31234.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/A/Bz31234.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/A/Bz31234.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/A/Bz31234.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/B/Bz31234.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/B/Bz31234.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/B/Bz31234.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/B/Bz31234.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/B/Bz31234.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/B/Bz31234.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/B/Bz31234.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31234/B/Bz31234.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31529.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31529.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz31529.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31529.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31529.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31529.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz31529.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz31529.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz34037.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz34037.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz34037.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz34037.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz34037.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz34037.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz34037.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz34037.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz36422.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz36422.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz36422.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz36422.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz36422.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz36422.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz36422.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz36422.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37306.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37306.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz37306.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37306.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37306.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37306.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz37306.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37306.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37524.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37524.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz37524.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37524.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37524.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37524.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz37524.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz37524.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz40906.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz40906.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz40906.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz40906.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz40906.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz40906.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz40906.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz40906.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41048.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41048.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz41048.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41048.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41048.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41048.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz41048.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41048.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41296.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41296.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz41296.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41296.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41296.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41296.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz41296.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz41296.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz42531.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43301.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43301.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz43301.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43301.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43301.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43301.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz43301.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43301.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43450.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43450.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz43450.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43450.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43450.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43450.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz43450.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43450.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43694.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43694.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz43694.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43694.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43694.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43694.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz43694.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43694.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz43733.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44213.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44213.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz44213.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44213.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44213.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44213.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz44213.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44213.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44216.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44216.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz44216.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44216.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44216.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44216.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz44216.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz44216.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45179.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45179.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz45179.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45179.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45179.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45179.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz45179.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45179.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45299.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45299.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz45299.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45299.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45299.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45299.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz45299.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45299.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45891.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45891.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz45891.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45891.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45891.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45891.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz45891.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz45891.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz46921.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz46921.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz46921.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz46921.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz46921.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz46921.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz46921.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz46921.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47703.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47703.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz47703.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47703.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47703.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47703.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz47703.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47703.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47950.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47950.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz47950.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47950.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47950.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47950.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz47950.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz47950.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz48554.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz48554.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz48554.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz48554.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz48554.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz48554.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz48554.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz48554.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz51567.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz51567.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz51567.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz51567.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz51567.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz51567.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz51567.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz51567.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53203.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53275.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53275.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53275.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53275.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53275.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53275.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53275.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53275.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53318.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53318.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53318.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53318.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53318.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53318.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53318.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53318.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53350.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53350.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53350.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53350.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53350.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53350.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53350.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53350.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381App.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381App.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381App.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381App.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381App.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381App.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381App.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz53381App.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54334.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54334.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz54334.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54334.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54334.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54334.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz54334.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54334.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54717.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54717.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz54717.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54717.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54717.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54717.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz54717.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz54717.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55343.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55343.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz55343.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55343.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55343.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55343.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz55343.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55343.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55347.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55347.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz55347.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55347.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55347.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55347.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz55347.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55347.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55862.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55862.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz55862.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55862.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55862.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55862.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz55862.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz55862.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz56852.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz56852.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz56852.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz56852.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz56852.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz56852.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz56852.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz56852.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz57574.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz57574.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz57574.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz57574.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz57574.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz57574.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz57574.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz57574.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz58922.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz58922.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz58922.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz58922.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz58922.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz58922.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz58922.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz58922.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz59818.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz59818.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz59818.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz59818.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz59818.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz59818.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz59818.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz59818.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60203.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60203.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz60203.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60203.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60203.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60203.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz60203.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60203.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60575.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60575.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz60575.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60575.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60575.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60575.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz60575.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60575.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60788.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60788.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz60788.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60788.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60788.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60788.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Bz60788.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Bz60788.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/DO817710.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/DO817710.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/DO817710.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/DO817710.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/DO817710.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/DO817710.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/DO817710.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/DO817710.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/GH2691.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GH2691.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/GH2691.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GH2691.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/GH2691.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GH2691.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/GH2691.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GH2691.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1346.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1346.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1346.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1346.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1346.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1346.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1346.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1346.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1497.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1497.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1497.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1497.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1497.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1497.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1497.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1497.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1554.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1554.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1554.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1554.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1554.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1554.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1554.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1554.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1566.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1566.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1566.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1566.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1566.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1566.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1566.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1566.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1766.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1766.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1766.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1766.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1766.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1766.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1766.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1766.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1978.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1978.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1978.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1978.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1978.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1978.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh1978.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh1978.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2007.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2007.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2007.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2007.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2007.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2007.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2007.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2007.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2034.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2034.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2034.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2034.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2034.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2034.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2034.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2034.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2063.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2063.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2063.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2063.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2063.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2063.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2063.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2063.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2064.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2064.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2064.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2064.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2064.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2064.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2064.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2064.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2130.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2130.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2130.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2130.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2130.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2130.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2130.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2130.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2171.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2171.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2171.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2171.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2171.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2171.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2171.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2171.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2483.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2483.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2483.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2483.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2483.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2483.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2483.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2483.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2508.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2508.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2508.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2508.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2508.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2508.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2508.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2508.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2517.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2517.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2517.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2517.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2517.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2517.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2517.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2517.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2549.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2549.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2549.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2549.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2549.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2549.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2549.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2549.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2574.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2574.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2574.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2574.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2574.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2574.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2574.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2574.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2632.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2632.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2632.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2632.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2632.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2632.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2632.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2632.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2752.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2752.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2752.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2752.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2752.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2752.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh2752.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh2752.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3082.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3082.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3082.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3082.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3082.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3082.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3082.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3082.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3260.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3260.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3260.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3260.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3260.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3260.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3260.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3260.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3280.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3280.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3280.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3280.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3280.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3280.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3280.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3280.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3512.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3539.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3539.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3539.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3539.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3539.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3539.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3539.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3539.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3606.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3606.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3606.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3606.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3606.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3606.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3606.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3606.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821View.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821View.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821View.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821View.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821View.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821View.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821View.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3821View.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3847.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3847.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3847.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3847.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3847.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3847.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3847.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3847.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3862.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3862.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3862.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3862.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3862.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3862.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh3862.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh3862.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4099.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4099.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4099.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4099.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4099.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4099.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4099.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4099.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4102.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4102.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4102.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4102.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4102.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4102.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4102.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4102.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4103.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4103.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4103.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4103.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4103.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4103.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4103.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4103.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4130.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4130.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4130.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4130.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4130.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4130.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4130.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4130.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4215.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4215.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4215.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4215.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4215.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4215.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4215.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4215.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4227.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4227.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4227.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4227.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4227.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4227.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4227.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4227.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4238.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4238.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4238.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4238.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4238.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4238.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4238.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4238.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4319.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4319.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4319.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4319.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4319.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4319.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4319.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4319.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4326.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4326.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4326.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4326.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4326.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4326.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4326.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4326.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4348.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4348.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4348.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4348.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4348.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4348.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4348.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4348.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4438.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4438.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4438.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4438.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4438.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4438.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4438.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4438.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4446.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4446.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4446.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4446.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4446.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4446.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4446.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4446.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4516.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4516.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4516.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4516.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4516.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4516.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4516.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4516.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4572.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4572.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4572.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4572.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4572.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4572.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4572.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4572.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4751.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4751.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4751.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4751.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4751.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4751.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4751.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4751.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4760.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4760.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4760.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4760.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4760.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4760.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh4760.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh4760.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5095.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5095.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5095.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5095.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5095.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5095.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5095.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5095.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5240.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5240.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5240.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5240.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5240.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5240.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5240.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5240.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5242.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5242.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5242.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5242.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5242.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5242.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5242.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5242.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5254.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5254.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5254.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5254.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5254.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5254.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5254.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5254.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5256.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5256.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5256.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5256.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5256.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5256.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5256.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5256.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5290.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5290.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5290.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5290.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5290.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5290.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5290.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5290.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5330.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5330.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5330.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5330.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5330.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5330.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5330.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5330.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_1.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_1.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_1.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_1.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_1.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_1.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_1.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_1.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_2.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_2.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_2.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_2.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_2.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_2.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_2.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5378_2.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5486.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5486.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5486.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5486.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5486.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5486.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5486.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5486.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5510.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5510.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5510.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5510.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5510.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5510.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5510.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5510.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5651.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5651.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5651.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5651.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5651.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5651.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5651.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5651.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5705.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5705.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5705.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5705.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5705.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5705.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5705.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5705.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5706.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5706.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5706.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5706.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5706.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5706.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh5706.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh5706.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6176.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6176.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6176.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6176.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6176.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6176.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6176.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6176.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192Template.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192Template.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192Template.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192Template.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192Template.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192Template.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192Template.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6192Template.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6361.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6361.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6361.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6361.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6361.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6361.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6361.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6361.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6648.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6648.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6648.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6648.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6648.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6648.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6648.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6648.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6996.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6996.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6996.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6996.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6996.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6996.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh6996.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh6996.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097Base.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097Base.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097Base.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097Base.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097Base.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097Base.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097Base.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7097Base.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7156.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7156.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7156.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7156.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7156.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7156.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7156.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7156.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7187.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7187.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7187.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7187.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7187.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7187.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7187.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7187.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7494.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7494.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7494.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7494.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7494.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7494.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7494.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7494.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7531.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7531.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7531.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7531.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7531.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7531.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7531.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7531.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7559.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7559.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7559.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7559.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7559.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7559.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7559.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7559.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7830.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7830.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7830.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7830.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7830.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7830.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7830.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7830.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7837.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7837.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7837.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7837.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7837.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7837.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh7837.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh7837.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh8221.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh8221.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh8221.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh8221.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Gh8221.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh8221.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Gh8221.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Gh8221.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue01.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue01.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue01.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue01.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue01.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue01.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue01.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue01.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue02.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue02.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue02.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue02.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue02.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue02.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue02.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/GrialIssue02.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1199.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1199.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1199.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1199.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1199.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1199.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1199.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1199.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1213.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1213.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1213.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1213.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1213.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1213.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1213.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1213.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1250.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1250.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1250.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1250.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1250.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1250.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1250.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1250.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1306.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1306.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1306.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1306.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1306.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1306.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1306.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1306.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1415.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1415.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1415.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1415.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1415.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1415.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1415.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1415.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1438.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1438.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1438.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1438.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1438.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1438.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1438.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1438.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1493.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1493.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1493.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1493.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1497.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1497.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1497.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1497.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1501.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1501.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1501.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1501.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1545.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1545.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1545.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1545.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1549.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1549.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1549.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1549.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1554.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1554.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1554.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1554.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1564.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1564.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1564.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1564.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1594.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1594.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1594.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1594.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1637.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1637.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1637.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1637.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1641.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1641.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1641.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1641.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1794.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1794.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue1794.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue1794.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2016.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2016.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2016.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2016.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2016.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2016.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2016.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2016.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2062.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2062.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2062.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2062.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2062.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2062.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2062.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2062.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2114.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2114.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2114.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2114.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2114.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2114.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2114.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2114.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2152.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2152.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2152.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2152.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2152.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2152.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2152.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2152.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2450.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2450.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2450.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2450.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2450.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2450.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2450.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2450.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2489.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2489.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2489.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2489.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2489.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2489.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2489.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2489.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2578.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2578.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2578.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2578.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2578.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2578.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2578.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2578.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2659.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2659.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2659.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2659.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2659.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2659.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2659.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2659.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2742.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2742.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2742.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2742.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2742.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2742.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue2742.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue2742.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3076.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3076.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue3076.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3076.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3076.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3076.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue3076.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3076.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3090.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3090.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue3090.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3090.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3090.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3090.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue3090.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3090.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3106.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3106.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue3106.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3106.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3106.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3106.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue3106.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue3106.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue6280.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue6280.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue6280.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue6280.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Issue6280.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue6280.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Issue6280.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Issue6280.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Pr3384.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/TestCases.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/TestCases.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/TestCases.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/TestCases.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported001.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported001.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported001.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported001.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported001.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported001.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported001.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported001.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported002.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported002.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported002.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported002.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported002.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported002.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported002.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported002.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported003.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported003.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported003.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported003.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported003.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported003.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported003.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported003.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported004.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported004.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported004.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported004.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported004.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported004.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported004.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported004.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported005.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported005.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported005.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported005.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported005.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported005.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported005.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported005.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported006.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported006.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported006.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported006.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported006.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported006.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported006.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported006.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported007.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported008.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported008.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported008.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported008.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported008.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported008.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported008.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported008.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported009.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported009.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported009.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported009.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported009.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported009.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Issues/Unreported009.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Issues/Unreported009.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/LabelHtml.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/LabelHtml.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/LabelHtml.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/LabelHtml.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/LabelHtml.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/LabelHtml.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/LabelHtml.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/LabelHtml.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/LoaderTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/LoaderTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/LoaderTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/LoaderTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MSBuild/DummyBuildEngine.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/DummyBuildEngine.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MSBuild/DummyBuildEngine.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/DummyBuildEngine.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildXmlExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildXmlExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildXmlExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/MSBuildXmlExtensions.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MSBuild/_Directory.Build.props b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/_Directory.Build.props
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MSBuild/_Directory.Build.props
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/_Directory.Build.props

diff --git a/Xamarin.Forms.Xaml.UnitTests/MSBuild/_Directory.Build.targets b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/_Directory.Build.targets
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MSBuild/_Directory.Build.targets
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MSBuild/_Directory.Build.targets

diff --git a/Xamarin.Forms.Xaml.UnitTests/MarkupExpressionParserTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MarkupExpressionParserTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MarkupExpressionParserTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MarkupExpressionParserTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MarkupExtensionTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MarkupExtensionTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MarkupExtensionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MarkupExtensionTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/McIgnorable.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/McIgnorable.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/McIgnorable.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/McIgnorable.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/McIgnorable.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/McIgnorable.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/McIgnorable.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/McIgnorable.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MergedResourceDictionaries.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MergedResourceDictionaries.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MergedResourceDictionaries.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MergedResourceDictionaries.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/MergedResourceDictionaries.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MergedResourceDictionaries.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MergedResourceDictionaries.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MergedResourceDictionaries.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MockAssemblyResolver.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MockAssemblyResolver.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MockAssemblyResolver.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MockAssemblyResolver.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MockCompiler.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MockCompiler.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MockCompiler.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MockCompiler.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/MultipleDataTemplateChildElements.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MultipleDataTemplateChildElements.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MultipleDataTemplateChildElements.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MultipleDataTemplateChildElements.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/MultipleDataTemplateChildElements.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MultipleDataTemplateChildElements.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/MultipleDataTemplateChildElements.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/MultipleDataTemplateChildElements.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/NameScopeTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/NameScopeTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/NameScopeTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/NameScopeTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/NativeViewsAndBindings.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/NativeViewsAndBindings.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/NativeViewsAndBindings.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/NativeViewsAndBindings.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/NativeViewsAndBindings.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/NativeViewsAndBindings.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/NativeViewsAndBindings.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/NativeViewsAndBindings.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/NullExtensionTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/NullExtensionTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/NullExtensionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/NullExtensionTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/OnPlatform.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/OnPlatform.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/OnPlatform.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/OnPlatform.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/OnPlatform.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/OnPlatform.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/OnPlatform.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/OnPlatform.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/OnPlatformTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/OnPlatformTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/OnPlatformTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/OnPlatformTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/PlatformSpecifics.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithInvalidSource.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithInvalidSource.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithInvalidSource.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithInvalidSource.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithInvalidSource.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithInvalidSource.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithInvalidSource.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithInvalidSource.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithSource.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithSource.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithSource.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithSource.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithSource.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithSource.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithSource.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceDictionaryWithSource.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/ResourceLoader.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceLoader.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ResourceLoader.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceLoader.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/ResourceLoader.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceLoader.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ResourceLoader.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ResourceLoader.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SetStyleIdFromXName.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/SetValue.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SetValue.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/SetValue.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SetValue.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/SetValue.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SetValue.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/SetValue.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SetValue.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary2.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary2.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary2.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary2.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary2.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary2.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary2.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/SharedResourceDictionary2.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Speed/SimpleContentPage.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Speed/SimpleContentPage.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Speed/SimpleContentPage.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Speed/SimpleContentPage.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Speed/SimpleContentPage.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Speed/SimpleContentPage.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Speed/SimpleContentPage.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Speed/SimpleContentPage.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StringLiterals.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/StyleSheet.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StyleSheet.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/StyleSheet.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StyleSheet.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/StyleSheet.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StyleSheet.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/StyleSheet.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StyleSheet.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/StyleTests.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StyleTests.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/StyleTests.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StyleTests.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/StyleTests.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StyleTests.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/StyleTests.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/StyleTests.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/TestSharedResourceDictionary.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TestSharedResourceDictionary.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TestSharedResourceDictionary.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TestSharedResourceDictionary.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/TestSharedResourceDictionary.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TestSharedResourceDictionary.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TestSharedResourceDictionary.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TestSharedResourceDictionary.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/TestXmlnsUsing.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TestXmlnsUsing.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TestXmlnsUsing.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TestXmlnsUsing.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/TestXmlnsUsing.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TestXmlnsUsing.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TestXmlnsUsing.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TestXmlnsUsing.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/TriggerTests.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TriggerTests.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TriggerTests.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TriggerTests.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/TriggerTests.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TriggerTests.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TriggerTests.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TriggerTests.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeConverterTests.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeConverterTests.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TypeConverterTests.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeConverterTests.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeConverterTests.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeConverterTests.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TypeConverterTests.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeConverterTests.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeConverterTestsLegacy.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeConverterTestsLegacy.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TypeConverterTestsLegacy.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeConverterTestsLegacy.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeExtension.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeExtensionTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeExtensionTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TypeExtensionTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeExtensionTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeLoader.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeLoader.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TypeLoader.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeLoader.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/TypeLoader.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeLoader.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/TypeLoader.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/TypeLoader.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Validation/SetterOnNonBP.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/SetterOnNonBP.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Validation/SetterOnNonBP.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/SetterOnNonBP.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Validation/SetterOnNonBP.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/SetterOnNonBP.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Validation/SetterOnNonBP.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/SetterOnNonBP.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Validation/StaticExtensionException.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/StaticExtensionException.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Validation/StaticExtensionException.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/StaticExtensionException.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Validation/StaticExtensionException.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/StaticExtensionException.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Validation/StaticExtensionException.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/StaticExtensionException.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Validation/TypeMismatch.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/TypeMismatch.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Validation/TypeMismatch.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/TypeMismatch.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/Validation/TypeMismatch.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/TypeMismatch.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Validation/TypeMismatch.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Validation/TypeMismatch.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/ViewExtensionsTest.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ViewExtensionsTest.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/ViewExtensionsTest.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/ViewExtensionsTest.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/VisualStateManagerTests.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/VisualStateManagerTests.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/VisualStateManagerTests.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/VisualStateManagerTests.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/VisualStateManagerTests.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/VisualStateManagerTests.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/VisualStateManagerTests.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/VisualStateManagerTests.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/X2009Primitives.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/X2009Primitives.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/X2009Primitives.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/X2009Primitives.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/X2009Primitives.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/X2009Primitives.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/X2009Primitives.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/X2009Primitives.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XArray.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XArray.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XArray.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XArray.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/XArray.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XArray.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XArray.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XArray.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XFCorePostProcessorCodeInjected.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XFCorePostProcessorCodeInjected.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XFCorePostProcessorCodeInjected.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XFCorePostProcessorCodeInjected.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XNull.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XNull.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XNull.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XNull.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/XNull.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XNull.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XNull.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XNull.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XReference.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XReference.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XReference.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XReference.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/XReference.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XReference.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XReference.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XReference.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XStatic.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XStatic.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XStatic.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XStaticException.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlC/FieldReferenceExtensionsTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/FieldReferenceExtensionsTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlC/FieldReferenceExtensionsTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/FieldReferenceExtensionsTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlC/MethodDefinitionExtensionsTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/MethodDefinitionExtensionsTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlC/MethodDefinitionExtensionsTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/MethodDefinitionExtensionsTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlC/MethodReferenceExtensionsTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/MethodReferenceExtensionsTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlC/MethodReferenceExtensionsTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/MethodReferenceExtensionsTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlC/ModuleDefinitionExtensionsTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/ModuleDefinitionExtensionsTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlC/ModuleDefinitionExtensionsTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/ModuleDefinitionExtensionsTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlC/TypeReferenceExtensionsTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/TypeReferenceExtensionsTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlC/TypeReferenceExtensionsTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlC/TypeReferenceExtensionsTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlLoaderCreateTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlLoaderCreateTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlLoaderCreateTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlLoaderCreateTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlLoaderGetXamlForTypeTests.xaml.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlParseExceptionConstraint.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlParseExceptionConstraint.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlParseExceptionConstraint.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlParseExceptionConstraint.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlgFileLockTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlgFileLockTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlgFileLockTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlgFileLockTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/XamlgTests.cs b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlgTests.cs
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/XamlgTests.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/XamlgTests.cs

diff --git a/Xamarin.Forms.Xaml.UnitTests/app.config b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/app.config
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/app.config
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/app.config

diff --git a/Xamarin.Forms.Xaml.UnitTests/css/bar.css b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/css/bar.css
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/css/bar.css
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/css/bar.css

diff --git a/Xamarin.Forms.Xaml.UnitTests/css/foo.css b/Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/css/foo.css
similarity index 100%
rename from Xamarin.Forms.Xaml.UnitTests/css/foo.css
rename to Xamarin.Forms/Xamarin.Forms.Xaml.UnitTests/css/foo.css

diff --git a/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs

diff --git a/Xamarin.Forms.Xaml/CreateValuesVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/CreateValuesVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/CreateValuesVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/CreateValuesVisitor.cs

diff --git a/Xamarin.Forms.Xaml/Diagnostics/ResourceDictionaryDiagnostics.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/Diagnostics/ResourceDictionaryDiagnostics.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/Diagnostics/ResourceDictionaryDiagnostics.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/Diagnostics/ResourceDictionaryDiagnostics.cs

diff --git a/Xamarin.Forms.Xaml/Diagnostics/StaticResourceResolvedEventArgs.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/Diagnostics/StaticResourceResolvedEventArgs.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/Diagnostics/StaticResourceResolvedEventArgs.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/Diagnostics/StaticResourceResolvedEventArgs.cs

diff --git a/Xamarin.Forms.Xaml/ExpandMarkupsVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/ExpandMarkupsVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/ExpandMarkupsVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/ExpandMarkupsVisitor.cs

diff --git a/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/FillResourceDictionariesVisitor.cs

diff --git a/Xamarin.Forms.Xaml/HydrationContext.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/HydrationContext.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/HydrationContext.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/HydrationContext.cs

diff --git a/Xamarin.Forms.Xaml/IDictionaryExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/IDictionaryExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/IDictionaryExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/IDictionaryExtensions.cs

diff --git a/Xamarin.Forms.Xaml/IExpressionParser.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/IExpressionParser.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/IExpressionParser.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/IExpressionParser.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExpressionParser.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExpressionParser.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExpressionParser.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExpressionParser.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensionParser.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensionParser.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensionParser.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensionParser.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/ArrayExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/ArrayExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/ArrayExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/ArrayExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/BindingExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/BindingExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/BindingExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/BindingExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/DataTemplateExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/DataTemplateExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/DataTemplateExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/DataTemplateExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/DynamicResourceExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/DynamicResourceExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/DynamicResourceExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/FontImageExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/FontImageExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/FontImageExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/FontImageExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/NullExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/NullExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/NullExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/NullExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/OnIdiomExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/OnIdiomExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/OnIdiomExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/OnIdiomExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/OnPlatformExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/OnPlatformExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/OnPlatformExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/OnPlatformExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/ReferenceExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/ReferenceExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/ReferenceExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/ReferenceExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/RelativeSourceExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/RelativeSourceExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/RelativeSourceExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/RelativeSourceExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/StaticExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/StaticExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/StaticExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/StaticExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/StaticResourceExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/StyleSheetExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/StyleSheetExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/StyleSheetExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/StyleSheetExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/TemplateBindingExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/TemplateBindingExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/TemplateBindingExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/TemplateBindingExtension.cs

diff --git a/Xamarin.Forms.Xaml/MarkupExtensions/TypeExtension.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/TypeExtension.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/MarkupExtensions/TypeExtension.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/MarkupExtensions/TypeExtension.cs

diff --git a/Xamarin.Forms.Xaml/NamescopingVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/NamescopingVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/NamescopingVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/NamescopingVisitor.cs

diff --git a/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/Properties/AssemblyInfo.cs

diff --git a/Xamarin.Forms.Xaml/PruneIgnoredNodesVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/PruneIgnoredNodesVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/PruneIgnoredNodesVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/PruneIgnoredNodesVisitor.cs

diff --git a/Xamarin.Forms.Xaml/RegisterXNamesVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/RegisterXNamesVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/RegisterXNamesVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/RegisterXNamesVisitor.cs

diff --git a/Xamarin.Forms.Xaml/RemoveDuplicateDesignNodes.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/RemoveDuplicateDesignNodes.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/RemoveDuplicateDesignNodes.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/RemoveDuplicateDesignNodes.cs

diff --git a/Xamarin.Forms.Xaml/ResourcesLoader.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/ResourcesLoader.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/ResourcesLoader.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/ResourcesLoader.cs

diff --git a/Xamarin.Forms.Xaml/TypeArgumentsParser.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/TypeArgumentsParser.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/TypeArgumentsParser.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/TypeArgumentsParser.cs

diff --git a/Xamarin.Forms.Xaml/ViewExtensions.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/ViewExtensions.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/ViewExtensions.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/ViewExtensions.cs

diff --git a/Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj b/Xamarin.Forms/Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj
similarity index 100%
rename from Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj
rename to Xamarin.Forms/Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj

diff --git a/Xamarin.Forms.Xaml/XamlCompilationAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XamlCompilationAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XamlCompilationAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XamlCompilationAttribute.cs

diff --git a/Xamarin.Forms.Xaml/XamlFilePathAttribute.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XamlFilePathAttribute.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XamlFilePathAttribute.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XamlFilePathAttribute.cs

diff --git a/Xamarin.Forms.Xaml/XamlLoader.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XamlLoader.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XamlLoader.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XamlLoader.cs

diff --git a/Xamarin.Forms.Xaml/XamlNode.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XamlNode.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XamlNode.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XamlNode.cs

diff --git a/Xamarin.Forms.Xaml/XamlNodeVisitor.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XamlNodeVisitor.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XamlNodeVisitor.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XamlNodeVisitor.cs

diff --git a/Xamarin.Forms.Xaml/XamlParser.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XamlParser.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XamlParser.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XamlParser.cs

diff --git a/Xamarin.Forms.Xaml/XamlServiceProvider.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XamlServiceProvider.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XamlServiceProvider.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XamlServiceProvider.cs

diff --git a/Xamarin.Forms.Xaml/XmlName.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XmlName.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XmlName.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XmlName.cs

diff --git a/Xamarin.Forms.Xaml/XmlnsHelper.cs b/Xamarin.Forms/Xamarin.Forms.Xaml/XmlnsHelper.cs
similarity index 100%
rename from Xamarin.Forms.Xaml/XmlnsHelper.cs
rename to Xamarin.Forms/Xamarin.Forms.Xaml/XmlnsHelper.cs

diff --git a/Xamarin.Forms.mdpolicy b/Xamarin.Forms/Xamarin.Forms.mdpolicy
similarity index 100%
rename from Xamarin.Forms.mdpolicy
rename to Xamarin.Forms/Xamarin.Forms.mdpolicy

diff --git a/Xamarin.Forms.sln b/Xamarin.Forms/Xamarin.Forms.sln
similarity index 100%
rename from Xamarin.Forms.sln
rename to Xamarin.Forms/Xamarin.Forms.sln

diff --git a/Xamarin.Forms.sln.DotSettings b/Xamarin.Forms/Xamarin.Forms.sln.DotSettings
similarity index 100%
rename from Xamarin.Forms.sln.DotSettings
rename to Xamarin.Forms/Xamarin.Forms.sln.DotSettings

diff --git a/Xamarin.Forms.vssettings b/Xamarin.Forms/Xamarin.Forms.vssettings
similarity index 100%
rename from Xamarin.Forms.vssettings
rename to Xamarin.Forms/Xamarin.Forms.vssettings

diff --git a/azure-pipelines.yml b/Xamarin.Forms/azure-pipelines.yml
similarity index 100%
rename from azure-pipelines.yml
rename to Xamarin.Forms/azure-pipelines.yml

diff --git a/banner.png b/Xamarin.Forms/banner.png
similarity index 100%
rename from banner.png
rename to Xamarin.Forms/banner.png

diff --git a/build.cake b/Xamarin.Forms/build.cake
similarity index 100%
rename from build.cake
rename to Xamarin.Forms/build.cake

diff --git a/build.cmd b/Xamarin.Forms/build.cmd
similarity index 100%
rename from build.cmd
rename to Xamarin.Forms/build.cmd

diff --git a/build.ps1 b/Xamarin.Forms/build.ps1
similarity index 100%
rename from build.ps1
rename to Xamarin.Forms/build.ps1

diff --git a/build.sh b/Xamarin.Forms/build.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from build.sh
rename to Xamarin.Forms/build.sh

diff --git a/build/provisioning/provisioning.csx b/Xamarin.Forms/build/provisioning/provisioning.csx
similarity index 100%
rename from build/provisioning/provisioning.csx
rename to Xamarin.Forms/build/provisioning/provisioning.csx

diff --git a/build/provisioning/provisioning_sign.csx b/Xamarin.Forms/build/provisioning/provisioning_sign.csx
similarity index 100%
rename from build/provisioning/provisioning_sign.csx
rename to Xamarin.Forms/build/provisioning/provisioning_sign.csx

diff --git a/build/scripts/generate-docs.ps1 b/Xamarin.Forms/build/scripts/generate-docs.ps1
similarity index 100%
rename from build/scripts/generate-docs.ps1
rename to Xamarin.Forms/build/scripts/generate-docs.ps1

diff --git a/build/steps/build-android.yml b/Xamarin.Forms/build/steps/build-android.yml
similarity index 100%
rename from build/steps/build-android.yml
rename to Xamarin.Forms/build/steps/build-android.yml

diff --git a/build/steps/build-nuget.yml b/Xamarin.Forms/build/steps/build-nuget.yml
similarity index 100%
rename from build/steps/build-nuget.yml
rename to Xamarin.Forms/build/steps/build-nuget.yml

diff --git a/build/steps/build-osx.yml b/Xamarin.Forms/build/steps/build-osx.yml
similarity index 100%
rename from build/steps/build-osx.yml
rename to Xamarin.Forms/build/steps/build-osx.yml

diff --git a/build/steps/build-prepare.yml b/Xamarin.Forms/build/steps/build-prepare.yml
similarity index 100%
rename from build/steps/build-prepare.yml
rename to Xamarin.Forms/build/steps/build-prepare.yml

diff --git a/build/steps/build-sign.yml b/Xamarin.Forms/build/steps/build-sign.yml
similarity index 100%
rename from build/steps/build-sign.yml
rename to Xamarin.Forms/build/steps/build-sign.yml

diff --git a/build/steps/build-windows-test.yml b/Xamarin.Forms/build/steps/build-windows-test.yml
similarity index 100%
rename from build/steps/build-windows-test.yml
rename to Xamarin.Forms/build/steps/build-windows-test.yml

diff --git a/build/steps/build-windows.yml b/Xamarin.Forms/build/steps/build-windows.yml
similarity index 100%
rename from build/steps/build-windows.yml
rename to Xamarin.Forms/build/steps/build-windows.yml

diff --git a/debug.keystore b/Xamarin.Forms/debug.keystore
similarity index 100%
rename from debug.keystore
rename to Xamarin.Forms/debug.keystore

diff --git a/docs/Xamarin.Forms.Core.xml b/Xamarin.Forms/docs/Xamarin.Forms.Core.xml
similarity index 100%
rename from docs/Xamarin.Forms.Core.xml
rename to Xamarin.Forms/docs/Xamarin.Forms.Core.xml

diff --git a/docs/Xamarin.Forms.Core/Xamarin.Forms/ListView.xml b/Xamarin.Forms/docs/Xamarin.Forms.Core/Xamarin.Forms/ListView.xml
similarity index 100%
rename from docs/Xamarin.Forms.Core/Xamarin.Forms/ListView.xml
rename to Xamarin.Forms/docs/Xamarin.Forms.Core/Xamarin.Forms/ListView.xml

diff --git a/docs/Xamarin.Forms.Maps.xml b/Xamarin.Forms/docs/Xamarin.Forms.Maps.xml
similarity index 100%
rename from docs/Xamarin.Forms.Maps.xml
rename to Xamarin.Forms/docs/Xamarin.Forms.Maps.xml

diff --git a/docs/Xamarin.Forms.Xaml.xml b/Xamarin.Forms/docs/Xamarin.Forms.Xaml.xml
similarity index 100%
rename from docs/Xamarin.Forms.Xaml.xml
rename to Xamarin.Forms/docs/Xamarin.Forms.Xaml.xml

diff --git a/xamarin.forms.snk b/Xamarin.Forms/xamarin.forms.snk
similarity index 100%
rename from xamarin.forms.snk
rename to Xamarin.Forms/xamarin.forms.snk

diff --git a/tools/mdoc/ICSharpCode.SharpZipLib.dll b/tools/mdoc/ICSharpCode.SharpZipLib.dll
deleted file mode 100644 (file)
index a2ae1be..0000000
Binary files a/tools/mdoc/ICSharpCode.SharpZipLib.dll and /dev/null differ

diff --git a/tools/mdoc/Mono.Cecil.dll b/tools/mdoc/Mono.Cecil.dll
deleted file mode 100644 (file)
index dce7a4f..0000000
Binary files a/tools/mdoc/Mono.Cecil.dll and /dev/null differ

diff --git a/tools/mdoc/Mono.Security.dll b/tools/mdoc/Mono.Security.dll
deleted file mode 100644 (file)
index dc2af1f..0000000
Binary files a/tools/mdoc/Mono.Security.dll and /dev/null differ

diff --git a/tools/mdoc/System.Configuration.dll b/tools/mdoc/System.Configuration.dll
deleted file mode 100644 (file)
index 96c2654..0000000
Binary files a/tools/mdoc/System.Configuration.dll and /dev/null differ

diff --git a/tools/mdoc/System.Security.dll b/tools/mdoc/System.Security.dll
deleted file mode 100644 (file)
index ccd25e4..0000000
Binary files a/tools/mdoc/System.Security.dll and /dev/null differ

diff --git a/tools/mdoc/mdoc.exe b/tools/mdoc/mdoc.exe
deleted file mode 100644 (file)
index f9a94ae..0000000
Binary files a/tools/mdoc/mdoc.exe and /dev/null differ

diff --git a/tools/mdoc/monodoc.dll b/tools/mdoc/monodoc.dll
deleted file mode 100644 (file)
index 2d34134..0000000
Binary files a/tools/mdoc/monodoc.dll and /dev/null differ