diff --git a/SpiroNet.sln b/SpiroNet.sln
index b7b24c7..f3a660b 100644
--- a/SpiroNet.sln
+++ b/SpiroNet.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Wpf", "src\SpiroNet.Wpf\SpiroNet.Wpf.csproj", "{D06A68AB-E369-4EC5-860F-04F54D29077F}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet", "src\SpiroNet\SpiroNet.csproj", "{B2DEAB02-F231-4AA9-8879-0FD73096C60D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Editor", "src\SpiroNet.Editor\SpiroNet.Editor.csproj", "{4F0E9E3E-DA95-40B2-8FDE-22902388E90A}"
@@ -13,7 +11,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Json", "src\SpiroN
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.ViewModels", "src\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj", "{A4CD560C-4567-4889-AC1A-FE03E15FF75E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Avalonia", "src\SpiroNet.Avalonia\SpiroNet.Avalonia.csproj", "{B8DB18EB-3BE1-4344-812E-5B3B22D969A3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{14839D79-4183-4D13-A0C3-6E396D51FA9B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Avalonia", "samples\SpiroNet.Avalonia\SpiroNet.Avalonia.csproj", "{B8DB18EB-3BE1-4344-812E-5B3B22D969A3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpiroNet.Wpf", "samples\SpiroNet.Wpf\SpiroNet.Wpf.csproj", "{D06A68AB-E369-4EC5-860F-04F54D29077F}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{945E10EB-994A-4B19-884C-35B203D1991B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,4 +53,12 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{D06A68AB-E369-4EC5-860F-04F54D29077F} = {945E10EB-994A-4B19-884C-35B203D1991B}
+		{B2DEAB02-F231-4AA9-8879-0FD73096C60D} = {14839D79-4183-4D13-A0C3-6E396D51FA9B}
+		{4F0E9E3E-DA95-40B2-8FDE-22902388E90A} = {14839D79-4183-4D13-A0C3-6E396D51FA9B}
+		{DDAF7FA6-7EE3-4CF8-9800-25A2C9387AFC} = {14839D79-4183-4D13-A0C3-6E396D51FA9B}
+		{A4CD560C-4567-4889-AC1A-FE03E15FF75E} = {14839D79-4183-4D13-A0C3-6E396D51FA9B}
+		{B8DB18EB-3BE1-4344-812E-5B3B22D969A3} = {945E10EB-994A-4B19-884C-35B203D1991B}
+	EndGlobalSection
 EndGlobal
diff --git a/src/SpiroNet.Avalonia/App.config b/samples/SpiroNet.Avalonia/App.config
similarity index 100%
rename from src/SpiroNet.Avalonia/App.config
rename to samples/SpiroNet.Avalonia/App.config
diff --git a/src/SpiroNet.Avalonia/App.xaml b/samples/SpiroNet.Avalonia/App.xaml
similarity index 100%
rename from src/SpiroNet.Avalonia/App.xaml
rename to samples/SpiroNet.Avalonia/App.xaml
diff --git a/src/SpiroNet.Avalonia/App.xaml.cs b/samples/SpiroNet.Avalonia/App.xaml.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/App.xaml.cs
rename to samples/SpiroNet.Avalonia/App.xaml.cs
diff --git a/src/SpiroNet.Avalonia/Converters/EnumToBooleanConverter.cs b/samples/SpiroNet.Avalonia/Converters/EnumToBooleanConverter.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/Converters/EnumToBooleanConverter.cs
rename to samples/SpiroNet.Avalonia/Converters/EnumToBooleanConverter.cs
diff --git a/src/SpiroNet.Avalonia/Converters/ShapeToDataConverter.cs b/samples/SpiroNet.Avalonia/Converters/ShapeToDataConverter.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/Converters/ShapeToDataConverter.cs
rename to samples/SpiroNet.Avalonia/Converters/ShapeToDataConverter.cs
diff --git a/src/SpiroNet.Avalonia/MainWindow.xaml b/samples/SpiroNet.Avalonia/MainWindow.xaml
similarity index 100%
rename from src/SpiroNet.Avalonia/MainWindow.xaml
rename to samples/SpiroNet.Avalonia/MainWindow.xaml
diff --git a/src/SpiroNet.Avalonia/MainWindow.xaml.cs b/samples/SpiroNet.Avalonia/MainWindow.xaml.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/MainWindow.xaml.cs
rename to samples/SpiroNet.Avalonia/MainWindow.xaml.cs
diff --git a/src/SpiroNet.Avalonia/Program.cs b/samples/SpiroNet.Avalonia/Program.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/Program.cs
rename to samples/SpiroNet.Avalonia/Program.cs
diff --git a/src/SpiroNet.Avalonia/Properties/AssemblyInfo.cs b/samples/SpiroNet.Avalonia/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/Properties/AssemblyInfo.cs
rename to samples/SpiroNet.Avalonia/Properties/AssemblyInfo.cs
diff --git a/src/SpiroNet.Avalonia/Renderer/BasicStyleCache.cs b/samples/SpiroNet.Avalonia/Renderer/BasicStyleCache.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/Renderer/BasicStyleCache.cs
rename to samples/SpiroNet.Avalonia/Renderer/BasicStyleCache.cs
diff --git a/src/SpiroNet.Avalonia/Renderer/CanvasRenderer.cs b/samples/SpiroNet.Avalonia/Renderer/CanvasRenderer.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/Renderer/CanvasRenderer.cs
rename to samples/SpiroNet.Avalonia/Renderer/CanvasRenderer.cs
diff --git a/src/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj b/samples/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj
similarity index 86%
rename from src/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj
rename to samples/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj
index b371eaa..e084b1b 100644
--- a/src/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj
+++ b/samples/SpiroNet.Avalonia/SpiroNet.Avalonia.csproj
@@ -38,83 +38,83 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Avalonia.Animation, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Animation.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Animation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Base, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Base.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Base.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Cairo, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1697-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1705-alpha\lib\net45\Avalonia.Cairo.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Controls, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Controls.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Controls.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.DesignerSupport, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.DesignerSupport.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.DesignerSupport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Diagnostics, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Diagnostics.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Diagnostics.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Direct2D1, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1697-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1705-alpha\lib\net45\Avalonia.Direct2D1.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Avalonia.Gtk, Version=1.0.6035.26088, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1697-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
+    <Reference Include="Avalonia.Gtk, Version=1.0.6039.36629, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1705-alpha\lib\net45\Avalonia.Gtk.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.HtmlRenderer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.HtmlRenderer.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.HtmlRenderer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Input, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Input.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Input.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Interactivity, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Interactivity.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Interactivity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Layout, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Layout.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Layout.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Logging.Serilog, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Logging.Serilog.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Logging.Serilog.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Markup.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Markup.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Markup.Xaml, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Markup.Xaml.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Markup.Xaml.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.ReactiveUI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.ReactiveUI.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.ReactiveUI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.SceneGraph, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.SceneGraph.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.SceneGraph.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Styling, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Styling.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Styling.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Themes.Default, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.0.2.0.1697-alpha\lib\portable-windows8+net45\Avalonia.Themes.Default.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.0.2.0.1705-alpha\lib\portable-windows8+net45\Avalonia.Themes.Default.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Avalonia.Win32, Version=0.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1697-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
+      <HintPath>..\..\packages\Avalonia.Desktop.0.2.0.1705-alpha\lib\net45\Avalonia.Win32.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Serilog, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
@@ -197,20 +197,23 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SpiroNet.Editor\SpiroNet.Editor.csproj">
+    <ProjectReference Include="..\..\src\SpiroNet.Editor\SpiroNet.Editor.csproj">
       <Project>{4f0e9e3e-da95-40b2-8fde-22902388e90a}</Project>
       <Name>SpiroNet.Editor</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj">
+    <ProjectReference Include="..\..\src\SpiroNet.Json\SpiroNet.Json.csproj">
+      <Project>{ddaf7fa6-7ee3-4cf8-9800-25a2c9387afc}</Project>
+      <Name>SpiroNet.Json</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj">
       <Project>{a4cd560c-4567-4889-ac1a-fe03e15ff75e}</Project>
       <Name>SpiroNet.ViewModels</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SpiroNet\SpiroNet.csproj">
+    <ProjectReference Include="..\..\src\SpiroNet\SpiroNet.csproj">
       <Project>{b2deab02-f231-4aa9-8879-0fd73096c60d}</Project>
       <Name>SpiroNet</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <EmbeddedResource Include="MainWindow.xaml" />
   </ItemGroup>
diff --git a/src/SpiroNet.Avalonia/Views/EditorView.xaml b/samples/SpiroNet.Avalonia/Views/EditorView.xaml
similarity index 100%
rename from src/SpiroNet.Avalonia/Views/EditorView.xaml
rename to samples/SpiroNet.Avalonia/Views/EditorView.xaml
diff --git a/src/SpiroNet.Avalonia/Views/EditorView.xaml.cs b/samples/SpiroNet.Avalonia/Views/EditorView.xaml.cs
similarity index 100%
rename from src/SpiroNet.Avalonia/Views/EditorView.xaml.cs
rename to samples/SpiroNet.Avalonia/Views/EditorView.xaml.cs
diff --git a/src/SpiroNet.Avalonia/packages.config b/samples/SpiroNet.Avalonia/packages.config
similarity index 87%
rename from src/SpiroNet.Avalonia/packages.config
rename to samples/SpiroNet.Avalonia/packages.config
index 3f3bbe5..163e437 100644
--- a/src/SpiroNet.Avalonia/packages.config
+++ b/samples/SpiroNet.Avalonia/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Avalonia" version="0.2.0.1697-alpha" targetFramework="net45" />
-  <package id="Avalonia.Desktop" version="0.2.0.1697-alpha" targetFramework="net45" />
+  <package id="Avalonia" version="0.2.0.1705-alpha" targetFramework="net45" />
+  <package id="Avalonia.Desktop" version="0.2.0.1705-alpha" targetFramework="net45" />
   <package id="Serilog" version="1.5.14" targetFramework="net45" />
   <package id="SharpDX" version="3.0.2" targetFramework="net45" />
   <package id="SharpDX.Direct2D1" version="3.0.2" targetFramework="net45" />
diff --git a/src/SpiroNet.Wpf/App.config b/samples/SpiroNet.Wpf/App.config
similarity index 100%
rename from src/SpiroNet.Wpf/App.config
rename to samples/SpiroNet.Wpf/App.config
diff --git a/src/SpiroNet.Wpf/App.xaml b/samples/SpiroNet.Wpf/App.xaml
similarity index 100%
rename from src/SpiroNet.Wpf/App.xaml
rename to samples/SpiroNet.Wpf/App.xaml
diff --git a/src/SpiroNet.Wpf/App.xaml.cs b/samples/SpiroNet.Wpf/App.xaml.cs
similarity index 100%
rename from src/SpiroNet.Wpf/App.xaml.cs
rename to samples/SpiroNet.Wpf/App.xaml.cs
diff --git a/src/SpiroNet.Wpf/Converters/EnumToBooleanConverter.cs b/samples/SpiroNet.Wpf/Converters/EnumToBooleanConverter.cs
similarity index 100%
rename from src/SpiroNet.Wpf/Converters/EnumToBooleanConverter.cs
rename to samples/SpiroNet.Wpf/Converters/EnumToBooleanConverter.cs
diff --git a/src/SpiroNet.Wpf/Converters/ShapeToDataConverter.cs b/samples/SpiroNet.Wpf/Converters/ShapeToDataConverter.cs
similarity index 100%
rename from src/SpiroNet.Wpf/Converters/ShapeToDataConverter.cs
rename to samples/SpiroNet.Wpf/Converters/ShapeToDataConverter.cs
diff --git a/src/SpiroNet.Wpf/MainWindow.xaml b/samples/SpiroNet.Wpf/MainWindow.xaml
similarity index 100%
rename from src/SpiroNet.Wpf/MainWindow.xaml
rename to samples/SpiroNet.Wpf/MainWindow.xaml
diff --git a/src/SpiroNet.Wpf/MainWindow.xaml.cs b/samples/SpiroNet.Wpf/MainWindow.xaml.cs
similarity index 100%
rename from src/SpiroNet.Wpf/MainWindow.xaml.cs
rename to samples/SpiroNet.Wpf/MainWindow.xaml.cs
diff --git a/src/SpiroNet.Wpf/Properties/AssemblyInfo.cs b/samples/SpiroNet.Wpf/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/SpiroNet.Wpf/Properties/AssemblyInfo.cs
rename to samples/SpiroNet.Wpf/Properties/AssemblyInfo.cs
diff --git a/src/SpiroNet.Wpf/Properties/Resources.Designer.cs b/samples/SpiroNet.Wpf/Properties/Resources.Designer.cs
similarity index 100%
rename from src/SpiroNet.Wpf/Properties/Resources.Designer.cs
rename to samples/SpiroNet.Wpf/Properties/Resources.Designer.cs
diff --git a/src/SpiroNet.Wpf/Properties/Resources.resx b/samples/SpiroNet.Wpf/Properties/Resources.resx
similarity index 100%
rename from src/SpiroNet.Wpf/Properties/Resources.resx
rename to samples/SpiroNet.Wpf/Properties/Resources.resx
diff --git a/src/SpiroNet.Wpf/Properties/Settings.Designer.cs b/samples/SpiroNet.Wpf/Properties/Settings.Designer.cs
similarity index 100%
rename from src/SpiroNet.Wpf/Properties/Settings.Designer.cs
rename to samples/SpiroNet.Wpf/Properties/Settings.Designer.cs
diff --git a/src/SpiroNet.Wpf/Properties/Settings.settings b/samples/SpiroNet.Wpf/Properties/Settings.settings
similarity index 100%
rename from src/SpiroNet.Wpf/Properties/Settings.settings
rename to samples/SpiroNet.Wpf/Properties/Settings.settings
diff --git a/src/SpiroNet.Wpf/Renderer/BasicStyleCache.cs b/samples/SpiroNet.Wpf/Renderer/BasicStyleCache.cs
similarity index 100%
rename from src/SpiroNet.Wpf/Renderer/BasicStyleCache.cs
rename to samples/SpiroNet.Wpf/Renderer/BasicStyleCache.cs
diff --git a/src/SpiroNet.Wpf/Renderer/CanvasRenderer.cs b/samples/SpiroNet.Wpf/Renderer/CanvasRenderer.cs
similarity index 100%
rename from src/SpiroNet.Wpf/Renderer/CanvasRenderer.cs
rename to samples/SpiroNet.Wpf/Renderer/CanvasRenderer.cs
diff --git a/src/SpiroNet.Wpf/Scripts/arc-tagged.txt b/samples/SpiroNet.Wpf/Scripts/arc-tagged.txt
similarity index 100%
rename from src/SpiroNet.Wpf/Scripts/arc-tagged.txt
rename to samples/SpiroNet.Wpf/Scripts/arc-tagged.txt
diff --git a/src/SpiroNet.Wpf/Scripts/arc.txt b/samples/SpiroNet.Wpf/Scripts/arc.txt
similarity index 100%
rename from src/SpiroNet.Wpf/Scripts/arc.txt
rename to samples/SpiroNet.Wpf/Scripts/arc.txt
diff --git a/src/SpiroNet.Wpf/Scripts/circle-tagged.txt b/samples/SpiroNet.Wpf/Scripts/circle-tagged.txt
similarity index 100%
rename from src/SpiroNet.Wpf/Scripts/circle-tagged.txt
rename to samples/SpiroNet.Wpf/Scripts/circle-tagged.txt
diff --git a/src/SpiroNet.Wpf/Scripts/circle.txt b/samples/SpiroNet.Wpf/Scripts/circle.txt
similarity index 100%
rename from src/SpiroNet.Wpf/Scripts/circle.txt
rename to samples/SpiroNet.Wpf/Scripts/circle.txt
diff --git a/src/SpiroNet.Wpf/Scripts/circles.txt b/samples/SpiroNet.Wpf/Scripts/circles.txt
similarity index 100%
rename from src/SpiroNet.Wpf/Scripts/circles.txt
rename to samples/SpiroNet.Wpf/Scripts/circles.txt
diff --git a/src/SpiroNet.Wpf/Scripts/line-tagged.txt b/samples/SpiroNet.Wpf/Scripts/line-tagged.txt
similarity index 100%
rename from src/SpiroNet.Wpf/Scripts/line-tagged.txt
rename to samples/SpiroNet.Wpf/Scripts/line-tagged.txt
diff --git a/src/SpiroNet.Wpf/Scripts/line.txt b/samples/SpiroNet.Wpf/Scripts/line.txt
similarity index 100%
rename from src/SpiroNet.Wpf/Scripts/line.txt
rename to samples/SpiroNet.Wpf/Scripts/line.txt
diff --git a/src/SpiroNet.Wpf/Scripts/plate-tagged.txt b/samples/SpiroNet.Wpf/Scripts/plate-tagged.txt
similarity index 100%
rename from src/SpiroNet.Wpf/Scripts/plate-tagged.txt
rename to samples/SpiroNet.Wpf/Scripts/plate-tagged.txt
diff --git a/src/SpiroNet.Wpf/SpiroNet.Wpf.csproj b/samples/SpiroNet.Wpf/SpiroNet.Wpf.csproj
similarity index 92%
rename from src/SpiroNet.Wpf/SpiroNet.Wpf.csproj
rename to samples/SpiroNet.Wpf/SpiroNet.Wpf.csproj
index 0b8f87f..c28cd29 100644
--- a/src/SpiroNet.Wpf/SpiroNet.Wpf.csproj
+++ b/samples/SpiroNet.Wpf/SpiroNet.Wpf.csproj
@@ -108,15 +108,19 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SpiroNet.Editor\SpiroNet.Editor.csproj">
+    <ProjectReference Include="..\..\src\SpiroNet.Editor\SpiroNet.Editor.csproj">
       <Project>{4f0e9e3e-da95-40b2-8fde-22902388e90a}</Project>
       <Name>SpiroNet.Editor</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj">
+    <ProjectReference Include="..\..\src\SpiroNet.Json\SpiroNet.Json.csproj">
+      <Project>{ddaf7fa6-7ee3-4cf8-9800-25a2c9387afc}</Project>
+      <Name>SpiroNet.Json</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\SpiroNet.ViewModels\SpiroNet.ViewModels.csproj">
       <Project>{a4cd560c-4567-4889-ac1a-fe03e15ff75e}</Project>
       <Name>SpiroNet.ViewModels</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SpiroNet\SpiroNet.csproj">
+    <ProjectReference Include="..\..\src\SpiroNet\SpiroNet.csproj">
       <Project>{b2deab02-f231-4aa9-8879-0fd73096c60d}</Project>
       <Name>SpiroNet</Name>
     </ProjectReference>
diff --git a/src/SpiroNet.Wpf/Views/EditorView.xaml b/samples/SpiroNet.Wpf/Views/EditorView.xaml
similarity index 100%
rename from src/SpiroNet.Wpf/Views/EditorView.xaml
rename to samples/SpiroNet.Wpf/Views/EditorView.xaml
diff --git a/src/SpiroNet.Wpf/Views/EditorView.xaml.cs b/samples/SpiroNet.Wpf/Views/EditorView.xaml.cs
similarity index 100%
rename from src/SpiroNet.Wpf/Views/EditorView.xaml.cs
rename to samples/SpiroNet.Wpf/Views/EditorView.xaml.cs
diff --git a/src/SpiroNet.Json/SpiroNet.Json.csproj b/src/SpiroNet.Json/SpiroNet.Json.csproj
index 4ce5130..cb5c531 100644
--- a/src/SpiroNet.Json/SpiroNet.Json.csproj
+++ b/src/SpiroNet.Json/SpiroNet.Json.csproj
@@ -39,8 +39,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.8.0.3\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/src/SpiroNet.Json/packages.config b/src/SpiroNet.Json/packages.config
index 5f2fa4d..f31afc7 100644
--- a/src/SpiroNet.Json/packages.config
+++ b/src/SpiroNet.Json/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.3" targetFramework="portable45-net45+win8" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="portable45-net45+win8" />
 </packages>
\ No newline at end of file