diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/Assets/AboutAssets.txt b/tests/Plugin.Settings.NUnitTest.Android/Assets/AboutAssets.txt
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/Assets/AboutAssets.txt
rename to tests/Plugin.Settings.NUnitTest.Android/Assets/AboutAssets.txt
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/MainActivity.cs b/tests/Plugin.Settings.NUnitTest.Android/MainActivity.cs
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/MainActivity.cs
rename to tests/Plugin.Settings.NUnitTest.Android/MainActivity.cs
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/Refractored.Xam.Settings.NUnitTest.Android.csproj b/tests/Plugin.Settings.NUnitTest.Android/Plugin.Settings.NUnitTest.Android.csproj
similarity index 88%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/Refractored.Xam.Settings.NUnitTest.Android.csproj
rename to tests/Plugin.Settings.NUnitTest.Android/Plugin.Settings.NUnitTest.Android.csproj
index 3265cee..aacff48 100644
--- a/tests/Refractored.Xam.Settings.NUnitTest.Android/Refractored.Xam.Settings.NUnitTest.Android.csproj
+++ b/tests/Plugin.Settings.NUnitTest.Android/Plugin.Settings.NUnitTest.Android.csproj
@@ -61,9 +61,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
-    <Compile Include="TestSample.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Tests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
@@ -79,17 +79,17 @@
     <Content Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Abstractions\Refractored.Xam.Settings.Abstractions.csproj">
+    <ProjectReference Include="..\..\src\Plugin.Settings.Abstractions\Plugin.Settings.Abstractions.csproj">
       <Project>{d12d6afa-0696-4177-9c85-ec576277ef8e}</Project>
-      <Name>Refractored.Xam.Settings.Abstractions</Name>
+      <Name>Plugin.Settings.Abstractions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Android\Refractored.Xam.Settings.Android.csproj">
+    <ProjectReference Include="..\..\src\Plugin.Settings.Android\Plugin.Settings.Android.csproj">
       <Project>{91b25a78-62c8-41aa-8d22-da326a5ea64d}</Project>
-      <Name>Refractored.Xam.Settings.Android</Name>
+      <Name>Plugin.Settings.Android</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Tests.Portable\Refractored.Xam.Settings.Tests.Portable.csproj">
+    <ProjectReference Include="..\Plugin.Settings.Tests.Portable\Plugin.Settings.Tests.Portable.csproj">
       <Project>{2961bec8-6e97-4943-af17-491e25309619}</Project>
