From 55da255d86e55c9c4a01a6c21e3e387c1a5b8722 Mon Sep 17 00:00:00 2001
From: CommonGuy <m-allenspach@hotmail.com>
Date: Wed, 16 May 2018 10:43:26 +0200
Subject: [PATCH 01/16] Improve KeyDown behavior in DropDown

---
 src/Avalonia.Controls/DropDown.cs     | 80 ++++++++++++++-------------
 src/Avalonia.Controls/DropDownItem.cs | 35 +++++++++++-
 2 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/src/Avalonia.Controls/DropDown.cs b/src/Avalonia.Controls/DropDown.cs
index 932179028e..5b7213257d 100644
--- a/src/Avalonia.Controls/DropDown.cs
+++ b/src/Avalonia.Controls/DropDown.cs
@@ -6,7 +6,6 @@ using Avalonia.Controls.Generators;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Shapes;
 using Avalonia.Input;
-using Avalonia.Layout;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
 using Avalonia.VisualTree;
@@ -51,6 +50,7 @@ namespace Avalonia.Controls
         {
             FocusableProperty.OverrideDefaultValue<DropDown>(true);
             SelectedItemProperty.Changed.AddClassHandler<DropDown>(x => x.SelectedItemChanged);
+            KeyDownEvent.AddClassHandler<DropDown>(x => x.OnKeyDown, Interactivity.RoutingStrategies.Tunnel);
         }
 
         /// <summary>
@@ -96,54 +96,46 @@ namespace Avalonia.Controls
             this.UpdateSelectionBoxItem(this.SelectedItem);
         }
 
-        protected override void OnGotFocus(GotFocusEventArgs e)
-        {
-            base.OnGotFocus(e);
-
-            if (!e.Handled && e.NavigationMethod == NavigationMethod.Directional)
-            {
-                e.Handled = UpdateSelectionFromEventSource(e.Source);
-            }
-        }
-
         /// <inheritdoc/>
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);
 
-            if (!e.Handled)
+            if (e.Handled)
+                return;
+
+            if (e.Key == Key.F4 ||
+                ((e.Key == Key.Down || e.Key == Key.Up) && ((e.Modifiers & InputModifiers.Alt) != 0)))
             {
-                if (e.Key == Key.F4 ||
-                    ((e.Key == Key.Down || e.Key == Key.Up) && ((e.Modifiers & InputModifiers.Alt) != 0)))
+                IsDropDownOpen = !IsDropDownOpen;
+                e.Handled = true;
+            }
+            else if (IsDropDownOpen && e.Key == Key.Escape)
+            {
+                IsDropDownOpen = false;
+                e.Handled = true;
+            }
+            else if (IsDropDownOpen && e.Key == Key.Enter)
+            {
+                SelectFocusedItem();
+                IsDropDownOpen = false;
+                e.Handled = true;
+            }
+            else if (!IsDropDownOpen)
+            {
+                if (e.Key == Key.Down)
                 {
-                    IsDropDownOpen = !IsDropDownOpen;
+                    if (++SelectedIndex >= ItemCount)
+                        SelectedIndex = 0;
+
                     e.Handled = true;
                 }
-                else if (IsDropDownOpen && (e.Key == Key.Escape || e.Key == Key.Enter))
+                else if (e.Key == Key.Up)
                 {
-                    IsDropDownOpen = false;
-                    e.Handled = true;
-                }
+                    if (--SelectedIndex < 0)
+                        SelectedIndex = ItemCount - 1;
 
-                if (!IsDropDownOpen)
-                {
-                    if (e.Key == Key.Down)
-                    {
-                        if (SelectedIndex == -1)
-                            SelectedIndex = 0;
-                        
-                        if (++SelectedIndex >= ItemCount)
-                            SelectedIndex = 0;
-                        
-                        e.Handled = true;
-                    }
-                    else if (e.Key == Key.Up)
-                    {
-                        if (--SelectedIndex < 0)
-                            SelectedIndex = ItemCount - 1;
-                        
-                        e.Handled = true;
-                    }
+                    e.Handled = true;
                 }
             }
         }
@@ -230,5 +222,17 @@ namespace Avalonia.Controls
                 SelectionBoxItem = item;
             }
         }
+
+        private void SelectFocusedItem()
+        {
+            foreach (ItemContainerInfo dropdownItem in ItemContainerGenerator.Containers)
+            {
+                if (dropdownItem.ContainerControl.IsFocused)
+                {
+                    SelectedIndex = dropdownItem.Index;
+                    break;
+                }
+            }
+        }
     }
 }
diff --git a/src/Avalonia.Controls/DropDownItem.cs b/src/Avalonia.Controls/DropDownItem.cs
index 1a5cbb5014..3fd80c4562 100644
--- a/src/Avalonia.Controls/DropDownItem.cs
+++ b/src/Avalonia.Controls/DropDownItem.cs
@@ -1,12 +1,45 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
+using System;
+
 namespace Avalonia.Controls
 {
     /// <summary>
     /// A selectable item in a <see cref="DropDown"/>.
     /// </summary>
-    public class DropDownItem : ListBoxItem
+    public class DropDownItem : ContentControl, ISelectable
     {
+        /// <summary>
+        /// Defines the <see cref="IsSelected"/> property.
+        /// </summary>
+        public static readonly StyledProperty<bool> IsSelectedProperty =
+            AvaloniaProperty.Register<DropDownItem, bool>(nameof(IsSelected));
+
+        /// <summary>
+        /// Initializes static members of the <see cref="DropDownItem"/> class.
+        /// </summary>
+        static DropDownItem()
+        {
+            FocusableProperty.OverrideDefaultValue<DropDownItem>(true);
+            IsFocusedProperty.Changed.Subscribe(x =>
+            {
+                var sender = x.Sender as IControl;
+
+                if (sender != null)
+                {
+                    ((IPseudoClasses)sender.Classes).Set(":selected", (bool)x.NewValue);
+                }
+            });
+        }
+
+        /// <summary>
+        /// Gets or sets the selection state of the item.
+        /// </summary>
+        public bool IsSelected
+        {
+            get { return GetValue(IsSelectedProperty); }
+            set { SetValue(IsSelectedProperty, value); }
+        }
     }
 }

From c2c581e524441dc76a8729a912b71995cb64725c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 13 May 2018 16:03:37 -0500
Subject: [PATCH 02/16] Refactor away dependencies between Avalonia.Markup and
 Avalonia.Controls. Now Avalonia.Markup only depends on Avalonia.Base.

---
 src/Avalonia.Controls/ControlExtensions.cs    | 15 -----
 .../Controls}/ControlLocator.cs               | 65 ++++++++-----------
 .../Controls/NameScopeExtensions.cs           | 13 ++++
 .../Avalonia.Markup.Xaml/Data/Binding.cs      | 23 ++++++-
 .../Avalonia.Markup/Avalonia.Markup.csproj    |  6 --
 5 files changed, 63 insertions(+), 59 deletions(-)
 rename src/{Markup/Avalonia.Markup => Avalonia.Styling/Controls}/ControlLocator.cs (65%)

diff --git a/src/Avalonia.Controls/ControlExtensions.cs b/src/Avalonia.Controls/ControlExtensions.cs
index 60a940627f..45a7554f1c 100644
--- a/src/Avalonia.Controls/ControlExtensions.cs
+++ b/src/Avalonia.Controls/ControlExtensions.cs
@@ -66,21 +66,6 @@ namespace Avalonia.Controls
             return nameScope.Find<T>(name);
         }
 
-        /// <summary>
-        /// Finds the name scope for a control by searching up the logical tree.
-        /// </summary>
-        /// <param name="control">The control.</param>
-        /// <returns>The control's name scope, or null if not found.</returns>
-        public static INameScope FindNameScope(this IControl control)
-        {
-            Contract.Requires<ArgumentNullException>(control != null);
-
-            return control.GetSelfAndLogicalAncestors()
-                .OfType<Control>()
-                .Select(x => (x as INameScope) ?? NameScope.GetNameScope(x))
-                .FirstOrDefault(x => x != null);
-        }
-
         /// <summary>
         /// Adds or removes a pseudoclass depending on a boolean value.
         /// </summary>
diff --git a/src/Markup/Avalonia.Markup/ControlLocator.cs b/src/Avalonia.Styling/Controls/ControlLocator.cs
similarity index 65%
rename from src/Markup/Avalonia.Markup/ControlLocator.cs
rename to src/Avalonia.Styling/Controls/ControlLocator.cs
index 1a82c0a4fd..e03ec722ad 100644
--- a/src/Markup/Avalonia.Markup/ControlLocator.cs
+++ b/src/Avalonia.Styling/Controls/ControlLocator.cs
@@ -9,7 +9,7 @@ using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
 
-namespace Avalonia.Markup
+namespace Avalonia.Controls
 {
     /// <summary>
     /// The type of tree via which to track a control.
@@ -38,12 +38,12 @@ namespace Avalonia.Markup
         /// The control relative from which the other control should be found.
         /// </param>
         /// <param name="name">The name of the control to find.</param>
-        public static IObservable<IControl> Track(IControl relativeTo, string name)
+        public static IObservable<ILogical> Track(ILogical relativeTo, string name)
         {
             var attached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
                 x => relativeTo.AttachedToLogicalTree += x,
                 x => relativeTo.AttachedToLogicalTree -= x)
-                .Select(x => ((IControl)x.Sender).FindNameScope())
+                .Select(x => ((ILogical)x.Sender).FindNameScope())
                 .StartWith(relativeTo.FindNameScope());
 
             var detached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
@@ -60,53 +60,32 @@ namespace Avalonia.Markup
                         x => nameScope.Registered -= x)
                         .Where(x => x.EventArgs.Name == name)
                         .Select(x => x.EventArgs.Element)
-                        .OfType<IControl>();
+                        .OfType<ILogical>();
                     var unregistered = Observable.FromEventPattern<NameScopeEventArgs>(
                         x => nameScope.Unregistered += x,
                         x => nameScope.Unregistered -= x)
                         .Where(x => x.EventArgs.Name == name)
-                        .Select(_ => (IControl)null);
+                        .Select(_ => (ILogical)null);
                     return registered
-                        .StartWith(nameScope.Find<IControl>(name))
+                        .StartWith(nameScope.Find<ILogical>(name))
                         .Merge(unregistered);
                 }
                 else
                 {
-                    return Observable.Return<IControl>(null);
+                    return Observable.Return<ILogical>(null);
                 }
             }).Switch();
         }
 
-        /// <summary>
-        /// Tracks a typed visual ancestor control.
-        /// </summary>
-        /// <param name="relativeTo">
-        /// The control relative from which the other control should be found.
-        /// </param>
-        /// <param name="tree">The tree via which to track the control.</param>
-        /// <param name="ancestorLevel">
-        /// The level of ancestor control to look for. Use 0 for the first ancestor of the
-        /// requested type.
-        /// </param>
-        /// <param name="ancestorType">The type of the ancestor to find.</param>
-        public static IObservable<IControl> Track(IControl relativeTo, TreeType tree, int ancestorLevel, Type ancestorType = null)
+        public static IObservable<ILogical> Track(ILogical relativeTo, int ancestorLevel, Type ancestorType = null)
         {
-            return TrackAttachmentToTree(relativeTo, tree).Select(isAttachedToTree =>
+            return TrackAttachmentToTree(relativeTo).Select(isAttachedToTree =>
             {
                 if (isAttachedToTree)
                 {
-                    if (tree == TreeType.Visual)
-                    {
-                        return relativeTo.GetVisualAncestors()
-                            .Where(x => ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
-                            .ElementAtOrDefault(ancestorLevel) as IControl; 
-                    }
-                    else
-                    {
-                        return relativeTo.GetLogicalAncestors()
-                            .Where(x => ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
-                            .ElementAtOrDefault(ancestorLevel) as IControl;
-                    }
+                    return relativeTo.GetLogicalAncestors()
+                        .Where(x => ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
+                        .ElementAtOrDefault(ancestorLevel);
                 }
                 else
                 {
@@ -115,12 +94,24 @@ namespace Avalonia.Markup
             });
         }
 
-        private static IObservable<bool> TrackAttachmentToTree(IControl relativeTo, TreeType tree)
+        public static IObservable<IVisual> Track(IVisual relativeTo, int ancestorLevel, Type ancestorType = null)
         {
-            return tree == TreeType.Visual ? TrackAttachmentToVisualTree(relativeTo) : TrackAttachmentToLogicalTree(relativeTo);
+            return TrackAttachmentToTree(relativeTo).Select(isAttachedToTree =>
+            {
+                if (isAttachedToTree)
+                {
+                    return relativeTo.GetVisualAncestors()
+                        .Where(x => ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
+                        .ElementAtOrDefault(ancestorLevel);
+                }
+                else
+                {
+                    return null;
+                }
+            });
         }
 
-        private static IObservable<bool> TrackAttachmentToVisualTree(IControl relativeTo)
+        private static IObservable<bool> TrackAttachmentToTree(IVisual relativeTo)
         {
             var attached = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
                 x => relativeTo.AttachedToVisualTree += x,
@@ -137,7 +128,7 @@ namespace Avalonia.Markup
             return attachmentStatus;
         }
 
-        private static IObservable<bool> TrackAttachmentToLogicalTree(IControl relativeTo)
+        private static IObservable<bool> TrackAttachmentToTree(ILogical relativeTo)
         {
             var attached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
                 x => relativeTo.AttachedToLogicalTree += x,
diff --git a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
index b8c26c8d49..49be842ffc 100644
--- a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
+++ b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
@@ -3,6 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using Avalonia.LogicalTree;
+using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
@@ -64,5 +67,15 @@ namespace Avalonia.Controls
 
             return (T)result;
         }
+
+        public static INameScope FindNameScope(this ILogical control)
+        {
+            Contract.Requires<ArgumentNullException>(control != null);
+
+            return control.GetSelfAndLogicalAncestors()
+                .OfType<Visual>()
+                .Select(x => (x as INameScope) ?? NameScope.GetNameScope(x))
+                .FirstOrDefault(x => x != null);
+        }
     }
 }
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
index 7f750144df..c440a94935 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
@@ -8,6 +8,7 @@ using System.Reactive.Linq;
 using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.LogicalTree;
 using Avalonia.Markup.Data;
 using Avalonia.VisualTree;
 
@@ -234,8 +235,28 @@ namespace Avalonia.Markup.Xaml.Data
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
+            IObservable<object> controlLocator;
+
+            switch (relativeSource.Tree)
+            {
+                case TreeType.Logical:
+                    controlLocator = ControlLocator.Track(
+                        (ILogical)target,
+                        relativeSource.AncestorLevel - 1,
+                        relativeSource.AncestorType);
+                    break;
+                case TreeType.Visual:
+                    controlLocator = ControlLocator.Track(
+                        (IVisual)target,
+                        relativeSource.AncestorLevel - 1,
+                        relativeSource.AncestorType);
+                    break;
+                default:
+                    throw new InvalidOperationException("Invalid tree to traverse.");
+            }
+
             return new ExpressionObserver(
-                ControlLocator.Track(target, relativeSource.Tree, relativeSource.AncestorLevel - 1, relativeSource.AncestorType),
+                controlLocator,
                 path,
                 enableDataValidation);
         }
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index a3b7d07784..56b8d46b64 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -4,12 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\Markup.props" />
   <Import Project="..\..\..\build\Rx.props" />

From cf8244b37ab60aea01e91c5632b068bcaad4d3c1 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 26 May 2018 22:15:42 -0500
Subject: [PATCH 03/16] Move current contents of Avalonia.Markup to
 Avalonia.Base. Move Avalonia.Markup.Xaml.Data/Parser classes to
 Avalonia.Markup since they're not Xaml-specific.

Use pattern-matching switch.

Fix bug from cleanup.
---
 Avalonia.sln                                  |   2 +
 build/Binding.props                           |   8 +
 .../Pages/AutoCompleteBoxPage.xaml.cs         |   3 +-
 .../Resources/Resource.Designer.cs            |   7 +-
 src/Avalonia.Base/Avalonia.Base.csproj        |   1 +
 .../Collections/AvaloniaDictionary.cs         |   5 +-
 src/Avalonia.Base/Data/BindingNotification.cs |   3 +-
 .../AlwaysEnabledDelegateCommand.cs           |   2 +-
 .../Data/Converters}/BoolConverters.cs        |   2 +-
 .../Data/Converters}/DefaultValueConverter.cs |   2 +-
 .../Converters}/FuncMultiValueConverter.cs    |   2 +-
 .../Data/Converters}/FuncValueConverter.cs    |   2 +-
 .../Data/Converters}/IMultiValueConverter.cs  |   2 +-
 .../Data/Converters}/IValueConverter.cs       |   2 +-
 .../Data/Converters}/StringConverters.cs      |   2 +-
 .../Data/Core}/BindingExpression.cs           |   4 +-
 .../Data/Core}/CommonPropertyNames.cs         |   2 +-
 .../Data/Core}/EmptyExpressionNode.cs         |   2 +-
 .../Data/Core}/ExpressionNode.cs              |   2 +-
 .../Data/Core}/ExpressionNodeBuilder.cs       |   4 +-
 .../Data/Core}/ExpressionObserver.cs          |  45 +-
 .../Data/Core}/ExpressionParseException.cs    |   4 +-
 .../Data/Core}/ISettableNode.cs               |   2 +-
 .../Data/Core}/ITransformNode.cs              |   2 +-
 .../Data/Core}/IndexerNode.cs                 |   2 +-
 .../Data/Core}/LogicalNotNode.cs              |   2 +-
 .../Data/Core}/MarkupBindingChainException.cs |   3 +-
 .../Data/Core}/Parsers/ArgumentListParser.cs  |   2 +-
 .../Data/Core}/Parsers/ExpressionParser.cs    |   2 +-
 .../Data/Core}/Parsers/IdentifierParser.cs    |   2 +-
 .../Data/Core}/Parsers/Reader.cs              |   2 +-
 .../Plugins/AvaloniaPropertyAccessorPlugin.cs |   2 +-
 .../DataAnnotationsValidationPlugin.cs        |   2 +-
 .../Data/Core}/Plugins/DataValidatiorBase.cs  |   2 +-
 .../Plugins/ExceptionValidationPlugin.cs      |   2 +-
 .../Core}/Plugins/IDataValidationPlugin.cs    |   2 +-
 .../Data/Core}/Plugins/IPropertyAccessor.cs   |   2 +-
 .../Core}/Plugins/IPropertyAccessorPlugin.cs  |   2 +-
 .../Data/Core}/Plugins/IStreamPlugin.cs       |   2 +-
 .../Core}/Plugins/IndeiValidationPlugin.cs    |   2 +-
 .../Plugins/InpcPropertyAccessorPlugin.cs     |   2 +-
 .../Core}/Plugins/MethodAccessorPlugin.cs     |   2 +-
 .../Core}/Plugins/ObservableStreamPlugin.cs   |   2 +-
 .../Core}/Plugins/PropertyAccessorBase.cs     |   2 +-
 .../Data/Core}/Plugins/PropertyError.cs       |   2 +-
 .../Data/Core}/Plugins/TaskStreamPlugin.cs    |   2 +-
 .../Data/Core}/PropertyAccessorNode.cs        |   4 +-
 .../Data/Core}/StreamNode.cs                  |   2 +-
 src/Avalonia.Base/Properties/AssemblyInfo.cs  |   3 +-
 .../Avalonia.Markup.Xaml.csproj               |   6 +-
 .../AvaloniaXamlLoader.cs                     |   2 +-
 .../AvaloniaPropertyTypeConverter.cs          |   2 +-
 .../Converters/SelectorTypeConverter.cs       |   4 +-
 .../MarkupExtensions/BindingExtension.cs      |   3 +-
 .../RelativeSourceExtension.cs                |   2 +-
 .../ResourceInclude.cs                        |   2 +-
 .../StaticResourceExtension.cs                |   2 +-
 .../TemplateBindingExtension.cs               |   5 +-
 .../AvaloniaRuntimeTypeProvider.cs            |   3 +-
 .../PortableXaml/AvaloniaXamlSchemaContext.cs |   2 +-
 .../PortableXaml/AvaloniaXamlType.cs          |   2 +-
 .../Properties/AssemblyInfo.cs                |   2 -
 .../Templates/MemberSelector.cs               |   2 +-
 .../Templates/TreeDataTemplate.cs             |   7 +-
 .../Avalonia.Markup/Avalonia.Markup.csproj    |   6 +-
 .../Data/Binding.cs                           |   7 +-
 .../Data/DelayedBinding.cs                    |   2 +-
 .../Data/MultiBinding.cs                      |   3 +-
 .../Data/RelativeSource.cs                    |   3 +-
 .../Parsers/SelectorGrammar.cs                |   2 +-
 .../Parsers/SelectorParser.cs                 |   2 +-
 .../Properties/AssemblyInfo.cs                |   2 +-
 .../AvaloniaObjectTests_Binding.cs            |   2 +-
 .../AvaloniaObjectTests_Direct.cs             |   2 +-
 .../Collections/AvaloniaDictionaryTests.cs    |   3 +-
 .../Data/Core}/BindingExpressionTests.cs      |   5 +-
 .../Data/Core}/ExpressionNodeBuilderTests.cs  |   4 +-
 .../ExpressionNodeBuilderTests_Errors.cs      |   4 +-
 ...xpressionObserverTests_AttachedProperty.cs |   4 +-
 ...xpressionObserverTests_AvaloniaProperty.cs |   4 +-
 .../ExpressionObserverTests_DataValidation.cs |   4 +-
 .../Core}/ExpressionObserverTests_Indexer.cs  |   4 +-
 .../Core}/ExpressionObserverTests_Lifetime.cs |   4 +-
 .../Core}/ExpressionObserverTests_Method.cs   |   4 +-
 .../Core}/ExpressionObserverTests_Negation.cs |   4 +-
 .../ExpressionObserverTests_Observable.cs     |   4 +-
 .../Core}/ExpressionObserverTests_Property.cs |   6 +-
 .../Core}/ExpressionObserverTests_SetValue.cs |   4 +-
 .../Core}/ExpressionObserverTests_Task.cs     |   4 +-
 .../Data/Core}/IndeiBase.cs                   |   2 +-
 .../DataAnnotationsValidationPluginTests.cs   |   2 +-
 .../Plugins/ExceptionValidationPluginTests.cs |   4 +-
 .../Plugins/IndeiValidationPluginTests.cs     |   4 +-
 .../Data}/DefaultValueConverterTests.cs       |   3 +-
 .../Data}/UnitTestSynchronizationContext.cs   |   2 +-
 .../AutoCompleteBoxTests.cs                   |   2 +-
 .../ButtonTests.cs                            |   2 +-
 .../ContentControlTests.cs                    |   2 +-
 .../DatePickerTests.cs                        |   2 +-
 .../ListBoxTests_Single.cs                    |   2 +-
 .../Primitives/RangeBaseTests.cs              |   2 +-
 .../Primitives/SelectingItemsControlTests.cs  |   2 +-
 .../SelectingItemsControlTests_Multiple.cs    |   2 +-
 .../Primitives/ToggleButtonTests.cs           |   2 +-
 .../RadioButtonTests.cs                       |   2 +-
 .../TextBoxTests.cs                           |   2 +-
 .../TextBoxTests_DataValidation.cs            |   2 +-
 .../TreeViewTests.cs                          |   1 +
 tests/Avalonia.LeakTests/ControlTests.cs      |   2 +-
 .../ExpressionObserverTests.cs                |   1 +
 .../Data/BindingTests.cs                      | 548 ++++++++++++++++++
 .../Data/BindingTests_DataValidation.cs       |   4 +-
 .../Data/BindingTests_ElementName.cs          |   4 +-
 .../Data/BindingTests_RelativeSource.cs       |   4 +-
 .../Data/BindingTests_Self.cs                 |   4 +-
 .../Data/BindingTests_Source.cs               |   3 +-
 .../Data/BindingTests_TemplatedParent.cs      |  76 +++
 .../Data/MultiBindingTests.cs                 |   5 +-
 .../Parsers/SelectorGrammarTests.cs           |   4 +-
 .../Parsers/SelectorParserTests.cs            |   2 +-
 .../Data/BindingTests.cs                      | 532 +----------------
 .../Data/BindingTests_TemplatedParent.cs      |  55 --
 .../DynamicResourceExtensionTests.cs          |   2 +-
 .../ResourceIncludeTests.cs                   |   2 +-
 .../MarkupExtensions/TestValueConverter.cs    |   1 +
 .../StyleTests.cs                             |   2 +-
 .../Xaml/BasicTests.cs                        |   3 +-
 .../Xaml/StyleTests.cs                        |   2 +-
 .../Xaml/TreeDataTemplateTests.cs             |   2 +-
 .../ControlLocatorTests.cs                    |   9 +-
 .../Avalonia.Styling.UnitTests/SetterTests.cs |   3 +-
 131 files changed, 841 insertions(+), 776 deletions(-)
 create mode 100644 build/Binding.props
 rename src/{Markup/Avalonia.Markup => Avalonia.Base/Data/Converters}/AlwaysEnabledDelegateCommand.cs (97%)
 rename src/{Markup/Avalonia.Markup => Avalonia.Base/Data/Converters}/BoolConverters.cs (94%)
 rename src/{Markup/Avalonia.Markup => Avalonia.Base/Data/Converters}/DefaultValueConverter.cs (98%)
 rename src/{Markup/Avalonia.Markup => Avalonia.Base/Data/Converters}/FuncMultiValueConverter.cs (97%)
 rename src/{Markup/Avalonia.Markup => Avalonia.Base/Data/Converters}/FuncValueConverter.cs (97%)
 rename src/{Markup/Avalonia.Markup => Avalonia.Base/Data/Converters}/IMultiValueConverter.cs (97%)
 rename src/{Markup/Avalonia.Markup => Avalonia.Base/Data/Converters}/IValueConverter.cs (98%)
 rename src/{Markup/Avalonia.Markup => Avalonia.Base/Data/Converters}/StringConverters.cs (96%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/BindingExpression.cs (99%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/CommonPropertyNames.cs (89%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/EmptyExpressionNode.cs (94%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/ExpressionNode.cs (99%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/ExpressionNodeBuilder.cs (92%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/ExpressionObserver.cs (90%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/ExpressionParseException.cs (93%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/ISettableNode.cs (90%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/ITransformNode.cs (83%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/IndexerNode.cs (99%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/LogicalNotNode.cs (98%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/MarkupBindingChainException.cs (95%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Parsers/ArgumentListParser.cs (97%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Parsers/ExpressionParser.cs (99%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Parsers/IdentifierParser.cs (97%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Parsers/Reader.cs (95%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/AvaloniaPropertyAccessorPlugin.cs (99%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/DataAnnotationsValidationPlugin.cs (98%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/DataValidatiorBase.cs (98%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/ExceptionValidationPlugin.cs (97%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/IDataValidationPlugin.cs (97%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/IPropertyAccessor.cs (97%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/IPropertyAccessorPlugin.cs (97%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/IStreamPlugin.cs (96%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/IndeiValidationPlugin.cs (99%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/InpcPropertyAccessorPlugin.cs (99%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/MethodAccessorPlugin.cs (98%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/ObservableStreamPlugin.cs (96%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/PropertyAccessorBase.cs (98%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/PropertyError.cs (96%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/Plugins/TaskStreamPlugin.cs (98%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/PropertyAccessorNode.cs (96%)
 rename src/{Markup/Avalonia.Markup/Data => Avalonia.Base/Data/Core}/StreamNode.cs (96%)
 rename src/Markup/Avalonia.Markup.Xaml/{Data => MarkupExtensions}/ResourceInclude.cs (97%)
 rename src/Markup/{Avalonia.Markup.Xaml => Avalonia.Markup}/Data/Binding.cs (98%)
 rename src/Markup/{Avalonia.Markup.Xaml => Avalonia.Markup}/Data/DelayedBinding.cs (99%)
 rename src/Markup/{Avalonia.Markup.Xaml => Avalonia.Markup}/Data/MultiBinding.cs (98%)
 rename src/Markup/{Avalonia.Markup.Xaml => Avalonia.Markup}/Data/RelativeSource.cs (98%)
 rename src/Markup/{Avalonia.Markup.Xaml => Avalonia.Markup}/Parsers/SelectorGrammar.cs (99%)
 rename src/Markup/{Avalonia.Markup.Xaml => Avalonia.Markup}/Parsers/SelectorParser.cs (99%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/BindingExpressionTests.cs (99%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionNodeBuilderTests.cs (98%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionNodeBuilderTests_Errors.cs (96%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_AttachedProperty.cs (98%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_AvaloniaProperty.cs (97%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_DataValidation.cs (99%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_Indexer.cs (99%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_Lifetime.cs (98%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_Method.cs (97%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_Negation.cs (98%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_Observable.cs (98%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_Property.cs (99%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_SetValue.cs (97%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/ExpressionObserverTests_Task.cs (98%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/IndeiBase.cs (96%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/Plugins/DataAnnotationsValidationPluginTests.cs (99%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/Plugins/ExceptionValidationPluginTests.cs (96%)
 rename tests/{Avalonia.Markup.UnitTests/Data => Avalonia.Base.UnitTests/Data/Core}/Plugins/IndeiValidationPluginTests.cs (98%)
 rename tests/{Avalonia.Markup.UnitTests => Avalonia.Base.UnitTests/Data}/DefaultValueConverterTests.cs (98%)
 rename tests/{Avalonia.Markup.UnitTests => Avalonia.Base.UnitTests/Data}/UnitTestSynchronizationContext.cs (98%)
 create mode 100644 tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
 rename tests/{Avalonia.Markup.Xaml.UnitTests => Avalonia.Markup.UnitTests}/Data/BindingTests_DataValidation.cs (96%)
 rename tests/{Avalonia.Markup.Xaml.UnitTests => Avalonia.Markup.UnitTests}/Data/BindingTests_ElementName.cs (98%)
 rename tests/{Avalonia.Markup.Xaml.UnitTests => Avalonia.Markup.UnitTests}/Data/BindingTests_RelativeSource.cs (98%)
 rename tests/{Avalonia.Markup.Xaml.UnitTests => Avalonia.Markup.UnitTests}/Data/BindingTests_Self.cs (96%)
 rename tests/{Avalonia.Markup.Xaml.UnitTests => Avalonia.Markup.UnitTests}/Data/BindingTests_Source.cs (94%)
 create mode 100644 tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
 rename tests/{Avalonia.Markup.Xaml.UnitTests => Avalonia.Markup.UnitTests}/Data/MultiBindingTests.cs (96%)
 rename tests/{Avalonia.Markup.Xaml.UnitTests => Avalonia.Markup.UnitTests}/Parsers/SelectorGrammarTests.cs (98%)
 rename tests/{Avalonia.Markup.Xaml.UnitTests => Avalonia.Markup.UnitTests}/Parsers/SelectorParserTests.cs (91%)
 rename tests/Avalonia.Markup.Xaml.UnitTests/{Data => MarkupExtensions}/ResourceIncludeTests.cs (96%)
 rename tests/{Avalonia.Markup.UnitTests => Avalonia.Styling.UnitTests}/ControlLocatorTests.cs (95%)

diff --git a/Avalonia.sln b/Avalonia.sln
index 47ee4c1ad9..91413fc5ee 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -138,6 +138,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{74487168
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A}"
 	ProjectSection(SolutionItems) = preProject
+		build\Base.props = build\Base.props
+		build\Binding.props = build\Binding.props
 		build\JetBrains.Annotations.props = build\JetBrains.Annotations.props
 		build\JetBrains.dotMemoryUnit.props = build\JetBrains.dotMemoryUnit.props
 		build\Magick.NET-Q16-AnyCPU.props = build\Magick.NET-Q16-AnyCPU.props
diff --git a/build/Binding.props b/build/Binding.props
new file mode 100644
index 0000000000..a512ee1d9c
--- /dev/null
+++ b/build/Binding.props
@@ -0,0 +1,8 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
+  </ItemGroup>
+</Project>
diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index 6f3b8361cd..65be8c801e 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -2,12 +2,13 @@ using Avalonia.Controls;
 using Avalonia.LogicalTree;
 using Avalonia.Markup;
 using Avalonia.Markup.Xaml;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Avalonia.Data.Converters;
 
 namespace ControlCatalog.Pages
 {
diff --git a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
index 80cbbc51ec..e66c2800d3 100644
--- a/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
+++ b/src/Android/Avalonia.Android/Resources/Resource.Designer.cs
@@ -40,11 +40,14 @@ namespace Avalonia.Android
 		public partial class String
 		{
 			
+			// aapt resource value: 0x7f020002
+			public static int ApplicationName = 2130837506;
+			
 			// aapt resource value: 0x7f020001
-			public static int ApplicationName = 2130837505;
+			public static int Hello = 2130837505;
 			
 			// aapt resource value: 0x7f020000
-			public static int Hello = 2130837504;
+			public static int library_name = 2130837504;
 			
 			static String()
 			{
diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index 35adcbeb92..26397a6f32 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>Avalonia</RootNamespace>
   </PropertyGroup>
   <Import Project="..\..\build\Base.props" />
+  <Import Project="..\..\build\Binding.props" />
   <Import Project="..\..\build\Rx.props" />
   <Import Project="..\..\build\JetBrains.Annotations.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
index 84ac85d3db..e8dc2a5ed7 100644
--- a/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
+++ b/src/Avalonia.Base/Collections/AvaloniaDictionary.cs
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
+using Avalonia.Data.Core;
 
 namespace Avalonia.Collections
 {
@@ -116,8 +117,8 @@ namespace Avalonia.Collections
 
             _inner = new Dictionary<TKey, TValue>();
 
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Count"));
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("Item[]"));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Count)));
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(CommonPropertyNames.IndexerName));
             
 
             if (CollectionChanged != null)
diff --git a/src/Avalonia.Base/Data/BindingNotification.cs b/src/Avalonia.Base/Data/BindingNotification.cs
index 5510a73b91..5d3e6b26f4 100644
--- a/src/Avalonia.Base/Data/BindingNotification.cs
+++ b/src/Avalonia.Base/Data/BindingNotification.cs
@@ -171,8 +171,7 @@ namespace Avalonia.Data
         /// </remarks>
         public static object ExtractError(object o)
         {
-            var notification = o as BindingNotification;
-            return notification != null ? notification.Error : o;
+            return o is BindingNotification notification ? notification.Error : o;
         }
 
         /// <summary>
diff --git a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs b/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
rename to src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs
index 48db99b43c..d2fb48ffb8 100644
--- a/src/Markup/Avalonia.Markup/AlwaysEnabledDelegateCommand.cs
+++ b/src/Avalonia.Base/Data/Converters/AlwaysEnabledDelegateCommand.cs
@@ -6,7 +6,7 @@ using System.Reflection;
 using System.Text;
 using System.Windows.Input;
 
-namespace Avalonia.Markup
+namespace Avalonia.Data.Converters
 {
     class AlwaysEnabledDelegateCommand : ICommand
     {
diff --git a/src/Markup/Avalonia.Markup/BoolConverters.cs b/src/Avalonia.Base/Data/Converters/BoolConverters.cs
similarity index 94%
rename from src/Markup/Avalonia.Markup/BoolConverters.cs
rename to src/Avalonia.Base/Data/Converters/BoolConverters.cs
index e049dccc06..6b429e1087 100644
--- a/src/Markup/Avalonia.Markup/BoolConverters.cs
+++ b/src/Avalonia.Base/Data/Converters/BoolConverters.cs
@@ -3,7 +3,7 @@
 
 using System.Linq;
 
-namespace Avalonia.Markup
+namespace Avalonia.Data.Converters
 {
     /// <summary>
     /// Provides a set of useful <see cref="IValueConverter"/>s for working with string values.
diff --git a/src/Markup/Avalonia.Markup/DefaultValueConverter.cs b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup/DefaultValueConverter.cs
rename to src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
index 28d64eb561..ec75076892 100644
--- a/src/Markup/Avalonia.Markup/DefaultValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
@@ -7,7 +7,7 @@ using Avalonia.Data;
 using Avalonia.Utilities;
 using System.Windows.Input;
 
-namespace Avalonia.Markup
+namespace Avalonia.Data.Converters
 {
     /// <summary>
     /// Provides a default set of value conversions for bindings that do not specify a value
diff --git a/src/Markup/Avalonia.Markup/FuncMultiValueConverter.cs b/src/Avalonia.Base/Data/Converters/FuncMultiValueConverter.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/FuncMultiValueConverter.cs
rename to src/Avalonia.Base/Data/Converters/FuncMultiValueConverter.cs
index 75aace0bd9..6e1c4cb0e3 100644
--- a/src/Markup/Avalonia.Markup/FuncMultiValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/FuncMultiValueConverter.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 
-namespace Avalonia.Markup
+namespace Avalonia.Data.Converters
 {
     /// <summary>
     /// A general purpose <see cref="IValueConverter"/> that uses a <see cref="Func{T1, TResult}"/>
diff --git a/src/Markup/Avalonia.Markup/FuncValueConverter.cs b/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/FuncValueConverter.cs
rename to src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
index 109de9371d..b747587b4a 100644
--- a/src/Markup/Avalonia.Markup/FuncValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/FuncValueConverter.cs
@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using Avalonia.Utilities;
 
-namespace Avalonia.Markup
+namespace Avalonia.Data.Converters
 {
     /// <summary>
     /// A general purpose <see cref="IValueConverter"/> that uses a <see cref="Func{T1, TResult}"/>
diff --git a/src/Markup/Avalonia.Markup/IMultiValueConverter.cs b/src/Avalonia.Base/Data/Converters/IMultiValueConverter.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/IMultiValueConverter.cs
rename to src/Avalonia.Base/Data/Converters/IMultiValueConverter.cs
index be75dabb1c..3f84fcb3e7 100644
--- a/src/Markup/Avalonia.Markup/IMultiValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/IMultiValueConverter.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace Avalonia.Markup
+namespace Avalonia.Data.Converters
 {
     /// <summary>
     /// Converts multi-binding inputs to a final value.
diff --git a/src/Markup/Avalonia.Markup/IValueConverter.cs b/src/Avalonia.Base/Data/Converters/IValueConverter.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup/IValueConverter.cs
rename to src/Avalonia.Base/Data/Converters/IValueConverter.cs
index 10d5c626c2..b55a2c4fe8 100644
--- a/src/Markup/Avalonia.Markup/IValueConverter.cs
+++ b/src/Avalonia.Base/Data/Converters/IValueConverter.cs
@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using Avalonia.Data;
 
-namespace Avalonia.Markup
+namespace Avalonia.Data.Converters
 {
     /// <summary>
     /// Converts a binding value.
diff --git a/src/Markup/Avalonia.Markup/StringConverters.cs b/src/Avalonia.Base/Data/Converters/StringConverters.cs
similarity index 96%
rename from src/Markup/Avalonia.Markup/StringConverters.cs
rename to src/Avalonia.Base/Data/Converters/StringConverters.cs
index fda79c76a3..470f0d2289 100644
--- a/src/Markup/Avalonia.Markup/StringConverters.cs
+++ b/src/Avalonia.Base/Data/Converters/StringConverters.cs
@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using Avalonia.Utilities;
 
-namespace Avalonia.Markup
+namespace Avalonia.Data.Converters
 {
     /// <summary>
     /// Provides a set of useful <see cref="IValueConverter"/>s for working with string values.
diff --git a/src/Markup/Avalonia.Markup/Data/BindingExpression.cs b/src/Avalonia.Base/Data/Core/BindingExpression.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup/Data/BindingExpression.cs
rename to src/Avalonia.Base/Data/Core/BindingExpression.cs
index 5b9959e42e..4b41d1568c 100644
--- a/src/Markup/Avalonia.Markup/Data/BindingExpression.cs
+++ b/src/Avalonia.Base/Data/Core/BindingExpression.cs
@@ -5,11 +5,11 @@ using System;
 using System.Globalization;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Avalonia.Data;
+using Avalonia.Data.Converters;
 using Avalonia.Logging;
 using Avalonia.Utilities;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     /// <summary>
     /// Binds to an expression on an object using a type value converter to convert the values
diff --git a/src/Markup/Avalonia.Markup/Data/CommonPropertyNames.cs b/src/Avalonia.Base/Data/Core/CommonPropertyNames.cs
similarity index 89%
rename from src/Markup/Avalonia.Markup/Data/CommonPropertyNames.cs
rename to src/Avalonia.Base/Data/Core/CommonPropertyNames.cs
index f91940baf7..6760c3f259 100644
--- a/src/Markup/Avalonia.Markup/Data/CommonPropertyNames.cs
+++ b/src/Avalonia.Base/Data/Core/CommonPropertyNames.cs
@@ -1,7 +1,7 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     public static class CommonPropertyNames
     {
diff --git a/src/Markup/Avalonia.Markup/Data/EmptyExpressionNode.cs b/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
similarity index 94%
rename from src/Markup/Avalonia.Markup/Data/EmptyExpressionNode.cs
rename to src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
index 02ecd817da..93e0d5947a 100644
--- a/src/Markup/Avalonia.Markup/Data/EmptyExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/EmptyExpressionNode.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Reactive.Linq;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     internal class EmptyExpressionNode : ExpressionNode
     {
diff --git a/src/Markup/Avalonia.Markup/Data/ExpressionNode.cs b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup/Data/ExpressionNode.cs
rename to src/Avalonia.Base/Data/Core/ExpressionNode.cs
index 56c0072eaa..ae70cacdba 100644
--- a/src/Markup/Avalonia.Markup/Data/ExpressionNode.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNode.cs
@@ -7,7 +7,7 @@ using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     internal abstract class ExpressionNode : ISubject<object>
     {
diff --git a/src/Markup/Avalonia.Markup/Data/ExpressionNodeBuilder.cs b/src/Avalonia.Base/Data/Core/ExpressionNodeBuilder.cs
similarity index 92%
rename from src/Markup/Avalonia.Markup/Data/ExpressionNodeBuilder.cs
rename to src/Avalonia.Base/Data/Core/ExpressionNodeBuilder.cs
index 013299c1d7..8e9e9fc3c1 100644
--- a/src/Markup/Avalonia.Markup/Data/ExpressionNodeBuilder.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionNodeBuilder.cs
@@ -2,9 +2,9 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using Avalonia.Markup.Data.Parsers;
+using Avalonia.Data.Core.Parsers;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     internal static class ExpressionNodeBuilder
     {
diff --git a/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs b/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
similarity index 90%
rename from src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs
rename to src/Avalonia.Base/Data/Core/ExpressionObserver.cs
index dd9718a0f6..7719f93a02 100644
--- a/src/Markup/Avalonia.Markup/Data/ExpressionObserver.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionObserver.cs
@@ -8,9 +8,9 @@ using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Avalonia.Data;
-using Avalonia.Markup.Data.Plugins;
+using Avalonia.Data.Core.Plugins;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     /// <summary>
     /// Observes and sets the value of an expression on an object.
@@ -245,40 +245,35 @@ namespace Avalonia.Markup.Data
 
         private object Translate(object o)
         {
-            var weak = o as WeakReference;
-
-            if (weak != null)
+            if (o is WeakReference weak)
             {
                 return weak.Target;
             }
-            else
+            else if (BindingNotification.ExtractError(o) is MarkupBindingChainException broken)
             {
-                var broken = BindingNotification.ExtractError(o) as MarkupBindingChainException;
-
-                if (broken != null)
-                {
-                    broken.Commit(Description);
-                }
-                return o;
+                broken.Commit(Description);
             }
+
+            return o;
         }
 
         private IDisposable StartRoot()
         {
-            var observable = _root as IObservable<object>;
-
-            if (observable != null)
+            switch (_root)
             {
-                return observable.Subscribe(
-                    x => _node.Target = new WeakReference(x != AvaloniaProperty.UnsetValue ? x : null),
-                    _ => _finished.OnNext(Unit.Default),
-                    () => _finished.OnNext(Unit.Default));
-            }
-            else
-            {
-                _node.Target = (WeakReference)_root;
-                return Disposable.Empty;
+                case IObservable<object> observable:
+                    return observable.Subscribe(
+                        x => _node.Target = new WeakReference(x != AvaloniaProperty.UnsetValue ? x : null),
+                        _ => _finished.OnNext(Unit.Default),
+                        () => _finished.OnNext(Unit.Default));
+                case WeakReference weak:
+                    _node.Target = weak;
+                    break;
+                default:
+                    throw new AvaloniaInternalException("The ExpressionObserver._root member should only be either an observable or WeakReference.");
             }
+
+            return Disposable.Empty;
         }
     }
 }
diff --git a/src/Markup/Avalonia.Markup/Data/ExpressionParseException.cs b/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
similarity index 93%
rename from src/Markup/Avalonia.Markup/Data/ExpressionParseException.cs
rename to src/Avalonia.Base/Data/Core/ExpressionParseException.cs
index d06bdd1e52..3d7bce4080 100644
--- a/src/Markup/Avalonia.Markup/Data/ExpressionParseException.cs
+++ b/src/Avalonia.Base/Data/Core/ExpressionParseException.cs
@@ -2,9 +2,9 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using Avalonia.Markup.Data.Parsers;
+using Avalonia.Data.Core.Parsers;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     /// <summary>
     /// Exception thrown when <see cref="ExpressionObserver"/> could not parse the provided
diff --git a/src/Markup/Avalonia.Markup/Data/ISettableNode.cs b/src/Avalonia.Base/Data/Core/ISettableNode.cs
similarity index 90%
rename from src/Markup/Avalonia.Markup/Data/ISettableNode.cs
rename to src/Avalonia.Base/Data/Core/ISettableNode.cs
index 8ee4f1de20..7788407833 100644
--- a/src/Markup/Avalonia.Markup/Data/ISettableNode.cs
+++ b/src/Avalonia.Base/Data/Core/ISettableNode.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     interface ISettableNode
     {
diff --git a/src/Markup/Avalonia.Markup/Data/ITransformNode.cs b/src/Avalonia.Base/Data/Core/ITransformNode.cs
similarity index 83%
rename from src/Markup/Avalonia.Markup/Data/ITransformNode.cs
rename to src/Avalonia.Base/Data/Core/ITransformNode.cs
index f33ecd3722..7638db8302 100644
--- a/src/Markup/Avalonia.Markup/Data/ITransformNode.cs
+++ b/src/Avalonia.Base/Data/Core/ITransformNode.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     interface ITransformNode
     {
diff --git a/src/Markup/Avalonia.Markup/Data/IndexerNode.cs b/src/Avalonia.Base/Data/Core/IndexerNode.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup/Data/IndexerNode.cs
rename to src/Avalonia.Base/Data/Core/IndexerNode.cs
index 4e2914a148..47e82fa2d3 100644
--- a/src/Markup/Avalonia.Markup/Data/IndexerNode.cs
+++ b/src/Avalonia.Base/Data/Core/IndexerNode.cs
@@ -13,7 +13,7 @@ using System.Reflection;
 using System.Reactive.Linq;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     internal class IndexerNode : ExpressionNode, ISettableNode
     {
diff --git a/src/Markup/Avalonia.Markup/Data/LogicalNotNode.cs b/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup/Data/LogicalNotNode.cs
rename to src/Avalonia.Base/Data/Core/LogicalNotNode.cs
index ae68867e82..f277005cec 100644
--- a/src/Markup/Avalonia.Markup/Data/LogicalNotNode.cs
+++ b/src/Avalonia.Base/Data/Core/LogicalNotNode.cs
@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     internal class LogicalNotNode : ExpressionNode, ITransformNode
     {
diff --git a/src/Markup/Avalonia.Markup/Data/MarkupBindingChainException.cs b/src/Avalonia.Base/Data/Core/MarkupBindingChainException.cs
similarity index 95%
rename from src/Markup/Avalonia.Markup/Data/MarkupBindingChainException.cs
rename to src/Avalonia.Base/Data/Core/MarkupBindingChainException.cs
index ddfcf531eb..a9b31c7617 100644
--- a/src/Markup/Avalonia.Markup/Data/MarkupBindingChainException.cs
+++ b/src/Avalonia.Base/Data/Core/MarkupBindingChainException.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Data;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     internal class MarkupBindingChainException : BindingChainException
     {
diff --git a/src/Markup/Avalonia.Markup/Data/Parsers/ArgumentListParser.cs b/src/Avalonia.Base/Data/Core/Parsers/ArgumentListParser.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/Data/Parsers/ArgumentListParser.cs
rename to src/Avalonia.Base/Data/Core/Parsers/ArgumentListParser.cs
index 05b3b29be0..17200a62b1 100644
--- a/src/Markup/Avalonia.Markup/Data/Parsers/ArgumentListParser.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/ArgumentListParser.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace Avalonia.Markup.Data.Parsers
+namespace Avalonia.Data.Core.Parsers
 {
     internal static class ArgumentListParser
     {
diff --git a/src/Markup/Avalonia.Markup/Data/Parsers/ExpressionParser.cs b/src/Avalonia.Base/Data/Core/Parsers/ExpressionParser.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup/Data/Parsers/ExpressionParser.cs
rename to src/Avalonia.Base/Data/Core/Parsers/ExpressionParser.cs
index f31f6eccb7..5c74c5cd13 100644
--- a/src/Markup/Avalonia.Markup/Data/Parsers/ExpressionParser.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/ExpressionParser.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Avalonia.Markup.Data.Parsers
+namespace Avalonia.Data.Core.Parsers
 {
     internal class ExpressionParser
     {
diff --git a/src/Markup/Avalonia.Markup/Data/Parsers/IdentifierParser.cs b/src/Avalonia.Base/Data/Core/Parsers/IdentifierParser.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/Data/Parsers/IdentifierParser.cs
rename to src/Avalonia.Base/Data/Core/Parsers/IdentifierParser.cs
index fa9051af06..b0a9ff4df2 100644
--- a/src/Markup/Avalonia.Markup/Data/Parsers/IdentifierParser.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/IdentifierParser.cs
@@ -4,7 +4,7 @@
 using System.Globalization;
 using System.Text;
 
-namespace Avalonia.Markup.Data.Parsers
+namespace Avalonia.Data.Core.Parsers
 {
     internal static class IdentifierParser
     {
diff --git a/src/Markup/Avalonia.Markup/Data/Parsers/Reader.cs b/src/Avalonia.Base/Data/Core/Parsers/Reader.cs
similarity index 95%
rename from src/Markup/Avalonia.Markup/Data/Parsers/Reader.cs
rename to src/Avalonia.Base/Data/Core/Parsers/Reader.cs
index 414648a10c..14187c769a 100644
--- a/src/Markup/Avalonia.Markup/Data/Parsers/Reader.cs
+++ b/src/Avalonia.Base/Data/Core/Parsers/Reader.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Avalonia.Markup.Data.Parsers
+namespace Avalonia.Data.Core.Parsers
 {
     internal class Reader
     {
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
index ac64459dd7..8cbcaa8233 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/AvaloniaPropertyAccessorPlugin.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Reads a property from a <see cref="AvaloniaObject"/>.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/DataAnnotationsValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup/Data/Plugins/DataAnnotationsValidationPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
index 859438636a..47e4d91e13 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/DataAnnotationsValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/DataAnnotationsValidationPlugin.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Reflection;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Validates properties on that have <see cref="ValidationAttribute"/>s.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/DataValidatiorBase.cs b/src/Avalonia.Base/Data/Core/Plugins/DataValidatiorBase.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup/Data/Plugins/DataValidatiorBase.cs
rename to src/Avalonia.Base/Data/Core/Plugins/DataValidatiorBase.cs
index 95d269f437..bd429f04d6 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/DataValidatiorBase.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/DataValidatiorBase.cs
@@ -4,7 +4,7 @@
 using System;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Base class for data validators.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/ExceptionValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/Data/Plugins/ExceptionValidationPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
index e0b6bcfd7c..35f9f7e59a 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/ExceptionValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/ExceptionValidationPlugin.cs
@@ -5,7 +5,7 @@ using Avalonia.Data;
 using System;
 using System.Reflection;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Validates properties that report errors by throwing exceptions.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/IDataValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/Data/Plugins/IDataValidationPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
index 0952e2edab..c55917b088 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/IDataValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IDataValidationPlugin.cs
@@ -4,7 +4,7 @@
 using System;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Defines how data validation is observed by an <see cref="ExpressionObserver"/>.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/IPropertyAccessor.cs b/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessor.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/Data/Plugins/IPropertyAccessor.cs
rename to src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessor.cs
index 9e686baf10..d7dda57a72 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/IPropertyAccessor.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessor.cs
@@ -4,7 +4,7 @@
 using System;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Defines an accessor to a property on an object returned by a 
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/IPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessorPlugin.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup/Data/Plugins/IPropertyAccessorPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessorPlugin.cs
index ebfdf6ebe4..539f518083 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/IPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IPropertyAccessorPlugin.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Defines how a member is read, written and observed by an
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/IStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IStreamPlugin.cs
similarity index 96%
rename from src/Markup/Avalonia.Markup/Data/Plugins/IStreamPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/IStreamPlugin.cs
index efb2e2d93a..b80d9d75c8 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/IStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IStreamPlugin.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Defines a plugin that handles the '^' stream binding operator.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/IndeiValidationPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup/Data/Plugins/IndeiValidationPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
index 82bc87c207..436046f3fa 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/IndeiValidationPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/IndeiValidationPlugin.cs
@@ -8,7 +8,7 @@ using System.Linq;
 using Avalonia.Data;
 using Avalonia.Utilities;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Validates properties on objects that implement <see cref="INotifyDataErrorInfo"/>.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/InpcPropertyAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup/Data/Plugins/InpcPropertyAccessorPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
index 3bdaba6fd9..ba4e60eb74 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/InpcPropertyAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/InpcPropertyAccessorPlugin.cs
@@ -10,7 +10,7 @@ using Avalonia.Data;
 using Avalonia.Logging;
 using Avalonia.Utilities;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Reads a property from a standard C# object that optionally supports the
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
index db0d3e0299..b2b3a107fa 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/MethodAccessorPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/MethodAccessorPlugin.cs
@@ -5,7 +5,7 @@ using Avalonia.Data;
 using System.Reflection;
 using System.Linq;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     class MethodAccessorPlugin : IPropertyAccessorPlugin
     {
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/ObservableStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
similarity index 96%
rename from src/Markup/Avalonia.Markup/Data/Plugins/ObservableStreamPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
index a1da42d28f..14ca8ee79e 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/ObservableStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/ObservableStreamPlugin.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Handles binding to <see cref="IObservable{T}"/>s for the '^' stream binding operator.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/PropertyAccessorBase.cs b/src/Avalonia.Base/Data/Core/Plugins/PropertyAccessorBase.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup/Data/Plugins/PropertyAccessorBase.cs
rename to src/Avalonia.Base/Data/Core/Plugins/PropertyAccessorBase.cs
index 9aa858e0eb..9cc78369a7 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/PropertyAccessorBase.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/PropertyAccessorBase.cs
@@ -4,7 +4,7 @@
 using System;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Defines a default base implementation for a <see cref="IPropertyAccessor"/>.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/PropertyError.cs b/src/Avalonia.Base/Data/Core/Plugins/PropertyError.cs
similarity index 96%
rename from src/Markup/Avalonia.Markup/Data/Plugins/PropertyError.cs
rename to src/Avalonia.Base/Data/Core/Plugins/PropertyError.cs
index b351ef39bd..647adc36cb 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/PropertyError.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/PropertyError.cs
@@ -2,7 +2,7 @@ using System;
 using System.Reactive.Disposables;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// An <see cref="IPropertyAccessor"/> that represents an error.
diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/TaskStreamPlugin.cs b/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup/Data/Plugins/TaskStreamPlugin.cs
rename to src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
index 02fe8104b8..cc9b3abd56 100644
--- a/src/Markup/Avalonia.Markup/Data/Plugins/TaskStreamPlugin.cs
+++ b/src/Avalonia.Base/Data/Core/Plugins/TaskStreamPlugin.cs
@@ -9,7 +9,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using Avalonia.Data;
 
-namespace Avalonia.Markup.Data.Plugins
+namespace Avalonia.Data.Core.Plugins
 {
     /// <summary>
     /// Handles binding to <see cref="Task"/>s for the '^' stream binding operator.
diff --git a/src/Markup/Avalonia.Markup/Data/PropertyAccessorNode.cs b/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
similarity index 96%
rename from src/Markup/Avalonia.Markup/Data/PropertyAccessorNode.cs
rename to src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
index f6040d3f15..4dbff4602f 100644
--- a/src/Markup/Avalonia.Markup/Data/PropertyAccessorNode.cs
+++ b/src/Avalonia.Base/Data/Core/PropertyAccessorNode.cs
@@ -6,9 +6,9 @@ using System.Linq;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using Avalonia.Data;
-using Avalonia.Markup.Data.Plugins;
+using Avalonia.Data.Core.Plugins;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     internal class PropertyAccessorNode : ExpressionNode, ISettableNode
     {
diff --git a/src/Markup/Avalonia.Markup/Data/StreamNode.cs b/src/Avalonia.Base/Data/Core/StreamNode.cs
similarity index 96%
rename from src/Markup/Avalonia.Markup/Data/StreamNode.cs
rename to src/Avalonia.Base/Data/Core/StreamNode.cs
index ebcbfc9598..187c79af49 100644
--- a/src/Markup/Avalonia.Markup/Data/StreamNode.cs
+++ b/src/Avalonia.Base/Data/Core/StreamNode.cs
@@ -6,7 +6,7 @@ using System.Globalization;
 using Avalonia.Data;
 using System.Reactive.Linq;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data.Core
 {
     internal class StreamNode : ExpressionNode
     {
diff --git a/src/Avalonia.Base/Properties/AssemblyInfo.cs b/src/Avalonia.Base/Properties/AssemblyInfo.cs
index 0a276aa2aa..75d58f45d5 100644
--- a/src/Avalonia.Base/Properties/AssemblyInfo.cs
+++ b/src/Avalonia.Base/Properties/AssemblyInfo.cs
@@ -1,9 +1,10 @@
-// Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using Avalonia.Metadata;
 
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data.Converters")]
 [assembly: InternalsVisibleTo("Avalonia.Base.UnitTests")]
 [assembly: InternalsVisibleTo("Avalonia.UnitTests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] 
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 8bfe8c25bd..1690ad97ae 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -32,6 +32,7 @@
         <Compile Include="Converters\TimeSpanTypeConverter.cs" />
         <Compile Include="Data\ResourceInclude.cs" />
         <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
+        <Compile Include="MarkupExtensions\ResourceInclude.cs" />
         <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
         <Compile Include="MarkupExtensions\StyleIncludeExtension.cs" />
         <Compile Include="PortableXaml\AvaloniaXamlContext.cs" />
@@ -51,11 +52,11 @@
         <Compile Include="Data\DelayedBinding.cs" />
         <Compile Include="Data\MultiBinding.cs" />
         <Compile Include="Data\RelativeSource.cs" />
+        <Compile Include="Converters\ThicknessTypeConverter.cs" />
+        <Compile Include="Converters\TimeSpanTypeConverter.cs" />
         <Compile Include="MarkupExtensions\BindingExtension.cs" />
         <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
         <Compile Include="MarkupExtensions\TemplateBindingExtension.cs" />
-        <Compile Include="Parsers\SelectorGrammar.cs" />
-        <Compile Include="Parsers\SelectorParser.cs" />
         <Compile Include="PortableXaml\AvaloniaTypeAttributeProvider.cs" />
         <Compile Include="PortableXaml\AvaloniaXamlType.cs" />
         <Compile Include="PortableXaml\TypeDescriptorExtensions.cs" />
@@ -86,6 +87,5 @@
     <ProjectReference Include="..\Avalonia.Markup\Avalonia.Markup.csproj" />
   </ItemGroup>
   <Import Project="..\..\..\build\Markup.props" />
-  <Import Project="..\..\..\build\Sprache.props" />
   <Import Project="..\..\..\build\Rx.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
index f3fac3faf7..c361372820 100644
--- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaXamlLoader.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.PortableXaml;
 using Avalonia.Platform;
 using Portable.Xaml;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
index bc3caff3b9..131cb5a20b 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/AvaloniaPropertyTypeConverter.cs
@@ -10,7 +10,7 @@ namespace Avalonia.Markup.Xaml.Converters
     using Avalonia.Styling;
     using Portable.Xaml;
     using Portable.Xaml.ComponentModel;
-	using System.ComponentModel;
+    using System.ComponentModel;
     using Portable.Xaml.Markup;
 
     public class AvaloniaPropertyTypeConverter : TypeConverter
diff --git a/src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs b/src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs
index 29ddcccd08..fb0131a9b4 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Converters/SelectorTypeConverter.cs
@@ -3,12 +3,12 @@
 
 using System;
 using System.Globalization;
-using Avalonia.Markup.Xaml.Parsers;
+using Avalonia.Markup.Parsers;
 
 namespace Avalonia.Markup.Xaml.Converters
 {
     using Portable.Xaml.ComponentModel;
-	using System.ComponentModel;
+    using System.ComponentModel;
 
     public class SelectorTypeConverter : TypeConverter
     {
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
index 6e8fe1e4c0..98203deebe 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/BindingExtension.cs
@@ -2,12 +2,13 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
 using System;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
     using Avalonia.Controls;
+    using Avalonia.Data.Converters;
+    using Avalonia.Markup.Data;
     using Avalonia.Styling;
     using Portable.Xaml;
     using Portable.Xaml.ComponentModel;
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
index 0b3345d6db..c9ec973f20 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
@@ -1,7 +1,7 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/ResourceInclude.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
similarity index 97%
rename from src/Markup/Avalonia.Markup.Xaml/Data/ResourceInclude.cs
rename to src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
index 035765fae0..75fac8aa92 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/ResourceInclude.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResourceInclude.cs
@@ -4,7 +4,7 @@ using Avalonia.Controls;
 using Portable.Xaml.ComponentModel;
 using Portable.Xaml.Markup;
 
-namespace Avalonia.Markup.Xaml.Data
+namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
     /// <summary>
     /// Loads a resource dictionary from a specified URL.
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index 8e71c5f81b..dd1d697224 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Reflection;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Portable.Xaml;
 using Portable.Xaml.ComponentModel;
 using Portable.Xaml.Markup;
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
index c5fe83977f..c8fc8a41d1 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/TemplateBindingExtension.cs
@@ -2,14 +2,15 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
     using System;
+    using Avalonia.Data.Converters;
+    using Avalonia.Markup.Data;
     using Portable.Xaml.Markup;
 
-    [MarkupExtensionReturnType(typeof(Binding))]
+    [MarkupExtensionReturnType(typeof(IBinding))]
     public class TemplateBindingExtension : MarkupExtension
     {
         public TemplateBindingExtension()
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs
index b6ffac69ab..9cb2cc6cd8 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Avalonia.Controls;
+using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Media;
 using Avalonia.Metadata;
@@ -35,7 +36,7 @@ namespace Avalonia.Markup.Xaml.Context
             typeof(Style).GetTypeInfo().Assembly,
             typeof(DataTemplate).GetTypeInfo().Assembly,
             typeof(SolidColorBrush).GetTypeInfo().Assembly,
-            typeof(IValueConverter).GetTypeInfo().Assembly,
+            typeof(Binding).GetTypeInfo().Assembly,
         };
 
         private Dictionary<string, HashSet<ClrNamespaceInfo>> _namespaces = new Dictionary<string, HashSet<ClrNamespaceInfo>>();
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs
index fda5da902a..70402aa764 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlSchemaContext.cs
@@ -1,6 +1,6 @@
 using Avalonia.Data;
 using Avalonia.Markup.Xaml.Context;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.MarkupExtensions;
 using Avalonia.Markup.Xaml.Styling;
 using Portable.Xaml;
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
index 59dbba7084..2194223cb7 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlType.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Metadata;
 using Avalonia.Styling;
 using Portable.Xaml;
diff --git a/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
index 1b0e056baf..e67e994123 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Properties/AssemblyInfo.cs
@@ -5,10 +5,8 @@ using System.Reflection;
 using Avalonia.Metadata;
 using System.Runtime.CompilerServices;
 
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Data")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.MarkupExtensions")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Styling")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Xaml.Templates")]
-[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml", "Avalonia.Markup.Xaml.MarkupExtensions.Standard")]
 [assembly: InternalsVisibleTo("Avalonia.Markup.Xaml.UnitTests")]
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs
index 1581765132..aa3c359953 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/MemberSelector.cs
@@ -3,7 +3,7 @@
 
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using System;
 using System.Reactive.Linq;
 
diff --git a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
index 883e177f8a..a733ef761c 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Templates/TreeDataTemplate.cs
@@ -6,8 +6,8 @@ using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Data.Core;
 using Avalonia.Markup.Data;
-using Avalonia.Markup.Xaml.Data;
 using Avalonia.Metadata;
 
 namespace Avalonia.Markup.Xaml.Templates
@@ -48,11 +48,6 @@ namespace Avalonia.Markup.Xaml.Templates
             return null;
         }
 
-        public bool IsExpanded(object item)
-        {
-            return true;
-        }
-
         public IControl Build(object data)
         {
             var visualTreeForItem = TemplateContent.Load(Content);
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 56b8d46b64..02e49a4d73 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -4,7 +4,11 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
+    <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
-  <Import Project="..\..\..\build\Markup.props" />
   <Import Project="..\..\..\build\Rx.props" />
+  <Import Project="..\..\..\build\Sprache.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
rename to src/Markup/Avalonia.Markup/Data/Binding.cs
index c440a94935..bf44912bba 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup/Data/Binding.cs
@@ -8,11 +8,12 @@ using System.Reactive.Linq;
 using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Data.Core;
 using Avalonia.LogicalTree;
-using Avalonia.Markup.Data;
 using Avalonia.VisualTree;
 
-namespace Avalonia.Markup.Xaml.Data
+namespace Avalonia.Markup.Data
 {
     /// <summary>
     /// A XAML binding.
@@ -84,7 +85,7 @@ namespace Avalonia.Markup.Xaml.Data
         /// </summary>
         public object Source { get; set; }
 
-        internal WeakReference DefaultAnchor { get; set; }
+        public WeakReference DefaultAnchor { get; set; }
 
         /// <inheritdoc/>
         public InstancedBinding Initiate(
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/DelayedBinding.cs b/src/Markup/Avalonia.Markup/Data/DelayedBinding.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup.Xaml/Data/DelayedBinding.cs
rename to src/Markup/Avalonia.Markup/Data/DelayedBinding.cs
index 5ec40fe702..df16c02dab 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/DelayedBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/DelayedBinding.cs
@@ -9,7 +9,7 @@ using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Logging;
 
-namespace Avalonia.Markup.Xaml.Data
+namespace Avalonia.Markup.Data
 {
     /// <summary>
     /// Provides delayed bindings for controls.
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/MultiBinding.cs b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup.Xaml/Data/MultiBinding.cs
rename to src/Markup/Avalonia.Markup/Data/MultiBinding.cs
index 3c29ed3a39..4c7d9396ac 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/MultiBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
@@ -9,9 +9,10 @@ using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Data.Converters;
 using Avalonia.Metadata;
 
-namespace Avalonia.Markup.Xaml.Data
+namespace Avalonia.Markup.Data
 {
     /// <summary>
     /// A XAML binding that calculates an aggregate value from multiple child <see cref="Bindings"/>.
diff --git a/src/Markup/Avalonia.Markup.Xaml/Data/RelativeSource.cs b/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
similarity index 98%
rename from src/Markup/Avalonia.Markup.Xaml/Data/RelativeSource.cs
rename to src/Markup/Avalonia.Markup/Data/RelativeSource.cs
index 825d3b8ba5..ffddb7ee03 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Data/RelativeSource.cs
+++ b/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
@@ -2,8 +2,9 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
+using Avalonia.Controls;
 
-namespace Avalonia.Markup.Xaml.Data
+namespace Avalonia.Markup.Data
 {
     /// <summary>
     /// Defines the mode of a <see cref="RelativeSource"/> object.
diff --git a/src/Markup/Avalonia.Markup.Xaml/Parsers/SelectorGrammar.cs b/src/Markup/Avalonia.Markup/Parsers/SelectorGrammar.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup.Xaml/Parsers/SelectorGrammar.cs
rename to src/Markup/Avalonia.Markup/Parsers/SelectorGrammar.cs
index 671fdfff30..014f08d995 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Parsers/SelectorGrammar.cs
+++ b/src/Markup/Avalonia.Markup/Parsers/SelectorGrammar.cs
@@ -9,7 +9,7 @@ using Sprache;
 // only reason they have overridden Equals methods is for unit testing.
 #pragma warning disable 659
 
-namespace Avalonia.Markup.Xaml.Parsers
+namespace Avalonia.Markup.Parsers
 {
     internal class SelectorGrammar
     {
diff --git a/src/Markup/Avalonia.Markup.Xaml/Parsers/SelectorParser.cs b/src/Markup/Avalonia.Markup/Parsers/SelectorParser.cs
similarity index 99%
rename from src/Markup/Avalonia.Markup.Xaml/Parsers/SelectorParser.cs
rename to src/Markup/Avalonia.Markup/Parsers/SelectorParser.cs
index 1cecb21f17..e50056ddef 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Parsers/SelectorParser.cs
+++ b/src/Markup/Avalonia.Markup/Parsers/SelectorParser.cs
@@ -7,7 +7,7 @@ using Avalonia.Styling;
 using Avalonia.Utilities;
 using Sprache;
 
-namespace Avalonia.Markup.Xaml.Parsers
+namespace Avalonia.Markup.Parsers
 {
     /// <summary>
     /// Parses a <see cref="Selector"/> from text.
diff --git a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
index 15c0be673a..28f0fd48bd 100644
--- a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
@@ -5,5 +5,5 @@ using System.Reflection;
 using Avalonia.Metadata;
 using System.Runtime.CompilerServices;
 
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup")]
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Data")]
 [assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests")]
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
index 80cd52d529..02fb1f11ad 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Binding.cs
@@ -10,7 +10,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Data;
 using Avalonia.Logging;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
diff --git a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
index 5cc5bae8b0..980cbfaaf8 100644
--- a/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
+++ b/tests/Avalonia.Base.UnitTests/AvaloniaObjectTests_Direct.cs
@@ -12,7 +12,7 @@ using Avalonia.Data;
 using Avalonia.Logging;
 using Avalonia.Platform;
 using Avalonia.Threading;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 using Moq;
 using Xunit;
diff --git a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaDictionaryTests.cs b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaDictionaryTests.cs
index 0f08c856fe..b6ab7dac34 100644
--- a/tests/Avalonia.Base.UnitTests/Collections/AvaloniaDictionaryTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Collections/AvaloniaDictionaryTests.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using Avalonia.Collections;
+using Avalonia.Data.Core;
 using Xunit;
 
 namespace Avalonia.Base.UnitTests.Collections
@@ -145,7 +146,7 @@ namespace Avalonia.Base.UnitTests.Collections
             var tracker = new PropertyChangedTracker(target);
             target.Clear();
 
-            Assert.Equal(new[] { "Count", "Item[]" }, tracker.Names);
+            Assert.Equal(new[] { "Count", CommonPropertyNames.IndexerName }, tracker.Names);
         }
     }
 }
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
similarity index 99%
rename from tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
index 2e0f048e21..6b71d28e22 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/BindingExpressionTests.cs
@@ -8,12 +8,13 @@ using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Data.Core;
 using Avalonia.UnitTests;
 using Moq;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class BindingExpressionTests : IClassFixture<InvariantCultureFixture>
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionNodeBuilderTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionNodeBuilderTests.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionNodeBuilderTests.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionNodeBuilderTests.cs
index 4e583191a5..146b7cace1 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionNodeBuilderTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionNodeBuilderTests.cs
@@ -3,10 +3,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionNodeBuilderTests
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionNodeBuilderTests_Errors.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionNodeBuilderTests_Errors.cs
similarity index 96%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionNodeBuilderTests_Errors.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionNodeBuilderTests_Errors.cs
index ed52d3e2a9..1bf1ce132a 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionNodeBuilderTests_Errors.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionNodeBuilderTests_Errors.cs
@@ -1,10 +1,10 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionNodeBuilderTests_Errors
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
index 5ddff63a0c..750e691103 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AttachedProperty.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
@@ -6,10 +6,10 @@ using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Diagnostics;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_AttachedProperty
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AvaloniaProperty.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AvaloniaProperty.cs
similarity index 97%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AvaloniaProperty.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AvaloniaProperty.cs
index 6d1e9d94a9..bf2b6cbcb2 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_AvaloniaProperty.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AvaloniaProperty.cs
@@ -6,10 +6,10 @@ using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Diagnostics;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_AvaloniaProperty
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
similarity index 99%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
index 9bf1e4711b..3732569753 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_DataValidation.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_DataValidation.cs
@@ -7,11 +7,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_DataValidation : IClassFixture<InvariantCultureFixture>
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Indexer.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
similarity index 99%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Indexer.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
index 1bdbf0d895..8a54f968b1 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Indexer.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Indexer.cs
@@ -8,11 +8,11 @@ using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Collections;
 using Avalonia.Diagnostics;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_Indexer
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Lifetime.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Lifetime.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
index 04a8e30d16..b88bf2c427 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Lifetime.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Lifetime.cs
@@ -7,10 +7,10 @@ using System.Reactive;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Microsoft.Reactive.Testing;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_Lifetime
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Method.cs
similarity index 97%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Method.cs
index 439e9dc542..ef89c2b4bd 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Method.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Method.cs
@@ -1,5 +1,5 @@
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_Method
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Negation.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Negation.cs
index f4aa85c393..556352f6ca 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Negation.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Negation.cs
@@ -5,10 +5,10 @@ using System;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_Negation
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Observable.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Observable.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
index aa78c100c1..f1c39617eb 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Observable.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Observable.cs
@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_Observable
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Property.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
similarity index 99%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Property.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
index 60174e65e6..a3cb11114a 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Property.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Property.cs
@@ -8,12 +8,12 @@ using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Microsoft.Reactive.Testing;
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Avalonia.UnitTests;
 using Xunit;
 using System.Threading.Tasks;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_Property
     {
@@ -363,7 +363,7 @@ namespace Avalonia.Markup.UnitTests.Data
                 {
                     "bar",
                     new BindingNotification(
-                        new MissingMemberException("Could not find CLR property 'Bar' on 'Avalonia.Markup.UnitTests.Data.ExpressionObserverTests_Property+WithoutBar'"),
+                        new MissingMemberException("Could not find CLR property 'Bar' on 'Avalonia.Base.UnitTests.Data.Core.ExpressionObserverTests_Property+WithoutBar'"),
                         BindingErrorType.Error),
                     "baz",
                 },
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_SetValue.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_SetValue.cs
similarity index 97%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_SetValue.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_SetValue.cs
index 0705ae9c5a..a163229e26 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_SetValue.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_SetValue.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_SetValue
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
index 87a8be045b..3b9a23f846 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/ExpressionObserverTests_Task.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_Task.cs
@@ -6,11 +6,11 @@ using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Data;
-using Avalonia.Markup.Data;
+using Avalonia.Data.Core;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     public class ExpressionObserverTests_Task
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/IndeiBase.cs b/tests/Avalonia.Base.UnitTests/Data/Core/IndeiBase.cs
similarity index 96%
rename from tests/Avalonia.Markup.UnitTests/Data/IndeiBase.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/IndeiBase.cs
index bd0ab71626..6edcdc820d 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/IndeiBase.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/IndeiBase.cs
@@ -7,7 +7,7 @@ using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Avalonia.UnitTests;
 
-namespace Avalonia.Markup.UnitTests.Data
+namespace Avalonia.Base.UnitTests.Data.Core
 {
     internal abstract class IndeiBase : NotifyingBase, INotifyDataErrorInfo
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
similarity index 99%
rename from tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
index 6663457add..2bffb7b84a 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/Plugins/DataAnnotationsValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/DataAnnotationsValidationPluginTests.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using Avalonia.Data;
-using Avalonia.Markup.Data.Plugins;
+using Avalonia.Data.Core.Plugins;
 using Avalonia.UnitTests;
 using Xunit;
 
diff --git a/tests/Avalonia.Markup.UnitTests/Data/Plugins/ExceptionValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/ExceptionValidationPluginTests.cs
similarity index 96%
rename from tests/Avalonia.Markup.UnitTests/Data/Plugins/ExceptionValidationPluginTests.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/Plugins/ExceptionValidationPluginTests.cs
index eb529a3b13..2a307f9a61 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/Plugins/ExceptionValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/ExceptionValidationPluginTests.cs
@@ -5,11 +5,11 @@ using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using Avalonia.Data;
-using Avalonia.Markup.Data.Plugins;
+using Avalonia.Data.Core.Plugins;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data.Plugins
+namespace Avalonia.Base.UnitTests.Data.Core.Plugins
 {
     public class ExceptionValidationPluginTests
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/Plugins/IndeiValidationPluginTests.cs b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/Data/Plugins/IndeiValidationPluginTests.cs
rename to tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
index 788bc25a34..45c084014b 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/Plugins/IndeiValidationPluginTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/Plugins/IndeiValidationPluginTests.cs
@@ -6,10 +6,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using Avalonia.Data;
-using Avalonia.Markup.Data.Plugins;
+using Avalonia.Data.Core.Plugins;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests.Data.Plugins
+namespace Avalonia.Base.UnitTests.Data.Core.Plugins
 {
     public class IndeiValidationPluginTests
     {
diff --git a/tests/Avalonia.Markup.UnitTests/DefaultValueConverterTests.cs b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/DefaultValueConverterTests.cs
rename to tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
index 0aa2e00c0f..eeb502d730 100644
--- a/tests/Avalonia.Markup.UnitTests/DefaultValueConverterTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/DefaultValueConverterTests.cs
@@ -7,8 +7,9 @@ using Avalonia.Data;
 using Xunit;
 using System.Windows.Input;
 using System;
+using Avalonia.Data.Converters;
 
-namespace Avalonia.Markup.UnitTests
+namespace Avalonia.Base.UnitTests.Data.Converters
 {
     public class DefaultValueConverterTests
     {
diff --git a/tests/Avalonia.Markup.UnitTests/UnitTestSynchronizationContext.cs b/tests/Avalonia.Base.UnitTests/Data/UnitTestSynchronizationContext.cs
similarity index 98%
rename from tests/Avalonia.Markup.UnitTests/UnitTestSynchronizationContext.cs
rename to tests/Avalonia.Base.UnitTests/Data/UnitTestSynchronizationContext.cs
index b5068c511d..838aee6528 100644
--- a/tests/Avalonia.Markup.UnitTests/UnitTestSynchronizationContext.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/UnitTestSynchronizationContext.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Reactive.Disposables;
 using System.Threading;
 
-namespace Avalonia.Markup.UnitTests
+namespace Avalonia.Base.UnitTests.Data
 {
     internal sealed class UnitTestSynchronizationContext : SynchronizationContext
     {
diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
index f9da2ab6f3..b10929cbdc 100644
--- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -10,7 +10,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Platform;
 using Avalonia.Threading;
 using Avalonia.UnitTests;
diff --git a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
index 71bf9104f7..a194da98a8 100644
--- a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Windows.Input;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests
diff --git a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
index 653ab17b63..c17893604c 100644
--- a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs
@@ -12,7 +12,7 @@ using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Data;
 using System.Collections.Generic;
 
diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
index fe4f1ea06e..936d700ad0 100644
--- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs
@@ -10,7 +10,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
 using Moq;
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
index fee4994ee3..70d59e82c8 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs
@@ -9,7 +9,7 @@ using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Styling;
 using Avalonia.VisualTree;
 using Xunit;
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
index 2dfb30a9f0..42578c61ac 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs
@@ -6,7 +6,7 @@ using System.ComponentModel;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Styling;
 using Xunit;
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index a60074fa43..0f742f5a35 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -10,7 +10,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Input;
 using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 using Xunit;
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index 642f594e4d..3c6b278e07 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -10,7 +10,7 @@ using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Xunit;
 
 namespace Avalonia.Controls.UnitTests.Primitives
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
index db60d05a34..377f861668 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
@@ -1,4 +1,4 @@
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 
 using Xunit;
diff --git a/tests/Avalonia.Controls.UnitTests/RadioButtonTests.cs b/tests/Avalonia.Controls.UnitTests/RadioButtonTests.cs
index 37fb52beeb..2d9dca93f5 100644
--- a/tests/Avalonia.Controls.UnitTests/RadioButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/RadioButtonTests.cs
@@ -1,4 +1,4 @@
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 
 using Xunit;
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
index 5ddc8e71e7..af461f07a4 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs
@@ -8,7 +8,7 @@ using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
 using Avalonia.Input;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Media;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
index 851d741eae..4d79dd557e 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs
@@ -9,7 +9,7 @@ using System.Linq;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Platform;
 using Avalonia.UnitTests;
 using Moq;
diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
index 625d9eb26e..a7263cacbd 100644
--- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs
@@ -8,6 +8,7 @@ using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Data.Core;
 using Avalonia.Input;
 using Avalonia.LogicalTree;
 using Avalonia.Markup.Data;
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index fe3ad59bb4..f00dd6d5d0 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -185,7 +185,7 @@ namespace Avalonia.LeakTests
                         Content = new TextBox()
                     };
 
-                    var binding = new Avalonia.Markup.Xaml.Data.Binding
+                    var binding = new Avalonia.Markup.Data.Binding
                     {
                         Path = "Name"
                     };
diff --git a/tests/Avalonia.LeakTests/ExpressionObserverTests.cs b/tests/Avalonia.LeakTests/ExpressionObserverTests.cs
index d0f892bebb..96f9e37897 100644
--- a/tests/Avalonia.LeakTests/ExpressionObserverTests.cs
+++ b/tests/Avalonia.LeakTests/ExpressionObserverTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Avalonia.Collections;
+using Avalonia.Data.Core;
 using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 using JetBrains.dotMemoryUnit;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
new file mode 100644
index 0000000000..6c95a465b3
--- /dev/null
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
@@ -0,0 +1,548 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Markup.Data;
+using Moq;
+using Xunit;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using Avalonia.UnitTests;
+using Avalonia.Data.Converters;
+using Avalonia.Data.Core;
+
+namespace Avalonia.Markup.UnitTests.Data
+{
+    public class BindingTests
+    {
+        [Fact]
+        public void OneWay_Binding_Should_Be_Set_Up()
+        {
+            var source = new Source { Foo = "foo" };
+            var target = new TextBlock { DataContext = source };
+            var binding = new Binding
+            {
+                Path = "Foo",
+                Mode = BindingMode.OneWay,
+            };
+
+            target.Bind(TextBox.TextProperty, binding);
+
+            Assert.Equal("foo", target.Text);
+            source.Foo = "bar";
+            Assert.Equal("bar", target.Text);
+            target.Text = "baz";
+            Assert.Equal("bar", source.Foo);
+        }
+
+        [Fact]
+        public void TwoWay_Binding_Should_Be_Set_Up()
+        {
+            var source = new Source { Foo = "foo" };
+            var target = new TextBlock { DataContext = source };
+            var binding = new Binding
+            {
+                Path = "Foo",
+                Mode = BindingMode.TwoWay,
+            };
+
+            target.Bind(TextBox.TextProperty, binding);
+
+            Assert.Equal("foo", target.Text);
+            source.Foo = "bar";
+            Assert.Equal("bar", target.Text);
+            target.Text = "baz";
+            Assert.Equal("baz", source.Foo);
+        }
+
+        [Fact]
+        public void OneTime_Binding_Should_Be_Set_Up()
+        {
+            var source = new Source { Foo = "foo" };
+            var target = new TextBlock { DataContext = source };
+            var binding = new Binding
+            {
+                Path = "Foo",
+                Mode = BindingMode.OneTime,
+            };
+
+            target.Bind(TextBox.TextProperty, binding);
+
+            Assert.Equal("foo", target.Text);
+            source.Foo = "bar";
+            Assert.Equal("foo", target.Text);
+            target.Text = "baz";
+            Assert.Equal("bar", source.Foo);
+        }
+
+        [Fact]
+        public void OneWayToSource_Binding_Should_Be_Set_Up()
+        {
+            var source = new Source { Foo = "foo" };
+            var target = new TextBlock { DataContext = source, Text = "bar" };
+            var binding = new Binding
+            {
+                Path = "Foo",
+                Mode = BindingMode.OneWayToSource,
+            };
+
+            target.Bind(TextBox.TextProperty, binding);
+
+            Assert.Equal("bar", source.Foo);
+            target.Text = "baz";
+            Assert.Equal("baz", source.Foo);
+            source.Foo = "quz";
+            Assert.Equal("baz", target.Text);
+        }
+
+        [Fact]
+        public void Default_BindingMode_Should_Be_Used()
+        {
+            var source = new Source { Foo = "foo" };
+            var target = new TwoWayBindingTest { DataContext = source };
+            var binding = new Binding
+            {
+                Path = "Foo",
+            };
+
+            target.Bind(TwoWayBindingTest.TwoWayProperty, binding);
+
+            Assert.Equal("foo", target.TwoWay);
+            source.Foo = "bar";
+            Assert.Equal("bar", target.TwoWay);
+            target.TwoWay = "baz";
+            Assert.Equal("baz", source.Foo);
+        }
+
+        [Fact]
+        public void DataContext_Binding_Should_Use_Parent_DataContext()
+        {
+            var parentDataContext = Mock.Of<IHeadered>(x => x.Header == (object)"Foo");
+
+            var parent = new Decorator
+            {
+                Child = new Control(),
+                DataContext = parentDataContext,
+            };
+
+            var binding = new Binding
+            {
+                Path = "Header",
+            };
+
+            parent.Child.Bind(Control.DataContextProperty, binding);
+
+            Assert.Equal("Foo", parent.Child.DataContext);
+
+            parentDataContext = Mock.Of<IHeadered>(x => x.Header == (object)"Bar");
+            parent.DataContext = parentDataContext;
+            Assert.Equal("Bar", parent.Child.DataContext);
+        }
+
+        [Fact]
+        public void DataContext_Binding_Should_Track_Parent()
+        {
+            var parent = new Decorator
+            {
+                DataContext = new { Foo = "foo" },
+            };
+
+            var child = new Control();
+
+            var binding = new Binding
+            {
+                Path = "Foo",
+            };
+
+            child.Bind(Control.DataContextProperty, binding);
+
+            Assert.Null(child.DataContext);
+            parent.Child = child;
+            Assert.Equal("foo", child.DataContext);
+        }
+
+        [Fact]
+        public void DataContext_Binding_Should_Produce_Correct_Results()
+        {
+            var viewModel = new { Foo = "bar" };
+            var root = new Decorator
+            {
+                DataContext = viewModel,
+            };
+
+            var child = new Control();
+            var values = new List<object>();
+
+            child.GetObservable(Control.DataContextProperty).Subscribe(x => values.Add(x));
+            child.Bind(Control.DataContextProperty, new Binding("Foo"));
+
+            // When binding to DataContext and the target isn't found, the binding should produce
+            // null rather than UnsetValue in order to not propagate incorrect DataContexts from
+            // parent controls while things are being set up. This logic is implemented in 
+            // `Avalonia.Markup.Xaml.Binding.Initiate`.
+            Assert.True(child.IsSet(Control.DataContextProperty));
+
+            root.Child = child;
+
+            Assert.Equal(new[] { null, "bar" }, values);
+        }
+
+        [Fact]
+        public void Should_Use_DefaultValueConverter_When_No_Converter_Specified()
+        {
+            var target = new TextBlock(); ;
+            var binding = new Binding
+            {
+                Path = "Foo",
+            };
+
+            var result = binding.Initiate(target, TextBox.TextProperty).Subject;
+
+            Assert.IsType<DefaultValueConverter>(((BindingExpression)result).Converter);
+        }
+
+        [Fact]
+        public void Should_Use_Supplied_Converter()
+        {
+            var target = new TextBlock();
+            var converter = new Mock<IValueConverter>();
+            var binding = new Binding
+            {
+                Converter = converter.Object,
+                Path = "Foo",
+            };
+
+            var result = binding.Initiate(target, TextBox.TextProperty).Subject;
+
+            Assert.Same(converter.Object, ((BindingExpression)result).Converter);
+        }
+
+        [Fact]
+        public void Should_Pass_ConverterParameter_To_Supplied_Converter()
+        {
+            var target = new TextBlock();
+            var converter = new Mock<IValueConverter>();
+            var binding = new Binding
+            {
+                Converter = converter.Object,
+                ConverterParameter = "foo",
+                Path = "Bar",
+            };
+
+            var result = binding.Initiate(target, TextBox.TextProperty).Subject;
+
+            Assert.Same("foo", ((BindingExpression)result).ConverterParameter);
+        }
+
+        [Fact]
+        public void Should_Return_FallbackValue_When_Path_Not_Resolved()
+        {
+            var target = new TextBlock();
+            var source = new Source();
+            var binding = new Binding
+            {
+                Source = source,
+                Path = "BadPath",
+                FallbackValue = "foofallback",
+            };
+
+            target.Bind(TextBlock.TextProperty, binding);
+
+            Assert.Equal("foofallback", target.Text);
+        }
+
+        [Fact]
+        public void Should_Return_FallbackValue_When_Invalid_Source_Type()
+        {
+            var target = new ProgressBar();
+            var source = new Source { Foo = "foo" };
+            var binding = new Binding
+            {
+                Source = source,
+                Path = "Foo",
+                FallbackValue = 42,
+            };
+
+            target.Bind(ProgressBar.ValueProperty, binding);
+
+            Assert.Equal(42, target.Value);
+        }
+
+        /// <summary>
+        /// Tests a problem discovered with ListBox with selection.
+        /// </summary>
+        /// <remarks>
+        /// - Items is bound to DataContext first, followed by say SelectedIndex
+        /// - When the ListBox is removed from the logical tree, DataContext becomes null (as it's
+        ///   inherited)
+        /// - This changes Items to null, which changes SelectedIndex to null as there are no
+        ///   longer any items
+        /// - However, the news that DataContext is now null hasn't yet reached the SelectedIndex
+        ///   binding and so the unselection is sent back to the ViewModel
+        /// </remarks>
+        [Fact]
+        public void Should_Not_Write_To_Old_DataContext()
+        {
+            var vm = new OldDataContextViewModel();
+            var target = new OldDataContextTest();
+
+            var fooBinding = new Binding
+            {
+                Path = "Foo",
+                Mode = BindingMode.TwoWay,
+            };
+
+            var barBinding = new Binding
+            {
+                Path = "Bar",
+                Mode = BindingMode.TwoWay,
+            };
+
+            // Bind Foo and Bar to the VM.
+            target.Bind(OldDataContextTest.FooProperty, fooBinding);
+            target.Bind(OldDataContextTest.BarProperty, barBinding);
+            target.DataContext = vm;
+
+            // Make sure the control's Foo and Bar properties are read from the VM
+            Assert.Equal(1, target.GetValue(OldDataContextTest.FooProperty));
+            Assert.Equal(2, target.GetValue(OldDataContextTest.BarProperty));
+
+            // Set DataContext to null.
+            target.DataContext = null;
+
+            // Foo and Bar are no longer bound so they return 0, their default value.
+            Assert.Equal(0, target.GetValue(OldDataContextTest.FooProperty));
+            Assert.Equal(0, target.GetValue(OldDataContextTest.BarProperty));
+
+            // The problem was here - DataContext is now null, setting Foo to 0. Bar is bound to 
+            // Foo so Bar also gets set to 0. However the Bar binding still had a reference to
+            // the VM and so vm.Bar was set to 0 erroneously.
+            Assert.Equal(1, vm.Foo);
+            Assert.Equal(2, vm.Bar);
+        }
+
+        [Fact]
+        public void AvaloniaObject_this_Operator_Accepts_Binding()
+        {
+            var target = new ContentControl
+            {
+                DataContext = new { Foo = "foo" }
+            };
+
+            target[!ContentControl.ContentProperty] = new Binding("Foo");
+
+            Assert.Equal("foo", target.Content);
+        }
+
+        [Fact]
+        public void StyledProperty_SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
+        {
+            var viewModel = new TestStackOverflowViewModel()
+            {
+                Value = 50
+            };
+
+            var target = new StyledPropertyClass();
+
+            target.Bind(StyledPropertyClass.DoubleValueProperty,
+                new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
+
+            var child = new StyledPropertyClass();
+
+            child.Bind(StyledPropertyClass.DoubleValueProperty,
+                new Binding("DoubleValue")
+                {
+                    Mode = BindingMode.TwoWay,
+                    Source = target
+                });
+
+            Assert.Equal(1, viewModel.SetterInvokedCount);
+
+            //here in real life stack overflow exception is thrown issue #855 and #824
+            target.DoubleValue = 51.001;
+
+            Assert.Equal(2, viewModel.SetterInvokedCount);
+
+            double expected = 51;
+
+            Assert.Equal(expected, viewModel.Value);
+            Assert.Equal(expected, target.DoubleValue);
+            Assert.Equal(expected, child.DoubleValue);
+        }
+
+        [Fact]
+        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
+        {
+            var viewModel = new TestStackOverflowViewModel()
+            {
+                Value = 50
+            };
+
+            var target = new DirectPropertyClass();
+
+            target.Bind(DirectPropertyClass.DoubleValueProperty, new Binding("Value")
+            {
+                Mode = BindingMode.TwoWay,
+                Source = viewModel
+            });
+
+            var child = new DirectPropertyClass();
+
+            child.Bind(DirectPropertyClass.DoubleValueProperty,
+                new Binding("DoubleValue")
+                {
+                    Mode = BindingMode.TwoWay,
+                    Source = target
+                });
+
+            Assert.Equal(1, viewModel.SetterInvokedCount);
+
+            //here in real life stack overflow exception is thrown issue #855 and #824
+            target.DoubleValue = 51.001;
+
+            Assert.Equal(2, viewModel.SetterInvokedCount);
+
+            double expected = 51;
+
+            Assert.Equal(expected, viewModel.Value);
+            Assert.Equal(expected, target.DoubleValue);
+            Assert.Equal(expected, child.DoubleValue);
+        }
+
+        private class StyledPropertyClass : AvaloniaObject
+        {
+            public static readonly StyledProperty<double> DoubleValueProperty =
+                        AvaloniaProperty.Register<StyledPropertyClass, double>(nameof(DoubleValue));
+
+            public double DoubleValue
+            {
+                get { return GetValue(DoubleValueProperty); }
+                set { SetValue(DoubleValueProperty, value); }
+            }
+        }
+
+        private class DirectPropertyClass : AvaloniaObject
+        {
+            public static readonly DirectProperty<DirectPropertyClass, double> DoubleValueProperty =
+                AvaloniaProperty.RegisterDirect<DirectPropertyClass, double>(
+                    nameof(DoubleValue),
+                    o => o.DoubleValue,
+                    (o, v) => o.DoubleValue = v);
+
+            private double _doubleValue;
+            public double DoubleValue
+            {
+                get { return _doubleValue; }
+                set { SetAndRaise(DoubleValueProperty, ref _doubleValue, value); }
+            }
+        }
+
+        private class TestStackOverflowViewModel : INotifyPropertyChanged
+        {
+            public int SetterInvokedCount { get; private set; }
+
+            public const int MaxInvokedCount = 1000;
+
+            private double _value;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            public double Value
+            {
+                get { return _value; }
+                set
+                {
+                    if (_value != value)
+                    {
+                        SetterInvokedCount++;
+                        if (SetterInvokedCount < MaxInvokedCount)
+                        {
+                            _value = (int)value;
+                            if (_value > 75) _value = 75;
+                            if (_value < 25) _value = 25;
+                        }
+                        else
+                        {
+                            _value = value;
+                        }
+
+                        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+                    }
+                }
+            }
+        }
+
+        private class TwoWayBindingTest : Control
+        {
+            public static readonly StyledProperty<string> TwoWayProperty =
+                AvaloniaProperty.Register<TwoWayBindingTest, string>(
+                    "TwoWay", 
+                    defaultBindingMode: BindingMode.TwoWay);
+
+            public string TwoWay
+            {
+                get { return GetValue(TwoWayProperty); }
+                set { SetValue(TwoWayProperty, value); }
+            }
+        }
+
+        public class Source : INotifyPropertyChanged
+        {
+            private string _foo;
+
+            public string Foo
+            {
+                get { return _foo; }
+                set
+                {
+                    _foo = value;
+                    RaisePropertyChanged();
+                }
+            }
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            private void RaisePropertyChanged([CallerMemberName] string prop = "")
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
+            }
+        }
+
+        private class OldDataContextViewModel
+        {
+            public int Foo { get; set; } = 1;
+            public int Bar { get; set; } = 2;
+        }
+
+        private class OldDataContextTest : Control
+        {
+            public static readonly StyledProperty<int> FooProperty =
+                AvaloniaProperty.Register<OldDataContextTest, int>("Foo");
+
+            public static readonly StyledProperty<int> BarProperty =
+              AvaloniaProperty.Register<OldDataContextTest, int>("Bar");
+
+            public OldDataContextTest()
+            {
+                Bind(BarProperty, this.GetObservable(FooProperty));
+            }
+        }
+
+        private class InheritanceTest : Decorator
+        {
+            public static readonly StyledProperty<int> BazProperty =
+                AvaloniaProperty.Register<InheritanceTest, int>(nameof(Baz), defaultValue: 6, inherits: true);
+
+            public int Baz
+            {
+                get { return GetValue(BazProperty); }
+                set { SetValue(BazProperty, value); }
+            }
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_DataValidation.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
similarity index 96%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_DataValidation.cs
rename to tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
index 5dd8d0cdf9..04b91b5f6a 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_DataValidation.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_DataValidation.cs
@@ -5,11 +5,11 @@ using System;
 using System.Reactive.Linq;
 using Avalonia.Controls;
 using Avalonia.Data;
+using Avalonia.Data.Core;
 using Avalonia.Markup.Data;
-using Avalonia.Markup.Xaml.Data;
 using Xunit;
 
-namespace Avalonia.Markup.Xaml.UnitTests.Data
+namespace Avalonia.Markup.UnitTests.Data
 {
     public class BindingTests_DataValidation
     {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_ElementName.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
similarity index 98%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_ElementName.cs
rename to tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
index d582964987..a05b121a42 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_ElementName.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
@@ -2,11 +2,11 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.Xaml.UnitTests.Data
+namespace Avalonia.Markup.UnitTests.Data
 {
     public class BindingTests_ElementName
     {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
similarity index 98%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs
rename to tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
index c46fb6fce2..36e801d22d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
@@ -2,11 +2,11 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.Xaml.UnitTests.Data
+namespace Avalonia.Markup.UnitTests.Data
 {
     public class BindingTests_RelativeSource
     {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Self.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs
similarity index 96%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Self.cs
rename to tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs
index e0d16a9563..7b899472bb 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Self.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Self.cs
@@ -5,12 +5,12 @@ using System;
 using Moq;
 using Avalonia.Controls;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
 using Avalonia.Styling;
 using Xunit;
 using System.Reactive.Disposables;
+using Avalonia.Markup.Data;
 
-namespace Avalonia.Markup.Xaml.UnitTests.Data
+namespace Avalonia.Markup.UnitTests.Data
 {
     public class BindingTests_Self
     {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs
similarity index 94%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs
rename to tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs
index 1fbf8b679d..9cc02539ce 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_Source.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_Source.cs
@@ -5,12 +5,11 @@ using Moq;
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Markup.Data;
-using Avalonia.Markup.Xaml.Data;
 using Xunit;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
-namespace Avalonia.Markup.Xaml.UnitTests.Data
+namespace Avalonia.Markup.UnitTests.Data
 {
     public class BindingTests_Source
     {
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
new file mode 100644
index 0000000000..e9c3da5160
--- /dev/null
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_TemplatedParent.cs
@@ -0,0 +1,76 @@
+// Copyright (c) The Avalonia Project. All rights reserved.
+// Licensed under the MIT license. See licence.md file in the project root for full license information.
+
+using System;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using Moq;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Styling;
+using Xunit;
+using System.Reactive.Disposables;
+using Avalonia.UnitTests;
+using Avalonia.VisualTree;
+using System.Linq;
+using Avalonia.Markup.Data;
+
+namespace Avalonia.Markup.UnitTests.Data
+{
+    public class BindingTests_TemplatedParent
+    {
+        [Fact]
+        public void OneWay_Binding_Should_Be_Set_Up()
+        {
+            var target = CreateTarget();
+            var binding = new Binding
+            {
+                Mode = BindingMode.OneWay,
+                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+                Priority = BindingPriority.TemplatedParent,
+                Path = "Foo",
+            };
+
+            target.Object.Bind(TextBox.TextProperty, binding);
+
+            target.Verify(x => x.Bind(
+                TextBox.TextProperty, 
+                It.IsAny<IObservable<object>>(), 
+                BindingPriority.TemplatedParent));
+        }
+
+        [Fact]
+        public void TwoWay_Binding_Should_Be_Set_Up()
+        {
+            var target = CreateTarget();
+            var binding = new Binding
+            {
+                Mode = BindingMode.TwoWay,
+                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
+                Priority = BindingPriority.TemplatedParent,
+                Path = "Foo",
+            };
+
+            target.Object.Bind(TextBox.TextProperty, binding);
+
+            target.Verify(x => x.Bind(
+                TextBox.TextProperty,
+                It.IsAny<ISubject<object>>(),
+                BindingPriority.TemplatedParent));
+        }
+
+        private Mock<IControl> CreateTarget(
+            ITemplatedControl templatedParent = null,
+            string text = null)
+        {
+            var result = new Mock<IControl>();
+
+            result.Setup(x => x.GetValue(Control.TemplatedParentProperty)).Returns(templatedParent);
+            result.Setup(x => x.GetValue((AvaloniaProperty)Control.TemplatedParentProperty)).Returns(templatedParent);
+            result.Setup(x => x.GetValue((AvaloniaProperty)TextBox.TextProperty)).Returns(text);
+            result.Setup(x => x.Bind(It.IsAny<AvaloniaProperty>(), It.IsAny<IObservable<object>>(), It.IsAny<BindingPriority>()))
+                .Returns(Disposable.Empty);
+            return result;
+        }
+    }
+}
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/MultiBindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
similarity index 96%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Data/MultiBindingTests.cs
rename to tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
index 4450cc0c90..b341af2810 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/MultiBindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
@@ -8,11 +8,12 @@ using System.Linq;
 using System.Reactive.Linq;
 using Moq;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Data;
 using Xunit;
 using System.Threading.Tasks;
+using Avalonia.Data.Converters;
+using Avalonia.Markup.Data;
 
-namespace Avalonia.Markup.Xaml.UnitTests.Data
+namespace Avalonia.Markup.UnitTests.Data
 {
     public class MultiBindingTests
     {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/SelectorGrammarTests.cs b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
similarity index 98%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Parsers/SelectorGrammarTests.cs
rename to tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
index ad2c1bf8d3..8cb2639125 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/SelectorGrammarTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorGrammarTests.cs
@@ -2,11 +2,11 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System.Linq;
-using Avalonia.Markup.Xaml.Parsers;
+using Avalonia.Markup.Parsers;
 using Sprache;
 using Xunit;
 
-namespace Avalonia.Xaml.Base.UnitTest.Parsers
+namespace Avalonia.Markup.UnitTest.Parsers
 {
     public class SelectorGrammarTests
     {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/SelectorParserTests.cs b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorParserTests.cs
similarity index 91%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Parsers/SelectorParserTests.cs
rename to tests/Avalonia.Markup.UnitTests/Parsers/SelectorParserTests.cs
index 8c0b043907..360be7f909 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Parsers/SelectorParserTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Parsers/SelectorParserTests.cs
@@ -1,6 +1,6 @@
 using System;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Parsers;
+using Avalonia.Markup.Parsers;
 using Xunit;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Parsers
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
index c6f89e07a6..0a00b9d39d 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests.cs
@@ -8,475 +8,18 @@ using System.Reactive.Linq;
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Markup.Data;
-using Avalonia.Markup.Xaml.Data;
 using Moq;
 using Xunit;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using Avalonia.UnitTests;
+using Avalonia.Data.Converters;
+using Avalonia.Data.Core;
 
 namespace Avalonia.Markup.Xaml.UnitTests.Data
 {
     public class BindingTests
     {
-        [Fact]
-        public void OneWay_Binding_Should_Be_Set_Up()
-        {
-            var source = new Source { Foo = "foo" };
-            var target = new TextBlock { DataContext = source };
-            var binding = new Binding
-            {
-                Path = "Foo",
-                Mode = BindingMode.OneWay,
-            };
-
-            target.Bind(TextBox.TextProperty, binding);
-
-            Assert.Equal("foo", target.Text);
-            source.Foo = "bar";
-            Assert.Equal("bar", target.Text);
-            target.Text = "baz";
-            Assert.Equal("bar", source.Foo);
-        }
-
-        [Fact]
-        public void TwoWay_Binding_Should_Be_Set_Up()
-        {
-            var source = new Source { Foo = "foo" };
-            var target = new TextBlock { DataContext = source };
-            var binding = new Binding
-            {
-                Path = "Foo",
-                Mode = BindingMode.TwoWay,
-            };
-
-            target.Bind(TextBox.TextProperty, binding);
-
-            Assert.Equal("foo", target.Text);
-            source.Foo = "bar";
-            Assert.Equal("bar", target.Text);
-            target.Text = "baz";
-            Assert.Equal("baz", source.Foo);
-        }
-
-        [Fact]
-        public void OneTime_Binding_Should_Be_Set_Up()
-        {
-            var source = new Source { Foo = "foo" };
-            var target = new TextBlock { DataContext = source };
-            var binding = new Binding
-            {
-                Path = "Foo",
-                Mode = BindingMode.OneTime,
-            };
-
-            target.Bind(TextBox.TextProperty, binding);
-
-            Assert.Equal("foo", target.Text);
-            source.Foo = "bar";
-            Assert.Equal("foo", target.Text);
-            target.Text = "baz";
-            Assert.Equal("bar", source.Foo);
-        }
-
-        [Fact]
-        public void OneWayToSource_Binding_Should_Be_Set_Up()
-        {
-            var source = new Source { Foo = "foo" };
-            var target = new TextBlock { DataContext = source, Text = "bar" };
-            var binding = new Binding
-            {
-                Path = "Foo",
-                Mode = BindingMode.OneWayToSource,
-            };
-
-            target.Bind(TextBox.TextProperty, binding);
-
-            Assert.Equal("bar", source.Foo);
-            target.Text = "baz";
-            Assert.Equal("baz", source.Foo);
-            source.Foo = "quz";
-            Assert.Equal("baz", target.Text);
-        }
-
-        [Fact]
-        public void Default_BindingMode_Should_Be_Used()
-        {
-            var source = new Source { Foo = "foo" };
-            var target = new TwoWayBindingTest { DataContext = source };
-            var binding = new Binding
-            {
-                Path = "Foo",
-            };
-
-            target.Bind(TwoWayBindingTest.TwoWayProperty, binding);
-
-            Assert.Equal("foo", target.TwoWay);
-            source.Foo = "bar";
-            Assert.Equal("bar", target.TwoWay);
-            target.TwoWay = "baz";
-            Assert.Equal("baz", source.Foo);
-        }
-
-        [Fact]
-        public void DataContext_Binding_Should_Use_Parent_DataContext()
-        {
-            var parentDataContext = Mock.Of<IHeadered>(x => x.Header == (object)"Foo");
-
-            var parent = new Decorator
-            {
-                Child = new Control(),
-                DataContext = parentDataContext,
-            };
-
-            var binding = new Binding
-            {
-                Path = "Header",
-            };
-
-            parent.Child.Bind(Control.DataContextProperty, binding);
-
-            Assert.Equal("Foo", parent.Child.DataContext);
-
-            parentDataContext = Mock.Of<IHeadered>(x => x.Header == (object)"Bar");
-            parent.DataContext = parentDataContext;
-            Assert.Equal("Bar", parent.Child.DataContext);
-        }
-
-        [Fact]
-        public void DataContext_Binding_Should_Track_Parent()
-        {
-            var parent = new Decorator
-            {
-                DataContext = new { Foo = "foo" },
-            };
-
-            var child = new Control();
-
-            var binding = new Binding
-            {
-                Path = "Foo",
-            };
-
-            child.Bind(Control.DataContextProperty, binding);
-
-            Assert.Null(child.DataContext);
-            parent.Child = child;
-            Assert.Equal("foo", child.DataContext);
-        }
-
-        [Fact]
-        public void DataContext_Binding_Should_Produce_Correct_Results()
-        {
-            var viewModel = new { Foo = "bar" };
-            var root = new Decorator
-            {
-                DataContext = viewModel,
-            };
-
-            var child = new Control();
-            var values = new List<object>();
-
-            child.GetObservable(Control.DataContextProperty).Subscribe(x => values.Add(x));
-            child.Bind(Control.DataContextProperty, new Binding("Foo"));
-
-            // When binding to DataContext and the target isn't found, the binding should produce
-            // null rather than UnsetValue in order to not propagate incorrect DataContexts from
-            // parent controls while things are being set up. This logic is implemented in 
-            // `Avalonia.Markup.Xaml.Binding.Initiate`.
-            Assert.True(child.IsSet(Control.DataContextProperty));
-
-            root.Child = child;
-
-            Assert.Equal(new[] { null, "bar" }, values);
-        }
-
-        [Fact]
-        public void Should_Use_DefaultValueConverter_When_No_Converter_Specified()
-        {
-            var target = new TextBlock(); ;
-            var binding = new Binding
-            {
-                Path = "Foo",
-            };
-
-            var result = binding.Initiate(target, TextBox.TextProperty).Subject;
-
-            Assert.IsType<DefaultValueConverter>(((BindingExpression)result).Converter);
-        }
-
-        [Fact]
-        public void Should_Use_Supplied_Converter()
-        {
-            var target = new TextBlock();
-            var converter = new Mock<IValueConverter>();
-            var binding = new Binding
-            {
-                Converter = converter.Object,
-                Path = "Foo",
-            };
-
-            var result = binding.Initiate(target, TextBox.TextProperty).Subject;
-
-            Assert.Same(converter.Object, ((BindingExpression)result).Converter);
-        }
-
-        [Fact]
-        public void Should_Pass_ConverterParameter_To_Supplied_Converter()
-        {
-            var target = new TextBlock();
-            var converter = new Mock<IValueConverter>();
-            var binding = new Binding
-            {
-                Converter = converter.Object,
-                ConverterParameter = "foo",
-                Path = "Bar",
-            };
-
-            var result = binding.Initiate(target, TextBox.TextProperty).Subject;
-
-            Assert.Same("foo", ((BindingExpression)result).ConverterParameter);
-        }
-
-        [Fact]
-        public void Should_Return_FallbackValue_When_Path_Not_Resolved()
-        {
-            var target = new TextBlock();
-            var source = new Source();
-            var binding = new Binding
-            {
-                Source = source,
-                Path = "BadPath",
-                FallbackValue = "foofallback",
-            };
-
-            target.Bind(TextBlock.TextProperty, binding);
-
-            Assert.Equal("foofallback", target.Text);
-        }
-
-        [Fact]
-        public void Should_Return_FallbackValue_When_Invalid_Source_Type()
-        {
-            var target = new ProgressBar();
-            var source = new Source { Foo = "foo" };
-            var binding = new Binding
-            {
-                Source = source,
-                Path = "Foo",
-                FallbackValue = 42,
-            };
-
-            target.Bind(ProgressBar.ValueProperty, binding);
-
-            Assert.Equal(42, target.Value);
-        }
-
-        /// <summary>
-        /// Tests a problem discovered with ListBox with selection.
-        /// </summary>
-        /// <remarks>
-        /// - Items is bound to DataContext first, followed by say SelectedIndex
-        /// - When the ListBox is removed from the logical tree, DataContext becomes null (as it's
-        ///   inherited)
-        /// - This changes Items to null, which changes SelectedIndex to null as there are no
-        ///   longer any items
-        /// - However, the news that DataContext is now null hasn't yet reached the SelectedIndex
-        ///   binding and so the unselection is sent back to the ViewModel
-        /// </remarks>
-        [Fact]
-        public void Should_Not_Write_To_Old_DataContext()
-        {
-            var vm = new OldDataContextViewModel();
-            var target = new OldDataContextTest();
-
-            var fooBinding = new Binding
-            {
-                Path = "Foo",
-                Mode = BindingMode.TwoWay,
-            };
-
-            var barBinding = new Binding
-            {
-                Path = "Bar",
-                Mode = BindingMode.TwoWay,
-            };
-
-            // Bind Foo and Bar to the VM.
-            target.Bind(OldDataContextTest.FooProperty, fooBinding);
-            target.Bind(OldDataContextTest.BarProperty, barBinding);
-            target.DataContext = vm;
-
-            // Make sure the control's Foo and Bar properties are read from the VM
-            Assert.Equal(1, target.GetValue(OldDataContextTest.FooProperty));
-            Assert.Equal(2, target.GetValue(OldDataContextTest.BarProperty));
-
-            // Set DataContext to null.
-            target.DataContext = null;
-
-            // Foo and Bar are no longer bound so they return 0, their default value.
-            Assert.Equal(0, target.GetValue(OldDataContextTest.FooProperty));
-            Assert.Equal(0, target.GetValue(OldDataContextTest.BarProperty));
-
-            // The problem was here - DataContext is now null, setting Foo to 0. Bar is bound to 
-            // Foo so Bar also gets set to 0. However the Bar binding still had a reference to
-            // the VM and so vm.Bar was set to 0 erroneously.
-            Assert.Equal(1, vm.Foo);
-            Assert.Equal(2, vm.Bar);
-        }
-
-        [Fact]
-        public void AvaloniaObject_this_Operator_Accepts_Binding()
-        {
-            var target = new ContentControl
-            {
-                DataContext = new { Foo = "foo" }
-            };
-
-            target[!ContentControl.ContentProperty] = new Binding("Foo");
-
-            Assert.Equal("foo", target.Content);
-        }
-
-        [Fact]
-        public void StyledProperty_SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
-        {
-            var viewModel = new TestStackOverflowViewModel()
-            {
-                Value = 50
-            };
-
-            var target = new StyledPropertyClass();
-
-            target.Bind(StyledPropertyClass.DoubleValueProperty,
-                new Binding("Value") { Mode = BindingMode.TwoWay, Source = viewModel });
-
-            var child = new StyledPropertyClass();
-
-            child.Bind(StyledPropertyClass.DoubleValueProperty,
-                new Binding("DoubleValue")
-                {
-                    Mode = BindingMode.TwoWay,
-                    Source = target
-                });
-
-            Assert.Equal(1, viewModel.SetterInvokedCount);
-
-            //here in real life stack overflow exception is thrown issue #855 and #824
-            target.DoubleValue = 51.001;
-
-            Assert.Equal(2, viewModel.SetterInvokedCount);
-
-            double expected = 51;
-
-            Assert.Equal(expected, viewModel.Value);
-            Assert.Equal(expected, target.DoubleValue);
-            Assert.Equal(expected, child.DoubleValue);
-        }
-
-        [Fact]
-        public void SetValue_Should_Not_Cause_StackOverflow_And_Have_Correct_Values()
-        {
-            var viewModel = new TestStackOverflowViewModel()
-            {
-                Value = 50
-            };
-
-            var target = new DirectPropertyClass();
-
-            target.Bind(DirectPropertyClass.DoubleValueProperty, new Binding("Value")
-            {
-                Mode = BindingMode.TwoWay,
-                Source = viewModel
-            });
-
-            var child = new DirectPropertyClass();
-
-            child.Bind(DirectPropertyClass.DoubleValueProperty,
-                new Binding("DoubleValue")
-                {
-                    Mode = BindingMode.TwoWay,
-                    Source = target
-                });
-
-            Assert.Equal(1, viewModel.SetterInvokedCount);
-
-            //here in real life stack overflow exception is thrown issue #855 and #824
-            target.DoubleValue = 51.001;
-
-            Assert.Equal(2, viewModel.SetterInvokedCount);
-
-            double expected = 51;
-
-            Assert.Equal(expected, viewModel.Value);
-            Assert.Equal(expected, target.DoubleValue);
-            Assert.Equal(expected, child.DoubleValue);
-        }
-
-        private class StyledPropertyClass : AvaloniaObject
-        {
-            public static readonly StyledProperty<double> DoubleValueProperty =
-                        AvaloniaProperty.Register<StyledPropertyClass, double>(nameof(DoubleValue));
-
-            public double DoubleValue
-            {
-                get { return GetValue(DoubleValueProperty); }
-                set { SetValue(DoubleValueProperty, value); }
-            }
-        }
-
-        private class DirectPropertyClass : AvaloniaObject
-        {
-            public static readonly DirectProperty<DirectPropertyClass, double> DoubleValueProperty =
-                AvaloniaProperty.RegisterDirect<DirectPropertyClass, double>(
-                    nameof(DoubleValue),
-                    o => o.DoubleValue,
-                    (o, v) => o.DoubleValue = v);
-
-            private double _doubleValue;
-            public double DoubleValue
-            {
-                get { return _doubleValue; }
-                set { SetAndRaise(DoubleValueProperty, ref _doubleValue, value); }
-            }
-        }
-
-        private class TestStackOverflowViewModel : INotifyPropertyChanged
-        {
-            public int SetterInvokedCount { get; private set; }
-
-            public const int MaxInvokedCount = 1000;
-
-            private double _value;
-
-            public event PropertyChangedEventHandler PropertyChanged;
-
-            public double Value
-            {
-                get { return _value; }
-                set
-                {
-                    if (_value != value)
-                    {
-                        SetterInvokedCount++;
-                        if (SetterInvokedCount < MaxInvokedCount)
-                        {
-                            _value = (int)value;
-                            if (_value > 75) _value = 75;
-                            if (_value < 25) _value = 25;
-                        }
-                        else
-                        {
-                            _value = value;
-                        }
-
-                        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
-                    }
-                }
-            }
-        }
-        
-
         [Fact]
         public void Binding_With_Null_Path_Works()
         {
@@ -484,8 +27,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
             {
                 var xaml = @"
 <Window xmlns='https://github.com/avaloniaui'
-        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'
-        xmlns:local='clr-namespace:Avalonia.Markup.Xaml.UnitTests.Xaml;assembly=Avalonia.Markup.Xaml.UnitTests'>
+        xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'>
     <TextBlock Name='textBlock' Text='{Binding}'/>
 </Window>";
                 var loader = new AvaloniaXamlLoader();
@@ -498,73 +40,5 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
                 Assert.Equal("foo", textBlock.Text);
             }
         }
-
-        private class TwoWayBindingTest : Control
-        {
-            public static readonly StyledProperty<string> TwoWayProperty =
-                AvaloniaProperty.Register<TwoWayBindingTest, string>(
-                    "TwoWay", 
-                    defaultBindingMode: BindingMode.TwoWay);
-
-            public string TwoWay
-            {
-                get { return GetValue(TwoWayProperty); }
-                set { SetValue(TwoWayProperty, value); }
-            }
-        }
-
-        public class Source : INotifyPropertyChanged
-        {
-            private string _foo;
-
-            public string Foo
-            {
-                get { return _foo; }
-                set
-                {
-                    _foo = value;
-                    RaisePropertyChanged();
-                }
-            }
-
-            public event PropertyChangedEventHandler PropertyChanged;
-
-            private void RaisePropertyChanged([CallerMemberName] string prop = "")
-            {
-                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(prop));
-            }
-        }
-
-        private class OldDataContextViewModel
-        {
-            public int Foo { get; set; } = 1;
-            public int Bar { get; set; } = 2;
-        }
-
-        private class OldDataContextTest : Control
-        {
-            public static readonly StyledProperty<int> FooProperty =
-                AvaloniaProperty.Register<OldDataContextTest, int>("Foo");
-
-            public static readonly StyledProperty<int> BarProperty =
-              AvaloniaProperty.Register<OldDataContextTest, int>("Bar");
-
-            public OldDataContextTest()
-            {
-                Bind(BarProperty, this.GetObservable(FooProperty));
-            }
-        }
-
-        private class InheritanceTest : Decorator
-        {
-            public static readonly StyledProperty<int> BazProperty =
-                AvaloniaProperty.Register<InheritanceTest, int>(nameof(Baz), defaultValue: 6, inherits: true);
-
-            public int Baz
-            {
-                get { return GetValue(BazProperty); }
-                set { SetValue(BazProperty, value); }
-            }
-        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
index ccb13039f1..ab5b7e76a4 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Data/BindingTests_TemplatedParent.cs
@@ -7,7 +7,6 @@ using System.Reactive.Subjects;
 using Moq;
 using Avalonia.Controls;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
 using Avalonia.Styling;
 using Xunit;
 using System.Reactive.Disposables;
@@ -19,46 +18,6 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
 {
     public class BindingTests_TemplatedParent
     {
-        [Fact]
-        public void OneWay_Binding_Should_Be_Set_Up()
-        {
-            var target = CreateTarget();
-            var binding = new Binding
-            {
-                Mode = BindingMode.OneWay,
-                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
-                Priority = BindingPriority.TemplatedParent,
-                Path = "Foo",
-            };
-
-            target.Object.Bind(TextBox.TextProperty, binding);
-
-            target.Verify(x => x.Bind(
-                TextBox.TextProperty, 
-                It.IsAny<IObservable<object>>(), 
-                BindingPriority.TemplatedParent));
-        }
-
-        [Fact]
-        public void TwoWay_Binding_Should_Be_Set_Up()
-        {
-            var target = CreateTarget();
-            var binding = new Binding
-            {
-                Mode = BindingMode.TwoWay,
-                RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
-                Priority = BindingPriority.TemplatedParent,
-                Path = "Foo",
-            };
-
-            target.Object.Bind(TextBox.TextProperty, binding);
-
-            target.Verify(x => x.Bind(
-                TextBox.TextProperty,
-                It.IsAny<ISubject<object>>(),
-                BindingPriority.TemplatedParent));
-        }
-
         [Fact]
         public void TemplateBinding_With_Null_Path_Works()
         {
@@ -87,19 +46,5 @@ namespace Avalonia.Markup.Xaml.UnitTests.Data
                 Assert.Equal("Avalonia.Controls.Button", textBlock.Text);
             }
         }
-
-        private Mock<IControl> CreateTarget(
-            ITemplatedControl templatedParent = null,
-            string text = null)
-        {
-            var result = new Mock<IControl>();
-
-            result.Setup(x => x.GetValue(Control.TemplatedParentProperty)).Returns(templatedParent);
-            result.Setup(x => x.GetValue((AvaloniaProperty)Control.TemplatedParentProperty)).Returns(templatedParent);
-            result.Setup(x => x.GetValue((AvaloniaProperty)TextBox.TextProperty)).Returns(text);
-            result.Setup(x => x.Bind(It.IsAny<AvaloniaProperty>(), It.IsAny<IObservable<object>>(), It.IsAny<BindingPriority>()))
-                .Returns(Disposable.Empty);
-            return result;
-        }
     }
 }
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
index d55e34cbe6..8f2cba06a3 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Templates;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Media;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Data/ResourceIncludeTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs
similarity index 96%
rename from tests/Avalonia.Markup.Xaml.UnitTests/Data/ResourceIncludeTests.cs
rename to tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs
index 6dc56e425c..a35c7bdd9b 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Data/ResourceIncludeTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/ResourceIncludeTests.cs
@@ -4,7 +4,7 @@ using Avalonia.Media;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.Xaml.UnitTests.Data
+namespace Avalonia.Markup.Xaml.UnitTests.MakrupExtensions
 {
     public class ResourceIncludeTests
     {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/TestValueConverter.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/TestValueConverter.cs
index 57570d8f5c..cafad1056f 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/TestValueConverter.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/TestValueConverter.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Globalization;
+using Avalonia.Data.Converters;
 
 namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
 {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs
index e8e1646d44..91da8e18a1 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/StyleTests.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using Avalonia.Controls;
 using Avalonia.Data;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Xunit;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index 0fcb9432ab..43df95cfce 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -4,7 +4,8 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Data.Converters;
+using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Media;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
index f1f4792d34..2c7e850fee 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/StyleTests.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Styling;
 using Avalonia.Media;
 using Avalonia.Styling;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
index a7ddfeeb00..cbcfa16771 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
@@ -3,7 +3,7 @@
 
 using System.Linq;
 using Avalonia.Controls.Templates;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Templates;
 using Avalonia.UnitTests;
 using Xunit;
diff --git a/tests/Avalonia.Markup.UnitTests/ControlLocatorTests.cs b/tests/Avalonia.Styling.UnitTests/ControlLocatorTests.cs
similarity index 95%
rename from tests/Avalonia.Markup.UnitTests/ControlLocatorTests.cs
rename to tests/Avalonia.Styling.UnitTests/ControlLocatorTests.cs
index b3e983036d..519a456ee2 100644
--- a/tests/Avalonia.Markup.UnitTests/ControlLocatorTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/ControlLocatorTests.cs
@@ -6,10 +6,11 @@ using System.Collections.Generic;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
+using Avalonia.LogicalTree;
 using Avalonia.UnitTests;
 using Xunit;
 
-namespace Avalonia.Markup.UnitTests
+namespace Avalonia.Styling.UnitTests
 {
     public class ControlLocatorTests
     {
@@ -61,7 +62,7 @@ namespace Avalonia.Markup.UnitTests
 
             var locator = ControlLocator.Track(relativeTo, "target");
             var target = new TextBlock { Name = "target" };
-            var result = new List<IControl>();
+            var result = new List<ILogical>();
 
             using (locator.Subscribe(x => result.Add(x)))
             {
@@ -93,7 +94,7 @@ namespace Avalonia.Markup.UnitTests
             };
 
             var locator = ControlLocator.Track(relativeTo, "target");
-            var result = new List<IControl>();
+            var result = new List<ILogical>();
             locator.Subscribe(x => result.Add(x));
 
             var other = new TextBlock { Name = "target" };
@@ -138,7 +139,7 @@ namespace Avalonia.Markup.UnitTests
 
             var locator = ControlLocator.Track(relativeTo, "target");
             var target = new TextBlock { Name = "target" };
-            var result = new List<IControl>();
+            var result = new List<ILogical>();
 
             using (locator.Subscribe(x => result.Add(x)))
             {
diff --git a/tests/Avalonia.Styling.UnitTests/SetterTests.cs b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
index f376df4d0b..7c1623cf21 100644
--- a/tests/Avalonia.Styling.UnitTests/SetterTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/SetterTests.cs
@@ -8,9 +8,10 @@ using Avalonia.Data;
 using Xunit;
 using System;
 using Avalonia.Controls.Templates;
-using Avalonia.Markup.Xaml.Data;
+using Avalonia.Markup.Data;
 using Avalonia.Markup;
 using System.Globalization;
+using Avalonia.Data.Converters;
 
 namespace Avalonia.Styling.UnitTests
 {

From da0ab8b6814fb64181beb5af4dcda285d9229265 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 15 May 2018 01:25:08 -0500
Subject: [PATCH 04/16] Move the styling system up the stack to live right
 below Avalonia.Animation since it has no dependencies on anything further
 down the dependency chain

---
 src/Avalonia.Base/AvaloniaObject.cs           |   2 +-
 src/Avalonia.Controls/Control.cs              | 754 +----------------
 src/Avalonia.Controls/HotkeyManager.cs        |   6 +-
 src/Avalonia.Controls/IControl.cs             |  30 +-
 src/Avalonia.Controls/Utils/AncestorFinder.cs |  24 +-
 .../Controls}/Classes.cs                      |  16 +-
 .../Controls}/IPseudoClasses.cs               |   0
 .../Controls}/ISetInheritanceParent.cs        |   2 +-
 .../Controls}/ISetLogicalParent.cs            |   2 +-
 src/Avalonia.Styling/Controls/NameScope.cs    |  36 +-
 .../Controls/NameScopeExtensions.cs           |   3 +-
 .../INamed.cs                                 |   0
 src/Avalonia.Styling/IStyledElement.cs        |  42 +
 .../ControlLocator.cs                         |  53 +-
 src/Avalonia.Styling/StyledElement.cs         | 783 ++++++++++++++++++
 .../Styling/IRequiresTemplateInStyle.cs       |  14 +
 src/Avalonia.Styling/Styling/IStyleable.cs    |   1 +
 src/Avalonia.Styling/Styling/Setter.cs        |   4 +-
 src/Avalonia.Styling/app.config               |  15 -
 src/Avalonia.Visuals/Avalonia.Visuals.csproj  |   3 +-
 src/Avalonia.Visuals/Visual.cs                |   2 +-
 .../VisualTree/VisualLocator.cs               |  46 +
 .../StaticResourceExtension.cs                |   2 +-
 .../Avalonia.Markup/Avalonia.Markup.csproj    |   2 -
 src/Markup/Avalonia.Markup/Data/Binding.cs    |  41 +-
 .../Avalonia.Markup/Data/DelayedBinding.cs    |  25 +-
 .../Avalonia.Markup/Data/RelativeSource.cs    |  17 +-
 .../ItemsControlTests.cs                      |   4 +-
 .../Presenters/CarouselPresenterTests.cs      |   2 +-
 .../Presenters/ItemsPresenterTests.cs         |   2 +-
 .../Templates/TemplateExtensionsTests.cs      |  20 +-
 .../Utils/AncestorFinderTests.cs              |   2 +-
 .../Data/BindingTests.cs                      |   2 +-
 .../StyledElementTests.cs}                    |  17 +-
 .../StyledElementTests_NameScope.cs}          |   4 +-
 .../StyledElementTests_Resources.cs}          |  12 +-
 36 files changed, 1028 insertions(+), 962 deletions(-)
 rename src/{Avalonia.Controls => Avalonia.Styling/Controls}/Classes.cs (95%)
 rename src/{Avalonia.Controls => Avalonia.Styling/Controls}/IPseudoClasses.cs (100%)
 rename src/{Avalonia.Controls => Avalonia.Styling/Controls}/ISetInheritanceParent.cs (88%)
 rename src/{Avalonia.Controls => Avalonia.Styling/Controls}/ISetLogicalParent.cs (85%)
 rename src/{Avalonia.Visuals => Avalonia.Styling}/INamed.cs (100%)
 create mode 100644 src/Avalonia.Styling/IStyledElement.cs
 rename src/Avalonia.Styling/{Controls => LogicalTree}/ControlLocator.cs (68%)
 create mode 100644 src/Avalonia.Styling/StyledElement.cs
 create mode 100644 src/Avalonia.Styling/Styling/IRequiresTemplateInStyle.cs
 delete mode 100644 src/Avalonia.Styling/app.config
 create mode 100644 src/Avalonia.Visuals/VisualTree/VisualLocator.cs
 rename tests/{Avalonia.Controls.UnitTests/ControlTests.cs => Avalonia.Styling.UnitTests/StyledElementTests.cs} (97%)
 rename tests/{Avalonia.Controls.UnitTests/ControlTests_NameScope.cs => Avalonia.Styling.UnitTests/StyledElementTests_NameScope.cs} (94%)
 rename tests/{Avalonia.Controls.UnitTests/ControlTests_Resources.cs => Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs} (95%)

diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
index 1a2db9fc3d..48e72db126 100644
--- a/src/Avalonia.Base/AvaloniaObject.cs
+++ b/src/Avalonia.Base/AvaloniaObject.cs
@@ -703,7 +703,7 @@ namespace Avalonia
         /// <returns>The default value.</returns>
         private object GetDefaultValue(AvaloniaProperty property)
         {
-            if (property.Inherits && _inheritanceParent is AvaloniaObject aobj)
+            if (property.Inherits && InheritanceParent is AvaloniaObject aobj)
                 return aobj.GetValueInternal(property);
             return ((IStyledPropertyAccessor) property).GetDefaultValue(GetType());
         }
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 89721e2e05..2bcd540264 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -29,53 +29,23 @@ namespace Avalonia.Controls
     /// <remarks>
     /// The control class extends <see cref="InputElement"/> and adds the following features:
     ///
-    /// - An inherited <see cref="DataContext"/>.
     /// - A <see cref="Tag"/> property to allow user-defined data to be attached to the control.
-    /// - A collection of class strings for custom styling.
-    /// - Implements <see cref="IStyleable"/> to allow styling to work on the control.
-    /// - Implements <see cref="ILogical"/> to form part of a logical tree.
+
     /// </remarks>
-    public class Control : InputElement, IControl, INamed, ISetInheritanceParent, ISetLogicalParent, ISupportInitialize, IVisualBrushInitialize
+    public class Control : InputElement, IControl, INamed, ISupportInitialize, IVisualBrushInitialize, IRequiresTemplateInStyle
     {
-        /// <summary>
-        /// Defines the <see cref="DataContext"/> property.
-        /// </summary>
-        public static readonly StyledProperty<object> DataContextProperty =
-            AvaloniaProperty.Register<Control, object>(
-                nameof(DataContext), 
-                inherits: true,
-                notifying: DataContextNotifying);
-
         /// <summary>
         /// Defines the <see cref="FocusAdorner"/> property.
         /// </summary>
         public static readonly StyledProperty<ITemplate<IControl>> FocusAdornerProperty =
             AvaloniaProperty.Register<Control, ITemplate<IControl>>(nameof(FocusAdorner));
 
-        /// <summary>
-        /// Defines the <see cref="Name"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Control, string> NameProperty =
-            AvaloniaProperty.RegisterDirect<Control, string>(nameof(Name), o => o.Name, (o, v) => o.Name = v);
-
-        /// <summary>
-        /// Defines the <see cref="Parent"/> property.
-        /// </summary>
-        public static readonly DirectProperty<Control, IControl> ParentProperty =
-            AvaloniaProperty.RegisterDirect<Control, IControl>(nameof(Parent), o => o.Parent);
-
         /// <summary>
         /// Defines the <see cref="Tag"/> property.
         /// </summary>
         public static readonly StyledProperty<object> TagProperty =
             AvaloniaProperty.Register<Control, object>(nameof(Tag));
-
-        /// <summary>
-        /// Defines the <see cref="TemplatedParent"/> property.
-        /// </summary>
-        public static readonly StyledProperty<ITemplatedControl> TemplatedParentProperty =
-            AvaloniaProperty.Register<Control, ITemplatedControl>(nameof(TemplatedParent), inherits: true);
-
+        
         /// <summary>
         /// Defines the <see cref="ContextMenu"/> property.
         /// </summary>
@@ -88,20 +58,8 @@ namespace Avalonia.Controls
         public static readonly RoutedEvent<RequestBringIntoViewEventArgs> RequestBringIntoViewEvent =
             RoutedEvent.Register<Control, RequestBringIntoViewEventArgs>("RequestBringIntoView", RoutingStrategies.Bubble);
 
-        private int _initCount;
-        private string _name;
-        private IControl _parent;
-        private readonly Classes _classes = new Classes();
         private DataTemplates _dataTemplates;
         private IControl _focusAdorner;
-        private bool _isAttachedToLogicalTree;
-        private IAvaloniaList<ILogical> _logicalChildren;
-        private INameScope _nameScope;
-        private IResourceDictionary _resources;
-        private Styles _styles;
-        private bool _styled;
-        private Subject<IStyleable> _styleDetach = new Subject<IStyleable>();
-        private bool _dataContextUpdating;
 
         /// <summary>
         /// Initializes static members of the <see cref="Control"/> class.
@@ -112,127 +70,6 @@ namespace Avalonia.Controls
             PseudoClass(IsEnabledCoreProperty, x => !x, ":disabled");
             PseudoClass(IsFocusedProperty, ":focus");
             PseudoClass(IsPointerOverProperty, ":pointerover");
-            DataContextProperty.Changed.AddClassHandler<Control>(x => x.OnDataContextChangedCore);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Control"/> class.
-        /// </summary>
-        public Control()
-        {
-            _nameScope = this as INameScope;
-            _isAttachedToLogicalTree = this is IStyleRoot;
-        }
-
-        /// <summary>
-        /// Raised when the control is attached to a rooted logical tree.
-        /// </summary>
-        public event EventHandler<LogicalTreeAttachmentEventArgs> AttachedToLogicalTree;
-
-        /// <summary>
-        /// Raised when the control is detached from a rooted logical tree.
-        /// </summary>
-        public event EventHandler<LogicalTreeAttachmentEventArgs> DetachedFromLogicalTree;
-
-        /// <summary>
-        /// Occurs when the <see cref="DataContext"/> property changes.
-        /// </summary>
-        /// <remarks>
-        /// This event will be raised when the <see cref="DataContext"/> property has changed and
-        /// all subscribers to that change have been notified.
-        /// </remarks>
-        public event EventHandler DataContextChanged;
-
-        /// <summary>
-        /// Occurs when the control has finished initialization.
-        /// </summary>
-        /// <remarks>
-        /// The Initialized event indicates that all property values on the control have been set.
-        /// When loading the control from markup, it occurs when 
-        /// <see cref="ISupportInitialize.EndInit"/> is called *and* the control
-        /// is attached to a rooted logical tree. When the control is created by code and
-        /// <see cref="ISupportInitialize"/> is not used, it is called when the control is attached
-        /// to the visual tree.
-        /// </remarks>
-        public event EventHandler Initialized;
-
-        /// <summary>
-        /// Occurs when a resource in this control or a parent control has changed.
-        /// </summary>
-        public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
-
-        /// <summary>
-        /// Gets or sets the name of the control.
-        /// </summary>
-        /// <remarks>
-        /// An element's name is used to uniquely identify a control within the control's name
-        /// scope. Once the element is added to a logical tree, its name cannot be changed.
-        /// </remarks>
-        public string Name
-        {
-            get
-            {
-                return _name;
-            }
-
-            set
-            {
-                if (String.IsNullOrWhiteSpace(value))
-                {
-                    throw new InvalidOperationException("Cannot set Name to null or empty string.");
-                }
-
-                if (_styled)
-                {
-                    throw new InvalidOperationException("Cannot set Name : control already styled.");
-                }
-
-                _name = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the control's classes.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// Classes can be used to apply user-defined styling to controls, or to allow controls
-        /// that share a common purpose to be easily selected.
-        /// </para>
-        /// <para>
-        /// Even though this property can be set, the setter is only intended for use in object
-        /// initializers. Assigning to this property does not change the underlying collection,
-        /// it simply clears the existing collection and addds the contents of the assigned
-        /// collection.
-        /// </para>
-        /// </remarks>
-        public Classes Classes
-        {
-            get
-            {
-                return _classes;
-            }
-
-            set
-            {
-                if (_classes != value)
-                {
-                    _classes.Replace(value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the control's data context.
-        /// </summary>
-        /// <remarks>
-        /// The data context is an inherited property that specifies the default object that will
-        /// be used for data binding.
-        /// </remarks>
-        public object DataContext
-        {
-            get { return GetValue(DataContextProperty); }
-            set { SetValue(DataContextProperty, value); }
         }
 
         /// <summary>
@@ -253,55 +90,6 @@ namespace Avalonia.Controls
         /// </remarks>
         public DataTemplates DataTemplates => _dataTemplates ?? (_dataTemplates = new DataTemplates());
 
-        /// <summary>
-        /// Gets a value that indicates whether the element has finished initialization.
-        /// </summary>
-        /// <remarks>
-        /// For more information about when IsInitialized is set, see the <see cref="Initialized"/>
-        /// event.
-        /// </remarks>
-        public bool IsInitialized { get; private set; }
-
-        /// <summary>
-        /// Gets the styles for the control.
-        /// </summary>
-        /// <remarks>
-        /// Styles for the entire application are added to the Application.Styles collection, but
-        /// each control may in addition define its own styles which are applied to the control
-        /// itself and its children.
-        /// </remarks>
-        public Styles Styles
-        {
-            get { return _styles ?? (Styles = new Styles()); }
-            set
-            {
-                Contract.Requires<ArgumentNullException>(value != null);
-
-                if (_styles != value)
-                {
-                    if (_styles != null)
-                    {
-                        (_styles as ISetStyleParent)?.SetParent(null);
-                        _styles.ResourcesChanged -= ThisResourcesChanged;
-                    }
-
-                    _styles = value;
-
-                    if (value is ISetStyleParent setParent && setParent.ResourceParent == null)
-                    {
-                        setParent.SetParent(this);
-                    } 
-
-                    _styles.ResourcesChanged += ThisResourcesChanged;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the control's logical parent.
-        /// </summary>
-        public IControl Parent => _parent;
-
         /// <summary>
         /// Gets or sets a context menu to the control.
         /// </summary>
@@ -311,34 +99,6 @@ namespace Avalonia.Controls
             set { SetValue(ContextMenuProperty, value); }
         }
 
-        /// <summary>
-        /// Gets or sets the control's resource dictionary.
-        /// </summary>
-        public IResourceDictionary Resources
-        {
-            get => _resources ?? (Resources = new ResourceDictionary());
-            set
-            {
-                Contract.Requires<ArgumentNullException>(value != null);
-
-                var hadResources = false;
-
-                if (_resources != null)
-                {
-                    hadResources = _resources.Count > 0;
-                    _resources.ResourcesChanged -= ThisResourcesChanged;
-                }
-
-                _resources = value;
-                _resources.ResourcesChanged += ThisResourcesChanged;
-
-                if (hadResources || _resources.Count > 0)
-                {
-                    ((ILogical)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
-                }
-            }
-        }
-
         /// <summary>
         /// Gets or sets a user-defined object attached to the control.
         /// </summary>
@@ -348,226 +108,11 @@ namespace Avalonia.Controls
             set { SetValue(TagProperty, value); }
         }
 
-        /// <summary>
-        /// Gets the control whose lookless template this control is part of.
-        /// </summary>
-        public ITemplatedControl TemplatedParent
-        {
-            get { return GetValue(TemplatedParentProperty); }
-            internal set { SetValue(TemplatedParentProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets the control's logical children.
-        /// </summary>
-        protected IAvaloniaList<ILogical> LogicalChildren
-        {
-            get
-            {
-                if (_logicalChildren == null)
-                {
-                    var list = new AvaloniaList<ILogical>();
-                    list.ResetBehavior = ResetBehavior.Remove;
-                    list.Validate = ValidateLogicalChild;
-                    list.CollectionChanged += LogicalChildrenCollectionChanged;
-                    _logicalChildren = list;
-                }
-
-                return _logicalChildren;
-            }
-        }
+        public new IControl Parent => (IControl)base.Parent;
 
         /// <inheritdoc/>
         bool IDataTemplateHost.IsDataTemplatesInitialized => _dataTemplates != null;
 
-        /// <summary>
-        /// Gets the <see cref="Classes"/> collection in a form that allows adding and removing
-        /// pseudoclasses.
-        /// </summary>
-        protected IPseudoClasses PseudoClasses => Classes;
-
-        /// <summary>
-        /// Gets a value indicating whether the element is attached to a rooted logical tree.
-        /// </summary>
-        bool ILogical.IsAttachedToLogicalTree => _isAttachedToLogicalTree;
-
-        /// <summary>
-        /// Gets the control's logical parent.
-        /// </summary>
-        ILogical ILogical.LogicalParent => Parent;
-
-        /// <summary>
-        /// Gets the control's logical children.
-        /// </summary>
-        IAvaloniaReadOnlyList<ILogical> ILogical.LogicalChildren => LogicalChildren;
-
-        /// <inheritdoc/>
-        bool IResourceProvider.HasResources => _resources?.Count > 0 || Styles.HasResources;
-
-        /// <inheritdoc/>
-        IResourceNode IResourceNode.ResourceParent => ((IStyleHost)this).StylingParent as IResourceNode;
-
-        /// <inheritdoc/>
-        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
-
-        /// <summary>
-        /// Gets the type by which the control is styled.
-        /// </summary>
-        /// <remarks>
-        /// Usually controls are styled by their own type, but there are instances where you want
-        /// a control to be styled by its base type, e.g. creating SpecialButton that
-        /// derives from Button and adds extra functionality but is still styled as a regular
-        /// Button.
-        /// </remarks>
-        Type IStyleable.StyleKey => GetType();
-
-        /// <inheritdoc/>
-        IObservable<IStyleable> IStyleable.StyleDetach => _styleDetach;
-
-        /// <inheritdoc/>
-        bool IStyleHost.IsStylesInitialized => _styles != null;
-
-        /// <inheritdoc/>
-        IStyleHost IStyleHost.StylingParent => (IStyleHost)InheritanceParent;
-
-        /// <inheritdoc/>
-        public virtual void BeginInit()
-        {
-            ++_initCount;
-        }
-
-        /// <inheritdoc/>
-        public virtual void EndInit()
-        {
-            if (_initCount == 0)
-            {
-                throw new InvalidOperationException("BeginInit was not called.");
-            }
-
-            if (--_initCount == 0 && _isAttachedToLogicalTree)
-            {
-                InitializeStylesIfNeeded();
-
-                InitializeIfNeeded();
-            }
-        }
-
-        private void InitializeStylesIfNeeded(bool force = false)
-        {
-            if (_initCount == 0 && (!_styled || force))
-            {
-                RegisterWithNameScope();
-                ApplyStyling();
-                _styled = true;
-            }
-        }
-
-        private void InitializeIfNeeded()
-        {
-            if (_initCount == 0 && !IsInitialized)
-            {
-                IsInitialized = true;
-                Initialized?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-            this.OnAttachedToLogicalTreeCore(e);
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-            this.OnDetachedFromLogicalTreeCore(e);
-        }
-
-        /// <inheritdoc/>
-        void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e)
-        {
-            ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
-        }
-
-        /// <inheritdoc/>
-        bool IResourceProvider.TryGetResource(string key, out object value)
-        {
-            value = null;
-            return (_resources?.TryGetResource(key, out value) ?? false) ||
-                   (_styles?.TryGetResource(key, out value) ?? false);
-        }
-
-        /// <summary>
-        /// Sets the control's logical parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void ISetLogicalParent.SetParent(ILogical parent)
-        {
-            var old = Parent;
-
-            if (parent != old)
-            {
-                if (old != null && parent != null)
-                {
-                    throw new InvalidOperationException("The Control already has a parent.");
-                }
-
-                if (_isAttachedToLogicalTree)
-                {
-                    var oldRoot = FindStyleRoot(old) ?? this as IStyleRoot;
-
-                    if (oldRoot == null)
-                    {
-                        throw new AvaloniaInternalException("Was attached to logical tree but cannot find root.");
-                    }
-
-                    var e = new LogicalTreeAttachmentEventArgs(oldRoot);
-                    OnDetachedFromLogicalTreeCore(e);
-                }
-
-                if (InheritanceParent == null || parent == null)
-                {
-                    InheritanceParent = parent as AvaloniaObject;
-                }
-
-                _parent = (IControl)parent;
-
-                if (old != null)
-                {
-                    old.ResourcesChanged -= ThisResourcesChanged; 
-                }
-                if (_parent != null)
-                {
-                    _parent.ResourcesChanged += ThisResourcesChanged; 
-                }
-                ((ILogical)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
-
-                if (_parent is IStyleRoot || _parent?.IsAttachedToLogicalTree == true || this is IStyleRoot)
-                {
-                    var newRoot = FindStyleRoot(this);
-
-                    if (newRoot == null)
-                    {
-                        throw new AvaloniaInternalException("Parent is atttached to logical tree but cannot find root.");
-                    }
-
-                    var e = new LogicalTreeAttachmentEventArgs(newRoot);
-                    OnAttachedToLogicalTreeCore(e);
-                }
-
-                RaisePropertyChanged(ParentProperty, old, _parent, BindingPriority.LocalValue);
-            }
-        }
-
-        /// <summary>
-        /// Sets the control's inheritance parent.
-        /// </summary>
-        /// <param name="parent">The parent.</param>
-        void ISetInheritanceParent.SetParent(IAvaloniaObject parent)
-        {
-            InheritanceParent = parent;
-        }
-
         /// <inheritdoc/>
         void IVisualBrushInitialize.EnsureInitialized()
         {
@@ -600,52 +145,6 @@ namespace Avalonia.Controls
             }
         }
 
-        /// <summary>
-        /// Adds a pseudo-class to be set when a property is true.
-        /// </summary>
-        /// <param name="property">The property.</param>
-        /// <param name="className">The pseudo-class.</param>
-        protected static void PseudoClass(AvaloniaProperty<bool> property, string className)
-        {
-            PseudoClass(property, x => x, className);
-        }
-
-        /// <summary>
-        /// Adds a pseudo-class to be set when a property equals a certain value.
-        /// </summary>
-        /// <typeparam name="T">The type of the property.</typeparam>
-        /// <param name="property">The property.</param>
-        /// <param name="selector">Returns a boolean value based on the property value.</param>
-        /// <param name="className">The pseudo-class.</param>
-        protected static void PseudoClass<T>(
-            AvaloniaProperty<T> property,
-            Func<T, bool> selector,
-            string className)
-        {
-            Contract.Requires<ArgumentNullException>(property != null);
-            Contract.Requires<ArgumentNullException>(selector != null);
-            Contract.Requires<ArgumentNullException>(className != null);
-
-            if (string.IsNullOrWhiteSpace(className))
-            {
-                throw new ArgumentException("Cannot supply an empty className.");
-            }
-
-            property.Changed.Merge(property.Initialized)
-                .Where(e => e.Sender is Control)
-                .Subscribe(e =>
-                {
-                    if (selector((T)e.NewValue))
-                    {
-                        ((Control)e.Sender).PseudoClasses.Add(className);
-                    }
-                    else
-                    {
-                        ((Control)e.Sender).PseudoClasses.Remove(className);
-                    }
-                });
-        }
-
         /// <summary>
         /// Gets the element that recieves the focus adorner.
         /// </summary>
@@ -655,22 +154,6 @@ namespace Avalonia.Controls
             return this;
         }
 
-        /// <summary>
-        /// Called when the control is added to a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-        }
-
-        /// <summary>
-        /// Called when the control is removed from a rooted logical tree.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-        }
-
         /// <inheritdoc/>
         protected sealed override void OnAttachedToVisualTreeCore(VisualTreeAttachmentEventArgs e)
         {
@@ -685,29 +168,6 @@ namespace Avalonia.Controls
             base.OnDetachedFromVisualTreeCore(e);
         }
 
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> property changes.
-        /// </summary>
-        /// <param name="e">The event args.</param>
-        protected virtual void OnDataContextChanged(EventArgs e)
-        {
-            DataContextChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> begins updating.
-        /// </summary>
-        protected virtual void OnDataContextBeginUpdate()
-        {
-        }
-
-        /// <summary>
-        /// Called when the <see cref="DataContext"/> finishes updating.
-        /// </summary>
-        protected virtual void OnDataContextEndUpdate()
-        {
-        }
-
         /// <inheritdoc/>
         protected override void OnGotFocus(GotFocusEventArgs e)
         {
@@ -757,211 +217,5 @@ namespace Avalonia.Controls
                 _focusAdorner = null;
             }
         }
-
-        private static void DataContextNotifying(IAvaloniaObject o, bool notifying)
-        {
-            if (o is Control control)
-            {
-                DataContextNotifying(control, notifying);
-            }
-        }
-
-        private static void DataContextNotifying(Control control, bool notifying)
-        {
-            if (notifying)
-            {
-                if (!control._dataContextUpdating)
-                {
-                    control._dataContextUpdating = true;
-                    control.OnDataContextBeginUpdate();
-
-                    foreach (var child in control.LogicalChildren)
-                    {
-                        if (child is Control c && 
-                            c.InheritanceParent == control &&
-                            !c.IsSet(DataContextProperty))
-                        {
-                            DataContextNotifying(c, notifying);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                if (control._dataContextUpdating)
-                {
-                    control.OnDataContextEndUpdate();
-                    control._dataContextUpdating = false;
-                }
-            }
-        }
-
-        private static IStyleRoot FindStyleRoot(IStyleHost e)
-        {
-            while (e != null)
-            {
-                if (e is IRenderRoot root)
-                {
-                    return root as IStyleRoot;
-                }
-
-                e = e.StylingParent;
-            }
-
-            return null;
-        }
-
-        private void ApplyStyling()
-        {
-            AvaloniaLocator.Current.GetService<IStyler>()?.ApplyStyles(this);
-        }
-
-        private void RegisterWithNameScope()
-        {
-            if (_nameScope == null)
-            {
-                _nameScope = NameScope.GetNameScope(this) ?? ((Control)Parent)?._nameScope;
-            }
-
-            if (Name != null)
-            {
-                _nameScope?.Register(Name, this);
-
-                var visualParent = Parent as Visual;
-
-                if (this is INameScope && visualParent != null)
-                {
-                    // If we have e.g. a named UserControl in a window then we want that control
-                    // to be findable by name from the Window, so register with both name scopes.
-                    // This differs from WPF's behavior in that XAML manually registers controls 
-                    // with name scopes based on the XAML file in which the name attribute appears,
-                    // but we're trying to avoid XAML magic in Avalonia in order to made code-
-                    // created UIs easy. This will cause problems if a UserControl declares a name
-                    // in its XAML and that control is included multiple times in a parent control
-                    // (as the name will be duplicated), however at the moment I'm fine with saying
-                    // "don't do that".
-                    var parentNameScope = NameScope.FindNameScope(visualParent);
-                    parentNameScope?.Register(Name, this);
-                }
-            }
-        }
-
-        private static void ValidateLogicalChild(ILogical c)
-        {
-            if (c == null)
-            {
-                throw new ArgumentException("Cannot add null to LogicalChildren.");
-            }
-        }
-
-        private void OnAttachedToLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
-        {
-            // This method can be called when a control is already attached to the logical tree
-            // in the following scenario:
-            // - ListBox gets assigned Items containing ListBoxItem
-            // - ListBox makes ListBoxItem a logical child
-            // - ListBox template gets applied; making its Panel get attached to logical tree
-            // - That AttachedToLogicalTree signal travels down to the ListBoxItem
-            if (!_isAttachedToLogicalTree)
-            {
-                _isAttachedToLogicalTree = true;
-
-                InitializeStylesIfNeeded(true);
-
-                OnAttachedToLogicalTree(e);
-                AttachedToLogicalTree?.Invoke(this, e);
-            }
-
-            foreach (var child in LogicalChildren.OfType<Control>())
-            {
-                child.OnAttachedToLogicalTreeCore(e);
-            }
-        }
-
-        private void OnDetachedFromLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
-        {
-            if (_isAttachedToLogicalTree)
-            {
-                if (Name != null)
-                {
-                    _nameScope?.Unregister(Name);
-                }
-
-                _isAttachedToLogicalTree = false;
-                _styleDetach.OnNext(this);
-                OnDetachedFromLogicalTree(e);
-                DetachedFromLogicalTree?.Invoke(this, e);
-
-                foreach (var child in LogicalChildren.OfType<Control>())
-                {
-                    child.OnDetachedFromLogicalTreeCore(e);
-                }
-
-#if DEBUG
-                if (((INotifyCollectionChangedDebug)_classes).GetCollectionChangedSubscribers()?.Length > 0)
-                {
-                    Logger.Warning(
-                        LogArea.Control,
-                        this,
-                        "{Type} detached from logical tree but still has class listeners",
-                        this.GetType());
-                }
-#endif
-            }
-        }
-
-        private void OnDataContextChangedCore(AvaloniaPropertyChangedEventArgs e)
-        {
-            OnDataContextChanged(EventArgs.Empty);
-        }
-
-        private void LogicalChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    SetLogicalParent(e.NewItems.Cast<ILogical>());
-                    break;
-
-                case NotifyCollectionChangedAction.Remove:
-                    ClearLogicalParent(e.OldItems.Cast<ILogical>());
-                    break;
-
-                case NotifyCollectionChangedAction.Replace:
-                    ClearLogicalParent(e.OldItems.Cast<ILogical>());
-                    SetLogicalParent(e.NewItems.Cast<ILogical>());
-                    break;
-
-                case NotifyCollectionChangedAction.Reset:
-                    throw new NotSupportedException("Reset should not be signalled on LogicalChildren collection");
-            }
-        }
-
-        private void SetLogicalParent(IEnumerable<ILogical> children)
-        {
-            foreach (var i in children)
-            {
-                if (i.LogicalParent == null)
-                {
-                    ((ISetLogicalParent)i).SetParent(this);
-                }
-            }
-        }
-
-        private void ClearLogicalParent(IEnumerable<ILogical> children)
-        {
-            foreach (var i in children)
-            {
-                if (i.LogicalParent == this)
-                {
-                    ((ISetLogicalParent)i).SetParent(null);
-                }
-            }
-        }
-
-        private void ThisResourcesChanged(object sender, ResourcesChangedEventArgs e)
-        {
-            ((ILogical)this).NotifyResourcesChanged(e);
-        }
     }
 }
diff --git a/src/Avalonia.Controls/HotkeyManager.cs b/src/Avalonia.Controls/HotkeyManager.cs
index 35c9d6a9c5..a59fb86fb7 100644
--- a/src/Avalonia.Controls/HotkeyManager.cs
+++ b/src/Avalonia.Controls/HotkeyManager.cs
@@ -55,13 +55,13 @@ namespace Avalonia.Controls
             public void Init()
             {
                 _hotkeySub = _control.GetObservable(HotKeyProperty).Subscribe(OnHotkeyChanged);
-                _parentSub = AncestorFinder.Create(_control, typeof (TopLevel)).Subscribe(OnParentChanged);
+                _parentSub = AncestorFinder.Create<TopLevel>(_control).Subscribe(OnParentChanged);
             }
 
-            private void OnParentChanged(IControl control)
+            private void OnParentChanged(TopLevel control)
             {
                 Unregister();
-                _root = (TopLevel) control;
+                _root = control;
                 Register();
             }
 
diff --git a/src/Avalonia.Controls/IControl.cs b/src/Avalonia.Controls/IControl.cs
index 36e09b2ea1..e7f2903249 100644
--- a/src/Avalonia.Controls/IControl.cs
+++ b/src/Avalonia.Controls/IControl.cs
@@ -16,37 +16,11 @@ namespace Avalonia.Controls
     /// </summary>
     public interface IControl : IVisual,
         IDataTemplateHost,
-        ILogical,
         ILayoutable,
         IInputElement,
         INamed,
-        IResourceNode,
-        IStyleable,
-        IStyleHost
+        IStyledElement
     {
-        /// <summary>
-        /// Occurs when the control has finished initialization.
-        /// </summary>
-        event EventHandler Initialized;
-
-        /// <summary>
-        /// Gets or sets the control's styling classes.
-        /// </summary>
-        new Classes Classes { get; set; }
-
-        /// <summary>
-        /// Gets or sets the control's data context.
-        /// </summary>
-        object DataContext { get; set; }
-
-        /// <summary>
-        /// Gets a value that indicates whether the element has finished initialization.
-        /// </summary>
-        bool IsInitialized { get; }
-
-        /// <summary>
-        /// Gets the control's logical parent.
-        /// </summary>
-        IControl Parent { get; }
+        new IControl Parent { get; }
     }
 }
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Utils/AncestorFinder.cs b/src/Avalonia.Controls/Utils/AncestorFinder.cs
index 7e6523261a..6ee284e05d 100644
--- a/src/Avalonia.Controls/Utils/AncestorFinder.cs
+++ b/src/Avalonia.Controls/Utils/AncestorFinder.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Disposables;
+using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Reflection;
 using System.Text;
@@ -14,15 +15,15 @@ namespace Avalonia.Controls.Utils
     {
         class FinderNode : IDisposable
         {
-            private readonly IControl _control;
+            private readonly IStyledElement _control;
             private readonly TypeInfo _ancestorType;
-            public IObservable<IControl> Observable => _subject;
-            private readonly Subject<IControl> _subject = new Subject<IControl>();
+            public IObservable<IStyledElement> Observable => _subject;
+            private readonly Subject<IStyledElement> _subject = new Subject<IStyledElement>();
 
             private FinderNode _child;
             private IDisposable _disposable;
 
-            public FinderNode(IControl control, TypeInfo ancestorType)
+            public FinderNode(IStyledElement control, TypeInfo ancestorType)
             {
                 _control = control;
                 _ancestorType = ancestorType;
@@ -33,7 +34,7 @@ namespace Avalonia.Controls.Utils
                 _disposable = _control.GetObservable(Control.ParentProperty).Subscribe(OnValueChanged);
             }
 
-            private void OnValueChanged(IControl next)
+            private void OnValueChanged(IStyledElement next)
             {
                 if (next == null || _ancestorType.IsAssignableFrom(next.GetType().GetTypeInfo()))
                     _subject.OnNext(next);
@@ -46,7 +47,7 @@ namespace Avalonia.Controls.Utils
                 }
             }
 
-            private void OnChildValueChanged(IControl control) => _subject.OnNext(control);
+            private void OnChildValueChanged(IStyledElement control) => _subject.OnNext(control);
 
 
             public void Dispose()
@@ -55,10 +56,15 @@ namespace Avalonia.Controls.Utils
             }
         }
 
+        public static IObservable<T> Create<T>(IStyledElement control)
+            where T : IStyledElement
+        {
+            return Create(control, typeof(T)).Cast<T>();
+        }
 
-        public static IObservable<IControl> Create(IControl control, Type ancestorType)
+        public static IObservable<IStyledElement> Create(IStyledElement control, Type ancestorType)
         {
-            return new AnonymousObservable<IControl>(observer =>
+            return new AnonymousObservable<IStyledElement>(observer =>
             {
                 var finder = new FinderNode(control, ancestorType.GetTypeInfo());
                 var subscription = finder.Observable.Subscribe(observer);
@@ -70,8 +76,6 @@ namespace Avalonia.Controls.Utils
                     finder.Dispose();
                 });
             });
-
-
         }
     }
 }
diff --git a/src/Avalonia.Controls/Classes.cs b/src/Avalonia.Styling/Controls/Classes.cs
similarity index 95%
rename from src/Avalonia.Controls/Classes.cs
rename to src/Avalonia.Styling/Controls/Classes.cs
index 48ce69f0c9..85935b030b 100644
--- a/src/Avalonia.Controls/Classes.cs
+++ b/src/Avalonia.Styling/Controls/Classes.cs
@@ -9,7 +9,7 @@ using Avalonia.Collections;
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// Holds a collection of style classes for an <see cref="IControl"/>.
+    /// Holds a collection of style classes for an <see cref="IStyledElement"/>.
     /// </summary>
     /// <remarks>
     /// Similar to CSS, each control may have any number of styling classes applied.
@@ -54,7 +54,7 @@ namespace Avalonia.Controls
         /// <param name="name">The class name.</param>
         /// <remarks>
         /// Only standard classes may be added via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="Control.PseudoClasses"/>
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
         /// property.
         /// </remarks>
         public override void Add(string name)
@@ -73,7 +73,7 @@ namespace Avalonia.Controls
         /// <param name="names">The class names.</param>
         /// <remarks>
         /// Only standard classes may be added via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="Control.PseudoClasses"/>
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
         /// property.
         /// </remarks>
         public override void AddRange(IEnumerable<string> names)
@@ -114,7 +114,7 @@ namespace Avalonia.Controls
         /// <param name="name">The class name.</param>
         /// <remarks>
         /// Only standard classes may be added via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="Control.PseudoClasses"/>
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
         /// property.
         /// </remarks>
         public override void Insert(int index, string name)
@@ -134,7 +134,7 @@ namespace Avalonia.Controls
         /// <param name="names">The class names.</param>
         /// <remarks>
         /// Only standard classes may be added via this method. To add pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="Control.PseudoClasses"/>
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
         /// property.
         /// </remarks>
         public override void InsertRange(int index, IEnumerable<string> names)
@@ -160,7 +160,7 @@ namespace Avalonia.Controls
         /// <param name="name">The class name.</param>
         /// <remarks>
         /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="Control.PseudoClasses"/>
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
         /// property.
         /// </remarks>
         public override bool Remove(string name)
@@ -175,7 +175,7 @@ namespace Avalonia.Controls
         /// <param name="names">The class name.</param>
         /// <remarks>
         /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="Control.PseudoClasses"/>
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
         /// property.
         /// </remarks>
         public override void RemoveAll(IEnumerable<string> names)
@@ -201,7 +201,7 @@ namespace Avalonia.Controls
         /// <param name="index">The index of the class in the collection.</param>
         /// <remarks>
         /// Only standard classes may be removed via this method. To remove pseudoclasses (classes
-        /// beginning with a ':' character) use the protected <see cref="Control.PseudoClasses"/>
+        /// beginning with a ':' character) use the protected <see cref="StyledElement.PseudoClasses"/>
         /// property.
         /// </remarks>
         public override void RemoveAt(int index)
diff --git a/src/Avalonia.Controls/IPseudoClasses.cs b/src/Avalonia.Styling/Controls/IPseudoClasses.cs
similarity index 100%
rename from src/Avalonia.Controls/IPseudoClasses.cs
rename to src/Avalonia.Styling/Controls/IPseudoClasses.cs
diff --git a/src/Avalonia.Controls/ISetInheritanceParent.cs b/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
similarity index 88%
rename from src/Avalonia.Controls/ISetInheritanceParent.cs
rename to src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
index 788ab77246..1a778fa0f9 100644
--- a/src/Avalonia.Controls/ISetInheritanceParent.cs
+++ b/src/Avalonia.Styling/Controls/ISetInheritanceParent.cs
@@ -4,7 +4,7 @@
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// Defines an interface through which a <see cref="Control"/>'s inheritance parent can be set.
+    /// Defines an interface through which a <see cref="StyledElement"/>'s inheritance parent can be set.
     /// </summary>
     /// <remarks>
     /// You should not usually need to use this interface - it is for advanced scenarios only.
diff --git a/src/Avalonia.Controls/ISetLogicalParent.cs b/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
similarity index 85%
rename from src/Avalonia.Controls/ISetLogicalParent.cs
rename to src/Avalonia.Styling/Controls/ISetLogicalParent.cs
index 4422033634..5fb450c896 100644
--- a/src/Avalonia.Controls/ISetLogicalParent.cs
+++ b/src/Avalonia.Styling/Controls/ISetLogicalParent.cs
@@ -6,7 +6,7 @@ using Avalonia.LogicalTree;
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// Defines an interface through which a <see cref="Control"/>'s logical parent can be set.
+    /// Defines an interface through which a <see cref="StyledElement"/>'s logical parent can be set.
     /// </summary>
     /// <remarks>
     /// You should not usually need to use this interface - it is for advanced scenarios only.
diff --git a/src/Avalonia.Styling/Controls/NameScope.cs b/src/Avalonia.Styling/Controls/NameScope.cs
index 8b5bd81d3c..e3a29af541 100644
--- a/src/Avalonia.Styling/Controls/NameScope.cs
+++ b/src/Avalonia.Styling/Controls/NameScope.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Controls
         /// Defines the NameScope attached property.
         /// </summary>
         public static readonly AttachedProperty<INameScope> NameScopeProperty =
-            AvaloniaProperty.RegisterAttached<NameScope, Visual, INameScope>("NameScope");
+            AvaloniaProperty.RegisterAttached<NameScope, StyledElement, INameScope>("NameScope");
 
         private readonly Dictionary<string, object> _inner = new Dictionary<string, object>();
 
@@ -31,53 +31,53 @@ namespace Avalonia.Controls
         public event EventHandler<NameScopeEventArgs> Unregistered;
 
         /// <summary>
-        /// Finds the containing name scope for a visual.
+        /// Finds the containing name scope for a styled element.
         /// </summary>
-        /// <param name="visual">The visual.</param>
+        /// <param name="styled">The styled element.</param>
         /// <returns>The containing name scope.</returns>
-        public static INameScope FindNameScope(Visual visual)
+        public static INameScope FindNameScope(StyledElement styled)
         {
-            Contract.Requires<ArgumentNullException>(visual != null);
+            Contract.Requires<ArgumentNullException>(styled != null);
 
             INameScope result;
 
-            while (visual != null)
+            while (styled != null)
             {
-                result = visual as INameScope ?? GetNameScope(visual);
+                result = styled as INameScope ?? GetNameScope(styled);
 
                 if (result != null)
                 {
                     return result;
                 }
 
-                visual = (visual as ILogical)?.LogicalParent as Visual;
+                styled = (styled as ILogical)?.LogicalParent as StyledElement;
             }
 
             return null;
         }
 
         /// <summary>
-        /// Gets the value of the attached <see cref="NameScopeProperty"/> on a visual.
+        /// Gets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
         /// </summary>
-        /// <param name="visual">The visual.</param>
+        /// <param name="styled">The styled element.</param>
         /// <returns>The value of the NameScope attached property.</returns>
-        public static INameScope GetNameScope(Visual visual)
+        public static INameScope GetNameScope(StyledElement styled)
         {
-            Contract.Requires<ArgumentNullException>(visual != null);
+            Contract.Requires<ArgumentNullException>(styled != null);
 
-            return visual.GetValue(NameScopeProperty);
+            return styled.GetValue(NameScopeProperty);
         }
 
         /// <summary>
-        /// Sets the value of the attached <see cref="NameScopeProperty"/> on a visual.
+        /// Sets the value of the attached <see cref="NameScopeProperty"/> on a styled element.
         /// </summary>
-        /// <param name="visual">The visual.</param>
+        /// <param name="styled">The styled element.</param>
         /// <param name="value">The value to set.</param>
-        public static void SetNameScope(Visual visual, INameScope value)
+        public static void SetNameScope(StyledElement styled, INameScope value)
         {
-            Contract.Requires<ArgumentNullException>(visual != null);
+            Contract.Requires<ArgumentNullException>(styled != null);
 
-            visual.SetValue(NameScopeProperty, value);
+            styled.SetValue(NameScopeProperty, value);
         }
 
         /// <summary>
diff --git a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
index 49be842ffc..491e4d71a7 100644
--- a/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
+++ b/src/Avalonia.Styling/Controls/NameScopeExtensions.cs
@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
@@ -73,7 +72,7 @@ namespace Avalonia.Controls
             Contract.Requires<ArgumentNullException>(control != null);
 
             return control.GetSelfAndLogicalAncestors()
-                .OfType<Visual>()
+                .OfType<StyledElement>()
                 .Select(x => (x as INameScope) ?? NameScope.GetNameScope(x))
                 .FirstOrDefault(x => x != null);
         }
diff --git a/src/Avalonia.Visuals/INamed.cs b/src/Avalonia.Styling/INamed.cs
similarity index 100%
rename from src/Avalonia.Visuals/INamed.cs
rename to src/Avalonia.Styling/INamed.cs
diff --git a/src/Avalonia.Styling/IStyledElement.cs b/src/Avalonia.Styling/IStyledElement.cs
new file mode 100644
index 0000000000..8369717233
--- /dev/null
+++ b/src/Avalonia.Styling/IStyledElement.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+
+namespace Avalonia
+{
+    public interface IStyledElement :
+        IStyleable,
+        IStyleHost,
+        ILogical,
+        IResourceProvider,
+        IResourceNode
+    {
+        /// <summary>
+        /// Occurs when the control has finished initialization.
+        /// </summary>
+        event EventHandler Initialized;
+
+        /// <summary>
+        /// Gets a value that indicates whether the element has finished initialization.
+        /// </summary>
+        bool IsInitialized { get; }
+
+        /// <summary>
+        /// Gets or sets the control's styling classes.
+        /// </summary>
+        new Classes Classes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the control's data context.
+        /// </summary>
+        object DataContext { get; set; }
+
+        /// <summary>
+        /// Gets the control's logical parent.
+        /// </summary>
+        IStyledElement Parent { get; }
+    }
+}
diff --git a/src/Avalonia.Styling/Controls/ControlLocator.cs b/src/Avalonia.Styling/LogicalTree/ControlLocator.cs
similarity index 68%
rename from src/Avalonia.Styling/Controls/ControlLocator.cs
rename to src/Avalonia.Styling/LogicalTree/ControlLocator.cs
index e03ec722ad..2858d11d9d 100644
--- a/src/Avalonia.Styling/Controls/ControlLocator.cs
+++ b/src/Avalonia.Styling/LogicalTree/ControlLocator.cs
@@ -6,26 +6,9 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Reflection;
 using Avalonia.Controls;
-using Avalonia.LogicalTree;
-using Avalonia.VisualTree;
 
-namespace Avalonia.Controls
+namespace Avalonia.LogicalTree
 {
-    /// <summary>
-    /// The type of tree via which to track a control.
-    /// </summary>
-    public enum TreeType
-    {
-        /// <summary>
-        /// The visual tree.
-        /// </summary>
-        Visual,
-        /// <summary>
-        /// The logical tree.
-        /// </summary>
-        Logical,
-    }
-
     /// <summary>
     /// Locates controls relative to other controls.
     /// </summary>
@@ -94,40 +77,6 @@ namespace Avalonia.Controls
             });
         }
 
-        public static IObservable<IVisual> Track(IVisual relativeTo, int ancestorLevel, Type ancestorType = null)
-        {
-            return TrackAttachmentToTree(relativeTo).Select(isAttachedToTree =>
-            {
-                if (isAttachedToTree)
-                {
-                    return relativeTo.GetVisualAncestors()
-                        .Where(x => ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
-                        .ElementAtOrDefault(ancestorLevel);
-                }
-                else
-                {
-                    return null;
-                }
-            });
-        }
-
-        private static IObservable<bool> TrackAttachmentToTree(IVisual relativeTo)
-        {
-            var attached = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
-                x => relativeTo.AttachedToVisualTree += x,
-                x => relativeTo.AttachedToVisualTree -= x)
-                .Select(x => true)
-                .StartWith(relativeTo.IsAttachedToVisualTree);
-
-            var detached = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
-                x => relativeTo.DetachedFromVisualTree += x,
-                x => relativeTo.DetachedFromVisualTree -= x)
-                .Select(x => false);
-
-            var attachmentStatus = attached.Merge(detached);
-            return attachmentStatus;
-        }
-
         private static IObservable<bool> TrackAttachmentToTree(ILogical relativeTo)
         {
             var attached = Observable.FromEventPattern<LogicalTreeAttachmentEventArgs>(
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
new file mode 100644
index 0000000000..bd0d0b8c1f
--- /dev/null
+++ b/src/Avalonia.Styling/StyledElement.cs
@@ -0,0 +1,783 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using System.Text;
+using Avalonia.Animation;
+using Avalonia.Collections;
+using Avalonia.Controls;
+using Avalonia.Data;
+using Avalonia.Diagnostics;
+using Avalonia.Logging;
+using Avalonia.LogicalTree;
+using Avalonia.Styling;
+
+namespace Avalonia
+{
+    /// <summary>
+    /// Extends an <see cref="Animatable"/> with the following features:
+    /// 
+    /// - An inherited <see cref="DataContext"/>.
+    /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
+    /// - Implements <see cref="ILogical"/> to form part of a logical tree.
+    /// - A collection of class strings for custom styling.
+    /// </summary>
+    public class StyledElement : Animatable, IStyledElement, ISetLogicalParent, ISetInheritanceParent
+    {
+        /// <summary>
+        /// Defines the <see cref="DataContext"/> property.
+        /// </summary>
+        public static readonly StyledProperty<object> DataContextProperty =
+            AvaloniaProperty.Register<StyledElement, object>(
+                nameof(DataContext),
+                inherits: true,
+                notifying: DataContextNotifying);
+
+        /// <summary>
+        /// Defines the <see cref="Name"/> property.
+        /// </summary>
+        public static readonly DirectProperty<StyledElement, string> NameProperty =
+            AvaloniaProperty.RegisterDirect<StyledElement, string>(nameof(Name), o => o.Name, (o, v) => o.Name = v);
+        
+        /// <summary>
+        /// Defines the <see cref="Parent"/> property.
+        /// </summary>
+        public static readonly DirectProperty<StyledElement, IStyledElement> ParentProperty =
+            AvaloniaProperty.RegisterDirect<StyledElement, IStyledElement>(nameof(Parent), o => o.Parent);
+
+        /// <summary>
+        /// Defines the <see cref="TemplatedParent"/> property.
+        /// </summary>
+        public static readonly StyledProperty<ITemplatedControl> TemplatedParentProperty =
+            AvaloniaProperty.Register<StyledElement, ITemplatedControl>(nameof(TemplatedParent), inherits: true);
+
+        private int _initCount;
+        private string _name;
+        private readonly Classes _classes = new Classes();
+        private bool _isAttachedToLogicalTree;
+        private IAvaloniaList<ILogical> _logicalChildren;
+        private INameScope _nameScope;
+        private IResourceDictionary _resources;
+        private Styles _styles;
+        private bool _styled;
+        private Subject<IStyleable> _styleDetach = new Subject<IStyleable>();
+        private bool _dataContextUpdating;
+
+        /// <summary>
+        /// Initializes static members of the <see cref="StyledElement"/> class.
+        /// </summary>
+        static StyledElement()
+        {
+            DataContextProperty.Changed.AddClassHandler<StyledElement>(x => x.OnDataContextChangedCore);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StyledElement"/> class.
+        /// </summary>
+        public StyledElement()
+        {
+            _nameScope = this as INameScope;
+            _isAttachedToLogicalTree = this is IStyleRoot;
+        }
+
+        /// <summary>
+        /// Raised when the styled element is attached to a rooted logical tree.
+        /// </summary>
+        public event EventHandler<LogicalTreeAttachmentEventArgs> AttachedToLogicalTree;
+
+        /// <summary>
+        /// Raised when the styled element is detached from a rooted logical tree.
+        /// </summary>
+        public event EventHandler<LogicalTreeAttachmentEventArgs> DetachedFromLogicalTree;
+
+        /// <summary>
+        /// Occurs when the <see cref="DataContext"/> property changes.
+        /// </summary>
+        /// <remarks>
+        /// This event will be raised when the <see cref="DataContext"/> property has changed and
+        /// all subscribers to that change have been notified.
+        /// </remarks>
+        public event EventHandler DataContextChanged;
+
+        /// <summary>
+        /// Occurs when the styled element has finished initialization.
+        /// </summary>
+        /// <remarks>
+        /// The Initialized event indicates that all property values on the styled element have been set.
+        /// When loading the styled element from markup, it occurs when 
+        /// <see cref="ISupportInitialize.EndInit"/> is called *and* the styled element
+        /// is attached to a rooted logical tree. When the styled element is created by code and
+        /// <see cref="ISupportInitialize"/> is not used, it is called when the styled element is attached
+        /// to the visual tree.
+        /// </remarks>
+        public event EventHandler Initialized;
+
+        /// <summary>
+        /// Occurs when a resource in this styled element or a parent styled element has changed.
+        /// </summary>
+        public event EventHandler<ResourcesChangedEventArgs> ResourcesChanged;
+
+        /// <summary>
+        /// Gets or sets the name of the styled element.
+        /// </summary>
+        /// <remarks>
+        /// An element's name is used to uniquely identify an element within the element's name
+        /// scope. Once the element is added to a logical tree, its name cannot be changed.
+        /// </remarks>
+        public string Name
+        {
+            get
+            {
+                return _name;
+            }
+
+            set
+            {
+                if (String.IsNullOrWhiteSpace(value))
+                {
+                    throw new InvalidOperationException("Cannot set Name to null or empty string.");
+                }
+
+                if (_styled)
+                {
+                    throw new InvalidOperationException("Cannot set Name : styled element already styled.");
+                }
+
+                _name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the styled element's classes.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Classes can be used to apply user-defined styling to styled elements, or to allow styled elements
+        /// that share a common purpose to be easily selected.
+        /// </para>
+        /// <para>
+        /// Even though this property can be set, the setter is only intended for use in object
+        /// initializers. Assigning to this property does not change the underlying collection,
+        /// it simply clears the existing collection and addds the contents of the assigned
+        /// collection.
+        /// </para>
+        /// </remarks>
+        public Classes Classes
+        {
+            get
+            {
+                return _classes;
+            }
+
+            set
+            {
+                if (_classes != value)
+                {
+                    _classes.Replace(value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the control's data context.
+        /// </summary>
+        /// <remarks>
+        /// The data context is an inherited property that specifies the default object that will
+        /// be used for data binding.
+        /// </remarks>
+        public object DataContext
+        {
+            get { return GetValue(DataContextProperty); }
+            set { SetValue(DataContextProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the element has finished initialization.
+        /// </summary>
+        /// <remarks>
+        /// For more information about when IsInitialized is set, see the <see cref="Initialized"/>
+        /// event.
+        /// </remarks>
+        public bool IsInitialized { get; private set; }
+
+        /// <summary>
+        /// Gets the styles for the styled element.
+        /// </summary>
+        /// <remarks>
+        /// Styles for the entire application are added to the Application.Styles collection, but
+        /// each styled element may in addition define its own styles which are applied to the styled element
+        /// itself and its children.
+        /// </remarks>
+        public Styles Styles
+        {
+            get { return _styles ?? (Styles = new Styles()); }
+            set
+            {
+                Contract.Requires<ArgumentNullException>(value != null);
+
+                if (_styles != value)
+                {
+                    if (_styles != null)
+                    {
+                        (_styles as ISetStyleParent)?.SetParent(null);
+                        _styles.ResourcesChanged -= ThisResourcesChanged;
+                    }
+
+                    _styles = value;
+
+                    if (value is ISetStyleParent setParent && setParent.ResourceParent == null)
+                    {
+                        setParent.SetParent(this);
+                    }
+
+                    _styles.ResourcesChanged += ThisResourcesChanged;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the styled element's resource dictionary.
+        /// </summary>
+        public IResourceDictionary Resources
+        {
+            get => _resources ?? (Resources = new ResourceDictionary());
+            set
+            {
+                Contract.Requires<ArgumentNullException>(value != null);
+
+                var hadResources = false;
+
+                if (_resources != null)
+                {
+                    hadResources = _resources.Count > 0;
+                    _resources.ResourcesChanged -= ThisResourcesChanged;
+                }
+
+                _resources = value;
+                _resources.ResourcesChanged += ThisResourcesChanged;
+
+                if (hadResources || _resources.Count > 0)
+                {
+                    ((ILogical)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the styled element whose lookless template this styled element is part of.
+        /// </summary>
+        public ITemplatedControl TemplatedParent
+        {
+            get { return GetValue(TemplatedParentProperty); }
+            internal set { SetValue(TemplatedParentProperty, value); }
+        }
+
+        /// <summary>
+        /// Gets the styled element's logical children.
+        /// </summary>
+        protected IAvaloniaList<ILogical> LogicalChildren
+        {
+            get
+            {
+                if (_logicalChildren == null)
+                {
+                    var list = new AvaloniaList<ILogical>
+                    {
+                        ResetBehavior = ResetBehavior.Remove,
+                        Validate = ValidateLogicalChild
+                    };
+                    list.CollectionChanged += LogicalChildrenCollectionChanged;
+                    _logicalChildren = list;
+                }
+
+                return _logicalChildren;
+            }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="Classes"/> collection in a form that allows adding and removing
+        /// pseudoclasses.
+        /// </summary>
+        protected IPseudoClasses PseudoClasses => Classes;
+
+        /// <summary>
+        /// Gets a value indicating whether the element is attached to a rooted logical tree.
+        /// </summary>
+        bool ILogical.IsAttachedToLogicalTree => _isAttachedToLogicalTree;
+
+        /// <summary>
+        /// Gets the styled element's logical parent.
+        /// </summary>
+        public IStyledElement Parent { get; private set; }
+
+        /// <summary>
+        /// Gets the styled element's logical parent.
+        /// </summary>
+        ILogical ILogical.LogicalParent => Parent;
+
+        /// <summary>
+        /// Gets the styled element's logical children.
+        /// </summary>
+        IAvaloniaReadOnlyList<ILogical> ILogical.LogicalChildren => LogicalChildren;
+
+        /// <inheritdoc/>
+        bool IResourceProvider.HasResources => _resources?.Count > 0 || Styles.HasResources;
+
+        /// <inheritdoc/>
+        IResourceNode IResourceNode.ResourceParent => ((IStyleHost)this).StylingParent as IResourceNode;
+
+        /// <inheritdoc/>
+        IAvaloniaReadOnlyList<string> IStyleable.Classes => Classes;
+
+        /// <summary>
+        /// Gets the type by which the styled element is styled.
+        /// </summary>
+        /// <remarks>
+        /// Usually controls are styled by their own type, but there are instances where you want
+        /// a styled element to be styled by its base type, e.g. creating SpecialButton that
+        /// derives from Button and adds extra functionality but is still styled as a regular
+        /// Button.
+        /// </remarks>
+        Type IStyleable.StyleKey => GetType();
+
+        /// <inheritdoc/>
+        IObservable<IStyleable> IStyleable.StyleDetach => _styleDetach;
+
+        /// <inheritdoc/>
+        bool IStyleHost.IsStylesInitialized => _styles != null;
+
+        /// <inheritdoc/>
+        IStyleHost IStyleHost.StylingParent => (IStyleHost)InheritanceParent;
+
+        /// <inheritdoc/>
+        public virtual void BeginInit()
+        {
+            ++_initCount;
+        }
+
+        /// <inheritdoc/>
+        public virtual void EndInit()
+        {
+            if (_initCount == 0)
+            {
+                throw new InvalidOperationException("BeginInit was not called.");
+            }
+
+            if (--_initCount == 0 && _isAttachedToLogicalTree)
+            {
+                InitializeStylesIfNeeded();
+
+                InitializeIfNeeded();
+            }
+        }
+
+        private void InitializeStylesIfNeeded(bool force = false)
+        {
+            if (_initCount == 0 && (!_styled || force))
+            {
+                RegisterWithNameScope();
+                ApplyStyling();
+                _styled = true;
+            }
+        }
+
+        protected void InitializeIfNeeded()
+        {
+            if (_initCount == 0 && !IsInitialized)
+            {
+                IsInitialized = true;
+                Initialized?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            this.OnAttachedToLogicalTreeCore(e);
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+            this.OnDetachedFromLogicalTreeCore(e);
+        }
+
+        /// <inheritdoc/>
+        void ILogical.NotifyResourcesChanged(ResourcesChangedEventArgs e)
+        {
+            ResourcesChanged?.Invoke(this, new ResourcesChangedEventArgs());
+        }
+
+        /// <inheritdoc/>
+        bool IResourceProvider.TryGetResource(string key, out object value)
+        {
+            value = null;
+            return (_resources?.TryGetResource(key, out value) ?? false) ||
+                   (_styles?.TryGetResource(key, out value) ?? false);
+        }
+
+        /// <summary>
+        /// Sets the styled element's logical parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void ISetLogicalParent.SetParent(ILogical parent)
+        {
+            var old = Parent;
+
+            if (parent != old)
+            {
+                if (old != null && parent != null)
+                {
+                    throw new InvalidOperationException("The Control already has a parent.");
+                }
+
+                if (_isAttachedToLogicalTree)
+                {
+                    var oldRoot = FindStyleRoot(old) ?? this as IStyleRoot;
+
+                    if (oldRoot == null)
+                    {
+                        throw new AvaloniaInternalException("Was attached to logical tree but cannot find root.");
+                    }
+
+                    var e = new LogicalTreeAttachmentEventArgs(oldRoot);
+                    OnDetachedFromLogicalTreeCore(e);
+                }
+
+                if (InheritanceParent == null || parent == null)
+                {
+                    InheritanceParent = parent as AvaloniaObject;
+                }
+
+                Parent = (IStyledElement)parent;
+
+                if (old != null)
+                {
+                    old.ResourcesChanged -= ThisResourcesChanged;
+                }
+                if (Parent != null)
+                {
+                    Parent.ResourcesChanged += ThisResourcesChanged;
+                }
+                ((ILogical)this).NotifyResourcesChanged(new ResourcesChangedEventArgs());
+
+                if (Parent is IStyleRoot || Parent?.IsAttachedToLogicalTree == true || this is IStyleRoot)
+                {
+                    var newRoot = FindStyleRoot(this);
+
+                    if (newRoot == null)
+                    {
+                        throw new AvaloniaInternalException("Parent is atttached to logical tree but cannot find root.");
+                    }
+
+                    var e = new LogicalTreeAttachmentEventArgs(newRoot);
+                    OnAttachedToLogicalTreeCore(e);
+                }
+
+                RaisePropertyChanged(ParentProperty, old, Parent, BindingPriority.LocalValue);
+            }
+        }
+
+        /// <summary>
+        /// Sets the styled element's inheritance parent.
+        /// </summary>
+        /// <param name="parent">The parent.</param>
+        void ISetInheritanceParent.SetParent(IAvaloniaObject parent)
+        {
+            InheritanceParent = parent;
+        }
+
+        /// <summary>
+        /// Adds a pseudo-class to be set when a property is true.
+        /// </summary>
+        /// <param name="property">The property.</param>
+        /// <param name="className">The pseudo-class.</param>
+        protected static void PseudoClass(AvaloniaProperty<bool> property, string className)
+        {
+            PseudoClass(property, x => x, className);
+        }
+
+        /// <summary>
+        /// Adds a pseudo-class to be set when a property equals a certain value.
+        /// </summary>
+        /// <typeparam name="T">The type of the property.</typeparam>
+        /// <param name="property">The property.</param>
+        /// <param name="selector">Returns a boolean value based on the property value.</param>
+        /// <param name="className">The pseudo-class.</param>
+        protected static void PseudoClass<T>(
+            AvaloniaProperty<T> property,
+            Func<T, bool> selector,
+            string className)
+        {
+            Contract.Requires<ArgumentNullException>(property != null);
+            Contract.Requires<ArgumentNullException>(selector != null);
+            Contract.Requires<ArgumentNullException>(className != null);
+
+            if (string.IsNullOrWhiteSpace(className))
+            {
+                throw new ArgumentException("Cannot supply an empty className.");
+            }
+
+            property.Changed.Merge(property.Initialized)
+                .Where(e => e.Sender is StyledElement)
+                .Subscribe(e =>
+                {
+                    if (selector((T)e.NewValue))
+                    {
+                        ((StyledElement)e.Sender).PseudoClasses.Add(className);
+                    }
+                    else
+                    {
+                        ((StyledElement)e.Sender).PseudoClasses.Remove(className);
+                    }
+                });
+        }
+
+        /// <summary>
+        /// Called when the styled element is added to a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the styled element is removed from a rooted logical tree.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> property changes.
+        /// </summary>
+        /// <param name="e">The event args.</param>
+        protected virtual void OnDataContextChanged(EventArgs e)
+        {
+            DataContextChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> begins updating.
+        /// </summary>
+        protected virtual void OnDataContextBeginUpdate()
+        {
+        }
+
+        /// <summary>
+        /// Called when the <see cref="DataContext"/> finishes updating.
+        /// </summary>
+        protected virtual void OnDataContextEndUpdate()
+        {
+        }
+        
+        private static void DataContextNotifying(IAvaloniaObject o, bool updateStarted)
+        {
+            if (o is StyledElement element)
+            {
+                DataContextNotifying(element, updateStarted);
+            }
+        }
+
+        private static void DataContextNotifying(StyledElement element, bool updateStarted)
+        {
+            if (updateStarted)
+            {
+                if (!element._dataContextUpdating)
+                {
+                    element._dataContextUpdating = true;
+                    element.OnDataContextBeginUpdate();
+
+                    foreach (var child in element.LogicalChildren)
+                    {
+                        if (child is StyledElement s &&
+                            s.InheritanceParent == element &&
+                            !s.IsSet(DataContextProperty))
+                        {
+                            DataContextNotifying(s, updateStarted);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (element._dataContextUpdating)
+                {
+                    element.OnDataContextEndUpdate();
+                    element._dataContextUpdating = false;
+                }
+            }
+        }
+
+        private static IStyleRoot FindStyleRoot(IStyleHost e)
+        {
+            while (e != null)
+            {
+                if (e is IStyleRoot root)
+                {
+                    return root;
+                }
+
+                e = e.StylingParent;
+            }
+
+            return null;
+        }
+
+        private void ApplyStyling()
+        {
+            AvaloniaLocator.Current.GetService<IStyler>()?.ApplyStyles(this);
+        }
+
+        private void RegisterWithNameScope()
+        {
+            if (_nameScope == null)
+            {
+                _nameScope = NameScope.GetNameScope(this) ?? ((StyledElement)Parent)?._nameScope;
+            }
+
+            if (Name != null)
+            {
+                _nameScope?.Register(Name, this);
+
+                var visualParent = Parent as StyledElement;
+
+                if (this is INameScope && visualParent != null)
+                {
+                    // If we have e.g. a named UserControl in a window then we want that control
+                    // to be findable by name from the Window, so register with both name scopes.
+                    // This differs from WPF's behavior in that XAML manually registers controls 
+                    // with name scopes based on the XAML file in which the name attribute appears,
+                    // but we're trying to avoid XAML magic in Avalonia in order to made code-
+                    // created UIs easy. This will cause problems if a UserControl declares a name
+                    // in its XAML and that control is included multiple times in a parent control
+                    // (as the name will be duplicated), however at the moment I'm fine with saying
+                    // "don't do that".
+                    var parentNameScope = NameScope.FindNameScope(visualParent);
+                    parentNameScope?.Register(Name, this);
+                }
+            }
+        }
+
+        private static void ValidateLogicalChild(ILogical c)
+        {
+            if (c == null)
+            {
+                throw new ArgumentException("Cannot add null to LogicalChildren.");
+            }
+        }
+
+        private void OnAttachedToLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
+        {
+            // This method can be called when a control is already attached to the logical tree
+            // in the following scenario:
+            // - ListBox gets assigned Items containing ListBoxItem
+            // - ListBox makes ListBoxItem a logical child
+            // - ListBox template gets applied; making its Panel get attached to logical tree
+            // - That AttachedToLogicalTree signal travels down to the ListBoxItem
+            if (!_isAttachedToLogicalTree)
+            {
+                _isAttachedToLogicalTree = true;
+
+                InitializeStylesIfNeeded(true);
+
+                OnAttachedToLogicalTree(e);
+                AttachedToLogicalTree?.Invoke(this, e);
+            }
+
+            foreach (var child in LogicalChildren.OfType<StyledElement>())
+            {
+                child.OnAttachedToLogicalTreeCore(e);
+            }
+        }
+
+        private void OnDetachedFromLogicalTreeCore(LogicalTreeAttachmentEventArgs e)
+        {
+            if (_isAttachedToLogicalTree)
+            {
+                if (Name != null)
+                {
+                    _nameScope?.Unregister(Name);
+                }
+
+                _isAttachedToLogicalTree = false;
+                _styleDetach.OnNext(this);
+                OnDetachedFromLogicalTree(e);
+                DetachedFromLogicalTree?.Invoke(this, e);
+
+                foreach (var child in LogicalChildren.OfType<StyledElement>())
+                {
+                    child.OnDetachedFromLogicalTreeCore(e);
+                }
+
+#if DEBUG
+                if (((INotifyCollectionChangedDebug)_classes).GetCollectionChangedSubscribers()?.Length > 0)
+                {
+                    Logger.Warning(
+                        LogArea.Control,
+                        this,
+                        "{Type} detached from logical tree but still has class listeners",
+                        this.GetType());
+                }
+#endif
+            }
+        }
+
+        private void OnDataContextChangedCore(AvaloniaPropertyChangedEventArgs e)
+        {
+            OnDataContextChanged(EventArgs.Empty);
+        }
+
+        private void LogicalChildrenCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    SetLogicalParent(e.NewItems.Cast<ILogical>());
+                    break;
+
+                case NotifyCollectionChangedAction.Remove:
+                    ClearLogicalParent(e.OldItems.Cast<ILogical>());
+                    break;
+
+                case NotifyCollectionChangedAction.Replace:
+                    ClearLogicalParent(e.OldItems.Cast<ILogical>());
+                    SetLogicalParent(e.NewItems.Cast<ILogical>());
+                    break;
+
+                case NotifyCollectionChangedAction.Reset:
+                    throw new NotSupportedException("Reset should not be signalled on LogicalChildren collection");
+            }
+        }
+
+        private void SetLogicalParent(IEnumerable<ILogical> children)
+        {
+            foreach (var i in children)
+            {
+                if (i.LogicalParent == null)
+                {
+                    ((ISetLogicalParent)i).SetParent(this);
+                }
+            }
+        }
+
+        private void ClearLogicalParent(IEnumerable<ILogical> children)
+        {
+            foreach (var i in children)
+            {
+                if (i.LogicalParent == this)
+                {
+                    ((ISetLogicalParent)i).SetParent(null);
+                }
+            }
+        }
+
+        private void ThisResourcesChanged(object sender, ResourcesChangedEventArgs e)
+        {
+            ((ILogical)this).NotifyResourcesChanged(e);
+        }
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/IRequiresTemplateInStyle.cs b/src/Avalonia.Styling/Styling/IRequiresTemplateInStyle.cs
new file mode 100644
index 0000000000..819d783061
--- /dev/null
+++ b/src/Avalonia.Styling/Styling/IRequiresTemplateInStyle.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Avalonia.Styling
+{
+    /// <summary>
+    /// This is an interface for advanced scenarios to assist users in correct style development.
+    /// You as a user will not need to use this interface directly.
+    /// </summary>
+    public interface IRequiresTemplateInStyle
+    {
+    }
+}
diff --git a/src/Avalonia.Styling/Styling/IStyleable.cs b/src/Avalonia.Styling/Styling/IStyleable.cs
index e03231e4ac..98c8501681 100644
--- a/src/Avalonia.Styling/Styling/IStyleable.cs
+++ b/src/Avalonia.Styling/Styling/IStyleable.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Avalonia.Collections;
+using Avalonia.LogicalTree;
 
 namespace Avalonia.Styling
 {
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index e4d0ce5fab..337e01c0b5 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -65,7 +65,7 @@ namespace Avalonia.Styling
 
             set
             {
-                if (value is IStyleable)
+                if (value is IRequiresTemplateInStyle)
                 {
                     throw new ArgumentException(
                         "Cannot assign a control to Style.Value. Wrap the control in a <Template>.",
@@ -105,7 +105,7 @@ namespace Avalonia.Styling
                 if (template != null && !isPropertyOfTypeITemplate)
                 {
                     var materialized = template.Build();
-                    NameScope.SetNameScope((Visual)materialized, new NameScope());
+                    NameScope.SetNameScope((StyledElement)materialized, new NameScope());
                     value = materialized;
                 }
 
diff --git a/src/Avalonia.Styling/app.config b/src/Avalonia.Styling/app.config
deleted file mode 100644
index 517d060521..0000000000
--- a/src/Avalonia.Styling/app.config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.5.0" newVersion="2.2.5.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.2.5.0" newVersion="2.2.5.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Avalonia.Visuals.csproj b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
index 557cfdbf37..0f003a4018 100644
--- a/src/Avalonia.Visuals/Avalonia.Visuals.csproj
+++ b/src/Avalonia.Visuals/Avalonia.Visuals.csproj
@@ -5,6 +5,7 @@
   <ItemGroup> 
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-  </ItemGroup>  
+    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
+  </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Visuals/Visual.cs b/src/Avalonia.Visuals/Visual.cs
index 5f3861a51a..2be39d4522 100644
--- a/src/Avalonia.Visuals/Visual.cs
+++ b/src/Avalonia.Visuals/Visual.cs
@@ -24,7 +24,7 @@ namespace Avalonia
     /// <see cref="IRenderer"/> to render the control. To traverse the visual tree, use the
     /// extension methods defined in <see cref="VisualExtensions"/>.
     /// </remarks>
-    public class Visual : Animatable, IVisual
+    public class Visual : StyledElement, IVisual
     {
         /// <summary>
         /// Defines the <see cref="Bounds"/> property.
diff --git a/src/Avalonia.Visuals/VisualTree/VisualLocator.cs b/src/Avalonia.Visuals/VisualTree/VisualLocator.cs
new file mode 100644
index 0000000000..6fcb6c0db1
--- /dev/null
+++ b/src/Avalonia.Visuals/VisualTree/VisualLocator.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Avalonia.VisualTree
+{
+    public class VisualLocator
+    {
+        public static IObservable<IVisual> Track(IVisual relativeTo, int ancestorLevel, Type ancestorType = null)
+        {
+            return TrackAttachmentToTree(relativeTo).Select(isAttachedToTree =>
+            {
+                if (isAttachedToTree)
+                {
+                    return relativeTo.GetVisualAncestors()
+                        .Where(x => ancestorType?.GetTypeInfo().IsAssignableFrom(x.GetType().GetTypeInfo()) ?? true)
+                        .ElementAtOrDefault(ancestorLevel);
+                }
+                else
+                {
+                    return null;
+                }
+            });
+        }
+
+        private static IObservable<bool> TrackAttachmentToTree(IVisual relativeTo)
+        {
+            var attached = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
+                x => relativeTo.AttachedToVisualTree += x,
+                x => relativeTo.AttachedToVisualTree -= x)
+                .Select(x => true)
+                .StartWith(relativeTo.IsAttachedToVisualTree);
+
+            var detached = Observable.FromEventPattern<VisualTreeAttachmentEventArgs>(
+                x => relativeTo.DetachedFromVisualTree += x,
+                x => relativeTo.DetachedFromVisualTree -= x)
+                .Select(x => false);
+
+            var attachmentStatus = attached.Merge(detached);
+            return attachmentStatus;
+        }
+    }
+}
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index dd1d697224..af4916097c 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -69,7 +69,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
             throw new KeyNotFoundException($"Static resource '{ResourceKey}' not found.");
         }
 
-        private object GetValue(IControl control)
+        private object GetValue(IStyledElement control)
         {
             return control.FindResource(ResourceKey);
         }
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 02e49a4d73..32045f446c 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -4,8 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\..\Avalonia.Styling\Avalonia.Styling.csproj" />
     <ProjectReference Include="..\..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
   </ItemGroup>
diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs
index bf44912bba..31131ecfa0 100644
--- a/src/Markup/Avalonia.Markup/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup/Data/Binding.cs
@@ -104,7 +104,7 @@ namespace Avalonia.Markup.Data
             if (ElementName != null)
             {
                 observer = CreateElementObserver(
-                    (target as IControl) ?? (anchor as IControl),
+                    (target as IStyledElement) ?? (anchor as IStyledElement),
                     ElementName,
                     Path,
                     enableDataValidation);
@@ -115,10 +115,10 @@ namespace Avalonia.Markup.Data
             }
             else if (RelativeSource == null || RelativeSource.Mode == RelativeSourceMode.DataContext)
             {
-                observer = CreateDataContexObserver(
+                observer = CreateDataContextObserver(
                     target,
                     Path,
-                    targetProperty == Control.DataContextProperty,
+                    targetProperty == StyledElement.DataContextProperty,
                     anchor,
                     enableDataValidation);
             }
@@ -138,7 +138,7 @@ namespace Avalonia.Markup.Data
                 }
 
                 observer = CreateFindAncestorObserver(
-                    (target as IControl) ?? (anchor as IControl),
+                    (target as IStyledElement) ?? (anchor as IStyledElement),
                     RelativeSource,
                     Path,
                     enableDataValidation);
@@ -153,8 +153,8 @@ namespace Avalonia.Markup.Data
             // If we're binding to DataContext and our fallback is UnsetValue then override
             // the fallback value to null, as broken bindings to DataContext must reset the
             // DataContext in order to not propagate incorrect DataContexts to child controls.
-            // See Avalonia.Markup.Xaml.UnitTests.Data.DataContext_Binding_Should_Produce_Correct_Results.
-            if (targetProperty == Control.DataContextProperty && fallback == AvaloniaProperty.UnsetValue)
+            // See Avalonia.Markup.UnitTests.Data.DataContext_Binding_Should_Produce_Correct_Results.
+            if (targetProperty == StyledElement.DataContextProperty && fallback == AvaloniaProperty.UnsetValue)
             {
                 fallback = null;
             }
@@ -170,7 +170,7 @@ namespace Avalonia.Markup.Data
             return new InstancedBinding(subject, Mode, Priority);
         }
 
-        private ExpressionObserver CreateDataContexObserver(
+        private ExpressionObserver CreateDataContextObserver(
             IAvaloniaObject target,
             string path,
             bool targetIsDataContext,
@@ -179,9 +179,9 @@ namespace Avalonia.Markup.Data
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
-            if (!(target is IControl))
+            if (!(target is IStyledElement))
             {
-                target = anchor as IControl;
+                target = anchor as IStyledElement;
 
                 if (target == null)
                 {
@@ -191,11 +191,11 @@ namespace Avalonia.Markup.Data
 
             if (!targetIsDataContext)
             {
-                var update = target.GetObservable(Control.DataContextProperty)
+                var update = target.GetObservable(StyledElement.DataContextProperty)
                     .Skip(1)
                     .Select(_ => Unit.Default);
                 var result = new ExpressionObserver(
-                    () => target.GetValue(Control.DataContextProperty),
+                    () => target.GetValue(StyledElement.DataContextProperty),
                     path,
                     update,
                     enableDataValidation);
@@ -212,7 +212,7 @@ namespace Avalonia.Markup.Data
         }
 
         private ExpressionObserver CreateElementObserver(
-            IControl target,
+            IStyledElement target,
             string elementName,
             string path,
             bool enableDataValidation)
@@ -229,7 +229,7 @@ namespace Avalonia.Markup.Data
         }
 
         private ExpressionObserver CreateFindAncestorObserver(
-            IControl target,
+            IStyledElement target,
             RelativeSource relativeSource,
             string path,
             bool enableDataValidation)
@@ -247,7 +247,7 @@ namespace Avalonia.Markup.Data
                         relativeSource.AncestorType);
                     break;
                 case TreeType.Visual:
-                    controlLocator = ControlLocator.Track(
+                    controlLocator = VisualLocator.Track(
                         (IVisual)target,
                         relativeSource.AncestorLevel - 1,
                         relativeSource.AncestorType);
@@ -279,12 +279,12 @@ namespace Avalonia.Markup.Data
         {
             Contract.Requires<ArgumentNullException>(target != null);
 
-            var update = target.GetObservable(Control.TemplatedParentProperty)
+            var update = target.GetObservable(StyledElement.TemplatedParentProperty)
                 .Skip(1)
                 .Select(_ => Unit.Default);
 
             var result = new ExpressionObserver(
-                () => target.GetValue(Control.TemplatedParentProperty),
+                () => target.GetValue(StyledElement.TemplatedParentProperty),
                 path,
                 update,
                 enableDataValidation);
@@ -303,16 +303,9 @@ namespace Avalonia.Markup.Data
             return target.GetObservable(Visual.VisualParentProperty)
                 .Select(x =>
                 {
-                    return (x as IAvaloniaObject)?.GetObservable(Control.DataContextProperty) ?? 
+                    return (x as IAvaloniaObject)?.GetObservable(StyledElement.DataContextProperty) ?? 
                            Observable.Return((object)null);
                 }).Switch();
         }
-
-        private class PathInfo
-        {
-            public string Path { get; set; }
-            public string ElementName { get; set; }
-            public RelativeSource RelativeSource { get; set; }
-        }
     }
 }
diff --git a/src/Markup/Avalonia.Markup/Data/DelayedBinding.cs b/src/Markup/Avalonia.Markup/Data/DelayedBinding.cs
index df16c02dab..fb126622c1 100644
--- a/src/Markup/Avalonia.Markup/Data/DelayedBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/DelayedBinding.cs
@@ -24,8 +24,8 @@ namespace Avalonia.Markup.Data
     /// </remarks>
     public static class DelayedBinding
     {
-        private static ConditionalWeakTable<IControl, List<Entry>> _entries = 
-            new ConditionalWeakTable<IControl, List<Entry>>();
+        private static ConditionalWeakTable<IStyledElement, List<Entry>> _entries = 
+            new ConditionalWeakTable<IStyledElement, List<Entry>>();
 
         /// <summary>
         /// Adds a delayed binding to a control.
@@ -33,7 +33,7 @@ namespace Avalonia.Markup.Data
         /// <param name="target">The control.</param>
         /// <param name="property">The property on the control to bind to.</param>
         /// <param name="binding">The binding.</param>
-        public static void Add(IControl target, AvaloniaProperty property, IBinding binding)
+        public static void Add(IStyledElement target, AvaloniaProperty property, IBinding binding)
         {
             if (target.IsInitialized)
             {
@@ -41,9 +41,8 @@ namespace Avalonia.Markup.Data
             }
             else
             {
-                List<Entry> bindings;
 
-                if (!_entries.TryGetValue(target, out bindings))
+                if (!_entries.TryGetValue(target, out List<Entry> bindings))
                 {
                     bindings = new List<Entry>();
                     _entries.Add(target, bindings);
@@ -62,7 +61,7 @@ namespace Avalonia.Markup.Data
         /// <param name="target">The control.</param>
         /// <param name="property">The property on the control to bind to.</param>
         /// <param name="value">A function which returns the value.</param>
-        public static void Add(IControl target, PropertyInfo property, Func<IControl, object> value)
+        public static void Add(IStyledElement target, PropertyInfo property, Func<IStyledElement, object> value)
         {
             if (target.IsInitialized)
             {
@@ -89,7 +88,7 @@ namespace Avalonia.Markup.Data
         /// Applies any delayed bindings to a control.
         /// </summary>
         /// <param name="control">The control.</param>
-        public static void ApplyBindings(IControl control)
+        public static void ApplyBindings(IStyledElement control)
         {
             List<Entry> entries;
 
@@ -106,14 +105,14 @@ namespace Avalonia.Markup.Data
 
         private static void ApplyBindings(object sender, EventArgs e)
         {
-            var target = (IControl)sender;
+            var target = (IStyledElement)sender;
             ApplyBindings(target);
             target.Initialized -= ApplyBindings;
         }
 
         private abstract class Entry
         {
-            public abstract void Apply(IControl control);
+            public abstract void Apply(IStyledElement control);
         }
 
         private class BindingEntry : Entry
@@ -127,7 +126,7 @@ namespace Avalonia.Markup.Data
             public IBinding Binding { get; }
             public AvaloniaProperty Property { get; }
 
-            public override void Apply(IControl control)
+            public override void Apply(IStyledElement control)
             {
                 control.Bind(Property, Binding);
             }
@@ -135,16 +134,16 @@ namespace Avalonia.Markup.Data
 
         private class ClrPropertyValueEntry : Entry
         {
-            public ClrPropertyValueEntry(PropertyInfo property, Func<IControl, object> value)
+            public ClrPropertyValueEntry(PropertyInfo property, Func<IStyledElement, object> value)
             {
                 Property = property;
                 Value = value;
             }
 
             public PropertyInfo Property { get; }
-            public Func<IControl, object> Value { get; }
+            public Func<IStyledElement, object> Value { get; }
 
-            public override void Apply(IControl control)
+            public override void Apply(IStyledElement control)
             {
                 try
                 {
diff --git a/src/Markup/Avalonia.Markup/Data/RelativeSource.cs b/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
index ffddb7ee03..9a3b770212 100644
--- a/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
+++ b/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using Avalonia.Controls;
 
 namespace Avalonia.Markup.Data
 {
@@ -32,6 +31,22 @@ namespace Avalonia.Markup.Data
         FindAncestor,
     }
 
+
+    /// <summary>
+    /// The type of tree via which to track a control.
+    /// </summary>
+    public enum TreeType
+    {
+        /// <summary>
+        /// The visual tree.
+        /// </summary>
+        Visual,
+        /// <summary>
+        /// The logical tree.
+        /// </summary>
+        Logical,
+    }
+
     /// <summary>
     /// Describes the the location of a binding source, relative to the binding target.
     /// </summary>
diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
index 50610cf595..4da803353e 100644
--- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs
@@ -74,7 +74,7 @@ namespace Avalonia.Controls.UnitTests
                 root.Content = target;
 
                 var templatedParent = new Button();
-                target.TemplatedParent = templatedParent;
+                target.SetValue(StyledElement.TemplatedParentProperty, templatedParent);
                 target.Template = GetTemplate();
 
                 target.Items = new[] { "Foo" };
@@ -360,7 +360,7 @@ namespace Avalonia.Controls.UnitTests
 
             var presenter = new ItemsPresenter
             {
-                TemplatedParent = target,
+                [StyledElement.TemplatedParentProperty] = target,
                 [~ItemsPresenter.ItemsProperty] = target[~ItemsControl.ItemsProperty],
             };
 
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
index a50fe852c3..c5ff64b0e3 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/CarouselPresenterTests.cs
@@ -43,7 +43,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var parent = new TestItemsControl();
             var target = new CarouselPresenter
             {
-                TemplatedParent = parent,
+                [StyledElement.TemplatedParentProperty] = parent,
             };
 
             Assert.IsType<ItemContainerGenerator<TestItem>>(target.ItemContainerGenerator);
diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
index 048cdb2ccb..3d13e4c32f 100644
--- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests.cs
@@ -69,7 +69,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
             var parent = new TestItemsControl();
             var target = new ItemsPresenter
             {
-                TemplatedParent = parent,
+                [StyledElement.TemplatedParentProperty] = parent,
             };
 
             Assert.IsType<ItemContainerGenerator<TestItem>>(target.ItemContainerGenerator);
diff --git a/tests/Avalonia.Controls.UnitTests/Templates/TemplateExtensionsTests.cs b/tests/Avalonia.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
index 983b7f7c70..df8a0f723a 100644
--- a/tests/Avalonia.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Templates/TemplateExtensionsTests.cs
@@ -18,12 +18,20 @@ namespace Avalonia.Controls.Templates.UnitTests
         public void GetTemplateChildren_Should_Not_Return_Nested_Template_Controls()
         {
             var target = new TestTemplatedControl();
-            var border1 = new Border { Name = "border1", TemplatedParent = target };
-            var inner = new TestTemplatedControl { Name = "inner", TemplatedParent = target };
-            var border2 = new Border { Name = "border2", TemplatedParent = inner };
-            var border3 = new Border { Name = "border3", TemplatedParent = inner };
-            var border4 = new Border { Name = "border4", TemplatedParent = target };
-            var border5 = new Border { Name = "border5", TemplatedParent = null };
+            var border1 = new Border
+            {
+                Name = "border1",
+                [StyledElement.TemplatedParentProperty] = target,
+            };
+            var inner = new TestTemplatedControl
+            {
+                Name = "inner",
+                [StyledElement.TemplatedParentProperty] = target,
+            };
+            var border2 = new Border { Name = "border2", [StyledElement.TemplatedParentProperty] = inner };
+            var border3 = new Border { Name = "border3", [StyledElement.TemplatedParentProperty] = inner };
+            var border4 = new Border { Name = "border4", [StyledElement.TemplatedParentProperty] = target };
+            var border5 = new Border { Name = "border5", [StyledElement.TemplatedParentProperty] = null };
 
             target.AddVisualChild(border1);
             border1.Child = inner;
diff --git a/tests/Avalonia.Controls.UnitTests/Utils/AncestorFinderTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/AncestorFinderTests.cs
index 2f05e11dfc..91a6e2948c 100644
--- a/tests/Avalonia.Controls.UnitTests/Utils/AncestorFinderTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Utils/AncestorFinderTests.cs
@@ -19,7 +19,7 @@ namespace Avalonia.Controls.UnitTests.Utils
             var grandParent = new Border();
             var grandParent2 = new Border();
 
-            IVisual currentParent = null;
+            IStyledElement currentParent = null;
             var subscription = AncestorFinder.Create(child, typeof (Border)).Subscribe(s => currentParent = s);
 
             Assert.Null(currentParent);
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
index 6c95a465b3..82b57224f0 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests.cs
@@ -184,7 +184,7 @@ namespace Avalonia.Markup.UnitTests.Data
             // When binding to DataContext and the target isn't found, the binding should produce
             // null rather than UnsetValue in order to not propagate incorrect DataContexts from
             // parent controls while things are being set up. This logic is implemented in 
-            // `Avalonia.Markup.Xaml.Binding.Initiate`.
+            // `Avalonia.Markup.Data.Binding.Initiate`.
             Assert.True(child.IsSet(Control.DataContextProperty));
 
             root.Child = child;
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
similarity index 97%
rename from tests/Avalonia.Controls.UnitTests/ControlTests.cs
rename to tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
index 313c0b1253..4096dcf380 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyledElementTests.cs
@@ -9,15 +9,16 @@ using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Xunit;
 using Avalonia.LogicalTree;
+using Avalonia.Controls;
 
-namespace Avalonia.Controls.UnitTests
+namespace Avalonia.Styling.UnitTests
 {
-    public class ControlTests
+    public class StyledElementTests
     {
         [Fact]
         public void Classes_Should_Initially_Be_Empty()
         {
-            var target = new Control();
+            var target = new StyledElement();
 
             Assert.Empty(target.Classes);
         }
@@ -116,7 +117,7 @@ namespace Avalonia.Controls.UnitTests
                 raised.Add("attached");
             };
 
-            child.GetObservable(Control.ParentProperty).Skip(1).Subscribe(_ => raised.Add("parent"));
+            child.GetObservable(StyledElement.ParentProperty).Skip(1).Subscribe(_ => raised.Add("parent"));
 
             root.Child = child;
 
@@ -354,7 +355,7 @@ namespace Avalonia.Controls.UnitTests
             };
 
             var called = new List<string>();
-            void Record(object sender, EventArgs e) => called.Add(((Control)sender).Name);
+            void Record(object sender, EventArgs e) => called.Add(((StyledElement)sender).Name);
 
             root.DataContextChanged += Record;
 
@@ -396,9 +397,9 @@ namespace Avalonia.Controls.UnitTests
 
             foreach (IDataContextEvents c in root.GetSelfAndLogicalDescendants())
             {
-                c.DataContextBeginUpdate += (s, e) => called.Add("begin " + ((Control)s).Name);
-                c.DataContextChanged += (s, e) => called.Add("changed " + ((Control)s).Name);
-                c.DataContextEndUpdate += (s, e) => called.Add("end " + ((Control)s).Name);
+                c.DataContextBeginUpdate += (s, e) => called.Add("begin " + ((StyledElement)s).Name);
+                c.DataContextChanged += (s, e) => called.Add("changed " + ((StyledElement)s).Name);
+                c.DataContextEndUpdate += (s, e) => called.Add("end " + ((StyledElement)s).Name);
             }
 
             root.DataContext = "foo";
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests_NameScope.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests_NameScope.cs
similarity index 94%
rename from tests/Avalonia.Controls.UnitTests/ControlTests_NameScope.cs
rename to tests/Avalonia.Styling.UnitTests/StyledElementTests_NameScope.cs
index 9f39f7a47a..47c540f44a 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests_NameScope.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyledElementTests_NameScope.cs
@@ -11,7 +11,7 @@ using Xunit;
 
 namespace Avalonia.Controls.UnitTests
 {
-    public class ControlTests_NameScope
+    public class StyledElementTests_NameScope
     {
         [Fact]
         public void Controls_Should_Register_With_NameScope()
@@ -68,7 +68,7 @@ namespace Avalonia.Controls.UnitTests
 
             root.ApplyTemplate();
 
-            Assert.Null(NameScope.GetNameScope((Control)root.Presenter).Find("foo"));
+            Assert.Null(NameScope.GetNameScope((StyledElement)root.Presenter).Find("foo"));
         }
 
         [Fact]
diff --git a/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
similarity index 95%
rename from tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
rename to tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
index 9ee6e3e456..c321adb394 100644
--- a/tests/Avalonia.Controls.UnitTests/ControlTests_Resources.cs
+++ b/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs
@@ -10,12 +10,12 @@ using Xunit;
 
 namespace Avalonia.Controls.UnitTests
 {
-    public class ControlTests_Resources
+    public class StyledElementTests_Resources
     {
         [Fact]
         public void FindResource_Should_Find_Control_Resource()
         {
-            var target = new Control
+            var target = new StyledElement
             {
                 Resources =
                 {
@@ -68,7 +68,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void FindResource_Should_Find_Style_Resource()
         {
-            var target = new Control
+            var target = new StyledElement
             {
                 Styles =
                 {
@@ -92,7 +92,7 @@ namespace Avalonia.Controls.UnitTests
         [Fact]
         public void FindResource_Should_Find_Styles_Resource()
         {
-            var target = new Control
+            var target = new StyledElement
             {
                 Styles =
                 {
@@ -188,7 +188,7 @@ namespace Avalonia.Controls.UnitTests
         public void Adding_Resource_To_Nested_Style_Should_Raise_ResourceChanged()
         {
             Style style;
-            var target = new Decorator
+            var target = new StyledElement
             {
                 Styles =
                 {
@@ -208,7 +208,7 @@ namespace Avalonia.Controls.UnitTests
         public void Setting_Logical_Parent_Subscribes_To_Parents_ResourceChanged_Event()
         {
             var parent = new ContentControl();
-            var child = new Border();
+            var child = new StyledElement();
 
             ((ISetLogicalParent)child).SetParent(parent);
             var raisedOnChild = false;

From b38b46a280ed723f9e7eb63c450e677f375b23bc Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 21 May 2018 11:48:31 -0500
Subject: [PATCH 05/16] PR Feedback.

---
 .../MarkupExtensions/RelativeSourceExtension.cs                | 2 +-
 .../PortableXaml/AvaloniaRuntimeTypeProvider.cs                | 1 +
 src/Markup/Avalonia.Markup/Avalonia.Markup.csproj              | 1 +
 src/Markup/Avalonia.Markup/Data/Binding.cs                     | 3 +--
 src/Markup/Avalonia.Markup/Data/MultiBinding.cs                | 3 +--
 src/Markup/Avalonia.Markup/Data/RelativeSource.cs              | 2 +-
 src/Markup/Avalonia.Markup/{ => Markup}/Data/DelayedBinding.cs | 0
 .../Avalonia.Markup/{ => Markup}/Parsers/SelectorGrammar.cs    | 0
 .../Avalonia.Markup/{ => Markup}/Parsers/SelectorParser.cs     | 0
 src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs          | 1 +
 .../Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs | 1 +
 .../Data/BindingTests_RelativeSource.cs                        | 1 +
 tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs      | 2 +-
 tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs        | 1 +
 .../Xaml/TreeDataTemplateTests.cs                              | 1 +
 15 files changed, 12 insertions(+), 7 deletions(-)
 rename src/Markup/Avalonia.Markup/{ => Markup}/Data/DelayedBinding.cs (100%)
 rename src/Markup/Avalonia.Markup/{ => Markup}/Parsers/SelectorGrammar.cs (100%)
 rename src/Markup/Avalonia.Markup/{ => Markup}/Parsers/SelectorParser.cs (100%)

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
index c9ec973f20..ab82b7a28b 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/RelativeSourceExtension.cs
@@ -1,7 +1,7 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Markup.Data;
+using Avalonia.Data;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
diff --git a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs
index 9cb2cc6cd8..3933a6ff19 100644
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaRuntimeTypeProvider.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Media;
diff --git a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
index 32045f446c..6e10509de6 100644
--- a/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
+++ b/src/Markup/Avalonia.Markup/Avalonia.Markup.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>Avalonia</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs
index 31131ecfa0..96fc2986e8 100644
--- a/src/Markup/Avalonia.Markup/Data/Binding.cs
+++ b/src/Markup/Avalonia.Markup/Data/Binding.cs
@@ -7,13 +7,12 @@ using System.Reactive;
 using System.Reactive.Linq;
 using System.Reflection;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.Data.Converters;
 using Avalonia.Data.Core;
 using Avalonia.LogicalTree;
 using Avalonia.VisualTree;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data
 {
     /// <summary>
     /// A XAML binding.
diff --git a/src/Markup/Avalonia.Markup/Data/MultiBinding.cs b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
index 4c7d9396ac..f6f62dcd1d 100644
--- a/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
+++ b/src/Markup/Avalonia.Markup/Data/MultiBinding.cs
@@ -8,11 +8,10 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using Avalonia.Controls;
-using Avalonia.Data;
 using Avalonia.Data.Converters;
 using Avalonia.Metadata;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data
 {
     /// <summary>
     /// A XAML binding that calculates an aggregate value from multiple child <see cref="Bindings"/>.
diff --git a/src/Markup/Avalonia.Markup/Data/RelativeSource.cs b/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
index 9a3b770212..42b43622da 100644
--- a/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
+++ b/src/Markup/Avalonia.Markup/Data/RelativeSource.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Avalonia.Markup.Data
+namespace Avalonia.Data
 {
     /// <summary>
     /// Defines the mode of a <see cref="RelativeSource"/> object.
diff --git a/src/Markup/Avalonia.Markup/Data/DelayedBinding.cs b/src/Markup/Avalonia.Markup/Markup/Data/DelayedBinding.cs
similarity index 100%
rename from src/Markup/Avalonia.Markup/Data/DelayedBinding.cs
rename to src/Markup/Avalonia.Markup/Markup/Data/DelayedBinding.cs
diff --git a/src/Markup/Avalonia.Markup/Parsers/SelectorGrammar.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
similarity index 100%
rename from src/Markup/Avalonia.Markup/Parsers/SelectorGrammar.cs
rename to src/Markup/Avalonia.Markup/Markup/Parsers/SelectorGrammar.cs
diff --git a/src/Markup/Avalonia.Markup/Parsers/SelectorParser.cs b/src/Markup/Avalonia.Markup/Markup/Parsers/SelectorParser.cs
similarity index 100%
rename from src/Markup/Avalonia.Markup/Parsers/SelectorParser.cs
rename to src/Markup/Avalonia.Markup/Markup/Parsers/SelectorParser.cs
diff --git a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
index 28f0fd48bd..4651dbab8d 100644
--- a/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
+++ b/src/Markup/Avalonia.Markup/Properties/AssemblyInfo.cs
@@ -5,5 +5,6 @@ using System.Reflection;
 using Avalonia.Metadata;
 using System.Runtime.CompilerServices;
 
+[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Data")]
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Markup.Data")]
 [assembly: InternalsVisibleTo("Avalonia.Markup.UnitTests")]
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
index a05b121a42..61df0bffdf 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_ElementName.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 using Xunit;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
index 36e801d22d..f2ddec6f3c 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/BindingTests_RelativeSource.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using Avalonia.Controls;
+using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 using Xunit;
diff --git a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
index b341af2810..fb23a38cce 100644
--- a/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
+++ b/tests/Avalonia.Markup.UnitTests/Data/MultiBindingTests.cs
@@ -11,7 +11,7 @@ using Avalonia.Controls;
 using Xunit;
 using System.Threading.Tasks;
 using Avalonia.Data.Converters;
-using Avalonia.Markup.Data;
+using Avalonia.Data;
 
 namespace Avalonia.Markup.UnitTests.Data
 {
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
index 43df95cfce..c41cf4a590 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/BasicTests.cs
@@ -4,6 +4,7 @@
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
+using Avalonia.Data;
 using Avalonia.Data.Converters;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Styling;
diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
index cbcfa16771..4134f5be23 100644
--- a/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
+++ b/tests/Avalonia.Markup.Xaml.UnitTests/Xaml/TreeDataTemplateTests.cs
@@ -3,6 +3,7 @@
 
 using System.Linq;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Templates;
 using Avalonia.UnitTests;

From 72708cae676b8f5e1ba25f7cc66f55a19dd699fa Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Mon, 21 May 2018 12:09:52 -0500
Subject: [PATCH 06/16] Fix namespace build break.

---
 samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs       | 1 +
 tests/Avalonia.Controls.UnitTests/ButtonTests.cs               | 1 +
 .../Primitives/SelectingItemsControlTests.cs                   | 1 +
 .../Primitives/ToggleButtonTests.cs                            | 3 ++-
 tests/Avalonia.LeakTests/ControlTests.cs                       | 2 +-
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
index 65be8c801e..f9d6a72a3a 100644
--- a/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
+++ b/samples/ControlCatalog/Pages/AutoCompleteBoxPage.xaml.cs
@@ -9,6 +9,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Data.Converters;
+using Avalonia.Data;
 
 namespace ControlCatalog.Pages
 {
diff --git a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
index a194da98a8..d218960726 100644
--- a/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ButtonTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Input;
+using Avalonia.Data;
 using Avalonia.Markup.Data;
 using Xunit;
 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
index 0f742f5a35..c052b81309 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs
@@ -8,6 +8,7 @@ using Avalonia.Collections;
 using Avalonia.Controls.Presenters;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
+using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Markup.Data;
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
index 377f861668..ab74d5e7d6 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/ToggleButtonTests.cs
@@ -1,4 +1,5 @@
-using Avalonia.Markup.Data;
+using Avalonia.Data;
+using Avalonia.Markup.Data;
 using Avalonia.UnitTests;
 
 using Xunit;
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index f00dd6d5d0..6993e32515 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -185,7 +185,7 @@ namespace Avalonia.LeakTests
                         Content = new TextBox()
                     };
 
-                    var binding = new Avalonia.Markup.Data.Binding
+                    var binding = new Avalonia.Data.Binding
                     {
                         Path = "Name"
                     };

From 61ebeb2ac93312cafd3c5eaa686e1cd2f7775fa7 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 24 May 2018 19:50:00 -0500
Subject: [PATCH 07/16] Move Avalonia.Styling to be below Avalonia.Animation in
 the dependency chain per conversation in Gitter.

---
 src/Avalonia.Animation/Animatable.cs             | 2 +-
 src/Avalonia.Animation/Avalonia.Animation.csproj | 1 +
 src/Avalonia.Styling/StyledElement.cs            | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
index a27d996301..e879f30369 100644
--- a/src/Avalonia.Animation/Animatable.cs
+++ b/src/Avalonia.Animation/Animatable.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Animation
     /// <summary>
     /// Base class for control which can have property transitions.
     /// </summary>
-    public class Animatable : AvaloniaObject
+    public class Animatable : StyledElement
     {
         /// <summary>
         /// Initializes this <see cref="Animatable"/> object.
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
index 46e41dd32a..e64bf0a7fc 100644
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@@ -4,6 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
+    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
index bd0d0b8c1f..259119eb5f 100644
--- a/src/Avalonia.Styling/StyledElement.cs
+++ b/src/Avalonia.Styling/StyledElement.cs
@@ -5,7 +5,6 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Text;
-using Avalonia.Animation;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Data;
@@ -17,14 +16,14 @@ using Avalonia.Styling;
 namespace Avalonia
 {
     /// <summary>
-    /// Extends an <see cref="Animatable"/> with the following features:
+    /// Extends an <see cref="AvaloniaObject"/> with the following features:
     /// 
     /// - An inherited <see cref="DataContext"/>.
     /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
     /// - Implements <see cref="ILogical"/> to form part of a logical tree.
     /// - A collection of class strings for custom styling.
     /// </summary>
-    public class StyledElement : Animatable, IStyledElement, ISetLogicalParent, ISetInheritanceParent
+    public class StyledElement : AvaloniaObject, IStyledElement, ISetLogicalParent, ISetInheritanceParent
     {
         /// <summary>
         /// Defines the <see cref="DataContext"/> property.

From b448b64bddc5baad6709c25beba1a20570152815 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 24 May 2018 19:54:41 -0500
Subject: [PATCH 08/16] Fixed broken doc comment.

---
 src/Avalonia.Controls/Control.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 2bcd540264..6d1f7a3fa9 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -30,7 +30,6 @@ namespace Avalonia.Controls
     /// The control class extends <see cref="InputElement"/> and adds the following features:
     ///
     /// - A <see cref="Tag"/> property to allow user-defined data to be attached to the control.
-
     /// </remarks>
     public class Control : InputElement, IControl, INamed, ISupportInitialize, IVisualBrushInitialize, IRequiresTemplateInStyle
     {

From 72a4889435d254d1a24c3ffe09629b3a373c1f66 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 24 May 2018 19:59:29 -0500
Subject: [PATCH 09/16] Move Control static constructor statements to more
 accurate layers.

---
 src/Avalonia.Controls/Control.cs   | 11 -----------
 src/Avalonia.Input/InputElement.cs |  4 ++++
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 6d1f7a3fa9..7b984adb89 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -60,17 +60,6 @@ namespace Avalonia.Controls
         private DataTemplates _dataTemplates;
         private IControl _focusAdorner;
 
-        /// <summary>
-        /// Initializes static members of the <see cref="Control"/> class.
-        /// </summary>
-        static Control()
-        {
-            AffectsMeasure(IsVisibleProperty);
-            PseudoClass(IsEnabledCoreProperty, x => !x, ":disabled");
-            PseudoClass(IsFocusedProperty, ":focus");
-            PseudoClass(IsPointerOverProperty, ":pointerover");
-        }
-
         /// <summary>
         /// Gets or sets the control's focus adorner.
         /// </summary>
diff --git a/src/Avalonia.Input/InputElement.cs b/src/Avalonia.Input/InputElement.cs
index 8ac49df4cd..9935dbe27c 100644
--- a/src/Avalonia.Input/InputElement.cs
+++ b/src/Avalonia.Input/InputElement.cs
@@ -168,6 +168,10 @@ namespace Avalonia.Input
             PointerPressedEvent.AddClassHandler<InputElement>(x => x.OnPointerPressed);
             PointerReleasedEvent.AddClassHandler<InputElement>(x => x.OnPointerReleased);
             PointerWheelChangedEvent.AddClassHandler<InputElement>(x => x.OnPointerWheelChanged);
+
+            PseudoClass(IsEnabledCoreProperty, x => !x, ":disabled");
+            PseudoClass(IsFocusedProperty, ":focus");
+            PseudoClass(IsPointerOverProperty, ":pointerover");
         }
 
         /// <summary>

From e3686ab10d8c0b8a91c7ac676d2d2939fbf201d9 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 25 May 2018 02:27:51 -0500
Subject: [PATCH 10/16] Fix intermittent test failures introduced by accidental
 possible inter-test dependency that caused a test to fail when a different
 (moved over from the refactor) test ran before it.

---
 .../Data/Core/ExpressionObserverTests_AttachedProperty.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
index 750e691103..3ed2c0b7eb 100644
--- a/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
+++ b/tests/Avalonia.Base.UnitTests/Data/Core/ExpressionObserverTests_AttachedProperty.cs
@@ -127,7 +127,7 @@ namespace Avalonia.Base.UnitTests.Data.Core
         private static class Owner
         {
             public static readonly AttachedProperty<string> FooProperty =
-                AvaloniaProperty.RegisterAttached<AvaloniaObject, string>(
+                AvaloniaProperty.RegisterAttached<Class1, string>(
                     "Foo", 
                     typeof(Owner), 
                     defaultValue: "foo");

From 9ff429879f387fea246c3157973d91bda3d2ce96 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 26 May 2018 22:02:03 -0500
Subject: [PATCH 11/16] Revert "Move Avalonia.Styling to be below
 Avalonia.Animation in the dependency chain per conversation in Gitter."

This reverts commit 867ecc05b6e7f94e08389e7f8383f61d488e1245.
---
 src/Avalonia.Animation/Animatable.cs             | 2 +-
 src/Avalonia.Animation/Avalonia.Animation.csproj | 1 -
 src/Avalonia.Styling/Avalonia.Styling.csproj     | 1 +
 src/Avalonia.Styling/StyledElement.cs            | 5 +++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Animation/Animatable.cs b/src/Avalonia.Animation/Animatable.cs
index e879f30369..a27d996301 100644
--- a/src/Avalonia.Animation/Animatable.cs
+++ b/src/Avalonia.Animation/Animatable.cs
@@ -16,7 +16,7 @@ namespace Avalonia.Animation
     /// <summary>
     /// Base class for control which can have property transitions.
     /// </summary>
-    public class Animatable : StyledElement
+    public class Animatable : AvaloniaObject
     {
         /// <summary>
         /// Initializes this <see cref="Animatable"/> object.
diff --git a/src/Avalonia.Animation/Avalonia.Animation.csproj b/src/Avalonia.Animation/Avalonia.Animation.csproj
index e64bf0a7fc..46e41dd32a 100644
--- a/src/Avalonia.Animation/Avalonia.Animation.csproj
+++ b/src/Avalonia.Animation/Avalonia.Animation.csproj
@@ -4,7 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
 </Project>
\ No newline at end of file
diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
index 61827bc59c..5aff478971 100644
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>Avalonia</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
diff --git a/src/Avalonia.Styling/StyledElement.cs b/src/Avalonia.Styling/StyledElement.cs
index 259119eb5f..bd0d0b8c1f 100644
--- a/src/Avalonia.Styling/StyledElement.cs
+++ b/src/Avalonia.Styling/StyledElement.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
 using System.Text;
+using Avalonia.Animation;
 using Avalonia.Collections;
 using Avalonia.Controls;
 using Avalonia.Data;
@@ -16,14 +17,14 @@ using Avalonia.Styling;
 namespace Avalonia
 {
     /// <summary>
-    /// Extends an <see cref="AvaloniaObject"/> with the following features:
+    /// Extends an <see cref="Animatable"/> with the following features:
     /// 
     /// - An inherited <see cref="DataContext"/>.
     /// - Implements <see cref="IStyleable"/> to allow styling to work on the styled element.
     /// - Implements <see cref="ILogical"/> to form part of a logical tree.
     /// - A collection of class strings for custom styling.
     /// </summary>
-    public class StyledElement : AvaloniaObject, IStyledElement, ISetLogicalParent, ISetInheritanceParent
+    public class StyledElement : Animatable, IStyledElement, ISetLogicalParent, ISetInheritanceParent
     {
         /// <summary>
         /// Defines the <see cref="DataContext"/> property.

From 6673123ffcca20c29e254040d26f1a8de966044f Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 26 May 2018 23:01:02 -0500
Subject: [PATCH 12/16] Fix bad csproj merge.

---
 src/Avalonia.Styling/Avalonia.Styling.csproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Avalonia.Styling/Avalonia.Styling.csproj b/src/Avalonia.Styling/Avalonia.Styling.csproj
index 5aff478971..1050d20523 100644
--- a/src/Avalonia.Styling/Avalonia.Styling.csproj
+++ b/src/Avalonia.Styling/Avalonia.Styling.csproj
@@ -7,8 +7,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
     <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Rx.props" />
 </Project>
\ No newline at end of file

From b14d76e257d9ed7f3d70f5f7e432e1210e966d82 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 26 May 2018 23:26:20 -0500
Subject: [PATCH 13/16] Fix another broken csproj merge.

---
 .../Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj       | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
index 1690ad97ae..32745e1d0b 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
+++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj
@@ -30,7 +30,6 @@
         <Compile Include="Converters\ParseTypeConverter.cs" />
         <Compile Include="Converters\SetterValueTypeConverter.cs" />
         <Compile Include="Converters\TimeSpanTypeConverter.cs" />
-        <Compile Include="Data\ResourceInclude.cs" />
         <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" />
         <Compile Include="MarkupExtensions\ResourceInclude.cs" />
         <Compile Include="MarkupExtensions\StaticResourceExtension.cs" />
@@ -48,12 +47,6 @@
         <Compile Include="Converters\AvaloniaPropertyTypeConverter.cs" />
         <Compile Include="Converters\PointsListTypeConverter.cs" />
         <Compile Include="Converters\SelectorTypeConverter.cs" />
-        <Compile Include="Data\Binding.cs" />
-        <Compile Include="Data\DelayedBinding.cs" />
-        <Compile Include="Data\MultiBinding.cs" />
-        <Compile Include="Data\RelativeSource.cs" />
-        <Compile Include="Converters\ThicknessTypeConverter.cs" />
-        <Compile Include="Converters\TimeSpanTypeConverter.cs" />
         <Compile Include="MarkupExtensions\BindingExtension.cs" />
         <Compile Include="MarkupExtensions\RelativeSourceExtension.cs" />
         <Compile Include="MarkupExtensions\TemplateBindingExtension.cs" />

From 4b8c6df9eb70d5f59efe854eb46c395756cbabba Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sat, 26 May 2018 23:59:06 -0500
Subject: [PATCH 14/16] Implement animation setters using the
 Avalonia.Styling.Setter class. Enable custom animators through a static
 method on Animation that can be called from the a static constructor (example
 in Transform.cs).

---
 samples/RenderTest/Pages/AnimationsPage.xaml  | 20 +++++------
 samples/RenderTest/Pages/ClippingPage.xaml    |  2 +-
 src/Avalonia.Animation/Animation.cs           | 33 +++++++++++++++----
 src/Avalonia.Animation/AnimationSetter.cs     | 17 ----------
 src/Avalonia.Animation/AnimatorAttribute.cs   | 18 ----------
 src/Avalonia.Animation/DoubleSetter.cs        | 21 ------------
 src/Avalonia.Controls/Control.cs              |  2 +-
 ...nStyle.cs => IRequiresTemplateInSetter.cs} |  2 +-
 src/Avalonia.Styling/Styling/Setter.cs        |  7 ++--
 .../Animation/TransformSetter.cs              | 22 -------------
 src/Avalonia.Visuals/Media/Transform.cs       |  5 +++
 11 files changed, 49 insertions(+), 100 deletions(-)
 delete mode 100644 src/Avalonia.Animation/AnimationSetter.cs
 delete mode 100644 src/Avalonia.Animation/AnimatorAttribute.cs
 delete mode 100644 src/Avalonia.Animation/DoubleSetter.cs
 rename src/Avalonia.Styling/Styling/{IRequiresTemplateInStyle.cs => IRequiresTemplateInSetter.cs} (87%)
 delete mode 100644 src/Avalonia.Visuals/Animation/TransformSetter.cs

diff --git a/samples/RenderTest/Pages/AnimationsPage.xaml b/samples/RenderTest/Pages/AnimationsPage.xaml
index 415c08728f..5287e4e373 100644
--- a/samples/RenderTest/Pages/AnimationsPage.xaml
+++ b/samples/RenderTest/Pages/AnimationsPage.xaml
@@ -48,13 +48,13 @@
                      PlaybackDirection="AlternateReverse" 
                      Easing="SineEaseInOut">
             <KeyFrame Cue="20%">
-              <TransformSetter Property="RotateTransform.Angle" Value="45"/>
+              <Setter Property="RotateTransform.Angle" Value="45"/>
              </KeyFrame>
             <KeyFrame Cue="50%">
-              <TransformSetter Property="ScaleTransform.ScaleX" Value="1.5"/>
+              <Setter Property="ScaleTransform.ScaleX" Value="1.5"/>
              </KeyFrame>
             <KeyFrame Cue="80%">
-              <TransformSetter Property="RotateTransform.Angle" Value="120"/>
+              <Setter Property="RotateTransform.Angle" Value="120"/>
             </KeyFrame>
           </Animation>
         </Style.Animations>
@@ -63,8 +63,8 @@
         <Style.Animations>
           <Animation Duration="0:0:0.5" Easing="SineEaseInOut">
             <KeyFrame Cue="50%">
-              <TransformSetter Property="ScaleTransform.ScaleX" Value="0.8"/>
-              <TransformSetter Property="ScaleTransform.ScaleY" Value="0.8"/>
+              <Setter Property="ScaleTransform.ScaleX" Value="0.8"/>
+              <Setter Property="ScaleTransform.ScaleY" Value="0.8"/>
             </KeyFrame>
           </Animation>
         </Style.Animations>
@@ -76,8 +76,8 @@
                      Easing="QuadraticEaseInOut"
                      RepeatCount="Loop">
             <KeyFrame Cue="50%">
-              <TransformSetter Property="ScaleTransform.ScaleX" Value="0.8"/>
-              <TransformSetter Property="ScaleTransform.ScaleY" Value="0.8"/>
+              <Setter Property="ScaleTransform.ScaleX" Value="0.8"/>
+              <Setter Property="ScaleTransform.ScaleY" Value="0.8"/>
             </KeyFrame>
            </Animation>
         </Style.Animations>
@@ -86,7 +86,7 @@
         <Style.Animations>
           <Animation Duration="0:0:3" Easing="BounceEaseInOut"> 
             <KeyFrame Cue="48%">
-              <TransformSetter Property="TranslateTransform.Y" Value="-100"/>
+              <Setter Property="TranslateTransform.Y" Value="-100"/>
             </KeyFrame>
           </Animation>
         </Style.Animations>
@@ -95,10 +95,10 @@
         <Style.Animations>
           <Animation Duration="0:0:3" Easing="CircularEaseInOut">
             <KeyFrame Cue="25%">
-              <TransformSetter Property="SkewTransform.AngleX" Value="-20"/>
+              <Setter Property="SkewTransform.AngleX" Value="-20"/>
             </KeyFrame>
             <KeyFrame Cue="75%">
-              <TransformSetter Property="SkewTransform.AngleX" Value="20"/>
+              <Setter Property="SkewTransform.AngleX" Value="20"/>
             </KeyFrame>
           </Animation>
         </Style.Animations>
diff --git a/samples/RenderTest/Pages/ClippingPage.xaml b/samples/RenderTest/Pages/ClippingPage.xaml
index 434468888a..2e7944b0fc 100644
--- a/samples/RenderTest/Pages/ClippingPage.xaml
+++ b/samples/RenderTest/Pages/ClippingPage.xaml
@@ -10,7 +10,7 @@
           <Style.Animations>
             <Animation Duration="0:0:2" RepeatCount="Loop">
               <KeyFrame Cue="100%">
-                <TransformSetter Property="RotateTransform.Angle" Value="360"/>
+                <Setter Property="RotateTransform.Angle" Value="360"/>
               </KeyFrame>
             </Animation>
           </Style.Animations>
diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index 525be53fc2..aa436f5f4e 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -18,6 +18,28 @@ namespace Avalonia.Animation
     /// </summary>
     public class Animation : AvaloniaList<KeyFrame>, IDisposable, IAnimation
     {
+        private readonly static List<(Func<AvaloniaProperty, bool> Condition, Type Animator)> Animators = new List<(Func<AvaloniaProperty, bool>, Type)>
+        {
+            ( prop => typeof(double).IsAssignableFrom(prop.PropertyType), typeof(DoubleAnimator) )
+        };
+
+        public static void RegisterAnimator<TAnimator>(Func<AvaloniaProperty, bool> condition)
+            where TAnimator: IAnimator
+        {
+            Animators.Insert(0, (condition, typeof(TAnimator)));
+        }
+
+        private static Type GetAnimatorType(AvaloniaProperty property)
+        {
+            foreach (var (condition, type) in Animators)
+            {
+                if (condition(property))
+                {
+                    return type;
+                }
+            }
+            return null;
+        }
 
         private bool _isChildrenChanged = false;
         private List<IDisposable> _subscription = new List<IDisposable>();
@@ -67,14 +89,13 @@ namespace Avalonia.Animation
             {
                 foreach (var setter in keyframe)
                 {
-                    var custAttr = setter.GetType()
-                                         .GetCustomAttributes()
-                                         .Where(p => p.GetType() == typeof(AnimatorAttribute));
+                    var handler = GetAnimatorType(setter.Property);
 
-                    if (!custAttr.Any())
-                        throw new InvalidProgramException($"Type {setter.GetType()} doesn't have Animator attribute.");
+                    if (handler == null)
+                    {
+                        throw new InvalidOperationException($"No animator registered for the property {setter.Property}. Add an animator to the Animation.Animators collection that matches this property to animate it.");
+                    }
 
-                    var handler = ((AnimatorAttribute)custAttr.First()).HandlerType;
                     if (!handlerList.Contains((handler, setter.Property)))
                         handlerList.Add((handler, setter.Property));
 
diff --git a/src/Avalonia.Animation/AnimationSetter.cs b/src/Avalonia.Animation/AnimationSetter.cs
deleted file mode 100644
index 1194e4606b..0000000000
--- a/src/Avalonia.Animation/AnimationSetter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Diagnostics;
-using Avalonia.Animation.Utils;
-using Avalonia.Data;
-
-namespace Avalonia.Animation
-{
-    public abstract class AnimationSetter : IAnimationSetter
-    {
-        public AvaloniaProperty Property { get; set; }
-        public object Value { get; set; }
-    }
-}
diff --git a/src/Avalonia.Animation/AnimatorAttribute.cs b/src/Avalonia.Animation/AnimatorAttribute.cs
deleted file mode 100644
index 58ee823a87..0000000000
--- a/src/Avalonia.Animation/AnimatorAttribute.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Attribute for <see cref="IAnimationSetter"/> objects
-    /// that maps the setter to it's <see cref="Animator{T}"/>.
-    /// </summary>
-    public class AnimatorAttribute : Attribute
-    {
-        public Type HandlerType;
-
-        public AnimatorAttribute(Type handler)
-        {
-            this.HandlerType = handler;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Animation/DoubleSetter.cs b/src/Avalonia.Animation/DoubleSetter.cs
deleted file mode 100644
index e524324a8c..0000000000
--- a/src/Avalonia.Animation/DoubleSetter.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Diagnostics;
-using Avalonia.Animation.Utils;
-using Avalonia.Data;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Setter that handles <see cref="double"/> properties
-    /// in the target.
-    /// </summary>
-    [Animator(typeof(DoubleAnimator))]
-    public class DoubleSetter : AnimationSetter
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.Controls/Control.cs b/src/Avalonia.Controls/Control.cs
index 7b984adb89..67288972b6 100644
--- a/src/Avalonia.Controls/Control.cs
+++ b/src/Avalonia.Controls/Control.cs
@@ -31,7 +31,7 @@ namespace Avalonia.Controls
     ///
     /// - A <see cref="Tag"/> property to allow user-defined data to be attached to the control.
     /// </remarks>
-    public class Control : InputElement, IControl, INamed, ISupportInitialize, IVisualBrushInitialize, IRequiresTemplateInStyle
+    public class Control : InputElement, IControl, INamed, ISupportInitialize, IVisualBrushInitialize, IRequiresTemplateInSetter
     {
         /// <summary>
         /// Defines the <see cref="FocusAdorner"/> property.
diff --git a/src/Avalonia.Styling/Styling/IRequiresTemplateInStyle.cs b/src/Avalonia.Styling/Styling/IRequiresTemplateInSetter.cs
similarity index 87%
rename from src/Avalonia.Styling/Styling/IRequiresTemplateInStyle.cs
rename to src/Avalonia.Styling/Styling/IRequiresTemplateInSetter.cs
index 819d783061..1f64326526 100644
--- a/src/Avalonia.Styling/Styling/IRequiresTemplateInStyle.cs
+++ b/src/Avalonia.Styling/Styling/IRequiresTemplateInSetter.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Styling
     /// This is an interface for advanced scenarios to assist users in correct style development.
     /// You as a user will not need to use this interface directly.
     /// </summary>
-    public interface IRequiresTemplateInStyle
+    public interface IRequiresTemplateInSetter
     {
     }
 }
diff --git a/src/Avalonia.Styling/Styling/Setter.cs b/src/Avalonia.Styling/Styling/Setter.cs
index 337e01c0b5..1a78e0f4d7 100644
--- a/src/Avalonia.Styling/Styling/Setter.cs
+++ b/src/Avalonia.Styling/Styling/Setter.cs
@@ -5,6 +5,7 @@ using System;
 using System.Reactive.Disposables;
 using System.Reactive.Subjects;
 using System.Reflection;
+using Avalonia.Animation;
 using Avalonia.Controls;
 using Avalonia.Data;
 using Avalonia.Metadata;
@@ -19,7 +20,7 @@ namespace Avalonia.Styling
     /// A <see cref="Setter"/> is used to set a <see cref="AvaloniaProperty"/> value on a
     /// <see cref="AvaloniaObject"/> depending on a condition.
     /// </remarks>
-    public class Setter : ISetter
+    public class Setter : ISetter, IAnimationSetter
     {
         private object _value;
 
@@ -65,10 +66,10 @@ namespace Avalonia.Styling
 
             set
             {
-                if (value is IRequiresTemplateInStyle)
+                if (value is IRequiresTemplateInSetter)
                 {
                     throw new ArgumentException(
-                        "Cannot assign a control to Style.Value. Wrap the control in a <Template>.",
+                        "Cannot assign a control to Setter.Value. Wrap the control in a <Template>.",
                         "value");
                 }
 
diff --git a/src/Avalonia.Visuals/Animation/TransformSetter.cs b/src/Avalonia.Visuals/Animation/TransformSetter.cs
deleted file mode 100644
index 1c0319514e..0000000000
--- a/src/Avalonia.Visuals/Animation/TransformSetter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Diagnostics;
-using Avalonia.Animation.Utils;
-using Avalonia.Data;
-using Avalonia.Media;
-
-namespace Avalonia.Animation
-{
-    /// <summary>
-    /// Setter that handles <see cref="Transform"/> objects
-    /// in the target.
-    /// </summary>
-    [Animator(typeof(TransformAnimator))]
-    public class TransformSetter : AnimationSetter
-    { 
-        
-    }
-}
diff --git a/src/Avalonia.Visuals/Media/Transform.cs b/src/Avalonia.Visuals/Media/Transform.cs
index f81938dad7..c17810fc4a 100644
--- a/src/Avalonia.Visuals/Media/Transform.cs
+++ b/src/Avalonia.Visuals/Media/Transform.cs
@@ -12,6 +12,11 @@ namespace Avalonia.Media
     /// </summary>
     public abstract class Transform : Animatable
     {
+        static Transform()
+        {
+            Animation.Animation.RegisterAnimator<TransformAnimator>(prop => typeof(Transform).IsAssignableFrom(prop.OwnerType));
+        }
+
         /// <summary>
         /// Raised when the transform changes.
         /// </summary>

From b89ab8f5f15f6f10cf442184703c94cbeff8d4d6 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 27 May 2018 14:43:03 -0500
Subject: [PATCH 15/16] Remove HtmlRenderer from the Avalonia repository and
 move it to the Avalonia.HtmlRenderer repo.

---
 .gitmodules                                   |   4 -
 Avalonia.sln                                  |  46 +-
 build.cake                                    |   2 +-
 packages.cake                                 |  17 -
 .../ControlCatalog.Android.csproj             |   4 -
 .../ControlCatalog.iOS.csproj                 |   4 -
 samples/ControlCatalog/ControlCatalog.csproj  |   1 -
 samples/Previewer/Previewer.csproj            |   1 -
 .../Avalonia.AndroidTestApplication.csproj    |   4 -
 .../Adapters/AvaloniaAdapter.cs               | 129 ----
 .../Adapters/BrushAdapter.cs                  |  47 --
 .../Adapters/ContextMenuAdapter.cs            |  51 --
 .../Adapters/ControlAdapter.cs                | 111 ----
 .../Adapters/FontAdapter.cs                   | 106 ---
 .../Adapters/FontFamilyAdapter.cs             |  29 -
 .../Adapters/GraphicsAdapter.cs               | 299 ---------
 .../Adapters/GraphicsPathAdapter.cs           |  67 --
 .../Adapters/ImageAdapter.cs                  |  52 --
 .../Adapters/PenAdapter.cs                    |  79 ---
 .../Avalonia.HtmlRenderer.csproj              |  24 -
 .../Avalonia.HtmlRenderer.csproj.DotSettings  |   2 -
 src/Avalonia.HtmlRenderer/Compat/Api.cs       |  16 -
 .../Compat/Attributes.cs                      |  28 -
 .../Compat/ThreadPool.cs                      |  22 -
 src/Avalonia.HtmlRenderer/HtmlContainer.cs    | 471 -------------
 src/Avalonia.HtmlRenderer/HtmlControl.cs      | 616 ------------------
 src/Avalonia.HtmlRenderer/HtmlLabel.cs        | 112 ----
 .../HtmlRendererRoutedEventArgs.cs            |  14 -
 .../Properties/AssemblyInfo.cs                |  33 -
 src/Avalonia.HtmlRenderer/PropertyHelper.cs   |  24 -
 src/Avalonia.HtmlRenderer/Utilities/Util.cs   | 123 ----
 src/Avalonia.HtmlRenderer/external            |   1 -
 .../Avalonia.iOSTestApplication.csproj        |   4 -
 .../Avalonia.Designer.HostApp.csproj          |   1 -
 34 files changed, 2 insertions(+), 2542 deletions(-)
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/AvaloniaAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/BrushAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/ContextMenuAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/ControlAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/FontAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/FontFamilyAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/GraphicsAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/GraphicsPathAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/ImageAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Adapters/PenAdapter.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
 delete mode 100644 src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj.DotSettings
 delete mode 100644 src/Avalonia.HtmlRenderer/Compat/Api.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Compat/Attributes.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Compat/ThreadPool.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/HtmlContainer.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/HtmlControl.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/HtmlLabel.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/HtmlRendererRoutedEventArgs.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Properties/AssemblyInfo.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/PropertyHelper.cs
 delete mode 100644 src/Avalonia.HtmlRenderer/Utilities/Util.cs
 delete mode 160000 src/Avalonia.HtmlRenderer/external

diff --git a/.gitmodules b/.gitmodules
index 98b6d076c1..2d2a9ac497 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "src/Avalonia.HtmlRenderer/external"]
-	path = src/Avalonia.HtmlRenderer/external
-	url = https://github.com/AvaloniaUI/HTML-Renderer.git
-	branch = perspex-pcl
 [submodule "src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github"]
 	path = src/Markup/Avalonia.Markup.Xaml/PortableXaml/portable.xaml.github
 	url = https://github.com/AvaloniaUI/Portable.Xaml.git
diff --git a/Avalonia.sln b/Avalonia.sln
index 47ee4c1ad9..539ba04728 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2027
@@ -68,8 +68,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gtk", "Gtk", "{B9894058-278
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI", "src\Avalonia.ReactiveUI\Avalonia.ReactiveUI.csproj", "{6417B24E-49C2-4985-8DB2-3AB9D898EC91}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.HtmlRenderer", "src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj", "{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlatformSupport", "src\Shared\PlatformSupport\PlatformSupport.shproj", "{E4D9629C-F168-4224-3F51-A5E482FFBC42}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Markup", "src\Markup\Avalonia.Markup\Avalonia.Markup.csproj", "{6417E941-21BC-467B-A771-0DE389353CE6}"
@@ -134,8 +132,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Gtk3", "src\Gtk\Av
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.NetCore", "samples\ControlCatalog.NetCore\ControlCatalog.NetCore.csproj", "{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{74487168-7D91-487E-BF93-055F2251461E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A}"
 	ProjectSection(SolutionItems) = preProject
 		build\JetBrains.Annotations.props = build\JetBrains.Annotations.props
@@ -1162,44 +1158,6 @@ Global
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|NetCoreOnly.Build.0 = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|x86.ActiveCfg = Release|Any CPU
 		{6417B24E-49C2-4985-8DB2-3AB9D898EC91}.Release|x86.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|NetCoreOnly.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhone.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|NetCoreOnly.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|x86.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.AppStore|x86.Build.0 = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|NetCoreOnly.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|NetCoreOnly.Build.0 = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Debug|x86.Build.0 = Debug|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhone.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|NetCoreOnly.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|NetCoreOnly.Build.0 = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|x86.ActiveCfg = Release|Any CPU
-		{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}.Release|x86.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{6417E941-21BC-467B-A771-0DE389353CE6}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
@@ -2582,8 +2540,6 @@ Global
 		{7D2D3083-71DD-4CC9-8907-39A0D86FB322} = {3743B0F2-CC41-4F14-A8C8-267F579BF91E}
 		{BB1F7BB5-6AD4-4776-94D9-C09D0A972658} = {B9894058-278A-46B5-B6ED-AD613FCC03B3}
 		{39D7B147-1A5B-47C2-9D01-21FB7C47C4B3} = {9B9E3891-2366-4253-A952-D08BCEB71098}
-		{F3AC8BC1-27F5-4255-9AFC-04ABFD11683A} = {74487168-7D91-487E-BF93-055F2251461E}
-		{4D6FAF79-58B4-482F-9122-0668C346364C} = {74487168-7D91-487E-BF93-055F2251461E}
 		{854568D5-13D1-4B4F-B50D-534DC7EFD3C9} = {86C53C40-57AA-45B8-AD42-FAE0EFDF0F2B}
 		{638580B0-7910-40EF-B674-DCB34DA308CD} = {A0CC0258-D18C-4AB3-854F-7101680FC3F9}
 		{CBC4FF2F-92D4-420B-BE21-9FE0B930B04E} = {B39A8919-9F95-48FE-AD7B-76E08B509888}
diff --git a/build.cake b/build.cake
index 20d77e25d3..aa35d88aac 100644
--- a/build.cake
+++ b/build.cake
@@ -376,7 +376,7 @@ Task("Inspect")
     {
         var badIssues = new []{"PossibleNullReferenceException"};
         var whitelist = new []{"tests", "src\\android", "src\\ios",
-            "src\\windows\\avalonia.designer", "src\\avalonia.htmlrenderer\\external",
+            "src\\windows\\avalonia.designer",
             "src\\markup\\avalonia.markup.xaml\\portablexaml\\portable.xaml.github"};
         Information("Running code inspections");
         
diff --git a/packages.cake b/packages.cake
index 17411aef4c..90cbb8d7ef 100644
--- a/packages.cake
+++ b/packages.cake
@@ -274,23 +274,6 @@ public class Packages
                 OutputDirectory = parameters.NugetRoot
             },
             ///////////////////////////////////////////////////////////////////////////////
-            // Avalonia.HtmlRenderer
-            ///////////////////////////////////////////////////////////////////////////////
-            new NuGetPackSettings()
-            {
-                Id = "Avalonia.HtmlRenderer",
-                Dependencies = new []
-                {
-                    new NuSpecDependency() { Id = "Avalonia", Version = parameters.Version }
-                },
-                Files = new []
-                {
-                    new NuSpecContent { Source = "Avalonia.HtmlRenderer.dll", Target = "lib/netstandard2.0" }
-                },
-                BasePath = context.Directory("./src/Avalonia.HtmlRenderer/bin/" + parameters.DirSuffix + "/netstandard2.0"),
-                OutputDirectory = parameters.NugetRoot
-            },
-            ///////////////////////////////////////////////////////////////////////////////
             // Avalonia.ReactiveUI
             ///////////////////////////////////////////////////////////////////////////////
             new NuGetPackSettings()
diff --git a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
index 2a91d6a3da..fab8ecd768 100644
--- a/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
+++ b/samples/ControlCatalog.Android/ControlCatalog.Android.csproj
@@ -111,10 +111,6 @@
       <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
       <Name>Avalonia.Diagnostics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj">
-      <Project>{5fb2b005-0a7f-4dad-add4-3ed01444e63d}</Project>
-      <Name>Avalonia.HtmlRenderer</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Avalonia.Input</Name>
diff --git a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
index c1c5cdcaf7..a60fd242e4 100644
--- a/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
+++ b/samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
@@ -141,10 +141,6 @@
       <Project>{7062AE20-5DCC-4442-9645-8195BDECE63E}</Project>
       <Name>Avalonia.Diagnostics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj">
-      <Project>{5FB2B005-0A7F-4DAD-ADD4-3ED01444E63D}</Project>
-      <Name>Avalonia.HtmlRenderer</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj">
       <Project>{62024B2D-53EB-4638-B26B-85EEAA54866E}</Project>
       <Name>Avalonia.Input</Name>
diff --git a/samples/ControlCatalog/ControlCatalog.csproj b/samples/ControlCatalog/ControlCatalog.csproj
index c37002ef6a..dea9b35e24 100644
--- a/samples/ControlCatalog/ControlCatalog.csproj
+++ b/samples/ControlCatalog/ControlCatalog.csproj
@@ -25,7 +25,6 @@
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
diff --git a/samples/Previewer/Previewer.csproj b/samples/Previewer/Previewer.csproj
index 13e2418d67..b4dda473f2 100644
--- a/samples/Previewer/Previewer.csproj
+++ b/samples/Previewer/Previewer.csproj
@@ -15,7 +15,6 @@
     <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj" />
diff --git a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
index 9977d77978..359adaa1f0 100644
--- a/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
+++ b/src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
@@ -143,10 +143,6 @@
       <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
       <Name>Avalonia.Themes.Default</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj">
-      <Project>{5fb2b005-0a7f-4dad-add4-3ed01444e63d}</Project>
-      <Name>Avalonia.HtmlRenderer</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj">
       <Project>{7d2d3083-71dd-4cc9-8907-39a0d86fb322}</Project>
       <Name>Avalonia.Skia</Name>
diff --git a/src/Avalonia.HtmlRenderer/Adapters/AvaloniaAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/AvaloniaAdapter.cs
deleted file mode 100644
index aab65fcbc7..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/AvaloniaAdapter.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia;
-using Avalonia.Input.Platform;
-using Avalonia.Media;
-using Avalonia.Media.Imaging;
-using TheArtOfDev.HtmlRenderer.Adapters;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-using TheArtOfDev.HtmlRenderer.Avalonia.Utilities;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    class AvaloniaAdapter : RAdapter
-    {
-        public static AvaloniaAdapter Instance { get; } = new AvaloniaAdapter();
-
-        /// <summary>
-        /// List of valid predefined color names in lower-case
-        /// </summary>
-        private static readonly Dictionary<string, Color> ColorNameDic = new Dictionary<string, Color>();
-        
-
-        static AvaloniaAdapter()
-        {
-            foreach (var colorProp in typeof(Colors).GetRuntimeProperties()
-                .Where(p=>p.PropertyType == typeof(Color)))
-            {
-                ColorNameDic[colorProp.Name.ToLower()] = (Color)colorProp.GetValue(null);
-            }
-        }
-
-        protected override RColor GetColorInt(string colorName)
-        {
-            Color c;
-            if(!ColorNameDic.TryGetValue(colorName.ToLower(), out c))
-                return RColor.Empty;
-            return Util.Convert(c);
-        }
-
-        protected override RPen CreatePen(RColor color)
-        {
-            return new PenAdapter(GetSolidColorBrush(color));
-        }
-
-        /// <summary>
-        /// Get solid color brush for the given color.
-        /// </summary>
-        private static IBrush GetSolidColorBrush(RColor color)
-        {
-            IBrush solidBrush;
-            if (color == RColor.White)
-                solidBrush = Brushes.White;
-            else if (color == RColor.Black)
-                solidBrush = Brushes.Black;
-            else if (color.A < 1)
-                solidBrush = Brushes.Transparent;
-            else
-                solidBrush = new SolidColorBrush(Util.Convert(color));
-            return solidBrush;
-        }
-
-        protected override RBrush CreateSolidBrush(RColor color)
-        {
-            return new BrushAdapter(GetSolidColorBrush(color));
-        }
-
-        protected override RBrush CreateLinearGradientBrush(RRect rect, RColor color1, RColor color2, double angle)
-        {
-            var startColor = angle <= 180 ? Util.Convert(color1) : Util.Convert(color2);
-            var endColor = angle <= 180 ? Util.Convert(color2) : Util.Convert(color1);
-            angle = angle <= 180 ? angle : angle - 180;
-            double x = angle < 135 ? Math.Max((angle - 45) / 90, 0) : 1;
-            double y = angle <= 45 ? Math.Max(0.5 - angle / 90, 0) : angle > 135 ? Math.Abs(1.5 - angle / 90) : 0;
-            return new BrushAdapter(new LinearGradientBrush
-            {
-                StartPoint = new RelativePoint(x, y, RelativeUnit.Relative), 
-                EndPoint = new RelativePoint(1 - x, 1 - y, RelativeUnit.Relative),
-                GradientStops = new[]
-                {
-                    new GradientStop(startColor, 0),
-                    new GradientStop(endColor, 1)
-                }
-            });
-
-        }
-
-        protected override RImage ConvertImageInt(object image)
-        {
-            return image != null ? new ImageAdapter((Bitmap)image) : null;
-        }
-
-        protected override RImage ImageFromStreamInt(Stream memoryStream)
-        {
-            //TODO: Implement bitmap loader
-            return null;
-        }
-
-        protected override RFont CreateFontInt(string family, double size, RFontStyle style)
-        {
-            return new FontAdapter(family, size, style);
-        }
-
-        protected override RFont CreateFontInt(RFontFamily family, double size, RFontStyle style)
-        {
-            return new FontAdapter(family.Name, size, style);
-        }
-
-        protected override void SetToClipboardInt(string html, string plainText)
-        {
-            SetToClipboardInt(plainText);
-        }
-
-        protected override void SetToClipboardInt(string text)
-        {
-            AvaloniaLocator.Current.GetService<IClipboard>().SetTextAsync(text);
-        }
-
-        protected override void SetToClipboardInt(RImage image)
-        {
-            //Do not crash, just ignore
-            //TODO: implement image clipboard support
-        }
-    }
-}
diff --git a/src/Avalonia.HtmlRenderer/Adapters/BrushAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/BrushAdapter.cs
deleted file mode 100644
index 8ea67274b1..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/BrushAdapter.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using Avalonia.Media;
-using TheArtOfDev.HtmlRenderer.Adapters;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia brushes.
-    /// </summary>
-    internal sealed class BrushAdapter : RBrush
-    {
-        /// <summary>
-        /// The actual Avalonia brush instance.
-        /// </summary>
-        private readonly IBrush _brush;
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        public BrushAdapter(IBrush brush)
-        {
-            _brush = brush;
-        }
-
-        /// <summary>
-        /// The actual Avalonia brush instance.
-        /// </summary>
-        public IBrush Brush
-        {
-            get { return _brush; }
-        }
-
-        public override void Dispose()
-        { }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Adapters/ContextMenuAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/ContextMenuAdapter.cs
deleted file mode 100644
index 380108c01a..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/ContextMenuAdapter.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using System;
-using TheArtOfDev.HtmlRenderer.Adapters;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia context menu for core.
-    /// </summary>
-    internal sealed class NullContextMenuAdapter : RContextMenu
-    {
-        //TODO: actually implement context menu
-
-        private int _itemCount;
-        public override int ItemsCount => _itemCount;
-        public override void AddDivider()
-        {
-            
-        }
-
-        public override void AddItem(string text, bool enabled, EventHandler onClick)
-        {
-            _itemCount++;
-        }
-
-        public override void RemoveLastDivider()
-        {
-            _itemCount++;
-        }
-
-        public override void Show(RControl parent, RPoint location)
-        {
-        }
-
-        public override void Dispose()
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Adapters/ControlAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/ControlAdapter.cs
deleted file mode 100644
index 9a55768f6a..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/ControlAdapter.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Html;
-using Avalonia.Input;
-using Avalonia.VisualTree;
-using TheArtOfDev.HtmlRenderer.Adapters;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-using TheArtOfDev.HtmlRenderer.Core.Utils;
-using TheArtOfDev.HtmlRenderer.Avalonia.Utilities;
-// ReSharper disable ConvertPropertyToExpressionBody
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia Control for core.
-    /// </summary>
-    internal sealed class ControlAdapter : RControl
-    {
-        /// <summary>
-        /// the underline Avalonia control.
-        /// </summary>
-        private readonly Control _control;
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        public ControlAdapter(Control control)
-            : base(AvaloniaAdapter.Instance)
-        {
-            ArgChecker.AssertArgNotNull(control, "control");
-
-            _control = control;
-        }
-
-        /// <summary>
-        /// Get the underline Avalonia control
-        /// </summary>
-        public Control Control
-        {
-            get { return _control; }
-        }
-
-        public override RPoint MouseLocation
-        {
-            get
-            {
-                var pos = (_control.GetVisualRoot() as IInputRoot)?.MouseDevice?.Position ?? default(Point);
-                return Util.Convert(pos);
-            }
-        }
-
-        private bool _leftMouseButton;
-        public override bool LeftMouseButton => (_control as HtmlControl)?.LeftMouseButton ?? false;
-
-        public override bool RightMouseButton
-        {
-            get
-            {
-                return false;
-                //TODO: Implement right mouse click
-                //return Mouse.RightButton == MouseButtonState.Pressed;
-            }
-        }
-
-        public override void SetCursorDefault()
-        {
-            _control.Cursor = new Cursor(StandardCursorType.Arrow);
-        }
-
-        public override void SetCursorHand()
-        {
-            _control.Cursor = new Cursor(StandardCursorType.Hand);
-        }
-
-        public override void SetCursorIBeam()
-        {
-            _control.Cursor = new Cursor(StandardCursorType.Ibeam);
-        }
-
-        public override void DoDragDropCopy(object dragDropData)
-        {
-            //TODO: Implement DragDropCopy
-            //DragDrop.DoDragDrop(_control, dragDropData, DragDropEffects.Copy);
-        }
-
-        public override void MeasureString(string str, RFont font, double maxWidth, out int charFit, out double charFitWidth)
-        {
-            using (var g = new GraphicsAdapter())
-            {
-                g.MeasureString(str, font, maxWidth, out charFit, out charFitWidth);
-            }
-        }
-
-        public override void Invalidate()
-        {
-            _control.InvalidateVisual();
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Adapters/FontAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/FontAdapter.cs
deleted file mode 100644
index 7e70967ac1..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/FontAdapter.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using Avalonia.Media;
-using TheArtOfDev.HtmlRenderer.Adapters;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia Font.
-    /// </summary>
-    internal sealed class FontAdapter : RFont
-    {
-        public RFontStyle Style { get; }
-
-        #region Fields and Consts
-
-
-        /// <summary>
-        /// the size of the font
-        /// </summary>
-        private readonly double _size;
-
-        /// <summary>
-        /// the vertical offset of the font underline location from the top of the font.
-        /// </summary>
-        private readonly double _underlineOffset = -1;
-
-        /// <summary>
-        /// Cached font height.
-        /// </summary>
-        private readonly double _height = -1;
-
-        /// <summary>
-        /// Cached font whitespace width.
-        /// </summary>
-        private double _whitespaceWidth = -1;
-        
-
-        #endregion
-
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        public FontAdapter(string fontFamily, double size, RFontStyle style)
-        {
-            Style = style;
-            Name = fontFamily;
-            _size = size;
-            //TODO: Somehow get proper line spacing and underlinePosition
-            var lineSpacing = 1;
-            var underlinePosition = 0;
-
-            _height = 96d / 72d * _size * lineSpacing;
-            _underlineOffset = 96d / 72d * _size * (lineSpacing + underlinePosition);
-
-        }
-
-        public string Name { get; set; }
-
-
-        public override double Size
-        {
-            get { return _size; }
-        }
-
-        public override double UnderlineOffset
-        {
-            get { return _underlineOffset; }
-        }
-
-        public override double Height
-        {
-            get { return _height; }
-        }
-
-        public override double LeftPadding
-        {
-            get { return _height / 6f; }
-        }
-
-        public override double GetWhitespaceWidth(RGraphics graphics)
-        {
-            if (_whitespaceWidth < 0)
-            {
-                _whitespaceWidth = graphics.MeasureString(" ", this).Width;
-            }
-            return _whitespaceWidth;
-        }
-
-        public FontStyle FontStyle => Style.HasFlag(RFontStyle.Italic) ? FontStyle.Italic : FontStyle.Normal;
-
-        public FontWeight Weight => Style.HasFlag(RFontStyle.Bold) ? FontWeight.Bold : FontWeight.Normal;
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Adapters/FontFamilyAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/FontFamilyAdapter.cs
deleted file mode 100644
index 063d8386ba..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/FontFamilyAdapter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using TheArtOfDev.HtmlRenderer.Adapters;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia Font family object for core.
-    /// </summary>
-    internal sealed class FontFamilyAdapter : RFontFamily
-    {
-        public FontFamilyAdapter(string fontFamily)
-        {
-            Name = fontFamily;
-        }
-        
-        public override string Name { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Adapters/GraphicsAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/GraphicsAdapter.cs
deleted file mode 100644
index 93f8790741..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/GraphicsAdapter.cs
+++ /dev/null
@@ -1,299 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Avalonia;
-using Avalonia.Media;
-using TheArtOfDev.HtmlRenderer.Adapters;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-using TheArtOfDev.HtmlRenderer.Core.Utils;
-using TheArtOfDev.HtmlRenderer.Avalonia.Utilities;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia Graphics.
-    /// </summary>
-    internal sealed class GraphicsAdapter : RGraphics
-    {
-        #region Fields and Consts
-
-        /// <summary>
-        /// The wrapped Avalonia graphics object
-        /// </summary>
-        private readonly DrawingContext _g;
-
-        /// <summary>
-        /// if to release the graphics object on dispose
-        /// </summary>
-        private readonly bool _releaseGraphics;
-
-        #endregion
-
-
-        private readonly Stack<IDisposable> _clipStack = new Stack<IDisposable>();
-
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        /// <param name="g">the Avalonia graphics object to use</param>
-        /// <param name="initialClip">the initial clip of the graphics</param>
-        /// <param name="releaseGraphics">optional: if to release the graphics object on dispose (default - false)</param>
-        public GraphicsAdapter(DrawingContext g, RRect initialClip, bool releaseGraphics = false)
-            : base(AvaloniaAdapter.Instance, initialClip)
-        {
-            ArgChecker.AssertArgNotNull(g, "g");
-
-            _g = g;
-            _releaseGraphics = releaseGraphics;
-        }
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        public GraphicsAdapter()
-            : base(AvaloniaAdapter.Instance, RRect.Empty)
-        {
-            _g = null;
-            _releaseGraphics = false;
-        }
-        
-        
-
-        public override void PopClip()
-        {
-            _clipStack.Pop()?.Dispose();
-        }
-
-        public override void PushClip(RRect rect)
-        {
-            _clipStack.Push(_g.PushClip(Util.Convert(rect)));
-            //_clipStack.Push(rect);
-            //_g.PushClip(new RectangleGeometry(Utils.Convert(rect)));
-        }
-
-        public override void PushClipExclude(RRect rect)
-        {
-            _clipStack.Push(null);
-
-            //TODO: Implement exclude rect, see #128
-            //var geometry = new CombinedGeometry();
-            //geometry.Geometry1 = new RectangleGeometry(Utils.Convert(_clipStack.Peek()));
-            //geometry.Geometry2 = new RectangleGeometry(Utils.Convert(rect));
-            //geometry.GeometryCombineMode = GeometryCombineMode.Exclude;
-
-            //_clipStack.Push(_clipStack.Peek());
-            //_g.PushClip(geometry);
-        }
-
-        public override Object SetAntiAliasSmoothingMode()
-        {
-            return null;
-        }
-
-        public override void ReturnPreviousSmoothingMode(Object prevMode)
-        { }
-
-        public override RSize MeasureString(string str, RFont font)
-        {
-            var text = GetText(str, font);
-            var measure = text.Measure();
-            return new RSize(measure.Width, measure.Height);
-            
-        }
-
-        FormattedText GetText(string str, RFont font)
-        {
-            var f = ((FontAdapter)font);
-            return new FormattedText
-            {
-                Text = str,
-                Typeface = new Typeface(f.Name, font.Size, f.FontStyle, f.Weight),
-            };
-        }
-
-        public override void MeasureString(string str, RFont font, double maxWidth, out int charFit, out double charFitWidth)
-        {
-            var text = GetText(str, font);
-            var fullLength = text.Measure().Width;
-            if (fullLength < maxWidth)
-            {
-                charFitWidth = fullLength;
-                charFit = str.Length;
-                return;
-            }
-
-            int lastLen = 0;
-            double lastMeasure = 0;
-            BinarySearch(len =>
-            {
-                text = GetText(str.Substring(0, len), font);
-                var size = text.Measure().Width;
-                lastMeasure = size;
-                lastLen = len;
-                if (size <= maxWidth)
-                    return -1;
-                return 1;
-
-            }, 0, str.Length);
-            if (lastMeasure > maxWidth)
-            {
-                lastLen--;
-                lastMeasure = GetText(str.Substring(0, lastLen), font).Measure().Width;
-            }
-            charFit = lastLen;
-            charFitWidth = lastMeasure;
-
-        }
-
-        private static int BinarySearch(Func<int, int> condition, int start, int end)
-        {
-            do
-            {
-                int ind = start + (end - start)/2;
-                int res = condition(ind);
-                if (res == 0)
-                    return ind;
-                else if (res > 0)
-                {
-                    if (start != ind)
-                        start = ind;
-                    else
-                        start = ind + 1;
-                }
-                else
-                    end = ind;
-
-            } while (end > start);
-            return -1;
-        }
-
-        public override void DrawString(string str, RFont font, RColor color, RPoint point, RSize size, bool rtl)
-        {
-            var text = GetText(str, font);
-            text.Constraint = Util.Convert(size);
-            _g.DrawText(new SolidColorBrush(Util.Convert(color)), Util.Convert(point), text);
-        }
-
-        public override RBrush GetTextureBrush(RImage image, RRect dstRect, RPoint translateTransformLocation)
-        {
-            //TODO: Implement texture brush
-            return AvaloniaAdapter.Instance.GetSolidBrush(Util.Convert(Colors.Magenta));
-
-            //var brush = new ImageBrush(((ImageAdapter)image).Image);
-            //brush.Stretch = Stretch.None;
-            //brush.TileMode = TileMode.Tile;
-            //brush.Viewport = Utils.Convert(dstRect);
-            //brush.ViewportUnits = BrushMappingMode.Absolute;
-            //brush.Transform = new TranslateTransform(translateTransformLocation.X, translateTransformLocation.Y);
-            //brush.Freeze();
-            //return new BrushAdapter(brush);
-        }
-        
-        public override RGraphicsPath GetGraphicsPath()
-        {
-            return new GraphicsPathAdapter();
-        }
-
-        public override void Dispose()
-        {
-            while (_clipStack.Count != 0)
-                PopClip();
-            if (_releaseGraphics)
-                _g.Dispose();
-        }
-
-    
-        #region Delegate graphics methods
-
-        public override void DrawLine(RPen pen, double x1, double y1, double x2, double y2)
-        {
-            x1 = (int)x1;
-            x2 = (int)x2;
-            y1 = (int)y1;
-            y2 = (int)y2;
-
-            var adj = pen.Width;
-            if (Math.Abs(x1 - x2) < .1 && Math.Abs(adj % 2 - 1) < .1)
-            {
-                x1 += .5;
-                x2 += .5;
-            }
-            if (Math.Abs(y1 - y2) < .1 && Math.Abs(adj % 2 - 1) < .1)
-            {
-                y1 += .5;
-                y2 += .5;
-            }
-
-            _g.DrawLine(((PenAdapter)pen).CreatePen(), new Point(x1, y1), new Point(x2, y2));
-        }
-        
-        public override void DrawRectangle(RPen pen, double x, double y, double width, double height)
-        {
-            var adj = pen.Width;
-            if (Math.Abs(adj % 2 - 1) < .1)
-            {
-                x += .5;
-                y += .5;
-            }
-            _g.DrawRectangle(((PenAdapter) pen).CreatePen(), new Rect(x, y, width, height));
-        }
-
-        public override void DrawRectangle(RBrush brush, double x, double y, double width, double height)
-        {
-            _g.FillRectangle(((BrushAdapter) brush).Brush, new Rect(x, y, width, height));
-        }
-
-        public override void DrawImage(RImage image, RRect destRect, RRect srcRect)
-        {
-            _g.DrawImage(((ImageAdapter) image).Image, 1, Util.Convert(srcRect), Util.Convert(destRect));
-        }
-
-        public override void DrawImage(RImage image, RRect destRect)
-        {
-            _g.DrawImage(((ImageAdapter) image).Image, 1, new Rect(0, 0, image.Width, image.Height),
-                Util.Convert(destRect));
-        }
-
-        public override void DrawPath(RPen pen, RGraphicsPath path)
-        {
-            _g.DrawGeometry(null, ((PenAdapter)pen).CreatePen(), ((GraphicsPathAdapter)path).GetClosedGeometry());
-        }
-
-        public override void DrawPath(RBrush brush, RGraphicsPath path)
-        {
-            _g.DrawGeometry(((BrushAdapter)brush).Brush, null, ((GraphicsPathAdapter)path).GetClosedGeometry());
-        }
-
-        public override void DrawPolygon(RBrush brush, RPoint[] points)
-        {
-            if (points != null && points.Length > 0)
-            {
-                var g = new StreamGeometry();
-                using (var context = g.Open())
-                {
-                    context.BeginFigure(Util.Convert(points[0]), true);
-                    for (int i = 1; i < points.Length; i++)
-                        context.LineTo(Util.Convert(points[i]));
-                    context.EndFigure(false);
-                }
-
-                _g.DrawGeometry(((BrushAdapter)brush).Brush, null, g);
-            }
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Adapters/GraphicsPathAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/GraphicsPathAdapter.cs
deleted file mode 100644
index f448c0ce09..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/GraphicsPathAdapter.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using Avalonia;
-using Avalonia.Media;
-using TheArtOfDev.HtmlRenderer.Adapters;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia graphics path object for core.
-    /// </summary>
-    internal sealed class GraphicsPathAdapter : RGraphicsPath
-    {
-        /// <summary>
-        /// The actual Avalonia graphics geometry instance.
-        /// </summary>
-        private readonly StreamGeometry _geometry = new StreamGeometry();
-
-        /// <summary>
-        /// The context used in Avalonia geometry to render path
-        /// </summary>
-        private readonly StreamGeometryContext _geometryContext;
-
-        public GraphicsPathAdapter()
-        {
-            _geometryContext = _geometry.Open();
-        }
-
-        public override void Start(double x, double y)
-        {
-            _geometryContext.BeginFigure(new Point(x, y), true);
-        }
-
-        public override void LineTo(double x, double y)
-        {
-            _geometryContext.LineTo(new Point(x, y));
-        }
-
-        public override void ArcTo(double x, double y, double size, Corner corner)
-        {
-            _geometryContext.ArcTo(new Point(x, y), new Size(size, size), 0, false, SweepDirection.Clockwise);
-        }
-
-        /// <summary>
-        /// Close the geometry to so no more path adding is allowed and return the instance so it can be rendered.
-        /// </summary>
-        public StreamGeometry GetClosedGeometry()
-        {
-            _geometryContext.EndFigure(true);
-            _geometryContext.Dispose();
-            return _geometry;
-        }
-
-        public override void Dispose()
-        { }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Adapters/ImageAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/ImageAdapter.cs
deleted file mode 100644
index 3ee0b40771..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/ImageAdapter.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using Avalonia.Media.Imaging;
-using TheArtOfDev.HtmlRenderer.Adapters;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia Image object for core.
-    /// </summary>
-    internal sealed class ImageAdapter : RImage
-    {
-        /// <summary>
-        /// the underline Avalonia image.
-        /// </summary>
-        private readonly Bitmap _image;
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        public ImageAdapter(Bitmap image)
-        {
-            _image = image;
-        }
-
-        /// <summary>
-        /// the underline Avalonia image.
-        /// </summary>
-        public Bitmap Image => _image;
-
-        public override double Width => _image.PixelWidth;
-
-        public override double Height => _image.PixelHeight;
-
-        public override void Dispose()
-        {
-            //TODO: Implement image disposal
-            /*if (_image.StreamSource != null)
-                _image.StreamSource.Dispose();*/
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Adapters/PenAdapter.cs b/src/Avalonia.HtmlRenderer/Adapters/PenAdapter.cs
deleted file mode 100644
index 42025afc63..0000000000
--- a/src/Avalonia.HtmlRenderer/Adapters/PenAdapter.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using System.Collections.Generic;
-using Avalonia.Media;
-using TheArtOfDev.HtmlRenderer.Adapters;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Adapters
-{
-    /// <summary>
-    /// Adapter for Avalonia pens objects for core.
-    /// </summary>
-    internal sealed class PenAdapter : RPen
-    {
-        /// <summary>
-        /// The actual Avalonia brush instance.
-        /// </summary>
-        private readonly IBrush _brush;
-
-        /// <summary>
-        /// the width of the pen
-        /// </summary>
-        private double _width;
-
-        private DashStyle _dashStyle;
-
-        /// <summary>
-        /// the dash style of the pen
-        /// </summary>
-        //private DashStyle _dashStyle = DashStyles.Solid;
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        public PenAdapter(IBrush brush)
-        {
-            _brush = brush;
-        }
-
-        public override double Width
-        {
-            get { return _width; }
-            set { _width = value; }
-        }
-
-        public override RDashStyle DashStyle
-        {
-            set { DashStyles.TryGetValue(value, out _dashStyle); }
-        }
-
-        private static readonly Dictionary<RDashStyle, DashStyle> DashStyles = new Dictionary<RDashStyle, DashStyle>
-        {
-            {RDashStyle.Solid,null },
-            {RDashStyle.Dash, global::Avalonia.Media.DashStyle.Dash },
-            {RDashStyle.DashDot, global::Avalonia.Media.DashStyle.DashDot },
-            {RDashStyle.DashDotDot, global::Avalonia.Media.DashStyle.DashDotDot },
-            {RDashStyle.Dot, global::Avalonia.Media.DashStyle.Dot }
-        };
-
-        /// <summary>
-        /// Create the actual Avalonia pen instance.
-        /// </summary>
-        public Pen CreatePen()
-        {
-            var pen = new Pen(_brush, _width, _dashStyle);
-            return pen;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
deleted file mode 100644
index 6e65264db0..0000000000
--- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj
+++ /dev/null
@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
-    <EnableDefaultItems>False</EnableDefaultItems>
-    <NoWarn>CS0436</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Content Include="external\Source\HtmlRenderer\Core\Utils\ImageError.png" />
-    <Content Include="external\Source\HtmlRenderer\Core\Utils\ImageLoad.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
-    <ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
-    <ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
-    <ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
-    <ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
-    <ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
-    <ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
-    <ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
-  </ItemGroup>
-  
-  <Import Project="..\..\build\Rx.props" />
-</Project>
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj.DotSettings b/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj.DotSettings
deleted file mode 100644
index 73e96563f9..0000000000
--- a/src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj.DotSettings
+++ /dev/null
@@ -1,2 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Compat/Api.cs b/src/Avalonia.HtmlRenderer/Compat/Api.cs
deleted file mode 100644
index d4f4c6abbe..0000000000
--- a/src/Avalonia.HtmlRenderer/Compat/Api.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace System.Net
-{
-    class WebException : Exception
-    {
-        public object Response { get; set; }
-    }
-
-    class HttpWebResponse
-    {
-        public HttpStatusCode StatusCode { get; set; }
-    }
-}
diff --git a/src/Avalonia.HtmlRenderer/Compat/Attributes.cs b/src/Avalonia.HtmlRenderer/Compat/Attributes.cs
deleted file mode 100644
index 311b2ae4e8..0000000000
--- a/src/Avalonia.HtmlRenderer/Compat/Attributes.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-internal class CategoryAttribute : Attribute
-{
-    public CategoryAttribute(string s)
-    {
-        
-    }
-}
-internal class DescriptionAttribute : Attribute
-{
-    public DescriptionAttribute(string s)
-    {
-
-    }
-}
-
-internal class BrowsableAttribute : Attribute
-{
-    public BrowsableAttribute(bool b)
-    {
-
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/Compat/ThreadPool.cs b/src/Avalonia.HtmlRenderer/Compat/ThreadPool.cs
deleted file mode 100644
index 9a664745a2..0000000000
--- a/src/Avalonia.HtmlRenderer/Compat/ThreadPool.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TheArtOfDev.HtmlRenderer.Core.Handlers;
-
-namespace System.Threading
-{
-    class ThreadPool
-    {
-        public static void QueueUserWorkItem(Action<object> cb, object state)
-        {
-            Task.Factory.StartNew(() => cb(state));
-        }
-
-        public static void QueueUserWorkItem(Action<object> cb)
-        {
-            Task.Factory.StartNew(() => cb(null));
-        }
-    }
-}
diff --git a/src/Avalonia.HtmlRenderer/HtmlContainer.cs b/src/Avalonia.HtmlRenderer/HtmlContainer.cs
deleted file mode 100644
index c3345589ce..0000000000
--- a/src/Avalonia.HtmlRenderer/HtmlContainer.cs
+++ /dev/null
@@ -1,471 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using System;
-using System.Collections.Generic;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.Html;
-using Avalonia.Input;
-using Avalonia.Media;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-using TheArtOfDev.HtmlRenderer.Core;
-using TheArtOfDev.HtmlRenderer.Core.Entities;
-using TheArtOfDev.HtmlRenderer.Core.Parse;
-using TheArtOfDev.HtmlRenderer.Core.Utils;
-using TheArtOfDev.HtmlRenderer.Avalonia.Adapters;
-using TheArtOfDev.HtmlRenderer.Avalonia.Utilities;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia
-{
-    /// <summary>
-    /// Low level handling of Html Renderer logic, this class is used by <see cref="HtmlParser"/>, 
-    /// <see cref="HtmlLabel"/>, <see cref="HtmlToolTip"/> and <see cref="HtmlRender"/>.<br/>
-    /// </summary>
-    /// <seealso cref="HtmlContainerInt"/>
-    public sealed class HtmlContainer : IDisposable
-    {
-        #region Fields and Consts
-
-        /// <summary>
-        /// The internal core html container
-        /// </summary>
-        private readonly HtmlContainerInt _htmlContainerInt;
-
-        #endregion
-
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        public HtmlContainer()
-        {
-            _htmlContainerInt = new HtmlContainerInt(AvaloniaAdapter.Instance);
-        }
-
-        /// <summary>
-        /// Raised when the set html document has been fully loaded.<br/>
-        /// Allows manipulation of the html dom, scroll position, etc.
-        /// </summary>
-        public event EventHandler LoadComplete
-        {
-            add { _htmlContainerInt.LoadComplete += value; }
-            remove { _htmlContainerInt.LoadComplete -= value; }
-        }
-
-        /// <summary>
-        /// Raised when the user clicks on a link in the html.<br/>
-        /// Allows canceling the execution of the link.
-        /// </summary>
-        public event EventHandler<HtmlLinkClickedEventArgs> LinkClicked
-        {
-            add { _htmlContainerInt.LinkClicked += value; }
-            remove { _htmlContainerInt.LinkClicked -= value; }
-        }
-
-        /// <summary>
-        /// Raised when html renderer requires refresh of the control hosting (invalidation and re-layout).
-        /// </summary>
-        /// <remarks>
-        /// There is no guarantee that the event will be raised on the main thread, it can be raised on thread-pool thread.
-        /// </remarks>
-        public event EventHandler<HtmlRefreshEventArgs> Refresh
-        {
-            add { _htmlContainerInt.Refresh += value; }
-            remove { _htmlContainerInt.Refresh -= value; }
-        }
-
-        /// <summary>
-        /// Raised when Html Renderer request scroll to specific location.<br/>
-        /// This can occur on document anchor click.
-        /// </summary>
-        public event EventHandler<HtmlScrollEventArgs> ScrollChange
-        {
-            add { _htmlContainerInt.ScrollChange += value; }
-            remove { _htmlContainerInt.ScrollChange -= value; }
-        }
-
-        /// <summary>
-        /// Raised when an error occurred during html rendering.<br/>
-        /// </summary>
-        /// <remarks>
-        /// There is no guarantee that the event will be raised on the main thread, it can be raised on thread-pool thread.
-        /// </remarks>
-        public event EventHandler<HtmlRenderErrorEventArgs> RenderError
-        {
-            add { _htmlContainerInt.RenderError += value; }
-            remove { _htmlContainerInt.RenderError -= value; }
-        }
-
-        /// <summary>
-        /// Raised when a stylesheet is about to be loaded by file path or URI by link element.<br/>
-        /// This event allows to provide the stylesheet manually or provide new source (file or Uri) to load from.<br/>
-        /// If no alternative data is provided the original source will be used.<br/>
-        /// </summary>
-        public event EventHandler<HtmlStylesheetLoadEventArgs> StylesheetLoad
-        {
-            add { _htmlContainerInt.StylesheetLoad += value; }
-            remove { _htmlContainerInt.StylesheetLoad -= value; }
-        }
-
-        /// <summary>
-        /// Raised when an image is about to be loaded by file path or URI.<br/>
-        /// This event allows to provide the image manually, if not handled the image will be loaded from file or download from URI.
-        /// </summary>
-        public event EventHandler<HtmlImageLoadEventArgs> ImageLoad
-        {
-            add { _htmlContainerInt.ImageLoad += value; }
-            remove { _htmlContainerInt.ImageLoad -= value; }
-        }
-
-        /// <summary>
-        /// The internal core html container
-        /// </summary>
-        internal HtmlContainerInt HtmlContainerInt
-        {
-            get { return _htmlContainerInt; }
-        }
-
-        /// <summary>
-        /// the parsed stylesheet data used for handling the html
-        /// </summary>
-        public CssData CssData
-        {
-            get { return _htmlContainerInt.CssData; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating if image asynchronous loading should be avoided (default - false).<br/>
-        /// True - images are loaded synchronously during html parsing.<br/>
-        /// False - images are loaded asynchronously to html parsing when downloaded from URL or loaded from disk.<br/>
-        /// </summary>
-        /// <remarks>
-        /// Asynchronously image loading allows to unblock html rendering while image is downloaded or loaded from disk using IO 
-        /// ports to achieve better performance.<br/>
-        /// Asynchronously image loading should be avoided when the full html content must be available during render, like render to image.
-        /// </remarks>
-        public bool AvoidAsyncImagesLoading
-        {
-            get { return _htmlContainerInt.AvoidAsyncImagesLoading; }
-            set { _htmlContainerInt.AvoidAsyncImagesLoading = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating if image loading only when visible should be avoided (default - false).<br/>
-        /// True - images are loaded as soon as the html is parsed.<br/>
-        /// False - images that are not visible because of scroll location are not loaded until they are scrolled to.
-        /// </summary>
-        /// <remarks>
-        /// Images late loading improve performance if the page contains image outside the visible scroll area, especially if there is large 
-        /// amount of images, as all image loading is delayed (downloading and loading into memory).<br/>
-        /// Late image loading may effect the layout and actual size as image without set size will not have actual size until they are loaded
-        /// resulting in layout change during user scroll.<br/>
-        /// Early image loading may also effect the layout if image without known size above the current scroll location are loaded as they
-        /// will push the html elements down.
-        /// </remarks>
-        public bool AvoidImagesLateLoading
-        {
-            get { return _htmlContainerInt.AvoidImagesLateLoading; }
-            set { _htmlContainerInt.AvoidImagesLateLoading = value; }
-        }
-
-        /// <summary>
-        /// Is content selection is enabled for the rendered html (default - true).<br/>
-        /// If set to 'false' the rendered html will be static only with ability to click on links.
-        /// </summary>
-        public bool IsSelectionEnabled
-        {
-            get { return _htmlContainerInt.IsSelectionEnabled; }
-            set { _htmlContainerInt.IsSelectionEnabled = value; }
-        }
-
-        /// <summary>
-        /// Is the build-in context menu enabled and will be shown on mouse right click (default - true)
-        /// </summary>
-        public bool IsContextMenuEnabled
-        {
-            get { return _htmlContainerInt.IsContextMenuEnabled; }
-            set { _htmlContainerInt.IsContextMenuEnabled = value; }
-        }
-
-        /// <summary>
-        /// The scroll offset of the html.<br/>
-        /// This will adjust the rendered html by the given offset so the content will be "scrolled".<br/>
-        /// </summary>
-        /// <example>
-        /// Element that is rendered at location (50,100) with offset of (0,200) will not be rendered as it
-        /// will be at -100 therefore outside the client Rect.
-        /// </example>
-        public Point ScrollOffset
-        {
-            get { return Util.Convert(_htmlContainerInt.ScrollOffset); }
-            set { _htmlContainerInt.ScrollOffset = Util.Convert(value); }
-        }
-
-        /// <summary>
-        /// The top-left most location of the rendered html.<br/>
-        /// This will offset the top-left corner of the rendered html.
-        /// </summary>
-        public Point Location
-        {
-            get { return Util.Convert(_htmlContainerInt.Location); }
-            set { _htmlContainerInt.Location = Util.Convert(value); }
-        }
-
-        /// <summary>
-        /// The max width and height of the rendered html.<br/>
-        /// The max width will effect the html layout wrapping lines, resize images and tables where possible.<br/>
-        /// The max height does NOT effect layout, but will not render outside it (clip).<br/>
-        /// <see cref="ActualSize"/> can be exceed the max size by layout restrictions (unwrappable line, set image size, etc.).<br/>
-        /// Set zero for unlimited (width\height separately).<br/>
-        /// </summary>
-        public Size MaxSize
-        {
-            get { return Util.Convert(_htmlContainerInt.MaxSize); }
-            set { _htmlContainerInt.MaxSize = Util.Convert(value); }
-        }
-
-        /// <summary>
-        /// The actual size of the rendered html (after layout)
-        /// </summary>
-        public Size ActualSize
-        {
-            get { return Util.Convert(_htmlContainerInt.ActualSize); }
-            internal set { _htmlContainerInt.ActualSize = Util.Convert(value); }
-        }
-
-        /// <summary>
-        /// Get the currently selected text segment in the html.
-        /// </summary>
-        public string SelectedText
-        {
-            get { return _htmlContainerInt.SelectedText; }
-        }
-
-        /// <summary>
-        /// Copy the currently selected html segment with style.
-        /// </summary>
-        public string SelectedHtml
-        {
-            get { return _htmlContainerInt.SelectedHtml; }
-        }
-
-        /// <summary>
-        /// Clear the current selection.
-        /// </summary>
-        public void ClearSelection()
-        {
-            HtmlContainerInt.ClearSelection();
-        }
-
-        /// <summary>
-        /// Init with optional document and stylesheet.
-        /// </summary>
-        /// <param name="htmlSource">the html to init with, init empty if not given</param>
-        /// <param name="baseCssData">optional: the stylesheet to init with, init default if not given</param>
-        public void SetHtml(string htmlSource, CssData baseCssData = null)
-        {
-            _htmlContainerInt.SetHtml(htmlSource, baseCssData);
-        }
-
-        /// <summary>
-        /// Clear the content of the HTML container releasing any resources used to render previously existing content.
-        /// </summary>
-        public void Clear()
-        {
-            _htmlContainerInt.Clear();
-        }
-
-        /// <summary>
-        /// Get html from the current DOM tree with style if requested.
-        /// </summary>
-        /// <param name="styleGen">Optional: controls the way styles are generated when html is generated (default: <see cref="HtmlGenerationStyle.Inline"/>)</param>
-        /// <returns>generated html</returns>
-        public string GetHtml(HtmlGenerationStyle styleGen = HtmlGenerationStyle.Inline)
-        {
-            return _htmlContainerInt.GetHtml(styleGen);
-        }
-
-        /// <summary>
-        /// Get attribute value of element at the given x,y location by given key.<br/>
-        /// If more than one element exist with the attribute at the location the inner most is returned.
-        /// </summary>
-        /// <param name="location">the location to find the attribute at</param>
-        /// <param name="attribute">the attribute key to get value by</param>
-        /// <returns>found attribute value or null if not found</returns>
-        public string GetAttributeAt(Point location, string attribute)
-        {
-            return _htmlContainerInt.GetAttributeAt(Util.Convert(location), attribute);
-        }
-
-        /// <summary>
-        /// Get all the links in the HTML with the element Rect and href data.
-        /// </summary>
-        /// <returns>collection of all the links in the HTML</returns>
-        public List<LinkElementData<Rect>> GetLinks()
-        {
-            var linkElements = new List<LinkElementData<Rect>>();
-            foreach (var link in HtmlContainerInt.GetLinks())
-            {
-                linkElements.Add(new LinkElementData<Rect>(link.Id, link.Href, Util.Convert(link.Rectangle)));
-            }
-            return linkElements;
-        }
-
-        /// <summary>
-        /// Get css link href at the given x,y location.
-        /// </summary>
-        /// <param name="location">the location to find the link at</param>
-        /// <returns>css link href if exists or null</returns>
-        public string GetLinkAt(Point location)
-        {
-            return _htmlContainerInt.GetLinkAt(Util.Convert(location));
-        }
-
-        /// <summary>
-        /// Get the Rect of html element as calculated by html layout.<br/>
-        /// Element if found by id (id attribute on the html element).<br/>
-        /// Note: to get the screen Rect you need to adjust by the hosting control.<br/>
-        /// </summary>
-        /// <param name="elementId">the id of the element to get its Rect</param>
-        /// <returns>the Rect of the element or null if not found</returns>
-        public Rect? GetElementRectangle(string elementId)
-        {
-            var r = _htmlContainerInt.GetElementRectangle(elementId);
-            return r.HasValue ? Util.Convert(r.Value) : (Rect?)null;
-        }
-
-        /// <summary>
-        /// Measures the bounds of box and children, recursively.
-        /// </summary>
-        public void PerformLayout()
-        {
-            using (var ig = new GraphicsAdapter())
-            {
-                _htmlContainerInt.PerformLayout(ig);
-            }
-        }
-
-        /// <summary>
-        /// Render the html using the given device.
-        /// </summary>
-        /// <param name="g">the device to use to render</param>
-        /// <param name="clip">the clip rectangle of the html container</param>
-        public void PerformPaint(DrawingContext g, Rect clip)
-        {
-            ArgChecker.AssertArgNotNull(g, "g");
-
-            using (var ig = new GraphicsAdapter(g, Util.Convert(clip)))
-            {
-                _htmlContainerInt.PerformPaint(ig);
-            }
-        }
-
-        /// <summary>
-        /// Handle mouse down to handle selection.
-        /// </summary>
-        /// <param name="parent">the control hosting the html to invalidate</param>
-        /// <param name="e">the mouse event args</param>
-        public void HandleLeftMouseDown(Control parent, PointerEventArgs e)
-        {
-            ArgChecker.AssertArgNotNull(parent, "parent");
-            ArgChecker.AssertArgNotNull(e, "e");
-            
-            _htmlContainerInt.HandleMouseDown(new ControlAdapter(parent), Util.Convert(e.GetPosition(parent)));
-        }
-
-        /// <summary>
-        /// Handle mouse up to handle selection and link click.
-        /// </summary>
-        /// <param name="parent">the control hosting the html to invalidate</param>
-        /// <param name="e">the mouse event args</param>
-        public void HandleLeftMouseUp(Control parent, PointerEventArgs e)
-        {
-            ArgChecker.AssertArgNotNull(parent, "parent");
-            ArgChecker.AssertArgNotNull(e, "e");
-
-            var mouseEvent = new RMouseEvent(true);
-            _htmlContainerInt.HandleMouseUp(new ControlAdapter(parent), Util.Convert(e.GetPosition(parent)), mouseEvent);
-        }
-
-        /// <summary>
-        /// Handle mouse double click to select word under the mouse.
-        /// </summary>
-        /// <param name="parent">the control hosting the html to set cursor and invalidate</param>
-        /// <param name="e">mouse event args</param>
-        public void HandleMouseDoubleClick(Control parent, PointerEventArgs e)
-        {
-            ArgChecker.AssertArgNotNull(parent, "parent");
-            ArgChecker.AssertArgNotNull(e, "e");
-
-            _htmlContainerInt.HandleMouseDoubleClick(new ControlAdapter(parent), Util.Convert(e.GetPosition(parent)));
-        }
-
-        /// <summary>
-        /// Handle mouse move to handle hover cursor and text selection.
-        /// </summary>
-        /// <param name="parent">the control hosting the html to set cursor and invalidate</param>
-        /// <param name="mousePos">the mouse event args</param>
-        public void HandleMouseMove(Control parent, Point mousePos)
-        {
-            ArgChecker.AssertArgNotNull(parent, "parent");
-
-            _htmlContainerInt.HandleMouseMove(new ControlAdapter(parent), Util.Convert(mousePos));
-        }
-
-        /// <summary>
-        /// Handle mouse leave to handle hover cursor.
-        /// </summary>
-        /// <param name="parent">the control hosting the html to set cursor and invalidate</param>
-        public void HandleMouseLeave(Control parent)
-        {
-            ArgChecker.AssertArgNotNull(parent, "parent");
-
-            _htmlContainerInt.HandleMouseLeave(new ControlAdapter(parent));
-        }
-
-        /// <summary>
-        /// Handle key down event for selection and copy.
-        /// </summary>
-        /// <param name="parent">the control hosting the html to invalidate</param>
-        /// <param name="e">the pressed key</param>
-        public void HandleKeyDown(Control parent, KeyEventArgs e)
-        {
-            ArgChecker.AssertArgNotNull(parent, "parent");
-            ArgChecker.AssertArgNotNull(e, "e");
-
-            _htmlContainerInt.HandleKeyDown(new ControlAdapter(parent), CreateKeyEevent(e));
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            _htmlContainerInt.Dispose();
-        }
-
-
-        #region Private methods
-
-        /// <summary>
-        /// Create HtmlRenderer key event from Avalonia key event.
-        /// </summary>
-        private static RKeyEvent CreateKeyEevent(KeyEventArgs e)
-        {
-            var control = (e.Modifiers & InputModifiers.Control) == InputModifiers.Control;
-            return new RKeyEvent(control, e.Key == Key.A, e.Key == Key.C);
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/HtmlControl.cs b/src/Avalonia.HtmlRenderer/HtmlControl.cs
deleted file mode 100644
index 94b2d56f5f..0000000000
--- a/src/Avalonia.HtmlRenderer/HtmlControl.cs
+++ /dev/null
@@ -1,616 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using System;
-using Avalonia.Controls.Primitives;
-using Avalonia.HtmlRenderer;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Media;
-using Avalonia.Threading;
-using Avalonia.VisualTree;
-using TheArtOfDev.HtmlRenderer.Core;
-using TheArtOfDev.HtmlRenderer.Core.Entities;
-using TheArtOfDev.HtmlRenderer.Avalonia;
-using TheArtOfDev.HtmlRenderer.Avalonia.Adapters;
-
-namespace Avalonia.Controls.Html
-{
-    /// <summary>
-    /// Provides HTML rendering using the text property.<br/>
-    /// Avalonia control that will render html content in it's client rectangle.<br/>
-    /// The control will handle mouse and keyboard events on it to support html text selection, copy-paste and mouse clicks.<br/>
-    /// <para>
-    /// The major differential to use HtmlPanel or HtmlLabel is size and scrollbars.<br/>
-    /// If the size of the control depends on the html content the HtmlLabel should be used.<br/>
-    /// If the size is set by some kind of layout then HtmlPanel is more suitable, also shows scrollbars if the html contents is larger than the control client rectangle.<br/>
-    /// </para>
-    /// <para>
-    /// <h4>LinkClicked event:</h4>
-    /// Raised when the user clicks on a link in the html.<br/>
-    /// Allows canceling the execution of the link.
-    /// </para>
-    /// <para>
-    /// <h4>StylesheetLoad event:</h4>
-    /// Raised when a stylesheet is about to be loaded by file path or URI by link element.<br/>
-    /// This event allows to provide the stylesheet manually or provide new source (file or uri) to load from.<br/>
-    /// If no alternative data is provided the original source will be used.<br/>
-    /// </para>
-    /// <para>
-    /// <h4>ImageLoad event:</h4>
-    /// Raised when an image is about to be loaded by file path or URI.<br/>
-    /// This event allows to provide the image manually, if not handled the image will be loaded from file or download from URI.
-    /// </para>
-    /// <para>
-    /// <h4>RenderError event:</h4>
-    /// Raised when an error occurred during html rendering.<br/>
-    /// </para>
-    /// </summary>
-    
-    public class HtmlControl : Control
-    {
-        /// <summary>
-        /// Underline html container instance.
-        /// </summary>
-        protected readonly HtmlContainer _htmlContainer;
-
-        /// <summary>
-        /// the base stylesheet data used in the control
-        /// </summary>
-        protected CssData _baseCssData;
-
-        /// <summary>
-        /// The last position of the scrollbars to know if it has changed to update mouse
-        /// </summary>
-        protected Point _lastScrollOffset;
-
-        public static readonly AvaloniaProperty AvoidImagesLateLoadingProperty = 
-            PropertyHelper.Register<HtmlControl, bool>(nameof(AvoidImagesLateLoading), false, OnAvaloniaProperty_valueChanged);
-        public static readonly AvaloniaProperty IsSelectionEnabledProperty =
-            PropertyHelper.Register<HtmlControl, bool>(nameof(IsSelectionEnabled), true, OnAvaloniaProperty_valueChanged);
-        public static readonly AvaloniaProperty IsContextMenuEnabledProperty =
-            PropertyHelper.Register<HtmlControl, bool>(nameof(IsContextMenuEnabled), true, OnAvaloniaProperty_valueChanged);
-
-        public static readonly AvaloniaProperty BaseStylesheetProperty =
-            PropertyHelper.Register<HtmlControl, string>(nameof(BaseStylesheet), null, OnAvaloniaProperty_valueChanged);
-
-        public static readonly AvaloniaProperty TextProperty =
-            PropertyHelper.Register<HtmlControl, string>(nameof(Text), null, OnAvaloniaProperty_valueChanged);
-
-        public static readonly StyledProperty<IBrush> BackgroundProperty =
-            Border.BackgroundProperty.AddOwner<HtmlControl>();
-
-        public static readonly AvaloniaProperty BorderThicknessProperty =
-            AvaloniaProperty.Register<HtmlControl, Thickness>(nameof(BorderThickness), new Thickness(0));
-
-        public static readonly AvaloniaProperty BorderBrushProperty =
-    AvaloniaProperty.Register<HtmlControl, IBrush>(nameof(BorderBrush));
-
-        public static readonly AvaloniaProperty PaddingProperty =
-            AvaloniaProperty.Register<HtmlControl, Thickness>(nameof(Padding), new Thickness(0));
-
-        public static readonly RoutedEvent LoadCompleteEvent =
-            RoutedEvent.Register<RoutedEventArgs>("LoadComplete",  RoutingStrategies.Bubble, typeof(HtmlControl));
-        public static readonly RoutedEvent LinkClickedEvent =
-            RoutedEvent.Register<HtmlRendererRoutedEventArgs<HtmlLinkClickedEventArgs>>("LinkClicked", RoutingStrategies.Bubble, typeof(HtmlControl));
-        public static readonly RoutedEvent RenderErrorEvent 
-            = RoutedEvent.Register<HtmlRendererRoutedEventArgs<HtmlRenderErrorEventArgs>>("RenderError", RoutingStrategies.Bubble, typeof(HtmlControl));
-        public static readonly RoutedEvent RefreshEvent 
-            = RoutedEvent.Register<HtmlRendererRoutedEventArgs<HtmlRefreshEventArgs>>("Refresh", RoutingStrategies.Bubble, typeof(HtmlControl));
-        public static readonly RoutedEvent StylesheetLoadEvent 
-            = RoutedEvent.Register<HtmlRendererRoutedEventArgs<HtmlStylesheetLoadEventArgs>>("StylesheetLoad", RoutingStrategies.Bubble, typeof(HtmlControl));
-
-        public static readonly RoutedEvent ImageLoadEvent
-            = RoutedEvent.Register<HtmlRendererRoutedEventArgs<HtmlImageLoadEventArgs>>("ImageLoad", RoutingStrategies.Bubble,
-                typeof (HtmlControl));
-
-        static HtmlControl()
-        {
-            FocusableProperty.OverrideDefaultValue(typeof(HtmlControl), true);
-        }
-
-        /// <summary>
-        /// Creates a new HtmlPanel and sets a basic css for it's styling.
-        /// </summary>
-        protected HtmlControl()
-        {
-            _htmlContainer = new HtmlContainer();
-            _htmlContainer.LoadComplete += (_, e) => OnLoadComplete(e);
-            _htmlContainer.LinkClicked += (_, e) => OnLinkClicked(e);
-            _htmlContainer.RenderError += (_, e) => OnRenderError(e);
-            _htmlContainer.Refresh += (_, e) => OnRefresh(e);
-            _htmlContainer.StylesheetLoad += (_, e) => OnStylesheetLoad(e);
-            _htmlContainer.ImageLoad += (_, e) => OnImageLoad(e);
-        }
-
-        //Hack for adapter
-        internal bool LeftMouseButton { get; private set; }
-
-        /// <summary>
-        /// Raised when the set html document has been fully loaded.<br/>
-        /// Allows manipulation of the html dom, scroll position, etc.
-        /// </summary>
-        public event EventHandler<HtmlRendererRoutedEventArgs<EventArgs>>  LoadComplete
-        {
-            add { AddHandler(LoadCompleteEvent, value); }
-            remove { RemoveHandler(LoadCompleteEvent, value); }
-        }
-
-        /// <summary>
-        /// Raised when the user clicks on a link in the html.<br/>
-        /// Allows canceling the execution of the link.
-        /// </summary>
-        public event EventHandler<HtmlRendererRoutedEventArgs<HtmlLinkClickedEventArgs>> LinkClicked
-        {
-            add { AddHandler(LinkClickedEvent, value); }
-            remove { RemoveHandler(LinkClickedEvent, value); }
-        }
-
-        /// <summary>
-        /// Raised when an error occurred during html rendering.<br/>
-        /// </summary>
-        public event EventHandler<HtmlRendererRoutedEventArgs<HtmlRenderErrorEventArgs>> RenderError
-        {
-            add { AddHandler(RenderErrorEvent, value); }
-            remove { RemoveHandler(RenderErrorEvent, value); }
-        }
-
-        /// <summary>
-        /// Raised when a stylesheet is about to be loaded by file path or URI by link element.<br/>
-        /// This event allows to provide the stylesheet manually or provide new source (file or uri) to load from.<br/>
-        /// If no alternative data is provided the original source will be used.<br/>
-        /// </summary>
-        public event EventHandler<HtmlRendererRoutedEventArgs<HtmlStylesheetLoadEventArgs>> StylesheetLoad
-        {
-            add { AddHandler(StylesheetLoadEvent, value); }
-            remove { RemoveHandler(StylesheetLoadEvent, value); }
-        }
-
-        /// <summary>
-        /// Raised when an image is about to be loaded by file path or URI.<br/>
-        /// This event allows to provide the image manually, if not handled the image will be loaded from file or download from URI.
-        /// </summary>
-        public event EventHandler<HtmlRendererRoutedEventArgs<HtmlImageLoadEventArgs>> ImageLoad
-        {
-            add { AddHandler(ImageLoadEvent, value); }
-            remove { RemoveHandler(ImageLoadEvent, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating if image loading only when visible should be avoided (default - false).<br/>
-        /// True - images are loaded as soon as the html is parsed.<br/>
-        /// False - images that are not visible because of scroll location are not loaded until they are scrolled to.
-        /// </summary>
-        /// <remarks>
-        /// Images late loading improve performance if the page contains image outside the visible scroll area, especially if there is large 
-        /// amount of images, as all image loading is delayed (downloading and loading into memory).<br/>
-        /// Late image loading may effect the layout and actual size as image without set size will not have actual size until they are loaded
-        /// resulting in layout change during user scroll.<br/>
-        /// Early image loading may also effect the layout if image without known size above the current scroll location are loaded as they
-        /// will push the html elements down.
-        /// </remarks>
-        [Category("Behavior")]
-        [Description("If image loading only when visible should be avoided")]
-        public bool AvoidImagesLateLoading
-        {
-            get { return (bool)GetValue(AvoidImagesLateLoadingProperty); }
-            set { SetValue(AvoidImagesLateLoadingProperty, value); }
-        }
-
-        /// <summary>
-        /// Is content selection is enabled for the rendered html (default - true).<br/>
-        /// If set to 'false' the rendered html will be static only with ability to click on links.
-        /// </summary>
-        [Category("Behavior")]
-        [Description("Is content selection is enabled for the rendered html.")]
-        public bool IsSelectionEnabled
-        {
-            get { return (bool)GetValue(IsSelectionEnabledProperty); }
-            set { SetValue(IsSelectionEnabledProperty, value); }
-        }
-
-        /// <summary>
-        /// Is the build-in context menu enabled and will be shown on mouse right click (default - true)
-        /// </summary>
-        [Category("Behavior")]
-        [Description("Is the build-in context menu enabled and will be shown on mouse right click.")]
-        public bool IsContextMenuEnabled
-        {
-            get { return (bool)GetValue(IsContextMenuEnabledProperty); }
-            set { SetValue(IsContextMenuEnabledProperty, value); }
-        }
-
-        /// <summary>
-        /// Set base stylesheet to be used by html rendered in the panel.
-        /// </summary>
-        [Category("Appearance")]
-        [Description("Set base stylesheet to be used by html rendered in the control.")]
-        public string BaseStylesheet
-        {
-            get { return (string)GetValue(BaseStylesheetProperty); }
-            set { SetValue(BaseStylesheetProperty, value); }
-        }
-
-        /// <summary>
-        /// Gets or sets the text of this panel
-        /// </summary>
-        [Description("Sets the html of this control.")]
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
-
-        public Thickness BorderThickness
-        {
-            get { return (Thickness) GetValue(BorderThicknessProperty); }
-            set { SetValue(BorderThicknessProperty, value); }
-        }
-
-        public IBrush BorderBrush
-        {
-            get { return (IBrush)GetValue(BorderBrushProperty); }
-            set { SetValue(BorderThicknessProperty, value); }
-        }
-
-        public Thickness Padding
-        {
-            get { return (Thickness)GetValue(PaddingProperty); }
-            set { SetValue(PaddingProperty, value); }
-        }
-
-        public IBrush Background
-        {
-            get { return (IBrush) GetValue(BackgroundProperty); }
-            set { SetValue(BackgroundProperty, value);}
-        }
-
-        /// <summary>
-        /// Get the currently selected text segment in the html.
-        /// </summary>
-        [Browsable(false)]
-        public virtual string SelectedText
-        {
-            get { return _htmlContainer.SelectedText; }
-        }
-
-        /// <summary>
-        /// Copy the currently selected html segment with style.
-        /// </summary>
-        [Browsable(false)]
-        public virtual string SelectedHtml
-        {
-            get { return _htmlContainer.SelectedHtml; }
-        }
-
-        /// <summary>
-        /// Get html from the current DOM tree with inline style.
-        /// </summary>
-        /// <returns>generated html</returns>
-        public virtual string GetHtml()
-        {
-            return _htmlContainer != null ? _htmlContainer.GetHtml() : null;
-        }
-
-        /// <summary>
-        /// Get the rectangle of html element as calculated by html layout.<br/>
-        /// Element if found by id (id attribute on the html element).<br/>
-        /// Note: to get the screen rectangle you need to adjust by the hosting control.<br/>
-        /// </summary>
-        /// <param name="elementId">the id of the element to get its rectangle</param>
-        /// <returns>the rectangle of the element or null if not found</returns>
-        public virtual Rect? GetElementRectangle(string elementId)
-        {
-            return _htmlContainer != null ? _htmlContainer.GetElementRectangle(elementId) : null;
-        }
-
-        /// <summary>
-        /// Clear the current selection.
-        /// </summary>
-        public void ClearSelection()
-        {
-            if (_htmlContainer != null)
-                _htmlContainer.ClearSelection();
-        }
-
-        
-
-        //HACK: We don't have support for RenderSize for now
-        private Size RenderSize => new Size(Bounds.Width, Bounds.Height);
-
-        
-        public override void Render(DrawingContext context)
-        {
-            context.FillRectangle(Background,  new Rect(RenderSize));
-
-            if (BorderThickness != new Thickness(0) && BorderBrush != null)
-            {
-                var brush = new SolidColorBrush(Colors.Black);
-                if (BorderThickness.Top > 0)
-                    context.FillRectangle(brush, new Rect(0, 0, RenderSize.Width, BorderThickness.Top));
-                if (BorderThickness.Bottom > 0)
-                    context.FillRectangle(brush, new Rect(0, RenderSize.Height - BorderThickness.Bottom, RenderSize.Width, BorderThickness.Bottom));
-                if (BorderThickness.Left > 0)
-                    context.FillRectangle(brush, new Rect(0, 0, BorderThickness.Left, RenderSize.Height));
-                if (BorderThickness.Right > 0)
-                    context.FillRectangle(brush, new Rect(RenderSize.Width - BorderThickness.Right, 0, BorderThickness.Right, RenderSize.Height));
-            }
-
-            var htmlWidth = HtmlWidth(RenderSize);
-            var htmlHeight = HtmlHeight(RenderSize);
-            if (_htmlContainer != null && htmlWidth > 0 && htmlHeight > 0)
-            {
-                /*
-                //TODO: Revert antialiasing fixes
-                var windows = Window.GetWindow(this);
-                if (windows != null)
-                {
-                    // adjust render location to round point so we won't get anti-alias smugness
-                    var wPoint = TranslatePoint(new Point(0, 0), windows);
-                    wPoint.Offset(-(int)wPoint.X, -(int)wPoint.Y);
-                    var xTrans = wPoint.X < .5 ? -wPoint.X : 1 - wPoint.X;
-                    var yTrans = wPoint.Y < .5 ? -wPoint.Y : 1 - wPoint.Y;
-                    context.PushTransform(new TranslateTransform(xTrans, yTrans));
-                }*/
-
-                using (context.PushClip(new Rect(Padding.Left + BorderThickness.Left, Padding.Top + BorderThickness.Top,
-                    htmlWidth, (int) htmlHeight)))
-                {
-                    _htmlContainer.Location = new Point(Padding.Left + BorderThickness.Left,
-                        Padding.Top + BorderThickness.Top);
-                    _htmlContainer.PerformPaint(context,
-                        new Rect(Padding.Left + BorderThickness.Left, Padding.Top + BorderThickness.Top, htmlWidth,
-                            htmlHeight));
-                }
-
-                if (!_lastScrollOffset.Equals(_htmlContainer.ScrollOffset))
-                {
-                    _lastScrollOffset = _htmlContainer.ScrollOffset;
-                    InvokeMouseMove();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Handle mouse move to handle hover cursor and text selection. 
-        /// </summary>
-        protected override void OnPointerMoved(PointerEventArgs e)
-        {
-            base.OnPointerMoved(e);
-            if (_htmlContainer != null)
-                _htmlContainer.HandleMouseMove(this, e.GetPosition(this));
-        }
-        /// <summary>
-        /// Handle mouse leave to handle cursor change.
-        /// </summary>
-        protected override void OnPointerLeave(PointerEventArgs e)
-        {
-            base.OnPointerLeave(e);
-            if (_htmlContainer != null)
-                _htmlContainer.HandleMouseLeave(this);
-        }
-
-        /// <summary>
-        /// Handle mouse down to handle selection. 
-        /// </summary>
-        protected override void OnPointerPressed(PointerPressedEventArgs e)
-        {
-            base.OnPointerPressed(e);
-            LeftMouseButton = true;
-            _htmlContainer?.HandleLeftMouseDown(this, e);
-        }
-
-        
-
-        /// <summary>
-        /// Handle mouse up to handle selection and link click. 
-        /// </summary>
-        protected override void OnPointerReleased(PointerReleasedEventArgs e)
-        {
-            base.OnPointerReleased(e);
-            LeftMouseButton = false;
-            if (_htmlContainer != null)
-                _htmlContainer.HandleLeftMouseUp(this, e);
-        }
-
-        //TODO: Implement double click
-        /*
-        /// <summary>
-        /// Handle mouse double click to select word under the mouse. 
-        /// </summary>
-        protected override void OnMouseDoubleClick(MouseButtonEventArgs e)
-        {
-            base.OnMouseDoubleClick(e);
-            if (_htmlContainer != null)
-                _htmlContainer.HandleMouseDoubleClick(this, e);
-        }
-        */
-        /// <summary>
-        /// Handle key down event for selection, copy and scrollbars handling.
-        /// </summary>
-        protected override void OnKeyDown(KeyEventArgs e)
-        {
-            base.OnKeyDown(e);
-            if (_htmlContainer != null)
-                _htmlContainer.HandleKeyDown(this, e);
-        }
-
-        void RaiseRouted<T>(RoutedEvent ev, T arg)
-        {
-            var e =new HtmlRendererRoutedEventArgs<T>
-            {
-                Event = arg,
-                Source = this,
-                RoutedEvent = ev,
-                Route = ev.RoutingStrategies
-            };
-            RaiseEvent(e);
-        }
-
-        /// <summary>
-        /// Propagate the LoadComplete event from root container.
-        /// </summary>
-        protected virtual void OnLoadComplete(EventArgs e) => RaiseRouted(LoadCompleteEvent, e);
-
-        /// <summary>
-        /// Propagate the LinkClicked event from root container.
-        /// </summary>
-        protected virtual void OnLinkClicked(HtmlLinkClickedEventArgs e) => RaiseRouted(LinkClickedEvent, e);
-
-        /// <summary>
-        /// Propagate the Render Error event from root container.
-        /// </summary>
-        protected virtual void OnRenderError(HtmlRenderErrorEventArgs e) => RaiseRouted(RenderErrorEvent, e);
-
-        /// <summary>
-        /// Propagate the stylesheet load event from root container.
-        /// </summary>
-        protected virtual void OnStylesheetLoad(HtmlStylesheetLoadEventArgs e) => RaiseRouted(StylesheetLoadEvent, e);
-
-        /// <summary>
-        /// Propagate the image load event from root container.
-        /// </summary>
-        protected virtual void OnImageLoad(HtmlImageLoadEventArgs e) => RaiseRouted(ImageLoadEvent, e);
-
-        /// <summary>
-        /// Handle html renderer invalidate and re-layout as requested.
-        /// </summary>
-        protected virtual void OnRefresh(HtmlRefreshEventArgs e)
-        {
-            if (e.Layout)
-                InvalidateMeasure();
-            InvalidateVisual();
-        }
-
-        /// <summary>
-        /// Get the width the HTML has to render in (not including vertical scroll iff it is visible)
-        /// </summary>
-        protected virtual double HtmlWidth(Size size)
-        {
-            return size.Width - Padding.Left - Padding.Right - BorderThickness.Left - BorderThickness.Right;
-        }
-
-        /// <summary>
-        /// Get the width the HTML has to render in (not including vertical scroll iff it is visible)
-        /// </summary>
-        protected virtual double HtmlHeight(Size size)
-        {
-            return size.Height - Padding.Top - Padding.Bottom - BorderThickness.Top - BorderThickness.Bottom;
-        }
-
-        /// <summary>
-        /// call mouse move to handle paint after scroll or html change affecting mouse cursor.
-        /// </summary>
-        protected virtual void InvokeMouseMove()
-        {
-
-            _htmlContainer.HandleMouseMove(this, (this.GetVisualRoot() as IInputRoot)?.MouseDevice?.GetPosition(this) ?? default(Point));
-        }
-
-        /// <summary>
-        /// Handle when dependency property value changes to update the underline HtmlContainer with the new value.
-        /// </summary>
-        private static void OnAvaloniaProperty_valueChanged(AvaloniaObject AvaloniaObject,
-            AvaloniaPropertyChangedEventArgs e)
-        {
-            var control = AvaloniaObject as HtmlControl;
-            if (control != null)
-            {
-                var htmlContainer = control._htmlContainer;
-                if (e.Property == AvoidImagesLateLoadingProperty)
-                {
-                    htmlContainer.AvoidImagesLateLoading = (bool) e.NewValue;
-                }
-                else if (e.Property == IsSelectionEnabledProperty)
-                {
-                    htmlContainer.IsSelectionEnabled = (bool) e.NewValue;
-                }
-                else if (e.Property == IsContextMenuEnabledProperty)
-                {
-                    htmlContainer.IsContextMenuEnabled = (bool) e.NewValue;
-                }
-                else if (e.Property == BaseStylesheetProperty)
-                {
-                    var baseCssData = CssData.Parse(AvaloniaAdapter.Instance, (string) e.NewValue);
-                    control._baseCssData = baseCssData;
-                    htmlContainer.SetHtml(control.Text, baseCssData);
-                }
-                else if (e.Property == TextProperty)
-                {
-                    htmlContainer.ScrollOffset = new Point(0, 0);
-                    htmlContainer.SetHtml((string) e.NewValue, control._baseCssData);
-                    control.InvalidateMeasure();
-                    control.InvalidateVisual();
-
-                    if (control.VisualRoot != null)
-                    {
-                        control.InvokeMouseMove();
-                    }
-                }
-            }
-        }
-
-
-        //TODO: Implement CheckAccess calls
-        /*
-        private void OnLoadComplete(object sender, EventArgs e)
-        {
-
-            if (CheckAccess())
-                OnLoadComplete(e);
-            else
-                Dispatcher.UIThread.Invoke(new Action<HtmlLinkClickedEventArgs>(OnLinkClicked), e);
-
-        }
-
-        private void OnLinkClicked(object sender, HtmlLinkClickedEventArgs e)
-        {
-            if (CheckAccess())
-                OnLinkClicked(e);
-            else
-                Dispatcher.UIThread.Invoke(new Action<HtmlLinkClickedEventArgs>(OnLinkClicked), e);
-        }
-
-        private void OnRenderError(object sender, HtmlRenderErrorEventArgs e)
-        {
-            if (CheckAccess())
-                OnRenderError(e);
-            else
-                Dispatcher.UIThread.Invoke(new Action<HtmlRenderErrorEventArgs>(OnRenderError), e);
-        }
-
-        private void OnStylesheetLoad(object sender, HtmlStylesheetLoadEventArgs e)
-        {
-            if (CheckAccess())
-                OnStylesheetLoad(e);
-            else
-                Dispatcher.UIThread.Invoke(new Action<HtmlStylesheetLoadEventArgs>(OnStylesheetLoad), e);
-        }
-
-        private void OnImageLoad(object sender, HtmlImageLoadEventArgs e)
-        {
-            if (CheckAccess())
-                OnImageLoad(e);
-            else
-                Dispatcher.UIThread.Invoke(new Action<HtmlImageLoadEventArgs>(OnImageLoad), e);
-        }
-
-        private void OnRefresh(object sender, HtmlRefreshEventArgs e)
-        {
-            if (CheckAccess())
-                OnRefresh(e);
-            else
-                Dispatcher.UIThread.Invoke(new Action<HtmlRefreshEventArgs>(OnRefresh), e);
-        }
-        */
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/HtmlLabel.cs b/src/Avalonia.HtmlRenderer/HtmlLabel.cs
deleted file mode 100644
index 547a3a10fa..0000000000
--- a/src/Avalonia.HtmlRenderer/HtmlLabel.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using System;
-using Avalonia.HtmlRenderer;
-using Avalonia.Media;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-using TheArtOfDev.HtmlRenderer.Core;
-using TheArtOfDev.HtmlRenderer.Avalonia.Adapters;
-
-namespace Avalonia.Controls.Html
-{
-    /// <summary>
-    /// Provides HTML rendering using the text property.<br/>
-    /// WPF control that will render html content in it's client rectangle.<br/>
-    /// Using <see cref="AutoSize"/> and <see cref="AutoSizeHeightOnly"/> client can control how the html content effects the
-    /// size of the label. Either case scrollbars are never shown and html content outside of client bounds will be clipped.
-    /// MaxWidth/MaxHeight and MinWidth/MinHeight with AutoSize can limit the max/min size of the control<br/>
-    /// The control will handle mouse and keyboard events on it to support html text selection, copy-paste and mouse clicks.<br/>
-    /// </summary>
-    /// <remarks>
-    /// See <see cref="HtmlControl"/> for more info.
-    /// </remarks>
-    public class HtmlLabel : HtmlControl
-    {
-        #region Dependency properties
-
-        public static readonly AvaloniaProperty AutoSizeProperty = PropertyHelper.Register<HtmlLabel, bool>("AutoSize", true, OnAvaloniaProperty_valueChanged);
-        public static readonly AvaloniaProperty AutoSizeHeightOnlyProperty = PropertyHelper.Register<HtmlLabel, bool>("AutoSizeHeightOnly", false, OnAvaloniaProperty_valueChanged);
-
-        #endregion
-
-
-        /// <summary>
-        /// Init.
-        /// </summary>
-        static HtmlLabel()
-        {
-            BackgroundProperty.OverrideDefaultValue<HtmlLabel>(Brushes.Transparent);
-        }
-
-        #region Private methods
-
-        /// <summary>
-        /// Perform the layout of the html in the control.
-        /// </summary>
-        protected override Size MeasureOverride(Size constraint)
-        {
-            if (_htmlContainer != null)
-            {
-                using (var ig = new GraphicsAdapter())
-                {
-                    var horizontal = Padding.Left + Padding.Right + BorderThickness.Left + BorderThickness.Right;
-                    var vertical = Padding.Top + Padding.Bottom + BorderThickness.Top + BorderThickness.Bottom;
-
-                    var size = new Size(Math.Min(MaxWidth, constraint.Width), Math.Min(MaxHeight, constraint.Height));
-                    var maxSize = new RSize(size.Width < Double.PositiveInfinity ? size.Width - horizontal : 0, size.Height < Double.PositiveInfinity ? size.Height - vertical : 0);
-                    _htmlContainer.HtmlContainerInt.MaxSize = maxSize;
-
-                    _htmlContainer.HtmlContainerInt.PerformLayout(ig);
-                    var newSize = _htmlContainer.ActualSize;
-                    constraint = new Size(newSize.Width + horizontal, newSize.Height + vertical);
-                }
-            }
-
-            if (double.IsPositiveInfinity(constraint.Width) || double.IsPositiveInfinity(constraint.Height))
-                constraint = Size.Empty;
-
-            return constraint;
-        }
-
-        /// <summary>
-        /// Handle when dependency property value changes to update the underline HtmlContainer with the new value.
-        /// </summary>
-        private static void OnAvaloniaProperty_valueChanged(AvaloniaObject AvaloniaObject, AvaloniaPropertyChangedEventArgs e)
-        {
-            var control = AvaloniaObject as HtmlLabel;
-            if (control != null)
-            {
-                if (e.Property == AutoSizeProperty)
-                {
-                    if ((bool)e.NewValue)
-                    {
-                        AvaloniaObject.SetValue(AutoSizeHeightOnlyProperty, false);
-                        control.InvalidateMeasure();
-                        control.InvalidateVisual();
-                    }
-                }
-                else if (e.Property == AutoSizeHeightOnlyProperty)
-                {
-                    if ((bool)e.NewValue)
-                    {
-                        AvaloniaObject.SetValue(AutoSizeProperty, false);
-                        control.InvalidateMeasure();
-                        control.InvalidateVisual();
-                    }
-                }
-            }
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/HtmlRendererRoutedEventArgs.cs b/src/Avalonia.HtmlRenderer/HtmlRendererRoutedEventArgs.cs
deleted file mode 100644
index 3136624b7f..0000000000
--- a/src/Avalonia.HtmlRenderer/HtmlRendererRoutedEventArgs.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Avalonia.Interactivity;
-
-namespace Avalonia.Controls.Html
-{
-    public class HtmlRendererRoutedEventArgs<T> : RoutedEventArgs
-    {
-        public T Event { get; set; }
-    }
-}
diff --git a/src/Avalonia.HtmlRenderer/Properties/AssemblyInfo.cs b/src/Avalonia.HtmlRenderer/Properties/AssemblyInfo.cs
deleted file mode 100644
index d77b5b900e..0000000000
--- a/src/Avalonia.HtmlRenderer/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Avalonia.Metadata;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Avalonia.HtmlRenderer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Avalonia.HtmlRenderer")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.Html")]
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/PropertyHelper.cs b/src/Avalonia.HtmlRenderer/PropertyHelper.cs
deleted file mode 100644
index 56257ed478..0000000000
--- a/src/Avalonia.HtmlRenderer/PropertyHelper.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Avalonia.HtmlRenderer
-{
-    static class PropertyHelper
-    {
-
-        public static AvaloniaProperty Register<TOwner, T>(string name, T def, Action<AvaloniaObject, AvaloniaPropertyChangedEventArgs> changed) where TOwner : AvaloniaObject
-        {
-            var pp = AvaloniaProperty.Register<TOwner, T>(name, def);
-            Action<AvaloniaPropertyChangedEventArgs> cb = args =>
-            {
-                changed(args.Sender, args);
-            };
-
-            pp.Changed.Subscribe(cb);
-            return pp;
-        }
-    }
-}
diff --git a/src/Avalonia.HtmlRenderer/Utilities/Util.cs b/src/Avalonia.HtmlRenderer/Utilities/Util.cs
deleted file mode 100644
index 3a19eaef92..0000000000
--- a/src/Avalonia.HtmlRenderer/Utilities/Util.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-// "Therefore those skilled at the unorthodox
-// are infinite as heaven and earth,
-// inexhaustible as the great rivers.
-// When they come to an end,
-// they begin again,
-// like the days and months;
-// they die and are reborn,
-// like the four seasons."
-// 
-// - Sun Tsu,
-// "The Art of War"
-
-using Avalonia;
-using Avalonia.Media;
-using TheArtOfDev.HtmlRenderer.Adapters.Entities;
-
-namespace TheArtOfDev.HtmlRenderer.Avalonia.Utilities
-{
-    /// <summary>
-    /// Utilities for converting WPF entities to HtmlRenderer core entities.
-    /// </summary>
-    internal static class Util
-    {
-        /// <summary>
-        /// Convert from WPF point to core point.
-        /// </summary>
-        public static RPoint Convert(Point p)
-        {
-            return new RPoint(p.X, p.Y);
-        }
-
-        /// <summary>
-        /// Convert from WPF point to core point.
-        /// </summary>
-        public static Point[] Convert(RPoint[] points)
-        {
-            Point[] myPoints = new Point[points.Length];
-            for (int i = 0; i < points.Length; i++)
-                myPoints[i] = Convert(points[i]);
-            return myPoints;
-        }
-
-        /// <summary>
-        /// Convert from core point to WPF point.
-        /// </summary>
-        public static Point Convert(RPoint p)
-        {
-            return new Point(p.X, p.Y);
-        }
-
-        /// <summary>
-        /// Convert from core point to WPF point.
-        /// </summary>
-        public static Point ConvertRound(RPoint p)
-        {
-            return new Point((int)p.X, (int)p.Y);
-        }
-
-        /// <summary>
-        /// Convert from WPF size to core size.
-        /// </summary>
-        public static RSize Convert(Size s)
-        {
-            return new RSize(s.Width, s.Height);
-        }
-
-        /// <summary>
-        /// Convert from core size to WPF size.
-        /// </summary>
-        public static Size Convert(RSize s)
-        {
-            return new Size(s.Width, s.Height);
-        }
-
-        /// <summary>
-        /// Convert from core point to WPF point.
-        /// </summary>
-        public static Size ConvertRound(RSize s)
-        {
-            return new Size((int)s.Width, (int)s.Height);
-        }
-
-        /// <summary>
-        /// Convert from WPF rectangle to core rectangle.
-        /// </summary>
-        public static RRect Convert(Rect r)
-        {
-            return new RRect(r.X, r.Y, r.Width, r.Height);
-        }
-
-        /// <summary>
-        /// Convert from core rectangle to WPF rectangle.
-        /// </summary>
-        public static Rect Convert(RRect r)
-        {
-            return new Rect(r.X, r.Y, r.Width, r.Height);
-        }
-
-        /// <summary>
-        /// Convert from core rectangle to WPF rectangle.
-        /// </summary>
-        public static Rect ConvertRound(RRect r)
-        {
-            return new Rect((int)r.X, (int)r.Y, (int)r.Width, (int)r.Height);
-        }
-
-        /// <summary>
-        /// Convert from WPF color to core color.
-        /// </summary>
-        public static RColor Convert(Color c)
-        {
-            return RColor.FromArgb(c.A, c.R, c.G, c.B);
-        }
-
-        /// <summary>
-        /// Convert from core color to WPF color.
-        /// </summary>
-        public static Color Convert(RColor c)
-        {
-            return Color.FromArgb(c.A, c.R, c.G, c.B);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Avalonia.HtmlRenderer/external b/src/Avalonia.HtmlRenderer/external
deleted file mode 160000
index 43df78f4d1..0000000000
--- a/src/Avalonia.HtmlRenderer/external
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 43df78f4d1bb09d05021f062cb15e939e3e1771d
diff --git a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
index cdca29a0fa..e85f1f657c 100644
--- a/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
+++ b/src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
@@ -140,10 +140,6 @@
       <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
       <Name>Avalonia.Diagnostics</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj">
-      <Project>{5fb2b005-0a7f-4dad-add4-3ed01444e63d}</Project>
-      <Name>Avalonia.HtmlRenderer</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj">
       <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project>
       <Name>Avalonia.Input</Name>
diff --git a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
index 5bb4b9dd4a..6ef1e1315e 100644
--- a/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
+++ b/src/tools/Avalonia.Designer.HostApp/Avalonia.Designer.HostApp.csproj
@@ -12,7 +12,6 @@
     <ProjectReference Include="..\..\Avalonia.Base\Avalonia.Base.csproj" />
     <ProjectReference Include="..\..\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj" />
-    <ProjectReference Include="..\..\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj" />
     <ProjectReference Include="..\..\Avalonia.Input\Avalonia.Input.csproj" />
     <ProjectReference Include="..\..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
     <ProjectReference Include="..\..\Avalonia.Layout\Avalonia.Layout.csproj" />

From 147b6bfe543a93415fc775340537ff28c4109690 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 28 May 2018 10:20:38 +0200
Subject: [PATCH 16/16] Convert brush to immutable brush.

Fixes #1613.
---
 src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs b/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
index 0f09a1827b..c3fe60e790 100644
--- a/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
+++ b/src/Windows/Avalonia.Direct2D1/Media/FormattedTextImpl.cs
@@ -101,7 +101,7 @@ namespace Avalonia.Direct2D1.Media
                 if (span.ForegroundBrush != null)
                 {
                     TextLayout.SetDrawingEffect(
-                        new BrushWrapper(span.ForegroundBrush),
+                        new BrushWrapper(span.ForegroundBrush.ToImmutable()),
                         new DWrite.TextRange(span.StartIndex, span.Length));
                 }
             }