diff --git a/samples/LoginCpp-UWP/LoginCpp-UWP.sln b/samples/LoginCpp-UWP/LoginCpp-UWP.sln
index ddb7c94..94bc717 100644
--- a/samples/LoginCpp-UWP/LoginCpp-UWP.sln
+++ b/samples/LoginCpp-UWP/LoginCpp-UWP.sln
@@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LoginCpp", "LoginCpp\LoginC
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb", "..\..\winsdkfb\winsdkfb_uwp\winsdkfb_uwp\winsdkfb_uwp.vcxproj", "{973A943B-FF77-4267-8F30-F5FE2B7F5583}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Shared", "..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems", "{5C0B24D0-BA5F-490A-AB3E-71265D4A0A4B}"
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{973a943b-ff77-4267-8f30-f5fe2b7f5583}*SharedItemsImports = 4
diff --git a/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.user b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.user
new file mode 100644
index 0000000..abe8dd8
--- /dev/null
+++ b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.user
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/samples/LoginCpp/LoginCpp.sln b/samples/LoginCpp/LoginCpp.sln
index 38a559d..cf7bf2c 100644
--- a/samples/LoginCpp/LoginCpp.sln
+++ b/samples/LoginCpp/LoginCpp.sln
@@ -15,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Windows", "..\..\w
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.WindowsPhone", "..\..\winsdkfb\winsdkfb\winsdkfb.WindowsPhone\winsdkfb.WindowsPhone.vcxproj", "{F833B1E6-2866-4A47-89E2-C474983FE70F}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Shared", "..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems", "{5C0B24D0-BA5F-490A-AB3E-71265D4A0A4B}"
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
LoginCpp\LoginCpp.Shared\LoginCpp.Shared.vcxitems*{079ac050-7d48-41f0-83c2-f4c4da7f21d4}*SharedItemsImports = 9
diff --git a/samples/LoginCs/LoginCs.sln b/samples/LoginCs/LoginCs.sln
index a91bc99..8010d8b 100644
--- a/samples/LoginCs/LoginCs.sln
+++ b/samples/LoginCs/LoginCs.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoginCs", "LoginCs", "{F3A8EFF0-4471-4905-B279-756B1D864AAB}"
EndProject
@@ -15,6 +15,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Windows", "..\..\w
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.WindowsPhone", "..\..\winsdkfb\winsdkfb\winsdkfb.WindowsPhone\winsdkfb.WindowsPhone.vcxproj", "{F833B1E6-2866-4A47-89E2-C474983FE70F}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Shared", "..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems", "{5C0B24D0-BA5F-490A-AB3E-71265D4A0A4B}"
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}*SharedItemsImports = 4
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/.gitignore b/winsdkfb/FBWinStoreCsTests/.gitignore
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/.gitignore
rename to winsdkfb/FBWinStoreCsTests/.gitignore
diff --git a/FBWinSDK/winsdkfb_testing_key.pfx b/winsdkfb/winsdkfb_testing_key.pfx
similarity index 100%
rename from FBWinSDK/winsdkfb_testing_key.pfx
rename to winsdkfb/winsdkfb_testing_key.pfx
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/LockScreenLogo.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/LockScreenLogo.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/LockScreenLogo.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/SplashScreen.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/SplashScreen.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/SplashScreen.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/Square150x150Logo.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/Square150x150Logo.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/Square150x150Logo.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/Square44x44Logo.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/Square44x44Logo.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/Square44x44Logo.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/StoreLogo.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/StoreLogo.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/StoreLogo.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/StoreLogo.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/Wide310x150Logo.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Assets/Wide310x150Logo.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Assets/Wide310x150Logo.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj
similarity index 98%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj
index d6f84d2..ba6e5c2 100644
--- a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj
+++ b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj
@@ -217,6 +217,9 @@
{973a943b-ff77-4267-8f30-f5fe2b7f5583}
+
+ {973a943b-ff77-4267-8f30-f5fe2b7f5583}
+
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.filters b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.filters
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.filters
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.filters
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.user b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.user
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.user
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.user
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Package.appxmanifest b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Package.appxmanifest
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/Package.appxmanifest
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/Package.appxmanifest
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/UnitTestApp.rd.xml b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/UnitTestApp.rd.xml
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/UnitTestApp.rd.xml
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/UnitTestApp.rd.xml
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/UnitTestApp.xaml b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/UnitTestApp.xaml
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/UnitTestApp.xaml
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/UnitTestApp.xaml
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/UnitTestApp.xaml.cpp b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/UnitTestApp.xaml.cpp
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/UnitTestApp.xaml.cpp
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/UnitTestApp.xaml.cpp
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/UnitTestApp.xaml.h b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/UnitTestApp.xaml.h
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/UnitTestApp.xaml.h
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/UnitTestApp.xaml.h
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/pch.cpp b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/pch.cpp
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/pch.cpp
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/pch.cpp
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/pch.h b/winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/pch.h
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCppTests/pch.h
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCppTests/pch.h
diff --git a/FBWinSDK/FBWinStoreCsTests/.gitignore b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/.gitignore
similarity index 100%
rename from FBWinSDK/FBWinStoreCsTests/.gitignore
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/.gitignore
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/LockScreenLogo.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/LockScreenLogo.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/LockScreenLogo.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/SplashScreen.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/SplashScreen.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/SplashScreen.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/Square150x150Logo.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/Square150x150Logo.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/Square150x150Logo.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/Square44x44Logo.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/Square44x44Logo.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/Square44x44Logo.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/StoreLogo.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/StoreLogo.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/StoreLogo.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/StoreLogo.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/Wide310x150Logo.scale-200.png b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Assets/Wide310x150Logo.scale-200.png
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Assets/Wide310x150Logo.scale-200.png
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/FBWinStoreCsTests.csproj b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/FBWinStoreCsTests.csproj
similarity index 98%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/FBWinStoreCsTests.csproj
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/FBWinStoreCsTests.csproj
index 430ac8b..ea12437 100644
--- a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/FBWinStoreCsTests.csproj
+++ b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/FBWinStoreCsTests.csproj
@@ -1,4 +1,4 @@
-
+
@@ -210,7 +210,7 @@
-
+
{973a943b-ff77-4267-8f30-f5fe2b7f5583}
Facebook
@@ -231,4 +231,4 @@
-->
-
+
\ No newline at end of file
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Package.appxmanifest b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Package.appxmanifest
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Package.appxmanifest
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Package.appxmanifest
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Properties/AssemblyInfo.cs b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Properties/AssemblyInfo.cs
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Properties/AssemblyInfo.cs
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Properties/UnitTestApp.rd.xml b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Properties/UnitTestApp.rd.xml
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/Properties/UnitTestApp.rd.xml
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/Properties/UnitTestApp.rd.xml
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/UnitTestApp.xaml b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/UnitTestApp.xaml
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/UnitTestApp.xaml
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/UnitTestApp.xaml
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/UnitTestApp.xaml.cs b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/UnitTestApp.xaml.cs
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/UnitTestApp.xaml.cs
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/UnitTestApp.xaml.cs
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/project.json b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/project.json
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/project.json
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/project.json
diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/project.lock.json b/winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/project.lock.json
similarity index 100%
rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/project.lock.json
rename to winsdkfb/winsdkfb_uwp/FBWinStoreCsTests/project.lock.json