-      <Name>Refractored.Xam.Settings.Tests.Portable</Name>
+      <Name>Plugin.Settings.Tests.Portable</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/Properties/AndroidManifest.xml b/tests/Plugin.Settings.NUnitTest.Android/Properties/AndroidManifest.xml
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/Properties/AndroidManifest.xml
rename to tests/Plugin.Settings.NUnitTest.Android/Properties/AndroidManifest.xml
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/Properties/AssemblyInfo.cs b/tests/Plugin.Settings.NUnitTest.Android/Properties/AssemblyInfo.cs
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/Properties/AssemblyInfo.cs
rename to tests/Plugin.Settings.NUnitTest.Android/Properties/AssemblyInfo.cs
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/Resources/AboutResources.txt b/tests/Plugin.Settings.NUnitTest.Android/Resources/AboutResources.txt
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/Resources/AboutResources.txt
rename to tests/Plugin.Settings.NUnitTest.Android/Resources/AboutResources.txt
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/Resources/Resource.Designer.cs b/tests/Plugin.Settings.NUnitTest.Android/Resources/Resource.Designer.cs
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/Resources/Resource.Designer.cs
rename to tests/Plugin.Settings.NUnitTest.Android/Resources/Resource.Designer.cs
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/Resources/drawable/Icon.png b/tests/Plugin.Settings.NUnitTest.Android/Resources/drawable/Icon.png
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/Resources/drawable/Icon.png
rename to tests/Plugin.Settings.NUnitTest.Android/Resources/drawable/Icon.png
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/Resources/values/Strings.xml b/tests/Plugin.Settings.NUnitTest.Android/Resources/values/Strings.xml
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/Resources/values/Strings.xml
rename to tests/Plugin.Settings.NUnitTest.Android/Resources/values/Strings.xml
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.Android/TestSample.cs b/tests/Plugin.Settings.NUnitTest.Android/TestSample.cs
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.Android/TestSample.cs
rename to tests/Plugin.Settings.NUnitTest.Android/TestSample.cs
diff --git a/tests/Plugin.Settings.NUnitTest.Android/Tests.cs b/tests/Plugin.Settings.NUnitTest.Android/Tests.cs
new file mode 100644
index 0000000..f7a6c41
--- /dev/null
+++ b/tests/Plugin.Settings.NUnitTest.Android/Tests.cs
@@ -0,0 +1,183 @@
+using System;
+using NUnit.Framework;
+using Plugin.Settings.Tests.Portable.Helpers;
+
+
+namespace Plugin.Settings.NUnitTest
+{
+    [TestFixture]
+    public class TestsSample
+    {
+
+        [SetUp]
+        public void Setup() { }
+
+
+        [TearDown]
+        public void Tear() { }
+
+        [Test]
+        public void Int64()
+        {
+            Int64 test = 10;
+
+            TestSettings.Int64Setting = test;
+            Assert.True(TestSettings.Int64Setting == test, "Int64 not saved");
+        }
+
+        [Test]
+        public void Clear()
+        {
+            Int64 test = 10;
+
+            TestSettings.Int64Setting = test;
+            Assert.True(TestSettings.Int64Setting == test, "Int64 not saved");
+
+            TestSettings.AppSettings.Clear();
+
+            Assert.IsFalse(TestSettings.AppSettings.Contains("int64_setting"), "Setting was not removed");
+        }
+
+        [Test]
+        public void ContainsKey()
+        {
+            Int64 test = 10;
+
+            Assert.IsFalse(TestSettings.AppSettings.Contains("int64_setting"), "Default value was not false");
+
+            TestSettings.Int64Setting = test;
+
+            Assert.IsTrue(TestSettings.AppSettings.Contains("int64_setting"), "Default value was not false");
+
+        }
+
+
+        [Test]
+        public void Int32()
+        {
+            Int32 test = 10;
+
+            TestSettings.Int32Setting = test;
+            Assert.True(TestSettings.Int32Setting == test, "Int32 not saved");
+        }
+
+
+        [Test]
+        public void Int()
+        {
+            int test = 10;
+
+            TestSettings.IntSetting = test;
+            Assert.True(TestSettings.IntSetting == test, "Int not saved");
+        }
+
+        [Test]
+        public void Bool()
+        {
+            var test = true;
+
+            TestSettings.BoolSetting = test;
+            Assert.True(TestSettings.BoolSetting == test, "Bool not saved");
+        }
+
+        [Test]
+        public void Double()
+        {
+            double test = 10.001;
+
+            TestSettings.DoubleSetting = test;
+            Assert.True(TestSettings.DoubleSetting == test, "Double not saved");
+        }
+
+        [Test]
+        public void Double_Zero()
+        {
+            double test = 0.0D;
+
+            TestSettings.DoubleSetting = test;
+            Assert.True(TestSettings.DoubleSetting == test, "Double not saved");
+        }
+
+        [Test]
+        public void Double_Max()
+        {
+            double test = double.MaxValue;
+
+            TestSettings.DoubleSetting = test;
+            Assert.True(TestSettings.DoubleSetting == test, "Double not saved");
+        }
+
+        [Test]
+        public void Double_Min()
+        {
+            double test = double.MinValue;
+
+            TestSettings.DoubleSetting = test;
+            Assert.True(TestSettings.DoubleSetting == test, "Double not saved");
+        }
+
+        [Test]
+        public void Decimal()
+        {
+            decimal test = 0.099M;
+
+            TestSettings.DecimalSetting = test;
+            Assert.True(TestSettings.DecimalSetting == test, "Decimal not saved");
+        }
+
+        [Test]
+        public void DateTime()
+        {
+
+            DateTime test = new DateTime(1986, 6, 25, 4, 0, 0).ToUniversalTime();
+
+            TestSettings.DateTimeSetting = test;
+            Assert.True(TestSettings.DateTimeSetting.Value.Ticks == test.Ticks, "DateTime not saved");
+        }
+
+        [Test]
+        public void Guid()
+        {
+            Guid test = new Guid("EFFB4B96-92F3-4551-9732-36B11DC8B051");
+
+            TestSettings.GuidSetting = test;
+            Assert.True(TestSettings.GuidSetting.ToString() == test.ToString(), "Guid not saved");
+        }
+
+
+        [Test]
+        public void AddRemove()
+        {
+            TestSettings.StringSetting = "Hello World";
+
+            TestSettings.DateTimeSetting = null;
+
+            Assert.IsTrue(TestSettings.DateTimeSetting.HasValue, "Date wasn't set to null, it is: " + TestSettings.StringSetting);
+
+
+
+            TestSettings.Remove("date_setting");
+
+            Assert.IsFalse(TestSettings.DateTimeSetting.HasValue, "String should be back to default of string.empty, it is: " + TestSettings.StringSetting);
+        }
+
+        [Test]
+        public void Upgrade140To150TestAddAndUpdate()
+        {
+            //old value was stored as a long to test
+            TestSettings.AppSettings.AddOrUpdateValue("test1", (long)100);
+            //new value is stored as a string via decimal
+            TestSettings.AppSettings.AddOrUpdateValue("test1", (decimal)100.01M);
+
+            Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<decimal>("test1", (decimal)100.02M) == (decimal)100.01M, "Decimal did not upgrade correctly");
+
+
+            //old value was stored as a long to test
+            TestSettings.AppSettings.AddOrUpdateValue("test2", (long)100);
+            TestSettings.AppSettings.AddOrUpdateValue("test2", (double)100.01);
+
+            Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<double>("test2", (double)100.02) == (double)100.01, "Double did not upgrade correctly");
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/AppDelegate.cs b/tests/Plugin.Settings.NUnitTest.iOS/AppDelegate.cs
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/AppDelegate.cs
rename to tests/Plugin.Settings.NUnitTest.iOS/AppDelegate.cs
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Info.plist b/tests/Plugin.Settings.NUnitTest.iOS/Info.plist
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Info.plist
rename to tests/Plugin.Settings.NUnitTest.iOS/Info.plist
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Main.cs b/tests/Plugin.Settings.NUnitTest.iOS/Main.cs
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Main.cs
rename to tests/Plugin.Settings.NUnitTest.iOS/Main.cs
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Refractored.Xam.Settings.NUnitTest.iOS.csproj b/tests/Plugin.Settings.NUnitTest.iOS/Plugin.Settings.NUnitTest.iOS.csproj
similarity index 68%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOS/Refractored.Xam.Settings.NUnitTest.iOS.csproj
rename to tests/Plugin.Settings.NUnitTest.iOS/Plugin.Settings.NUnitTest.iOS.csproj
index bc9d026..953a2b5 100644
--- a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Refractored.Xam.Settings.NUnitTest.iOS.csproj
+++ b/tests/Plugin.Settings.NUnitTest.iOS/Plugin.Settings.NUnitTest.iOS.csproj
@@ -3,14 +3,12 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{38DD1031-7DA2-4F7D-B6EF-060317B34950}</ProjectGuid>
-    <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
-    <RootNamespace>Refractored.Xam.Settings.NUnitTest.iOS</RootNamespace>
+    <RootNamespace>Refractored.Xam.Settings.NUnitTest.iOSUnified</RootNamespace>
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>RefractoredXamSettingsNUnitTestiOS</AssemblyName>
+    <AssemblyName>RefractoredXamSettingsNUnitTestiOSUnified</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,8 +19,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -30,8 +30,15 @@
     <OutputPath>bin\iPhoneSimulator\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
     <MtouchLink>None</MtouchLink>
+    <MtouchArch>i386, x86_64</MtouchArch>
+    <ConsolePause>false</ConsolePause>
+    <CodesignEntitlements>
+    </CodesignEntitlements>
+    <CodesignKey>iPhone Developer</CodesignKey>
+    <CodesignProvision />
+    <CodesignResourceRules />
+    <CodesignExtraArgs />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,21 +49,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchDebug>False</MtouchDebug>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchSdkVersion>8.1</MtouchSdkVersion>
-    <MtouchLink>SdkOnly</MtouchLink>
-    <MtouchProfiling>False</MtouchProfiling>
-    <MtouchExtraArgs />
-    <MtouchFastDev>False</MtouchFastDev>
-    <MtouchEnableGenericValueTypeSharing>True</MtouchEnableGenericValueTypeSharing>
-    <MtouchArch>Default, ARMv7</MtouchArch>
-    <MtouchUseLlvm>False</MtouchUseLlvm>
-    <MtouchUseThumb>False</MtouchUseThumb>
-    <MtouchUseSGen>False</MtouchUseSGen>
-    <MtouchUseRefCounting>False</MtouchUseRefCounting>
-    <MtouchOptimizePNGs>False</MtouchOptimizePNGs>
-    <MtouchI18n />
+    <MtouchDebug>true</MtouchDebug>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -64,6 +59,8 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
   </PropertyGroup>
@@ -74,8 +71,11 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <CodesignKey>iPhone Distribution</CodesignKey>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <BuildIpa>True</BuildIpa>
+    <CodesignProvision>Automatic:AdHoc</CodesignProvision>
+    <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
     <DebugType>none</DebugType>
@@ -84,11 +84,14 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+    <CodesignProvision>Automatic:AppStore</CodesignProvision>
     <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Refractored.Xam.Settings.NUnitTest.Android\TestSample.cs">
-      <Link>TestSample.cs</Link>
+    <Compile Include="..\Plugin.Settings.NUnitTest.Android\Tests.cs">
+      <Link>Tests.cs</Link>
     </Compile>
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />
@@ -107,21 +110,23 @@
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
-    <Reference Include="monotouch" />
+    <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Abstractions\Refractored.Xam.Settings.Abstractions.csproj">
+    <ProjectReference Include="..\..\src\Plugin.Settings.Abstractions\Plugin.Settings.Abstractions.csproj">
       <Project>{d12d6afa-0696-4177-9c85-ec576277ef8e}</Project>
-      <Name>Refractored.Xam.Settings.Abstractions</Name>
+      <Name>Plugin.Settings.Abstractions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings.iOS\Refractored.Xam.Settings.iOS.csproj">
-      <Project>{c598e2c2-e094-42b7-a8d7-be83e1c72c86}</Project>
-      <Name>Refractored.Xam.Settings.iOS</Name>
+    <ProjectReference Include="..\..\src\Plugin.Settings.iOSUnified\Plugin.Settings.iOSUnified.csproj">
+      <Project>{fcf19725-8c2f-44c5-aa52-513ee32469e2}</Project>
+      <Name>Plugin.Settings.iOSUnified</Name>
+      <IsAppExtension>false</IsAppExtension>
+      <IsWatchApp>false</IsWatchApp>
     </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Tests.Portable\Refractored.Xam.Settings.Tests.Portable.csproj">
+    <ProjectReference Include="..\Plugin.Settings.Tests.Portable\Plugin.Settings.Tests.Portable.csproj">
       <Project>{2961bec8-6e97-4943-af17-491e25309619}</Project>
-      <Name>Refractored.Xam.Settings.Tests.Portable</Name>
+      <Name>Plugin.Settings.Tests.Portable</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.MonoTouch.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Properties/AssemblyInfo.cs b/tests/Plugin.Settings.NUnitTest.iOS/Properties/AssemblyInfo.cs
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Properties/AssemblyInfo.cs
rename to tests/Plugin.Settings.NUnitTest.iOS/Properties/AssemblyInfo.cs
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Refractored.Xam.Settings.NUnitTest.iOSUnified.csproj b/tests/Plugin.Settings.NUnitTest.iOS/Refractored.Xam.Settings.NUnitTest.iOSUnified.csproj
similarity index 88%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Refractored.Xam.Settings.NUnitTest.iOSUnified.csproj
rename to tests/Plugin.Settings.NUnitTest.iOS/Refractored.Xam.Settings.NUnitTest.iOSUnified.csproj
index dc92915..67f47a8 100644
--- a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Refractored.Xam.Settings.NUnitTest.iOSUnified.csproj
+++ b/tests/Plugin.Settings.NUnitTest.iOS/Refractored.Xam.Settings.NUnitTest.iOSUnified.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
-    <ProjectGuid>{0C283E74-8FEF-4441-A9B4-708DC70C3E35}</ProjectGuid>
+    <ProjectGuid>{38DD1031-7DA2-4F7D-B6EF-060317B34950}</ProjectGuid>
     <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <RootNamespace>Refractored.Xam.Settings.NUnitTest.iOSUnified</RootNamespace>
@@ -91,9 +91,6 @@
     <CodesignKey>iPhone Distribution</CodesignKey>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\Refractored.Xam.Settings.NUnitTest.Android\TestSample.cs">
-      <Link>TestSample.cs</Link>
-    </Compile>
     <Compile Include="Main.cs" />
     <Compile Include="AppDelegate.cs" />
     <None Include="Info.plist" />
@@ -114,18 +111,14 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Abstractions\Refractored.Xam.Settings.Abstractions.csproj">
+    <ProjectReference Include="..\..\src\Plugin.Settings.Abstractions\Plugin.Settings.Abstractions.csproj">
       <Project>{d12d6afa-0696-4177-9c85-ec576277ef8e}</Project>
       <Name>Refractored.Xam.Settings.Abstractions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings.iOSUnified\Refractored.Xam.Settings.iOSUnified.csproj">
+    <ProjectReference Include="..\..\src\Plugin.Settings.iOSUnified\Plugin.Settings.iOSUnified.csproj">
       <Project>{fcf19725-8c2f-44c5-aa52-513ee32469e2}</Project>
       <Name>Refractored.Xam.Settings.iOSUnified</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Tests.Portable\Refractored.Xam.Settings.Tests.Portable.csproj">
-      <Project>{2961bec8-6e97-4943-af17-491e25309619}</Project>
-      <Name>Refractored.Xam.Settings.Tests.Portable</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Resources/Default-568h@2x.png b/tests/Plugin.Settings.NUnitTest.iOS/Resources/Default-568h@2x.png
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOS/Resources/Default-568h@2x.png
rename to tests/Plugin.Settings.NUnitTest.iOS/Resources/Default-568h@2x.png
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Resources/Default.png b/tests/Plugin.Settings.NUnitTest.iOS/Resources/Default.png
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOS/Resources/Default.png
rename to tests/Plugin.Settings.NUnitTest.iOS/Resources/Default.png
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Resources/Default@2x.png b/tests/Plugin.Settings.NUnitTest.iOS/Resources/Default@2x.png
similarity index 100%
rename from tests/Refractored.Xam.Settings.NUnitTest.iOS/Resources/Default@2x.png
rename to tests/Plugin.Settings.NUnitTest.iOS/Resources/Default@2x.png
diff --git a/tests/Plugin.Settings.Tests.Portable/Helpers/TestSettings.cs b/tests/Plugin.Settings.Tests.Portable/Helpers/TestSettings.cs
new file mode 100644
index 0000000..bdf7e1a
--- /dev/null
+++ b/tests/Plugin.Settings.Tests.Portable/Helpers/TestSettings.cs
@@ -0,0 +1,164 @@
+// Helpers/Settings.cs
+using Plugin.Settings.Abstractions;
+using System;
+
+namespace Plugin.Settings.Tests.Portable.Helpers
+{
+    /// <summary>
+    /// This is the Settings static class that can be used in your Core solution or in any
+    /// of your client applications. All settings are laid out the same exact way with getters
+    /// and setters. 
+    /// </summary>
+    public static class TestSettings
+    {
+        public static ISettings AppSettings
+        {
+            get
+            {
+                return CrossSettings.Current;
+            }
+        }
+
+        #region Setting Constants
+
+        public const string SettingsKey = "settings_key";
+        private static readonly string SettingsDefault = string.Empty;
+
+        #endregion
+
+        public static Guid GuidSetting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault("guid_setting", Guid.Empty);
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue("guid_setting", value);
+            }
+        }
+
+        public static decimal DecimalSetting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault("decimal_setting", (decimal)0);
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue("decimal_setting", value);
+            }
+        }
+
+        public static int IntSetting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault("int_setting", (int)0);
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue("int_setting", value);
+            }
+        }
+
+        public static float FloatSetting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault("float_setting", (float)0);
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue("float_setting", value);
+            }
+        }
+
+        public static Int64 Int64Setting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault("int64_setting", (Int64)0);
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue("int64_setting", value);
+            }
+        }
+
+        public static Int32 Int32Setting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault("int32_setting", (Int32)0);
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue("int32_setting", value);
+            }
+        }
+
+        public static DateTime? DateTimeSetting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault<DateTime?>("date_setting");
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue("date_setting", value);
+            }
+        }
+
+        public static double DoubleSetting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault("double_setting", (double)0);
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue("double_setting", value);
+            }
+        }
+
+        public static bool BoolSetting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault("bool_setting", false);
+            }
+            set
+            {
+                AppSettings.AddOrUpdateValue("bool_setting", value);
+            }
+        }
+
+        public static string StringSetting
+        {
+            get
+            {
+                return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault);
+            }
+            set
+            {
+                //if value has changed then save it!
+                AppSettings.AddOrUpdateValue(SettingsKey, value);
+            }
+        }
+
+        public static void Remove(string key)
+        {
+            AppSettings.Remove(key);
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.Tests.Portable/Refractored.Xam.Settings.Tests.Portable.csproj b/tests/Plugin.Settings.Tests.Portable/Plugin.Settings.Tests.Portable.csproj
similarity index 89%
rename from tests/Refractored.Xam.Settings.Tests.Portable/Refractored.Xam.Settings.Tests.Portable.csproj
rename to tests/Plugin.Settings.Tests.Portable/Plugin.Settings.Tests.Portable.csproj
index d1846d0..6b4801f 100644
--- a/tests/Refractored.Xam.Settings.Tests.Portable/Refractored.Xam.Settings.Tests.Portable.csproj
+++ b/tests/Plugin.Settings.Tests.Portable/Plugin.Settings.Tests.Portable.csproj
@@ -37,13 +37,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Abstractions\Refractored.Xam.Settings.Abstractions.csproj">
+    <ProjectReference Include="..\..\src\Plugin.Settings.Abstractions\Plugin.Settings.Abstractions.csproj">
       <Project>{d12d6afa-0696-4177-9c85-ec576277ef8e}</Project>
-      <Name>Refractored.Xam.Settings.Abstractions</Name>
+      <Name>Plugin.Settings.Abstractions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings\Refractored.Xam.Settings.csproj">
+    <ProjectReference Include="..\..\src\Plugin.Settings\Plugin.Settings.csproj">
       <Project>{747706f4-ecbf-4d50-8d72-b0ddcc18395c}</Project>
-      <Name>Refractored.Xam.Settings</Name>
+      <Name>Plugin.Settings</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
diff --git a/tests/Refractored.Xam.Settings.Tests.Portable/Properties/AssemblyInfo.cs b/tests/Plugin.Settings.Tests.Portable/Properties/AssemblyInfo.cs
similarity index 100%
rename from tests/Refractored.Xam.Settings.Tests.Portable/Properties/AssemblyInfo.cs
rename to tests/Plugin.Settings.Tests.Portable/Properties/AssemblyInfo.cs
diff --git a/tests/Plugin.Settings.Tests/Plugin.Settings.Tests.projitems b/tests/Plugin.Settings.Tests/Plugin.Settings.Tests.projitems
new file mode 100644
index 0000000..eb9b1d7
--- /dev/null
+++ b/tests/Plugin.Settings.Tests/Plugin.Settings.Tests.projitems
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>bf22d037-a5fc-4f7e-81fb-9bd8a3b04c7c</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Plugin.Settings.Tests</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Tests.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/tests/Plugin.Settings.Tests/Plugin.Settings.Tests.shproj b/tests/Plugin.Settings.Tests/Plugin.Settings.Tests.shproj
new file mode 100644
index 0000000..db74b07
--- /dev/null
+++ b/tests/Plugin.Settings.Tests/Plugin.Settings.Tests.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>bf22d037-a5fc-4f7e-81fb-9bd8a3b04c7c</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Plugin.Settings.Tests.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/tests/Plugin.Settings.Tests/Tests.cs b/tests/Plugin.Settings.Tests/Tests.cs
new file mode 100644
index 0000000..63b49be
--- /dev/null
+++ b/tests/Plugin.Settings.Tests/Tests.cs
@@ -0,0 +1,158 @@
+using System;
+using NUnit.Framework;
+using Plugin.Settings.Tests.Portable.Helpers;
+
+
+namespace Plugin.Settings.NUnitTest
+{
+  [TestFixture]
+  public class TestsSample
+  {
+
+    [SetUp]
+    public void Setup() { }
+
+
+    [TearDown]
+    public void Tear() { }
+
+    [Test]
+    public void Int64()
+    {
+      Int64 test = 10;
+
+      TestSettings.Int64Setting = test;
+      Assert.True(TestSettings.Int64Setting == test, "Int64 not saved");
+    }
+
+
+    [Test]
+    public void Int32()
+    {
+      Int32 test = 10;
+
+      TestSettings.Int32Setting = test;
+      Assert.True(TestSettings.Int32Setting == test, "Int32 not saved");
+    }
+
+
+    [Test]
+    public void Int()
+    {
+      int test = 10;
+
+      TestSettings.IntSetting = test;
+      Assert.True(TestSettings.IntSetting == test, "Int not saved");
+    }
+
+    [Test]
+    public void Bool()
+    {
+      var test = true;
+
+      TestSettings.BoolSetting = test;
+      Assert.True(TestSettings.BoolSetting == test, "Bool not saved");
+    }
+
+    [Test]
+    public void Double()
+    {
+      double test = 10.001;
+
+      TestSettings.DoubleSetting = test;
+      Assert.True(TestSettings.DoubleSetting == test, "Double not saved");
+    }
+
+    [Test]
+    public void Decimal()
+    {
+      decimal test = 0.099M;
+
+      TestSettings.DecimalSetting = test;
+      Assert.True(TestSettings.DecimalSetting == test, "Decimal not saved");
+    }
+
+    [Test]
+    public void DateTime()
+    {
+      
+      DateTime test = new DateTime(1986, 6, 25, 4, 0, 0);
+
+      TestSettings.DateTimeSetting = test;
+      Assert.True(TestSettings.DateTimeSetting.Value.Ticks == test.Ticks, "DateTime not saved");
+    }
+
+    [Test]
+    public void Guid()
+    {
+      Guid test = new Guid("EFFB4B96-92F3-4551-9732-36B11DC8B051");
+
+      TestSettings.GuidSetting = test;
+      Assert.True(TestSettings.GuidSetting.ToString() == test.ToString(), "Guid not saved");
+    }
+
+
+    [Test]
+    public void AddRemove()
+    {
+      TestSettings.StringSetting = "Hello World";
+
+      TestSettings.DateTimeSetting = null;
+
+      Assert.IsTrue(TestSettings.DateTimeSetting.HasValue, "Date wasn't set to null, it is: " + TestSettings.StringSetting);
+
+
+
+      TestSettings.Remove("date_setting");
+
+      Assert.IsFalse(TestSettings.DateTimeSetting.HasValue, "String should be back to default of string.empty, it is: " + TestSettings.StringSetting);
+    }
+
+    [Test]
+    public void Upgrade140To150Test()
+    {
+      //old value was stored as a long to test
+      TestSettings.AppSettings.AddOrUpdateValue("test1", (long)100);
+
+      Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<decimal>("test1", (decimal)101.01M) == (decimal)100M, "Decimal did not upgrade correctly");
+      Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<decimal>("test1", (decimal)101.01M) == (decimal)100M, "Decimal did not upgrade correctly");
+
+
+      //new value is stored as a string via decimal
+      TestSettings.AppSettings.AddOrUpdateValue("test1", (decimal)100.01M);
+
+      Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<decimal>("test1", (decimal)100.02M) == (decimal)100.01M, "Decimal did not upgrade correctly");
+
+
+      //old value was stored as a long to test
+      TestSettings.AppSettings.AddOrUpdateValue("test2", (long)100);
+
+      Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<double>("test2", (double)101) == (double)100, "Double did not upgrade correctly");
+      Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<double>("test2", (double)101) == (double)100, "Double did not upgrade correctly");
+    
+      //new value is stored as a string via decimal
+      TestSettings.AppSettings.AddOrUpdateValue("test2", (double)100.01);
+
+      Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<double>("test2", (double)100.02) == (double)100.01, "Double did not upgrade correctly");
+    }
+
+    [Test]
+    public void Upgrade140To150TestAddAndUpdate()
+    {
+      //old value was stored as a long to test
+      TestSettings.AppSettings.AddOrUpdateValue("test1", (long)100);
+      //new value is stored as a string via decimal
+      TestSettings.AppSettings.AddOrUpdateValue("test1", (decimal)100.01M);
+
+      Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<decimal>("test1", (decimal)100.02M) == (decimal)100.01M, "Decimal did not upgrade correctly");
+
+
+      //old value was stored as a long to test
+      TestSettings.AppSettings.AddOrUpdateValue("test2", (long)100);
+      TestSettings.AppSettings.AddOrUpdateValue("test2", (double)100.01);
+
+      Assert.IsTrue(TestSettings.AppSettings.GetValueOrDefault<double>("test2", (double)100.02) == (double)100.01, "Double did not upgrade correctly");
+    }
+
+  }
+}
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOS/AppDelegate.cs b/tests/Refractored.Xam.Settings.NUnitTest.iOS/AppDelegate.cs
deleted file mode 100644
index c6fc6da..0000000
--- a/tests/Refractored.Xam.Settings.NUnitTest.iOS/AppDelegate.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-using MonoTouch.NUnit.UI;
-
-namespace Plugin.Settings.NUnitTest.iOS
-{
-  // The UIApplicationDelegate for the application. This class is responsible for launching the 
-  // User Interface of the application, as well as listening (and optionally responding) to 
-  // application events from iOS.
-  [Register("AppDelegate")]
-  public partial class AppDelegate : UIApplicationDelegate
-  {
-    // class-level declarations
-    UIWindow window;
-    TouchRunner runner;
-
-    //
-    // This method is invoked when the application has loaded and is ready to run. In this 
-    // method you should instantiate the window, load the UI into it and then make the window
-    // visible.
-    //
-    // You have 17 seconds to return from this method, or iOS will terminate your application.
-    //
-    public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-    {
-      // create a new window instance based on the screen size
-      window = new UIWindow(UIScreen.MainScreen.Bounds);
-      runner = new TouchRunner(window);
-
-      // register every tests included in the main application/assembly
-      runner.Add(System.Reflection.Assembly.GetExecutingAssembly());
-
-      window.RootViewController = new UINavigationController(runner.GetViewController());
-
-      // make the window visible
-      window.MakeKeyAndVisible();
-
-      return true;
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Info.plist b/tests/Refractored.Xam.Settings.NUnitTest.iOS/Info.plist
deleted file mode 100644
index a511415..0000000
--- a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Info.plist
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>CFBundleDisplayName</key>
-    <string>Plugin.Settings.NUnitTest.iOS</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.your-company.Plugin.Settings.NUnitTest.iOS</string>
-    <key>CFBundleShortVersionString</key>
-    <string>1.0</string>
-    <key>CFBundleVersion</key>
-    <string>1.0</string>
-    <key>UIDeviceFamily</key>
-    <array>
-      <integer>1</integer>
-      <integer>2</integer>
-    </array>
-    <key>UISupportedInterfaceOrientations</key>
-    <array>
-      <string>UIInterfaceOrientationPortrait</string>
-      <string>UIInterfaceOrientationLandscapeLeft</string>
-      <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>UISupportedInterfaceOrientations~ipad</key>
-    <array>
-      <string>UIInterfaceOrientationPortrait</string>
-      <string>UIInterfaceOrientationPortraitUpsideDown</string>
-      <string>UIInterfaceOrientationLandscapeLeft</string>
-      <string>UIInterfaceOrientationLandscapeRight</string>
-    </array>
-    <key>MinimumOSVersion</key>
-    <string>7.0</string>
-  </dict>
-</plist>
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Main.cs b/tests/Refractored.Xam.Settings.NUnitTest.iOS/Main.cs
deleted file mode 100644
index f024f4a..0000000
--- a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Main.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-
-namespace Plugin.Settings.NUnitTest.iOS
-{
-  public class Application
-  {
-    // This is the main entry point of the application.
-    static void Main(string[] args)
-    {
-      // if you want to use a different Application Delegate class from "AppDelegate"
-      // you can specify it here.
-      UIApplication.Main(args, null, "AppDelegate");
-    }
-  }
-}
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Properties/AssemblyInfo.cs b/tests/Refractored.Xam.Settings.NUnitTest.iOS/Properties/AssemblyInfo.cs
deleted file mode 100644
index 34f3f35..0000000
--- a/tests/Refractored.Xam.Settings.NUnitTest.iOS/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// 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("Plugin.Settings.NUnitTest.iOS")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Plugin.Settings.NUnitTest.iOS")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8c095fff-5a28-469d-9bd3-cb9ac57ca105")]
-
-// 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")]
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default-568h@2x.png b/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default-568h@2x.png
deleted file mode 100644
index b3f6678..0000000
Binary files a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default-568h@2x.png and /dev/null differ
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default.png b/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default.png
deleted file mode 100644
index 7ad63b0..0000000
Binary files a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default.png and /dev/null differ
diff --git a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default@2x.png b/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default@2x.png
deleted file mode 100644
index 8d59426..0000000
Binary files a/tests/Refractored.Xam.Settings.NUnitTest.iOSUnified/Resources/Default@2x.png and /dev/null differ
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Activity1.cs b/tests/Refractored.Xam.Settings.Tests.Android/Activity1.cs
deleted file mode 100644
index 509b0d3..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Activity1.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-
-using Android.App;
-using Android.Content;
-using Android.Runtime;
-using Android.Views;
-using Android.Widget;
-using Android.OS;
-using Refractored.Xam.Settings.Tests.Android;
-
-namespace Plugin.Settings.Tests.Android
-{
-  [Activity(Label = "Plugin.Settings.Tests.Android", MainLauncher = true, Icon = "@drawable/icon")]
-  public class Activity1 : Activity
-  {
-    int count = 1;
-
-    protected override void OnCreate(Bundle bundle)
-    {
-      base.OnCreate(bundle);
-
-      // Set our view from the "main" layout resource
-      SetContentView(Resource.Layout.Main);
-
-      // Get our button from the layout resource,
-      // and attach an event to it
-      Button button = FindViewById<Button>(Resource.Id.MyButton);
-
-      button.Click += delegate
-      {
-        button.Text = string.Format("{0} clicks!", count++);
-      };
-
-      Portable.Helpers.TestSettings.StringSetting = "Settings stuff";
-      button.Text = Portable.Helpers.TestSettings.StringSetting;
-
-    }
-  }
-}
-
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Assets/AboutAssets.txt b/tests/Refractored.Xam.Settings.Tests.Android/Assets/AboutAssets.txt
deleted file mode 100644
index ee39886..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Assets/AboutAssets.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with you package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
-	protected override void OnCreate (Bundle bundle)
-	{
-		base.OnCreate (bundle);
-
-		InputStream input = Assets.Open ("my_asset.txt");
-	}
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Properties/AndroidManifest.xml b/tests/Refractored.Xam.Settings.Tests.Android/Properties/AndroidManifest.xml
deleted file mode 100644
index 6ad3b6a..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="23" />
-	<application></application>
-</manifest>
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Properties/AssemblyInfo.cs b/tests/Refractored.Xam.Settings.Tests.Android/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8c021c4..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// 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("Plugin.Settings.Tests.Android")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Plugin.Settings.Tests.Android")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
-
-// 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("2.1.0")]
-[assembly: AssemblyFileVersion("2.1.0")]
-[assembly: AssemblyInformationalVersion("2.1.0")]
-
-// Add some common permissions, these can be removed if not needed
-[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
-[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Refractored.Xam.Settings.Tests.Android.csproj b/tests/Refractored.Xam.Settings.Tests.Android/Refractored.Xam.Settings.Tests.Android.csproj
deleted file mode 100644
index d372481..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Refractored.Xam.Settings.Tests.Android.csproj
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Refractored.Xam.Settings.Tests.Android</RootNamespace>
-    <AssemblyName>Refractored.Xam.Settings.Tests.Android</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <AndroidApplication>true</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" />
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Activity1.cs" />
-    <Compile Include="Resources\Resource.Designer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\AboutResources.txt" />
-    <None Include="Assets\AboutAssets.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\Layout\Main.axml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\Values\Strings.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\Drawable\Icon.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\AndroidManifest.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Abstractions\Refractored.Xam.Settings.Abstractions.csproj">
-      <Project>{d12d6afa-0696-4177-9c85-ec576277ef8e}</Project>
-      <Name>Refractored.Xam.Settings.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Android\Refractored.Xam.Settings.Android.csproj">
-      <Project>{91b25a78-62c8-41aa-8d22-da326a5ea64d}</Project>
-      <Name>Refractored.Xam.Settings.Android</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Refractored.Xam.Settings.Tests.Portable\Refractored.Xam.Settings.Tests.Portable.csproj">
-      <Project>{2961bec8-6e97-4943-af17-491e25309619}</Project>
-      <Name>Refractored.Xam.Settings.Tests.Portable</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-     Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Resources/AboutResources.txt b/tests/Refractored.Xam.Settings.Tests.Android/Resources/AboutResources.txt
deleted file mode 100644
index 194ae28..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Resources/AboutResources.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-Images, layout descriptions, binary blobs and string dictionaries can be included 
-in your application as resource files.  Various Android APIs are designed to 
-operate on the resource IDs instead of dealing with images, strings or binary blobs 
-directly.
-
-For example, a sample Android app that contains a user interface layout (main.xml),
-an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) 
-would keep its resources in the "Resources" directory of the application:
-
-Resources/
-    drawable-hdpi/
-        icon.png
-
-    drawable-ldpi/
-        icon.png
-
-    drawable-mdpi/
-        icon.png
-
-    layout/
-        main.xml
-
-    values/
-        strings.xml
-
-In order to get the build system to recognize Android resources, set the build action to
-"AndroidResource".  The native Android APIs do not operate directly with filenames, but 
-instead operate on resource IDs.  When you compile an Android application that uses resources, 
-the build system will package the resources for distribution and generate a class called
-"Resource" that contains the tokens for each one of the resources included. For example, 
-for the above Resources layout, this is what the Resource class would expose:
-
-public class Resource {
-    public class drawable {
-        public const int icon = 0x123;
-    }
-
-    public class layout {
-        public const int main = 0x456;
-    }
-
-    public class strings {
-        public const int first_string = 0xabc;
-        public const int second_string = 0xbcd;
-    }
-}
-
-You would then use R.drawable.icon to reference the drawable/icon.png file, or Resource.layout.main 
-to reference the layout/main.xml file, or Resource.strings.first_string to reference the first 
-string in the dictionary file values/strings.xml.
\ No newline at end of file
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Resources/Drawable/Icon.png b/tests/Refractored.Xam.Settings.Tests.Android/Resources/Drawable/Icon.png
deleted file mode 100644
index 8074c4c..0000000
Binary files a/tests/Refractored.Xam.Settings.Tests.Android/Resources/Drawable/Icon.png and /dev/null differ
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Resources/Layout/Main.axml b/tests/Refractored.Xam.Settings.Tests.Android/Resources/Layout/Main.axml
deleted file mode 100644
index 98be164..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Resources/Layout/Main.axml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<Button  
-    android:id="@+id/MyButton"
-    android:layout_width="fill_parent" 
-    android:layout_height="wrap_content" 
-    android:text="@string/Hello"
-    />
-</LinearLayout>
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Resources/Resource.Designer.cs b/tests/Refractored.Xam.Settings.Tests.Android/Resources/Resource.Designer.cs
deleted file mode 100644
index f730b00..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Resources/Resource.Designer.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("Refractored.Xam.Settings.Tests.Android.Resource", IsApplication=true)]
-
-namespace Refractored.Xam.Settings.Tests.Android
-{
-	
-	
-	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
-	public partial class Resource
-	{
-		
-		static Resource()
-		{
-			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-		}
-		
-		public static void UpdateIdValues()
-		{
-		}
-		
-		public partial class Attribute
-		{
-			
-			static Attribute()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Attribute()
-			{
-			}
-		}
-		
-		public partial class Drawable
-		{
-			
-			// aapt resource value: 0x7f020000
-			public const int Icon = 2130837504;
-			
-			static Drawable()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Drawable()
-			{
-			}
-		}
-		
-		public partial class Id
-		{
-			
-			// aapt resource value: 0x7f050000
-			public const int MyButton = 2131034112;
-			
-			static Id()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Id()
-			{
-			}
-		}
-		
-		public partial class Layout
-		{
-			
-			// aapt resource value: 0x7f030000
-			public const int Main = 2130903040;
-			
-			static Layout()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Layout()
-			{
-			}
-		}
-		
-		public partial class String
-		{
-			
-			// aapt resource value: 0x7f040001
-			public const int ApplicationName = 2130968577;
-			
-			// aapt resource value: 0x7f040000
-			public const int Hello = 2130968576;
-			
-			static String()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private String()
-			{
-			}
-		}
-	}
-}
-#pragma warning restore 1591
diff --git a/tests/Refractored.Xam.Settings.Tests.Android/Resources/Values/Strings.xml b/tests/Refractored.Xam.Settings.Tests.Android/Resources/Values/Strings.xml
deleted file mode 100644
index 967250d..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Android/Resources/Values/Strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="Hello">Hello World, Click Me!</string>
-    <string name="ApplicationName">Plugin.Settings.Tests.Android</string>
-</resources>
diff --git a/tests/Refractored.Xam.Settings.Tests.Portable/Helpers/TEstSettings.cs b/tests/Refractored.Xam.Settings.Tests.Portable/Helpers/TEstSettings.cs
deleted file mode 100644
index 8583268..0000000
--- a/tests/Refractored.Xam.Settings.Tests.Portable/Helpers/TEstSettings.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-// Helpers/Settings.cs
-using Plugin.Settings.Abstractions;
-using System;
-
-namespace Plugin.Settings.Tests.Portable.Helpers
-{
-  /// <summary>
-  /// This is the Settings static class that can be used in your Core solution or in any
-  /// of your client applications. All settings are laid out the same exact way with getters
-  /// and setters. 
-  /// </summary>
-  public static class TestSettings
-  {
-    public static ISettings AppSettings
-    {
-      get
-      {
-        return CrossSettings.Current;
-      }
-    }
-
-    #region Setting Constants
-
-    public const string SettingsKey = "settings_key";
-    private static readonly string SettingsDefault = string.Empty;
-
-    #endregion
-
-    public static Guid GuidSetting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault("guid_setting", Guid.Empty);
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue("guid_setting", value);
-      }
-    }
-
-    public static decimal DecimalSetting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault("decimal_setting", (decimal)0);
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue("decimal_setting", value);
-      }
-    }
-
-    public static int IntSetting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault("int_setting", (int)0);
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue("int_setting", value);
-      }
-    }
-
-    public static float FloatSetting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault("float_setting", (float)0);
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue("float_setting", value);
-      }
-    }
-
-    public static Int64 Int64Setting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault("int64_setting", (Int64)0);
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue("int64_setting", value);
-      }
-    }
-
-    public static Int32 Int32Setting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault("int32_setting", (Int32)0);
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue("int32_setting", value);
-      }
-    }
-
-    public static DateTime? DateTimeSetting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault<DateTime?>("date_setting");
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue("date_setting", value);
-      }
-    }
-
-    public static double DoubleSetting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault("double_setting", (double)0);
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue("double_setting", value);
-      }
-    }
-
-    public static bool BoolSetting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault("bool_setting", false);
-      }
-      set
-      {
-        AppSettings.AddOrUpdateValue("bool_setting", value);
-      }
-    }
-
-    public static string StringSetting
-    {
-      get
-      {
-        return AppSettings.GetValueOrDefault(SettingsKey, SettingsDefault);
-      }
-      set
-      {
-        //if value has changed then save it!
-        AppSettings.AddOrUpdateValue(SettingsKey, value);
-      }
-    }
-
-    public static void Remove(string key)
-    {
-      AppSettings.Remove(key);
-    }
-
-  }
-}
\ No newline at end of file
diff --git a/tests/Refractored.XamPlugins.Settings.sln b/tests/SettingsTests.sln
similarity index 81%
rename from tests/Refractored.XamPlugins.Settings.sln
rename to tests/SettingsTests.sln
index 53fd320..a59904e 100644
--- a/tests/Refractored.XamPlugins.Settings.sln
+++ b/tests/SettingsTests.sln
@@ -1,56 +1,59 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4900279E-8A47-4E5D-B8F0-A6DD8773F351}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings", "Refractored.Xam.Settings\Refractored.Xam.Settings.csproj", "{747706F4-ECBF-4D50-8D72-B0DDCC18395C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.Android", "Refractored.Xam.Settings.Android\Refractored.Xam.Settings.Android.csproj", "{91B25A78-62C8-41AA-8D22-DA326A5EA64D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings", "..\src\Plugin.Settings\Plugin.Settings.csproj", "{747706F4-ECBF-4D50-8D72-B0DDCC18395C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.WindowsPhone", "Refractored.Xam.Settings.WindowsPhone\Refractored.Xam.Settings.WindowsPhone.csproj", "{DFC49539-6A6E-4AD5-AE04-500D65B30F20}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.Android", "..\src\Plugin.Settings.Android\Plugin.Settings.Android.csproj", "{91B25A78-62C8-41AA-8D22-DA326A5EA64D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.iOS", "Refractored.Xam.Settings.iOS\Refractored.Xam.Settings.iOS.csproj", "{C598E2C2-E094-42B7-A8D7-BE83E1C72C86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.WindowsPhone", "..\src\Plugin.Settings.WindowsPhone\Plugin.Settings.WindowsPhone.csproj", "{DFC49539-6A6E-4AD5-AE04-500D65B30F20}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.WindowsStore", "Refractored.Xam.Settings.WindowsStore\Refractored.Xam.Settings.WindowsStore.csproj", "{489617CC-3D48-4189-BAAE-06D08384F965}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.iOS", "..\src\Plugin.Settings.iOS\Plugin.Settings.iOS.csproj", "{C598E2C2-E094-42B7-A8D7-BE83E1C72C86}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.Abstractions", "Refractored.Xam.Settings.Abstractions\Refractored.Xam.Settings.Abstractions.csproj", "{D12D6AFA-0696-4177-9C85-EC576277EF8E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.WindowsStore", "..\src\Plugin.Settings.WindowsStore\Plugin.Settings.WindowsStore.csproj", "{489617CC-3D48-4189-BAAE-06D08384F965}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.Tests.Android", "Refractored.Xam.Settings.Tests.Android\Refractored.Xam.Settings.Tests.Android.csproj", "{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.Abstractions", "..\src\Plugin.Settings.Abstractions\Plugin.Settings.Abstractions.csproj", "{D12D6AFA-0696-4177-9C85-EC576277EF8E}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6B56CF03-9506-46A9-BF28-FEBDA3776AA5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.WindowsPhone81", "..\src\Plugin.Settings.WindowsPhone81\Plugin.Settings.WindowsPhone81.csproj", "{47E0D9FA-8A76-4F09-A238-F88D692477DA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.Tests.Portable", "Refractored.Xam.Settings.Tests.Portable\Refractored.Xam.Settings.Tests.Portable.csproj", "{2961BEC8-6E97-4943-AF17-491E25309619}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.iOSUnified", "..\src\Plugin.Settings.iOSUnified\Plugin.Settings.iOSUnified.csproj", "{FCF19725-8C2F-44C5-AA52-513EE32469E2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.WindowsPhone81", "Refractored.Xam.Settings.WindowsPhone81\Refractored.Xam.Settings.WindowsPhone81.csproj", "{47E0D9FA-8A76-4F09-A238-F88D692477DA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.UWP", "..\src\Plugin.Settings.UWP\Plugin.Settings.UWP.csproj", "{C1B59CE7-B44B-4F31-B671-02E685ED036F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.iOSUnified", "Refractored.Xam.Settings.iOSUnified\Refractored.Xam.Settings.iOSUnified.csproj", "{FCF19725-8C2F-44C5-AA52-513EE32469E2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.Net45", "..\src\Plugin.Settings.Net45\Plugin.Settings.Net45.csproj", "{52E1406B-0FEA-4EA8-BE48-888BCC0884C7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.NUnitTest.Android", "Refractored.Xam.Settings.NUnitTest.Android\Refractored.Xam.Settings.NUnitTest.Android.csproj", "{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6B56CF03-9506-46A9-BF28-FEBDA3776AA5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.NUnitTest.iOS", "Refractored.Xam.Settings.NUnitTest.iOS\Refractored.Xam.Settings.NUnitTest.iOS.csproj", "{38DD1031-7DA2-4F7D-B6EF-060317B34950}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.NUnitTest.Android", "Plugin.Settings.NUnitTest.Android\Plugin.Settings.NUnitTest.Android.csproj", "{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.NUnitTest.iOSUnified", "Refractored.Xam.Settings.NUnitTest.iOSUnified\Refractored.Xam.Settings.NUnitTest.iOSUnified.csproj", "{0C283E74-8FEF-4441-A9B4-708DC70C3E35}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.NUnitTest.iOS", "Plugin.Settings.NUnitTest.iOS\Plugin.Settings.NUnitTest.iOS.csproj", "{38DD1031-7DA2-4F7D-B6EF-060317B34950}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3E1F951A-5B27-4BB7-8D11-0150C9B427A4}"
 	ProjectSection(SolutionItems) = preProject
-		Common\core\readme.txt = Common\core\readme.txt
-		Common\core\Settings.cs.pp = Common\core\Settings.cs.pp
-		Common\core\SettingsPlatform.cs.pp = Common\core\SettingsPlatform.cs.pp
-		Common\Xam.Plugins.Settings.nuspec = Common\Xam.Plugins.Settings.nuspec
+		..\appveyor.yml = ..\appveyor.yml
+		..\build.cake = ..\build.cake
+		..\component\component.template.yaml = ..\component\component.template.yaml
+		..\nuget\Plugin.nuspec = ..\nuget\Plugin.nuspec
+		..\nuget\readme.txt = ..\nuget\readme.txt
+		..\files\Settings.cs.pp = ..\files\Settings.cs.pp
+		..\files\SettingsPlatform.cs.pp = ..\files\SettingsPlatform.cs.pp
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.UWP", "Refractored.Xam.Settings.UWP\Refractored.Xam.Settings.UWP.csproj", "{C1B59CE7-B44B-4F31-B671-02E685ED036F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Refractored.Xam.Settings.Net45", "Refractored.Xam.Settings.Net45\Refractored.Xam.Settings.Net45.csproj", "{52E1406B-0FEA-4EA8-BE48-888BCC0884C7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.Settings.Tests.Portable", "Plugin.Settings.Tests.Portable\Plugin.Settings.Tests.Portable.csproj", "{2961BEC8-6E97-4943-AF17-491E25309619}"
 EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{47e0d9fa-8a76-4f09-a238-f88d692477da}*SharedItemsImports = 4
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{489617cc-3d48-4189-baae-06d08384f965}*SharedItemsImports = 4
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{52e1406b-0fea-4ea8-be48-888bcc0884c7}*SharedItemsImports = 4
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{747706f4-ecbf-4d50-8d72-b0ddcc18395c}*SharedItemsImports = 4
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{91b25a78-62c8-41aa-8d22-da326a5ea64d}*SharedItemsImports = 4
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{c1b59ce7-b44b-4f31-b671-02e685ed036f}*SharedItemsImports = 4
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{c598e2c2-e094-42b7-a8d7-be83e1c72c86}*SharedItemsImports = 4
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{dfc49539-6a6e-4ad5-ae04-500d65b30f20}*SharedItemsImports = 4
+		..\src\Plugin.Settings.Shared\Plugin.Settings.Shared.projitems*{fcf19725-8c2f-44c5-aa52-513ee32469e2}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
 		Ad-Hoc|ARM = Ad-Hoc|ARM
@@ -319,88 +322,6 @@ Global
 		{D12D6AFA-0696-4177-9C85-EC576277EF8E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{D12D6AFA-0696-4177-9C85-EC576277EF8E}.Release|x64.ActiveCfg = Release|Any CPU
 		{D12D6AFA-0696-4177-9C85-EC576277EF8E}.Release|x86.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|x64.ActiveCfg = Release|Any CPU
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE}.Release|x86.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|iPhone.Build.0 = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|x64.ActiveCfg = Release|Any CPU
-		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|x86.ActiveCfg = Release|Any CPU
 		{47E0D9FA-8A76-4F09-A238-F88D692477DA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{47E0D9FA-8A76-4F09-A238-F88D692477DA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{47E0D9FA-8A76-4F09-A238-F88D692477DA}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
@@ -484,131 +405,6 @@ Global
 		{FCF19725-8C2F-44C5-AA52-513EE32469E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{FCF19725-8C2F-44C5-AA52-513EE32469E2}.Release|x64.ActiveCfg = Release|Any CPU
 		{FCF19725-8C2F-44C5-AA52-513EE32469E2}.Release|x86.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Any CPU.Build.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|ARM.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|x64.ActiveCfg = Release|Any CPU
-		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|x86.ActiveCfg = Release|Any CPU
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|Mixed Platforms.ActiveCfg = Ad-Hoc|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|Mixed Platforms.Build.0 = Ad-Hoc|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|Mixed Platforms.ActiveCfg = AppStore|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|Mixed Platforms.Build.0 = AppStore|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|x64.ActiveCfg = AppStore|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|x86.ActiveCfg = AppStore|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|iPhone.Build.0 = Debug|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|Mixed Platforms.ActiveCfg = Debug|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|Mixed Platforms.Build.0 = Debug|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|x64.ActiveCfg = Debug|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|x86.ActiveCfg = Debug|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|ARM.ActiveCfg = Release|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|iPhone.ActiveCfg = Release|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|iPhone.Build.0 = Release|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|Mixed Platforms.ActiveCfg = Release|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|Mixed Platforms.Build.0 = Release|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|x64.ActiveCfg = Release|iPhone
-		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|x86.ActiveCfg = Release|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|Mixed Platforms.ActiveCfg = Ad-Hoc|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|Mixed Platforms.Build.0 = Ad-Hoc|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|ARM.ActiveCfg = AppStore|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|iPhone.Build.0 = AppStore|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|Mixed Platforms.ActiveCfg = AppStore|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|Mixed Platforms.Build.0 = AppStore|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|x64.ActiveCfg = AppStore|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.AppStore|x86.ActiveCfg = AppStore|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|ARM.ActiveCfg = Debug|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|iPhone.Build.0 = Debug|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|Mixed Platforms.ActiveCfg = Debug|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|Mixed Platforms.Build.0 = Debug|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|x64.ActiveCfg = Debug|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Debug|x86.ActiveCfg = Debug|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|ARM.ActiveCfg = Release|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|iPhone.ActiveCfg = Release|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|iPhone.Build.0 = Release|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|Mixed Platforms.ActiveCfg = Release|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|Mixed Platforms.Build.0 = Release|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|x64.ActiveCfg = Release|iPhone
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35}.Release|x86.ActiveCfg = Release|iPhone
 		{C1B59CE7-B44B-4F31-B671-02E685ED036F}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{C1B59CE7-B44B-4F31-B671-02E685ED036F}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
 		{C1B59CE7-B44B-4F31-B671-02E685ED036F}.Ad-Hoc|ARM.ActiveCfg = Release|ARM
@@ -721,16 +517,154 @@ Global
 		{52E1406B-0FEA-4EA8-BE48-888BCC0884C7}.Release|x64.Build.0 = Release|Any CPU
 		{52E1406B-0FEA-4EA8-BE48-888BCC0884C7}.Release|x86.ActiveCfg = Release|Any CPU
 		{52E1406B-0FEA-4EA8-BE48-888BCC0884C7}.Release|x86.Build.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Any CPU.Deploy.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|x64.ActiveCfg = Release|Any CPU
+		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E}.Release|x86.ActiveCfg = Release|Any CPU
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|Any CPU.ActiveCfg = Ad-Hoc|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|ARM.ActiveCfg = Ad-Hoc|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|iPhone.ActiveCfg = Ad-Hoc|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|iPhone.Build.0 = Ad-Hoc|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Ad-Hoc|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|iPhoneSimulator.Build.0 = Ad-Hoc|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|Mixed Platforms.ActiveCfg = Ad-Hoc|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|Mixed Platforms.Build.0 = Ad-Hoc|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|x64.ActiveCfg = Ad-Hoc|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Ad-Hoc|x86.ActiveCfg = Ad-Hoc|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|Any CPU.ActiveCfg = AppStore|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|ARM.ActiveCfg = AppStore|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|iPhone.ActiveCfg = AppStore|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|iPhone.Build.0 = AppStore|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|iPhoneSimulator.ActiveCfg = AppStore|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|iPhoneSimulator.Build.0 = AppStore|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|Mixed Platforms.ActiveCfg = AppStore|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|Mixed Platforms.Build.0 = AppStore|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|x64.ActiveCfg = AppStore|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.AppStore|x86.ActiveCfg = AppStore|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|ARM.ActiveCfg = Debug|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|iPhone.Build.0 = Debug|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|Mixed Platforms.ActiveCfg = Debug|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|Mixed Platforms.Build.0 = Debug|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|x64.ActiveCfg = Debug|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Debug|x86.ActiveCfg = Debug|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|ARM.ActiveCfg = Release|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|iPhone.ActiveCfg = Release|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|iPhone.Build.0 = Release|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|Mixed Platforms.ActiveCfg = Release|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|Mixed Platforms.Build.0 = Release|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|x64.ActiveCfg = Release|iPhone
+		{38DD1031-7DA2-4F7D-B6EF-060317B34950}.Release|x86.ActiveCfg = Release|iPhone
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|Mixed Platforms.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|ARM.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|ARM.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|Mixed Platforms.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|x64.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|x64.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|x86.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.AppStore|x86.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|ARM.Build.0 = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|x64.Build.0 = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Debug|x86.Build.0 = Debug|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|ARM.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|ARM.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|iPhone.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|x64.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|x64.Build.0 = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|x86.ActiveCfg = Release|Any CPU
+		{2961BEC8-6E97-4943-AF17-491E25309619}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{5B54C4B6-8164-43A3-B1A2-9CA959FF31EE} = {6B56CF03-9506-46A9-BF28-FEBDA3776AA5}
-		{2961BEC8-6E97-4943-AF17-491E25309619} = {6B56CF03-9506-46A9-BF28-FEBDA3776AA5}
 		{F7CE1ED7-3D25-4D22-95CC-B24B0223EB7E} = {6B56CF03-9506-46A9-BF28-FEBDA3776AA5}
 		{38DD1031-7DA2-4F7D-B6EF-060317B34950} = {6B56CF03-9506-46A9-BF28-FEBDA3776AA5}
-		{0C283E74-8FEF-4441-A9B4-708DC70C3E35} = {6B56CF03-9506-46A9-BF28-FEBDA3776AA5}
+		{2961BEC8-6E97-4943-AF17-491E25309619} = {6B56CF03-9506-46A9-BF28-FEBDA3776AA5}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = Refractored.Xam.Settings\Refractored.Xam.Settings.csproj