diff --git a/FireSharp.Test.Windows8App/App.xaml b/FireSharp.Test.Windows8App/App.xaml
deleted file mode 100644
index 0f894eb..0000000
--- a/FireSharp.Test.Windows8App/App.xaml
+++ /dev/null
@@ -1,7 +0,0 @@
-<Application
-    x:Class="FireSharp.Test.Windows8App.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:FireSharp.Test.Windows8App">
-
-</Application>
diff --git a/FireSharp.sln b/FireSharp.sln
index dfbea56..1387fb5 100644
--- a/FireSharp.sln
+++ b/FireSharp.sln
@@ -22,8 +22,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireSharp.Serialization.Jso
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireSharp.Serialization.ServiceStack", "FireSharp.Serialization.ServiceStack\FireSharp.Serialization.ServiceStack.csproj", "{7B0E3BC1-4C1D-4748-B678-3197E8E194FC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireSharp.Test.Windows8App", "FireSharp.Test.Windows8App\FireSharp.Test.Windows8App.csproj", "{DEE14420-0A35-4E47-BB42-33C3EC691A8E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -96,30 +94,6 @@ Global
 		{7B0E3BC1-4C1D-4748-B678-3197E8E194FC}.Release|ARM.ActiveCfg = Release|Any CPU
 		{7B0E3BC1-4C1D-4748-B678-3197E8E194FC}.Release|x64.ActiveCfg = Release|Any CPU
 		{7B0E3BC1-4C1D-4748-B678-3197E8E194FC}.Release|x86.ActiveCfg = Release|Any CPU
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.ActiveCfg = Debug|ARM
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.Build.0 = Debug|ARM
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.Deploy.0 = Debug|ARM
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.ActiveCfg = Debug|x64
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.Build.0 = Debug|x64
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.Deploy.0 = Debug|x64
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.ActiveCfg = Debug|x86
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.Build.0 = Debug|x86
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.Deploy.0 = Debug|x86
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.ActiveCfg = Release|ARM
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.Build.0 = Release|ARM
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.Deploy.0 = Release|ARM
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.ActiveCfg = Release|x64
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.Build.0 = Release|x64
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.Deploy.0 = Release|x64
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.ActiveCfg = Release|x86
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.Build.0 = Release|x86
-		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/FireSharp/FireSharp.nuspec b/FireSharp/FireSharp.nuspec
index b5c164c..6074eb7 100644
--- a/FireSharp/FireSharp.nuspec
+++ b/FireSharp/FireSharp.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>FireSharp</id>
-    <version>2.0.1-beta2</version>
+    <version>2.0.1-beta3</version>
     <title>Fire#</title>
     <authors>ziyasal</authors>
     <owners>ziyasal</owners>
diff --git a/Samples/FireSharp.Sample.Windows8App.sln b/Samples/FireSharp.Sample.Windows8App.sln
new file mode 100644
index 0000000..0f7157b
--- /dev/null
+++ b/Samples/FireSharp.Sample.Windows8App.sln
@@ -0,0 +1,48 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FireSharp.Sample.Windows8App", "FireSharp.Sample.Windows8App\FireSharp.Sample.Windows8App.csproj", "{DEE14420-0A35-4E47-BB42-33C3EC691A8E}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.ActiveCfg = Debug|ARM
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.Build.0 = Debug|ARM
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|ARM.Deploy.0 = Debug|ARM
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.ActiveCfg = Debug|x64
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.Build.0 = Debug|x64
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x64.Deploy.0 = Debug|x64
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.ActiveCfg = Debug|x86
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.Build.0 = Debug|x86
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Debug|x86.Deploy.0 = Debug|x86
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.ActiveCfg = Release|ARM
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.Build.0 = Release|ARM
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|ARM.Deploy.0 = Release|ARM
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.ActiveCfg = Release|x64
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.Build.0 = Release|x64
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x64.Deploy.0 = Release|x64
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.ActiveCfg = Release|x86
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.Build.0 = Release|x86
+		{DEE14420-0A35-4E47-BB42-33C3EC691A8E}.Release|x86.Deploy.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Samples/FireSharp.Sample.Windows8App/App.xaml b/Samples/FireSharp.Sample.Windows8App/App.xaml
new file mode 100644
index 0000000..ae1ee6c
--- /dev/null
+++ b/Samples/FireSharp.Sample.Windows8App/App.xaml
@@ -0,0 +1,6 @@
+<Application
+    x:Class="FireSharp.Sample.Windows8App.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+</Application>
diff --git a/FireSharp.Test.Windows8App/App.xaml.cs b/Samples/FireSharp.Sample.Windows8App/App.xaml.cs
similarity index 91%
rename from FireSharp.Test.Windows8App/App.xaml.cs
rename to Samples/FireSharp.Sample.Windows8App/App.xaml.cs
index 1856f12..c49ff90 100644
--- a/FireSharp.Test.Windows8App/App.xaml.cs
+++ b/Samples/FireSharp.Sample.Windows8App/App.xaml.cs
@@ -1,23 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
 // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227
 
-namespace FireSharp.Test.Windows8App
+namespace FireSharp.Sample.Windows8App
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
diff --git a/FireSharp.Test.Windows8App/Assets/Logo.scale-100.png b/Samples/FireSharp.Sample.Windows8App/Assets/Logo.scale-100.png
similarity index 100%
rename from FireSharp.Test.Windows8App/Assets/Logo.scale-100.png
rename to Samples/FireSharp.Sample.Windows8App/Assets/Logo.scale-100.png
diff --git a/FireSharp.Test.Windows8App/Assets/SmallLogo.scale-100.png b/Samples/FireSharp.Sample.Windows8App/Assets/SmallLogo.scale-100.png
similarity index 100%
rename from FireSharp.Test.Windows8App/Assets/SmallLogo.scale-100.png
rename to Samples/FireSharp.Sample.Windows8App/Assets/SmallLogo.scale-100.png
diff --git a/FireSharp.Test.Windows8App/Assets/SplashScreen.scale-100.png b/Samples/FireSharp.Sample.Windows8App/Assets/SplashScreen.scale-100.png
similarity index 100%
rename from FireSharp.Test.Windows8App/Assets/SplashScreen.scale-100.png
rename to Samples/FireSharp.Sample.Windows8App/Assets/SplashScreen.scale-100.png
diff --git a/FireSharp.Test.Windows8App/Assets/StoreLogo.scale-100.png b/Samples/FireSharp.Sample.Windows8App/Assets/StoreLogo.scale-100.png
similarity index 100%
rename from FireSharp.Test.Windows8App/Assets/StoreLogo.scale-100.png
rename to Samples/FireSharp.Sample.Windows8App/Assets/StoreLogo.scale-100.png
diff --git a/FireSharp.Test.Windows8App/FireSharp.Test.Windows8App.csproj b/Samples/FireSharp.Sample.Windows8App/FireSharp.Sample.Windows8App.csproj
similarity index 71%
rename from FireSharp.Test.Windows8App/FireSharp.Test.Windows8App.csproj
rename to Samples/FireSharp.Sample.Windows8App/FireSharp.Sample.Windows8App.csproj
index faa87d8..fc98bed 100644
--- a/FireSharp.Test.Windows8App/FireSharp.Test.Windows8App.csproj
+++ b/Samples/FireSharp.Sample.Windows8App/FireSharp.Sample.Windows8App.csproj
@@ -7,14 +7,15 @@
     <ProjectGuid>{DEE14420-0A35-4E47-BB42-33C3EC691A8E}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FireSharp.Test.Windows8App</RootNamespace>
-    <AssemblyName>FireSharp.Test.Windows8App</AssemblyName>
+    <RootNamespace>FireSharp.Sample.Windows8App</RootNamespace>
+    <AssemblyName>FireSharp.Sample.Windows8App</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformVersion>8.1</TargetPlatformVersion>
     <MinimumVisualStudioVersion>12</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>FireSharp.Test.Windows8App_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <NuGetPackageImportStamp>75865d56</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -101,13 +102,6 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <ProjectReference Include="..\FireSharp\FireSharp.csproj">
-      <Project>{67b7ea6f-dc34-4f48-8331-58df137d78c9}</Project>
-      <Name>FireSharp</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
@@ -122,6 +116,7 @@
       <SubType>Designer</SubType>
     </AppxManifest>
     <None Include="FireSharp.Test.Windows8App_TemporaryKey.pfx" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Logo.scale-100.png" />
@@ -139,10 +134,41 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="FireSharp, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\FireSharp.2.0.1-beta3\lib\portable-net45+sl5+wp8+win8\FireSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\win8\Microsoft.Threading.Tasks.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Threading.Tasks.Extensions, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\win8\Microsoft.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\netcore45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Extensions">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\win8\System.Net.Http.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Primitives">
+      <HintPath>..\packages\Microsoft.Net.Http.2.2.29\lib\win8\System.Net.Http.Primitives.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '12.0' ">
     <VisualStudioVersion>12.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
+  </Target>
   <!-- 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">
diff --git a/FireSharp.Test.Windows8App/FireSharp.Test.Windows8App_TemporaryKey.pfx b/Samples/FireSharp.Sample.Windows8App/FireSharp.Test.Windows8App_TemporaryKey.pfx
similarity index 100%
rename from FireSharp.Test.Windows8App/FireSharp.Test.Windows8App_TemporaryKey.pfx
rename to Samples/FireSharp.Sample.Windows8App/FireSharp.Test.Windows8App_TemporaryKey.pfx
diff --git a/FireSharp.Test.Windows8App/MainPage.xaml b/Samples/FireSharp.Sample.Windows8App/MainPage.xaml
similarity index 94%
rename from FireSharp.Test.Windows8App/MainPage.xaml
rename to Samples/FireSharp.Sample.Windows8App/MainPage.xaml
index b6ee970..d15cb01 100644
--- a/FireSharp.Test.Windows8App/MainPage.xaml
+++ b/Samples/FireSharp.Sample.Windows8App/MainPage.xaml
@@ -1,8 +1,7 @@
 <Page
-    x:Class="FireSharp.Test.Windows8App.MainPage"
+    x:Class="FireSharp.Sample.Windows8App.MainPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:FireSharp.Test.Windows8App"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d" Loaded="MainPage_OnLoaded">
diff --git a/FireSharp.Test.Windows8App/MainPage.xaml.cs b/Samples/FireSharp.Sample.Windows8App/MainPage.xaml.cs
similarity index 98%
rename from FireSharp.Test.Windows8App/MainPage.xaml.cs
rename to Samples/FireSharp.Sample.Windows8App/MainPage.xaml.cs
index 2fb0c1b..f67c565 100644
--- a/FireSharp.Test.Windows8App/MainPage.xaml.cs
+++ b/Samples/FireSharp.Sample.Windows8App/MainPage.xaml.cs
@@ -5,7 +5,7 @@
 using FireSharp.Config;
 using FireSharp.Response;
 
-namespace FireSharp.Test.Windows8App
+namespace FireSharp.Sample.Windows8App
 {
     public class ChatMessage
     {
diff --git a/FireSharp.Test.Windows8App/Package.appxmanifest b/Samples/FireSharp.Sample.Windows8App/Package.appxmanifest
similarity index 73%
rename from FireSharp.Test.Windows8App/Package.appxmanifest
rename to Samples/FireSharp.Sample.Windows8App/Package.appxmanifest
index e43e39c..76a28df 100644
--- a/FireSharp.Test.Windows8App/Package.appxmanifest
+++ b/Samples/FireSharp.Sample.Windows8App/Package.appxmanifest
@@ -2,7 +2,7 @@
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
   <Identity Name="c4a370fa-5a47-4de0-a3c9-eb887cb45700" Publisher="CN=ziyasal" Version="1.0.0.0" />
   <Properties>
-    <DisplayName>FireSharp.Test.Windows8App</DisplayName>
+    <DisplayName>FireSharp.Sample.Windows8App</DisplayName>
     <PublisherDisplayName>ziyasal</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -14,8 +14,8 @@
     <Resource Language="x-generate" />
   </Resources>
   <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="FireSharp.Test.Windows8App.App">
-      <m2:VisualElements DisplayName="FireSharp.Test.Windows8App" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="FireSharp.Test.Windows8App" ForegroundText="light" BackgroundColor="#464646">
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="FireSharp.Sample.Windows8App">
+      <m2:VisualElements DisplayName="FireSharp.Sample.Windows8App" Square150x150Logo="Assets\Logo.png" Square30x30Logo="Assets\SmallLogo.png" Description="FireSharp.Sample.Windows8App" ForegroundText="light" BackgroundColor="#464646">
         <m2:SplashScreen Image="Assets\SplashScreen.png" />
       </m2:VisualElements>
     </Application>
diff --git a/FireSharp.Test.Windows8App/Properties/AssemblyInfo.cs b/Samples/FireSharp.Sample.Windows8App/Properties/AssemblyInfo.cs
similarity index 100%
rename from FireSharp.Test.Windows8App/Properties/AssemblyInfo.cs
rename to Samples/FireSharp.Sample.Windows8App/Properties/AssemblyInfo.cs
diff --git a/Samples/FireSharp.Sample.Windows8App/packages.config b/Samples/FireSharp.Sample.Windows8App/packages.config
new file mode 100644
index 0000000..dd861be
--- /dev/null
+++ b/Samples/FireSharp.Sample.Windows8App/packages.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FireSharp" version="2.0.1-beta3" targetFramework="win81" />
+  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="win81" />
+  <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="win81" />
+  <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="win81" />
+  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="win81" />
+  <package id="Newtonsoft.Json" version="6.0.8" targetFramework="win81" />
+</packages>
\ No newline at end of file